summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2012-03-02 15:32:21 +0000
committerCalum Lind <calumlind+deluge@gmail.com>2012-03-02 15:44:08 +0000
commit752e5a7a8f7f206fc81234d5b80183e0acd6848e (patch)
tree69957d730dae05df9b34a5dcd28d02f02531c13f
parent2ecb54c4f7e528eb20a0c2adfb55b3b3891677b1 (diff)
downloaddeluge-752e5a7a8f7f206fc81234d5b80183e0acd6848e.tar.gz
deluge-752e5a7a8f7f206fc81234d5b80183e0acd6848e.tar.bz2
deluge-752e5a7a8f7f206fc81234d5b80183e0acd6848e.zip
Fix #2045 : UnicodeDecodeError when using non-ascii chars in info
Input arg string needed decoding otherwise comparing with unicode torrent name fails.
-rw-r--r--ChangeLog5
-rw-r--r--deluge/ui/console/main.py1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d605be682..2c0f8cf21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@
* Fix setting daemon listen interface from command line
* #2021: Fix share ratio limit not obeyed for seeded torrents added to session
* Add optparse custom version to prevent unnecessary loading of libtorrent
+ * #1554: Fix seeding on share ratio failing for partially selected torrents
==== GtkUI ====
* #1918: Fix Drag'n'Drop not working in Windows
@@ -87,6 +88,7 @@
==== Console ====
* #1953: Fix flickering on every update
* #1954: Fix 'invalid literal for float' when setting listen interface
+ * #1945: Fix UnicodeDecodeError when using non-ascii chars in info
==== Label ====
* #1961: Add missing 'All' filter option
@@ -100,6 +102,9 @@
==== Scheduler ====
* Add plugin page for WebUi
+==== Execute ====
+ * Commands now run scripts asynchronous to prevent Deluge from hanging
+
==== AutoAdd ====
* Added watch folder support for '.magnet' text file containing single or multiple magnet uris
* Fix glade object issue when re-enabling plugin in same session
diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py
index 14833a42e..9ec0279a4 100644
--- a/deluge/ui/console/main.py
+++ b/deluge/ui/console/main.py
@@ -307,6 +307,7 @@ Please use commands from the command line, eg:\n
if self.interactive and isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy):
return self.screen.match_torrent(string)
ret = []
+ string = string.decode(self.encoding)
for tid, name in self.torrents:
if tid.startswith(string) or name.startswith(string):
ret.append(tid)