codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of deluge-torrent.org:/deluge

This commit is contained in:
Nick Lanham 2011-02-23 20:05:48 +01:00
parent 4c2f9a1a0a 64e38eac20
commit db46a97263
13 changed files with 105 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deluge/event.py
View File

@ -243,12 +243,13 @@ class PluginEnabledEvent(DelugeEvent):
"""
Emitted when a plugin is enabled in the Core.
"""
def __init__(self, name):
self._args = [name]
def __init__(self, plugin_name):
self._args = [plugin_name]
class PluginDisabledEvent(DelugeEvent):
"""
Emitted when a plugin is disabled in the Core.
"""
def __init__(self, name):
self._args = [name]
def __init__(self, plugin_name):
self._args = [plugin_name]

2
deluge/plugins/autoadd/autoadd/core.py
View File

@ -81,6 +81,8 @@ MAX_NUM_ATTEMPTS = 10
class AutoaddOptionsChangedEvent(DelugeEvent):
"""Emitted when the options for the plugin are changed."""
def __init__(self):
pass
def CheckInput(cond, message):
if not cond:

2
deluge/plugins/autoadd/autoadd/gtkui.py
View File

@ -334,7 +334,7 @@ class GtkUI(GtkPluginBase):
def on_show_prefs(self):
client.autoadd.get_config().addCallback(self.cb_get_config)
def on_options_changed_event(self, event):
def on_options_changed_event(self):
client.autoadd.get_config().addCallback(self.cb_get_config)
def cb_get_config(self, config):

24
deluge/plugins/execute/execute/core.py
View File

@ -64,19 +64,15 @@ class ExecuteCommandAddedEvent(DelugeEvent):
"""
Emitted when a new command is added.
"""
__slots__ = ('command_id', 'event', 'command')
def __init__(self, command_id, event, command):
self.command_id = command_id
self.event = event
self.command = command
self._args = [command_id, event, command]
class ExecuteCommandRemovedEvent(DelugeEvent):
"""
Emitted when a command is removed.
"""
__slots__ = ('command_id',)
def __init__(self, command_id):
self.command_id = command_id
self._args = [command_id]
class Core(CorePluginBase):
def enable(self):
@ -86,17 +82,17 @@ class Core(CorePluginBase):
# Go through the commands list and register event handlers
for command in self.config["commands"]:
event_name = command[EXECUTE_EVENT]
if event_name in self.registered_events:
event = command[EXECUTE_EVENT]
if event in self.registered_events:
continue
def create_event_handler(event_name):
def event_handler(event):
self.execute_commands(event.torrent_id, event_name)
def create_event_handler(event):
def event_handler(torrent_id):
self.execute_commands(torrent_id, event)
return event_handler
event_handler = create_event_handler(event_name)
event_manager.register_event_handler(EVENT_MAP[event_name], event_handler)
self.registered_events[event_name] = event_handler
event_handler = create_event_handler(event)
event_manager.register_event_handler(EVENT_MAP[event], event_handler)
self.registered_events[event] = event_handler
log.debug("Execute core plugin enabled!")

12
deluge/plugins/execute/execute/gtkui.py
View File

@ -161,13 +161,13 @@ class ExecutePreferences(object):
command = widget.get_text()
client.execute.save_command(command_id, event, command)
def on_command_added_event(self, event):
log.debug("Adding command %s: %s", event.event, event.command)
self.add_command(event.command_id, event.event, event.command)
def on_command_added_event(self, command_id, event, command):
log.debug("Adding command %s: %s", event, command)
self.add_command(command_id, event, command)
def on_command_removed_event(self, event):
log.debug("Removing command %s", event.command_id)
self.remove_command(event.command_id)
def on_command_removed_event(self, command_id):
log.debug("Removing command %s", command_id)
self.remove_command(command_id)
class GtkUI(GtkPluginBase):

12
deluge/plugins/extractor/extractor/core.py
View File

@ -77,14 +77,14 @@ class Core(CorePluginBase):
def update(self):
pass
def _on_torrent_finished(self, event):
def _on_torrent_finished(self, torrent_id):
"""
This is called when a torrent finishes. We need to check to see if there
are any files to extract.
"""
# Get the save path
save_path = component.get("TorrentManager")[event.torrent_id].get_status(["save_path"])["save_path"]
files = component.get("TorrentManager")[event.torrent_id].get_files()
save_path = component.get("TorrentManager")[torrent_id].get_status(["save_path"])["save_path"]
files = component.get("TorrentManager")[torrent_id].get_files()
for f in files:
ext = os.path.splitext(f["path"])
if ext[1] in (".gz", ".bz2", ".lzma"):
@ -104,7 +104,7 @@ class Core(CorePluginBase):
# Get the destination path
dest = self.config["extract_path"]
if self.config["use_name_folder"]:
name = component.get("TorrentManager")[event.torrent_id].get_status(["name"])["name"]
name = component.get("TorrentManager")[torrent_id].get_status(["name"])["name"]
dest = os.path.join(dest, name)
# Create the destination folder if it doesn't exist
@ -126,8 +126,8 @@ class Core(CorePluginBase):
# Run the command and add some callbacks
d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
d.addCallback(on_extract_success, event.torrent_id)
d.addErrback(on_extract_failed, event.torrent_id)
d.addCallback(on_extract_success, torrent_id)
d.addErrback(on_extract_failed, torrent_id)
@export
def set_config(self, config):

16
deluge/plugins/freespace/freespace/core.py
View File

