Module: deluge
Branch: 1.3-stable
Commit: 4d2b7df49dde4327415ca6e8560bd558b9e77763

Author: John Garland <[email protected]>
Date:   Tue Jun  8 00:17:22 2010 +1000

Fix execute plugin only executing last event (#1306)

---

 ChangeLog                              |    3 +++
 deluge/plugins/execute/execute/core.py |    9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b119be..cb9e715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 ==== ConsoleUI ====
        * #1307: Fix not being able to add torrents
 
+==== Execute ====
+       * #1306: Fix always executing last event
+
 === Deluge 1.3.0-rc1 (08 May 2010) ===
 ==== Core ====
        * Implement #1063 option to delete torrent file copy on torrent removal 
- patch from Ghent
diff --git a/deluge/plugins/execute/execute/core.py 
b/deluge/plugins/execute/execute/core.py
index 57fd13f..4c5e660 100644
--- a/deluge/plugins/execute/execute/core.py
+++ b/deluge/plugins/execute/execute/core.py
@@ -84,8 +84,11 @@ class Core(CorePluginBase):
             if event in self.registered_events:
                 continue
 
-            def event_handler(torrent_id):
-                self.execute_commands(torrent_id, command[EXECUTE_EVENT])
+            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)
             event_manager.register_event_handler(EVENT_MAP[event], 
event_handler)
             self.registered_events[event] = event_handler
 
@@ -102,7 +105,7 @@ class Core(CorePluginBase):
         else:
             save_path = info["save_path"]
 
-        log.debug("[execute] Running commands for %s", EXECUTE_EVENT)
+        log.debug("[execute] Running commands for %s", event)
 
         # Go through and execute all the commands
         for command in self.config["commands"]:

-- 
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en.

Reply via email to