Author: andar
Revision: 6044
Log:
Fix #1104, #735 use path.utf-8 if available
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-12-18 00:55:26 UTC (rev 6043)
+++ branches/1.2_RC/ChangeLog 2009-12-18 04:36:42 UTC (rev 6044)
@@ -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) ===
==== Web ====
* Swap order of buttons in Remove window (Closes #1083)
Modified: branches/1.2_RC/deluge/ui/common.py
===================================================================
--- branches/1.2_RC/deluge/ui/common.py 2009-12-18 00:55:26 UTC (rev 6043)
+++ branches/1.2_RC/deluge/ui/common.py 2009-12-18 04:36:42 UTC (rev 6044)
@@ -114,7 +114,10 @@
prefix = self.__m_name
for index, f in enumerate(self.__m_metadata["info"]["files"]):
- path = decode_string(os.path.join(prefix,
decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
+ 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)
f["index"] = index
paths[path] = f
@@ -138,8 +141,12 @@
prefix = self.__m_name
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({
- 'path': decode_string(os.path.join(prefix,
decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding),
+ 'path': path,
'size': f["length"],
'download': True
})
Modified: trunk/deluge/ui/common.py
===================================================================
--- trunk/deluge/ui/common.py 2009-12-18 00:55:26 UTC (rev 6043)
+++ trunk/deluge/ui/common.py 2009-12-18 04:36:42 UTC (rev 6044)
@@ -114,7 +114,10 @@
prefix = self.__m_name
for index, f in enumerate(self.__m_metadata["info"]["files"]):
- path = decode_string(os.path.join(prefix,
decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding)
+ 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)
f["index"] = index
paths[path] = f
@@ -138,8 +141,12 @@
prefix = self.__m_name
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({
- 'path': decode_string(os.path.join(prefix,
decode_string(os.path.join(*f["path"]), self.encoding)), self.encoding),
+ 'path': path,
'size': f["length"],
'download': True
})
--
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.
