Changeset 368613

Timestamp:

01/19/2010 11:00:48 PM (15 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Children:

445096

Parents:

4af387

Message:

Fix hanging when using commands from the command-line
Fix displaying plugin command output on the command-line

Files:

• ChangeLog (modified) (1 diff)
• deluge/ui/console/commands/plugin.py (modified) (4 diffs)
• deluge/ui/console/main.py (modified) (1 diff)

ChangeLog

@@ -2 +2 @@
 ==== GtkUI ====
         * Fix #1128 Show an error dialog when unable to start a 'deluged' process
-        
+
+==== Console ====
+        * Fix hanging when using commands from the command-line
+
 === Deluge 1.2.0 - "Bursting like an infected kidney" (10 January 2010) ===
 ==== Core ====

deluge/ui/console/commands/plugin.py

@@ -70 +70 @@
                     self.console.write("{!input!}  " + p)
 
-            client.core.get_available_plugins().addCallback(on_available_plugins)
+            return client.core.get_available_plugins().addCallback(on_available_plugins)
 
         if options["show"]:
@@ -78 +78 @@
                     self.console.write("{!input!}  " + p)
 
-            client.core.get_enabled_plugins().addCallback(on_enabled_plugins)
+            return client.core.get_enabled_plugins().addCallback(on_enabled_plugins)
 
         if options["enable"]:
@@ -91 +91 @@
                         client.core.enable_plugin(plugins[arg.lower()])
 
-            client.core.get_available_plugins().addCallback(on_available_plugins)
+            return client.core.get_available_plugins().addCallback(on_available_plugins)
 
         if options["disable"]:
@@ -104 +104 @@
                         client.core.disable_plugin(plugins[arg.lower()])
 
-            client.core.get_enabled_plugins().addCallback(on_enabled_plugins)
+            return client.core.get_enabled_plugins().addCallback(on_enabled_plugins)

deluge/ui/console/main.py

@@ -171 +171 @@
                     # allow multiple commands split by ";"
                     for arg in args.split(";"):
-                        deferreds.append(self.do_command(arg.strip()))
+                        deferreds.append(defer.maybeDeferred(self.do_command, arg.strip()))
 
                     def on_complete(result):