Author: andar

Revision: 6082

Log:
        Fix displaying root folder when using the 'path.utf-8' keys in torrents

Diff:
Modified: branches/1.2_RC/deluge/ui/common.py
===================================================================
--- branches/1.2_RC/deluge/ui/common.py 2010-01-08 17:28:08 UTC (rev 6081)
+++ branches/1.2_RC/deluge/ui/common.py 2010-01-08 21:26:33 UTC (rev 6082)
@@ -115,7 +115,7 @@
 
             for index, f in enumerate(self.__m_metadata["info"]["files"]):
                 if "path.utf-8" in f:
-                    path = os.path.join(*f["path.utf-8"])
+                    path = os.path.join(prefix, *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
@@ -142,7 +142,7 @@
 
             for f in self.__m_metadata["info"]["files"]:
                 if "path.utf-8" in f:
-                    path = os.path.join(*f["path.utf-8"])
+                    path = os.path.join(prefix, *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({

Modified: trunk/deluge/ui/common.py
===================================================================
--- trunk/deluge/ui/common.py   2010-01-08 17:28:08 UTC (rev 6081)
+++ trunk/deluge/ui/common.py   2010-01-08 21:26:33 UTC (rev 6082)
@@ -115,7 +115,7 @@
 
             for index, f in enumerate(self.__m_metadata["info"]["files"]):
                 if "path.utf-8" in f:
-                    path = os.path.join(*f["path.utf-8"])
+                    path = os.path.join(prefix, *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
@@ -142,7 +142,7 @@
 
             for f in self.__m_metadata["info"]["files"]:
                 if "path.utf-8" in f:
-                    path = os.path.join(*f["path.utf-8"])
+                    path = os.path.join(prefix, *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({


-- 
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.


Reply via email to