diff options
author | Andrew Resch <andrewresch@gmail.com> | 2009-04-21 17:16:19 +0000 |
---|---|---|
committer | Andrew Resch <andrewresch@gmail.com> | 2009-04-21 17:16:19 +0000 |
commit | fbb5cd94e8b8bd5d6ae9b89efb5dd6d18c00a8f8 (patch) | |
tree | 26afb1269745ca668015bcec0d6a33eeaf82eb58 | |
parent | abc5bcf3894d1ae9219bd6c5f9d223a1d8ba9569 (diff) | |
download | deluge-fbb5cd94e8b8bd5d6ae9b89efb5dd6d18c00a8f8.tar.gz deluge-fbb5cd94e8b8bd5d6ae9b89efb5dd6d18c00a8f8.tar.bz2 deluge-fbb5cd94e8b8bd5d6ae9b89efb5dd6d18c00a8f8.zip |
Fix loading improperly created torrents with mismatched encodings
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | deluge/ui/common.py | 8 |
2 files changed, 6 insertions, 5 deletions
@@ -1,12 +1,13 @@ === Deluge 1.1.7 - (In Development) === ==== Core ==== * Fix issue where cannot resume torrent after doing a 'Pause All' - + ==== GtkUI ==== * Fix #883 segfault if locale is not using UTF-8 encoding * Fix for adding torrents with invalid filename encodings * Fix displaying IPv6 peers in the Peers tab * Fix starting the daemon in OS X + * Fix loading improperly created torrents with mismatched encodings === Deluge 1.1.6 - (06 April 2009) === ==== Core ==== diff --git a/deluge/ui/common.py b/deluge/ui/common.py index f7eaab276..8ba6cfa8b 100644 --- a/deluge/ui/common.py +++ b/deluge/ui/common.py @@ -70,24 +70,24 @@ class TorrentInfo(object): if self.__m_metadata["info"].has_key("files"): prefix = "" if len(self.__m_metadata["info"]["files"]) > 1: - prefix = self.__m_metadata["info"]["name"].decode(self.encoding).encode("utf8") + prefix = self.__m_metadata["info"]["name"].decode(self.encoding, "replace").encode("utf8") for f in self.__m_metadata["info"]["files"]: self.__m_files.append({ - 'path': os.path.join(prefix, *f["path"]).decode(self.encoding).encode("utf8"), + 'path': os.path.join(prefix, *f["path"]).decode(self.encoding, "replace").encode("utf8"), 'size': f["length"], 'download': True }) else: self.__m_files.append({ - "path": self.__m_metadata["info"]["name"].decode(self.encoding).encode("utf8"), + "path": self.__m_metadata["info"]["name"].decode(self.encoding, "replace").encode("utf8"), "size": self.__m_metadata["info"]["length"], "download": True }) @property def name(self): - return self.__m_metadata["info"]["name"].decode(self.encoding).encode("utf8") + return self.__m_metadata["info"]["name"].decode(self.encoding, "replace").encode("utf8") @property def info_hash(self): |