Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hanging when using commands from the command-line

Browse Source 
Fix displaying plugin command output on the command-line
This commit is contained in:
Andrew Resch 2010-01-19 23:00:48 +00:00
parent 4af387f774
commit 3686130ea5
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,7 +1,10 @@
=== Deluge 1.2.1 === === Deluge 1.2.1 ===
==== GtkUI ==== ==== GtkUI ====
* Fix #1128 Show an error dialog when unable to start a 'deluged' process * 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) === === Deluge 1.2.0 - "Bursting like an infected kidney" (10 January 2010) ===
==== Core ==== ==== Core ====
* Fix file renaming * Fix file renaming

8
deluge/ui/console/commands/plugin.py
View File

@ -69,7 +69,7 @@ class Command(BaseCommand):
for p in result: for p in result:
self.console.write("{!input!} " + p) 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"]: if options["show"]:
def on_enabled_plugins(result): def on_enabled_plugins(result):
@ -77,7 +77,7 @@ class Command(BaseCommand):
for p in result: for p in result:
self.console.write("{!input!} " + p) 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"]: if options["enable"]:
def on_available_plugins(result): def on_available_plugins(result):
@ -90,7 +90,7 @@ class Command(BaseCommand):
if arg.lower() in plugins: if arg.lower() in plugins:
client.core.enable_plugin(plugins[arg.lower()]) 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"]: if options["disable"]:
def on_enabled_plugins(result): def on_enabled_plugins(result):
@ -103,4 +103,4 @@ class Command(BaseCommand):
if arg.lower() in plugins: if arg.lower() in plugins:
client.core.disable_plugin(plugins[arg.lower()]) 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)

2
deluge/ui/console/main.py
View File

@ -170,7 +170,7 @@ class ConsoleUI(component.Component):
# If we have args, lets process them and quit # If we have args, lets process them and quit
# allow multiple commands split by ";" # allow multiple commands split by ";"
for arg in args.split(";"): 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): def on_complete(result):
self.do_command("quit") self.do_command("quit")