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

fix #1240 and #1208

This commit is contained in:
Damien Churchill 2010-04-28 16:42:16 +01:00
parent 68f0e9ddc7
commit 111bea19d9
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,10 @@ EXECUTE_ID = 0
EXECUTE_EVENT = 1 EXECUTE_EVENT = 1
EXECUTE_COMMAND = 2 EXECUTE_COMMAND = 2
EVENT_MAP = {
"complete": "TorrentFinishedEvent",
"added": "TorrentAddedEvent"
}
class ExecuteCommandAddedEvent(DelugeEvent): class ExecuteCommandAddedEvent(DelugeEvent):
""" """
@ -72,29 +76,40 @@ class Core(CorePluginBase):
def enable(self): def enable(self):
self.config = ConfigManager("execute.conf", DEFAULT_CONFIG) self.config = ConfigManager("execute.conf", DEFAULT_CONFIG)
event_manager = component.get("EventManager") event_manager = component.get("EventManager")
event_manager.register_event_handler("TorrentFinishedEvent", registered_events = []
self.on_torrent_finished)
log.debug("Example core plugin enabled!") # Go through the commands list and register event handlers
for command in self.config["commands"]:
event = command[EXECUTE_EVENT]
if event in registered_events:
continue
def event_handler(torrent_id):
self.execute_commands(torrent_id, command[EXECUTE_EVENT])
event_manager.register_event_handler(EVENT_MAP[event], event_handler)
registered_events.append(event)
log.debug("Execute core plugin enabled!")
def execute_commands(self, torrent_id, event): def execute_commands(self, torrent_id, event):
torrent = component.get("TorrentManager").torrents[torrent_id] torrent = component.get("TorrentManager").torrents[torrent_id]
info = torrent.get_status(["name", "save_path", info = torrent.get_status(["name", "save_path", "move_completed", "move_on_completed_path"])
"move_on_completed_path"])
# Grab the torrent name and save path
torrent_name = info["name"] torrent_name = info["name"]
path = info["save_path"] if \ if event == "completed":
info["move_on_completed_path"] == info["save_path"] else \ save_path = info["move_on_completed_path"] if info ["move_completed"] else info["save_path"]
info["move_on_completed_path"] else:
save_path = info["save_path"]
# Go through and execute all the commands
for command in self.config["commands"]: for command in self.config["commands"]:
if command[EXECUTE_EVENT] == event: if command[EXECUTE_EVENT] == event:
command = os.path.expandvars(command[EXECUTE_COMMAND]) command = os.path.expandvars(command[EXECUTE_COMMAND])
command = os.path.expanduser(command) command = os.path.expanduser(command)
p = Popen([command, torrent_id, torrent_name, path], p = Popen([command, torrent_id, torrent_name, save_path], stdin=PIPE, stdout=PIPE, stderr=PIPE)
stdin=PIPE, stdout=PIPE, stderr=PIPE)
if p.wait() != 0: if p.wait() != 0:
log.warn("Execute command failed with exit code %d", log.warn("Execute command failed with exit code %d", p.returncode)
p.returncode)
def disable(self): def disable(self):
self.config.save() self.config.save()
@ -103,9 +118,6 @@ class Core(CorePluginBase):
self.on_torrent_finished) self.on_torrent_finished)
log.debug("Example core plugin disabled!") log.debug("Example core plugin disabled!")
def on_torrent_finished(self, torrent_id):
self.execute_commands(torrent_id, "complete")
### Exported RPC methods ### ### Exported RPC methods ###
@export @export
def add_command(self, event, command): def add_command(self, event, command):