mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-05 16:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Console] Refactor Eventlog for readability

Browse source
This commit is contained in:
Calum Lind 2023-02-27 14:11:22 +00:00
commit 7af584d649
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
1 changed files with 33 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

73
deluge/ui/console/eventlog.py
View file

@ -1,6 +1,7 @@
import time import time
import deluge.component as component import deluge.component as component
from deluge.decorators import maybe_coroutine
from deluge.ui.client import client from deluge.ui.client import client
from deluge.ui.console.utils import colors from deluge.ui.console.utils import colors
@ -16,60 +17,44 @@ class EventLog(component.Component):
self.prefix = '{!event!}* [%H:%M:%S] ' self.prefix = '{!event!}* [%H:%M:%S] '
self.date_change_format = 'On {!yellow!}%a, %d %b %Y{!input!} %Z:' self.date_change_format = 'On {!yellow!}%a, %d %b %Y{!input!} %Z:'
client.register_event_handler('TorrentAddedEvent', self.on_torrent_added_event) event_callbacks = {
client.register_event_handler( 'TorrentAddedEvent': self.on_torrent_added,
'PreTorrentRemovedEvent', self.on_torrent_removed_event 'PreTorrentRemovedEvent': self.on_torrent_removed,
) 'TorrentStateChangedEvent': self.on_torrent_state_changed,
client.register_event_handler( 'TorrentFinishedEvent': self.on_torrent_finished,
'TorrentStateChangedEvent', self.on_torrent_state_changed_event 'NewVersionAvailableEvent': self.on_new_version_available,
) 'SessionPausedEvent': self.on_session_paused,
client.register_event_handler( 'SessionResumedEvent': self.on_session_resumed,
'TorrentFinishedEvent', self.on_torrent_finished_event 'ConfigValueChangedEvent': self.on_config_value_changed,
) 'PluginEnabledEvent': self.on_plugin_enabled,
client.register_event_handler( 'PluginDisabledEvent': self.on_plugin_disabled,
'NewVersionAvailableEvent', self.on_new_version_available_event }
)
client.register_event_handler( for event, callback in event_callbacks.items():
'SessionPausedEvent', self.on_session_paused_event client.register_event_handler(event, callback)
)
client.register_event_handler(
'SessionResumedEvent', self.on_session_resumed_event
)
client.register_event_handler(
'ConfigValueChangedEvent', self.on_config_value_changed_event
)
client.register_event_handler(
'PluginEnabledEvent', self.on_plugin_enabled_event
)
client.register_event_handler(
'PluginDisabledEvent', self.on_plugin_disabled_event
)
self.previous_time = time.localtime(0) self.previous_time = time.localtime(0)
def on_torrent_added_event(self, torrent_id, from_state): @maybe_coroutine
async def on_torrent_added(self, torrent_id, from_state):
if from_state: if from_state:
return return
def on_torrent_status(status): status = await client.core.get_torrent_status(torrent_id, ['name', 'state'])
self.write( self.write(
'{!green!}Torrent Added: {!info!}%s ({!cyan!}%s{!info!})' '{!green!}Torrent Added: {!info!}%s ({!cyan!}%s{!info!})'
% (status['name'], torrent_id) % (status['name'], torrent_id)
) )
# Write out what state the added torrent took # Write out what state the added torrent took
self.on_torrent_state_changed_event(torrent_id, status['state']) self.on_torrent_state_changed(torrent_id, status['state'])
client.core.get_torrent_status(torrent_id, ['name', 'state']).addCallback( def on_torrent_removed(self, torrent_id):
on_torrent_status
)
def on_torrent_removed_event(self, torrent_id):
self.write( self.write(
'{!red!}Torrent Removed: {!info!}%s ({!cyan!}%s{!info!})' '{!red!}Torrent Removed: {!info!}%s ({!cyan!}%s{!info!})'
% (self.console.get_torrent_name(torrent_id), torrent_id) % (self.console.get_torrent_name(torrent_id), torrent_id)
) )
def on_torrent_state_changed_event(self, torrent_id, state): def on_torrent_state_changed(self, torrent_id, state):
# It's probably a new torrent, ignore it # It's probably a new torrent, ignore it
if not state: if not state:
return return
@ -85,7 +70,7 @@ class EventLog(component.Component):
self.write(f'{state}: {{!info!}}{t_name} ({{!cyan!}}{torrent_id}{{!info!}})') self.write(f'{state}: {{!info!}}{t_name} ({{!cyan!}}{torrent_id}{{!info!}})')
def on_torrent_finished_event(self, torrent_id): def on_torrent_finished(self, torrent_id):
if component.get('TorrentList').config['ring_bell']: if component.get('TorrentList').config['ring_bell']:
import curses.beep import curses.beep
@ -95,16 +80,16 @@ class EventLog(component.Component):
% (self.console.get_torrent_name(torrent_id), torrent_id) % (self.console.get_torrent_name(torrent_id), torrent_id)
) )
def on_new_version_available_event(self, version): def on_new_version_available(self, version):
self.write('{!input!}New Deluge version available: {!info!}%s' % (version)) self.write('{!input!}New Deluge version available: {!info!}%s' % (version))
def on_session_paused_event(self): def on_session_paused(self):
self.write('{!input!}Session Paused') self.write('{!input!}Session Paused')
def on_session_resumed_event(self): def on_session_resumed(self):
self.write('{!green!}Session Resumed') self.write('{!green!}Session Resumed')
def on_config_value_changed_event(self, key, value): def on_config_value_changed(self, key, value):
color = '{!white,black,bold!}' color = '{!white,black,bold!}'
try: try:
color = colors.type_color[type(value)] color = colors.type_color[type(value)]
@ -133,8 +118,8 @@ class EventLog(component.Component):
self.console.write_event(p + s) self.console.write_event(p + s)
self.previous_time = current_time self.previous_time = current_time
def on_plugin_enabled_event(self, name): def on_plugin_enabled(self, name):
self.write('PluginEnabled: {!info!}%s' % name) self.write('PluginEnabled: {!info!}%s' % name)
def on_plugin_disabled_event(self, name): def on_plugin_disabled(self, name):
self.write('PluginDisabled: {!info!}%s' % name) self.write('PluginDisabled: {!info!}%s' % name)