Fix 2163 : Cannot add torrent file with empty (0:) encoding tag

This commit is contained in:
Calum Lind 2012-09-27 18:36:50 +01:00
commit 43390b850a

View file

@ -75,11 +75,13 @@ class TorrentInfo(object):
self.__m_info_hash = sha(bencode.bencode(self.__m_metadata["info"])).hexdigest() self.__m_info_hash = sha(bencode.bencode(self.__m_metadata["info"])).hexdigest()
# Get encoding from torrent file if available # Get encoding from torrent file if available
self.encoding = "UTF-8" self.encoding = None
if "encoding" in self.__m_metadata: if "encoding" in self.__m_metadata:
self.encoding = self.__m_metadata["encoding"] self.encoding = self.__m_metadata["encoding"]
elif "codepage" in self.__m_metadata: elif "codepage" in self.__m_metadata:
self.encoding = str(self.__m_metadata["codepage"]) self.encoding = str(self.__m_metadata["codepage"])
if not self.encoding:
self.encoding = "UTF-8"
# Check if 'name.utf-8' is in the torrent and if not try to decode the string # Check if 'name.utf-8' is in the torrent and if not try to decode the string
# using the encoding found. # using the encoding found.