Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2010-01-19 23:00:48 +0000 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2010-01-19 23:00:48 +0000 |
| commit | 3686130ea5647634674ec0ae30f73e1a1cf5fadb (patch) | |
| tree | 8236484fae21bcbb8747c30b289e129e061b910f | |
| parent | 4af387f774aac1146e09d39f9f77de228c50327f (diff) | |
| download | deluge-3686130ea5647634674ec0ae30f73e1a1cf5fadb.tar.gz deluge-3686130ea5647634674ec0ae30f73e1a1cf5fadb.tar.bz2 deluge-3686130ea5647634674ec0ae30f73e1a1cf5fadb.zip | |
Fix hanging when using commands from the command-line
Fix displaying plugin command output on the command-line
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | deluge/ui/console/commands/plugin.py | 8 | ||||
| -rw-r--r-- | deluge/ui/console/main.py | 2 |
3 files changed, 9 insertions, 6 deletions
@@ -1,7 +1,10 @@ === Deluge 1.2.1 === ==== 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 ==== * Fix file renaming diff --git a/deluge/ui/console/commands/plugin.py b/deluge/ui/console/commands/plugin.py index e626e7e54..84b92e623 100644 --- a/deluge/ui/console/commands/plugin.py +++ b/deluge/ui/console/commands/plugin.py @@ -69,7 +69,7 @@ class Command(BaseCommand): for p in result: 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"]: def on_enabled_plugins(result): @@ -77,7 +77,7 @@ class Command(BaseCommand): for p in result: 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"]: def on_available_plugins(result): @@ -90,7 +90,7 @@ class Command(BaseCommand): if arg.lower() in plugins: 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"]: def on_enabled_plugins(result): @@ -103,4 +103,4 @@ class Command(BaseCommand): if arg.lower() in plugins: 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) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 5bf8df9f8..30e530002 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -170,7 +170,7 @@ class ConsoleUI(component.Component): # If we have args, lets process them and quit # 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): self.do_command("quit") |