Author: andar
Revision: 6099
Log:
Fix hanging when using commands from the command-line
Fix displaying plugin command output on the command-line
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2010-01-18 02:36:03 UTC (rev 6098)
+++ branches/1.2_RC/ChangeLog 2010-01-19 23:00:48 UTC (rev 6099)
@@ -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
Modified: branches/1.2_RC/deluge/ui/console/commands/plugin.py
===================================================================
--- branches/1.2_RC/deluge/ui/console/commands/plugin.py 2010-01-18
02:36:03 UTC (rev 6098)
+++ branches/1.2_RC/deluge/ui/console/commands/plugin.py 2010-01-19
23:00:48 UTC (rev 6099)
@@ -69,7 +69,7 @@
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 @@
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 @@
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 @@
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)
Modified: branches/1.2_RC/deluge/ui/console/main.py
===================================================================
--- branches/1.2_RC/deluge/ui/console/main.py 2010-01-18 02:36:03 UTC (rev
6098)
+++ branches/1.2_RC/deluge/ui/console/main.py 2010-01-19 23:00:48 UTC (rev
6099)
@@ -170,7 +170,7 @@
# 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")
Modified: trunk/deluge/ui/console/commands/plugin.py
===================================================================
--- trunk/deluge/ui/console/commands/plugin.py 2010-01-18 02:36:03 UTC (rev
6098)
+++ trunk/deluge/ui/console/commands/plugin.py 2010-01-19 23:00:48 UTC (rev
6099)
@@ -69,7 +69,7 @@
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 @@
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 @@
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 @@
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)
Modified: trunk/deluge/ui/console/main.py
===================================================================
--- trunk/deluge/ui/console/main.py 2010-01-18 02:36:03 UTC (rev 6098)
+++ trunk/deluge/ui/console/main.py 2010-01-19 23:00:48 UTC (rev 6099)
@@ -170,7 +170,7 @@
# 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")
--
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.