@ -55,14 +55,12 @@ class LowDiskSpaceEvent(DelugeEvent):
"""Triggered when the available space for a specific path is getting
too low.
"""
__slots__ = ('percents_dict',)
def __init__(self, percents_dict):
"""
:param percents: dictionary of path keys with their respecive
occupation percentages.
"""
self.percents_dict = percents_dict
self._args = [percents_dict]
DEFAULT_PREFS = {
"enabled": False,
@ -174,25 +172,25 @@ class Core(CorePluginBase):
free_percent = free_blocks * 100 / total_blocks
return free_percent
def __custom_email_notification(self, event):
def __custom_email_notification(self, ocupied_percents):
subject = _("Low Disk Space Warning")
message = _("You're running low on disk space:\n")
for path, ocupied_percent in event.percents_dict.iteritems():
for path, ocupied_percent in ocupied_percents.iteritems():
message += _(' %s%% ocupation in %s\n') % (ocupied_percent, path)
# "\"%s\"%% space occupation on %s") % (ocupied_percent, path)
return subject, message
def __on_plugin_enabled(self, event):
if event.plugin_name == 'Notifications':
def __on_plugin_enabled(self, plugin_name):
if plugin_name == 'Notifications':
component.get("CorePlugin.Notifications"). \
register_custom_email_notification(
"LowDiskSpaceEvent", self.__custom_email_notification
)
def __on_plugin_disabled(self, event):
if event.plugin_name == 'Notifications':
def __on_plugin_disabled(self, plugin_name):
if plugin_name == 'Notifications':
component.get("CorePlugin.Notifications"). \
deregister_custom_email_notification("LowDiskSpaceEvent")

14
deluge/plugins/freespace/freespace/gtkui.py
View File

@ -134,22 +134,22 @@ class GtkUI(GtkPluginBase):
self.glade.get_widget('enabled').set_active(config['enabled'])
self.glade.get_widget('percent').set_value(config['percent'])
def __custom_popup_notification(self, event):
def __custom_popup_notification(self, ocupied_percents):
title = _("Low Free Space")
message = ''
for path, percent in event.percents_dict.iteritems():
for path, percent in ocupied_percents.iteritems():
message += '%s%% %s\n' % (percent, path)
message += '\n'
return title, message
def __custom_blink_notification(self, event):
def __custom_blink_notification(self, ocupied_percents):
return True # Yes, do blink
def __custom_sound_notification(self, event):
def __custom_sound_notification(self, ocupied_percents):
return '' # Use default sound
def __on_plugin_enabled(self, event):
if event.plugin_name == 'Notifications':
def __on_plugin_enabled(self, plugin_name):
if plugin_name == 'Notifications':
notifications = component.get("GtkPlugin.Notifications")
notifications.register_custom_popup_notification(
"LowDiskSpaceEvent", self.__custom_popup_notification
@ -161,7 +161,7 @@ class GtkUI(GtkPluginBase):
"LowDiskSpaceEvent", self.__custom_sound_notification
)
def __on_plugin_disabled(self, event):
def __on_plugin_disabled(self, plugin_name):
pass
# if plugin_name == 'Notifications':
# notifications = component.get("GtkPlugin.Notifications")

12
deluge/plugins/label/label/core.py
View File

@ -133,20 +133,20 @@ class Core(CorePluginBase):
return dict( [(label, 0) for label in self.labels.keys()])
## Plugin hooks ##
def post_torrent_add(self, event):
def post_torrent_add(self, torrent_id, from_state):
log.debug("post_torrent_add")
torrent = self.torrents[event.torrent_id]
torrent = self.torrents[torrent_id]
for label_id, options in self.labels.iteritems():
if options["auto_add"]:
if self._has_auto_match(torrent, options):
self.set_torrent(event.torrent_id, label_id)
self.set_torrent(torrent_id, label_id)
return
def post_torrent_remove(self, event):
def post_torrent_remove(self, torrent_id):
log.debug("post_torrent_remove")
if event.torrent_id in self.torrent_labels:
del self.torrent_labels[event.torrent_id]
if torrent_id in self.torrent_labels:
del self.torrent_labels[torrent_id]
## Utils ##
def clean_config(self):

4
deluge/plugins/notifications/notifications/core.py
View File

@ -188,9 +188,9 @@ Subject: %(subject)s
return _("Notification email sent.")
def _on_torrent_finished_event(self, event):
def _on_torrent_finished_event(self, torrent_id):
log.debug("Handler for TorrentFinishedEvent called for CORE")
torrent = component.get("TorrentManager")[event.torrent_id]
torrent = component.get("TorrentManager")[torrent_id]
torrent_status = torrent.get_status({})
# Email
subject = _("Finished Torrent \"%(name)s\"") % torrent_status

7
deluge/plugins/scheduler/scheduler/core.py
View File

@ -76,12 +76,11 @@ class SchedulerEvent(DelugeEvent):
"""
Emitted when a schedule state changes.
"""
__slots__ = ('colour',)
def __init__(self, colour):
"""
:param colour: str, the current scheduler state
"""
self.colour = colour
self._args = [colour]
class Core(CorePluginBase):
def enable(self):
@ -120,8 +119,8 @@ class Core(CorePluginBase):
pass
def on_config_value_changed(self, event):
if event.key in CONTROLLED_SETTINGS:
def on_config_value_changed(self, key, value):
if key in CONTROLLED_SETTINGS:
self.do_schedule(False)
def __apply_set_functions(self):

4
deluge/plugins/scheduler/scheduler/gtkui.py
View File

@ -203,9 +203,9 @@ class GtkUI(GtkPluginBase):
client.scheduler.get_config().addCallback(on_get_config)
def on_scheduler_event(self, event):
def on_scheduler_event(self, state):
def on_state_deferred(s):
self.status_item.set_image_from_file(get_resource(event.colour.lower() + ".png"))
self.status_item.set_image_from_file(get_resource(state.lower() + ".png"))
self.state_deferred.addCallback(on_state_deferred)