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

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
Ruud
2013-03-09 18:15:26 +01:00
parent 8e07dfc730 89bff73431
commit f84aa8c638
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/downloaders/utorrent/main.py
+7 -7
View File
@@ -39,19 +39,19 @@ class uTorrent(Downloader):
if not filedata and data.get('type') == 'torrent': if not filedata and data.get('type') == 'torrent':
log.error('Failed sending torrent, no data') log.error('Failed sending torrent, no data')
return False return False
if data.get('type') == 'torrent_magnet': if data.get('type') == 'torrent_magnet':
torrent_hash = re.findall('urn:btih:([\w]{32,40})', data.get('url'))[0].upper() torrent_hash = re.findall('urn:btih:([\w]{32,40})', data.get('url'))[0].upper()
torrent_params['trackers'] = '%0D%0A%0D%0A'.join(self.torrent_trackers) torrent_params['trackers'] = '%0D%0A%0D%0A'.join(self.torrent_trackers)
else: else:
# Convert base 32 to hex info = bdecode(filedata)["info"]
if len(torrent_hash) == 32: torrent_hash = sha1(bencode(info)).hexdigest().upper()
torrent_hash = b16encode(b32decode(torrent_hash))
else:
info = bdecode(filedata)["info"]
torrent_hash = sha1(bencode(info)).hexdigest().upper()
torrent_filename = self.createFileName(data, filedata, movie) torrent_filename = self.createFileName(data, filedata, movie)
# Convert base 32 to hex
if len(torrent_hash) == 32:
torrent_hash = b16encode(b32decode(torrent_hash))
# Send request to uTorrent # Send request to uTorrent
try: try:
if not self.utorrent_api: if not self.utorrent_api: