summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-05-09 03:05:43 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-05-09 03:05:43 +0000
commit5cbf30aef812365de0da1af968625b627f5cbbb4 (patch)
tree15dc78fad21744e92243a580ebcd3b35373da00c
parentf9942720284755089c9f35b6ff818dff4d9cb23c (diff)
downloaddeluge-5cbf30aef812365de0da1af968625b627f5cbbb4.tar.gz
deluge-5cbf30aef812365de0da1af968625b627f5cbbb4.tar.bz2
deluge-5cbf30aef812365de0da1af968625b627f5cbbb4.zip
Torrent name is now changed when the root folder or file is renamed
-rw-r--r--ChangeLog1
-rw-r--r--deluge/core/torrent.py5
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dc0010e4..710e824b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
=== Deluge 1.1.8 - (In Development) ===
==== Core ====
* Fix pause all/resume all
+ * Torrent name is now changed when the root folder or file is renamed
==== GtkUI ====
* Fix high cpu usage when displaying speeds in titlebar
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 16b1aaf7a..c9f5febe8 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -637,10 +637,11 @@ class Torrent:
def ti_name():
if self.handle.has_metadata():
+ name = os.path.split(self.torrent_info.file_at(0).path)[0]
try:
- return self.torrent_info.name().decode("utf8", "ignore")
+ return name.decode("utf8", "ignore")
except UnicodeDecodeError:
- return self.torrent_info.name()
+ return name
return self.torrent_id
def ti_priv():