codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-26 10:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 62a336b7d8
commit 9e53e33c24
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
}) })