mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-07 00:48:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1104, #735 use path.utf-8 if available

Browse source
This commit is contained in:
Andrew Resch 2009-12-18 04:36:42 +00:00
commit 3d821fb80b
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
=== Deluge 1.2.0_rc6 (In Development) ===
==== GtkUI ====
* Fix #1104, #735 use path.utf-8 if available
=== Deluge 1.2.0_rc5 (17 December 2009) === === Deluge 1.2.0_rc5 (17 December 2009) ===
==== Web ==== ==== Web ====
* Swap order of buttons in Remove window (Closes #1083) * Swap order of buttons in Remove window (Closes #1083)

9
deluge/ui/common.py
View file

@ -114,6 +114,9 @@ class TorrentInfo(object):
prefix = self.__m_name prefix = self.__m_name
for index, f in enumerate(self.__m_metadata["info"]["files"]): for index, f in enumerate(self.__m_metadata["info"]["files"]):
if "path.utf-8" in f:
path = os.path.join(*f["path.utf-8"])
else:
path = decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding) path = decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
f["index"] = index f["index"] = index
paths[path] = f paths[path] = f
@ -138,8 +141,12 @@ class TorrentInfo(object):
prefix = self.__m_name prefix = self.__m_name
for f in self.__m_metadata["info"]["files"]: for f in self.__m_metadata["info"]["files"]:
if "path.utf-8" in f:
path = os.path.join(*f["path.utf-8"])
else:
path = decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
self.__m_files.append({ self.__m_files.append({
'path': decode_string(os.path.join(prefix, decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding), 'path': path,
'size': f["length"], 'size': f["length"],
'download': True 'download': True
}) })