dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated rtorrent-python library

Browse Source
This commit is contained in:
Dean Gardiner
2013-09-29 23:21:53 +13:00
parent 1b96489656
commit 48db4c8b8e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/rtorrent/__init__.py
+2 -4
View File
@@ -71,12 +71,10 @@ class RTorrent:
def _verify_conn(self): def _verify_conn(self):
# check for rpc methods that should be available # check for rpc methods that should be available
assert {"system.client_version", assert "system.client_version" in self._get_rpc_methods(), "Required RPC method not available."
"system.library_version"}.issubset(set(self._get_rpc_methods())),\ assert "system.library_version" in self._get_rpc_methods(), "Required RPC method not available."
"Required RPC methods not available."
# minimum rTorrent version check # minimum rTorrent version check
assert self._meets_version_requirement() is True,\ assert self._meets_version_requirement() is True,\
"Error: Minimum rTorrent version required is {0}".format( "Error: Minimum rTorrent version required is {0}".format(
MIN_RTORRENT_VERSION_STR) MIN_RTORRENT_VERSION_STR)
libs/rtorrent/lib/torrentparser.py
+4 -3
View File
@@ -90,9 +90,10 @@ class TorrentParser():
def _calc_info_hash(self): def _calc_info_hash(self):
self.info_hash = None self.info_hash = None
if "info" in self._torrent_decoded.keys(): if "info" in self._torrent_decoded.keys():
info_dict = self._torrent_decoded["info"] info_encoded = bencode.encode(self._torrent_decoded["info"])
self.info_hash = hashlib.sha1(bencode.encode(
info_dict)).hexdigest().upper() if info_encoded:
self.info_hash = hashlib.sha1(info_encoded).hexdigest().upper()
return(self.info_hash) return(self.info_hash)