gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-16 00:25:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Encoding issues

Browse Source 
- UTF-8 encoding/decoding issues, removed conversion (for now...)
- Noticed I was accidentally base64-encoding already-based64-encoded
torrents
This commit is contained in:
Noam
2016-02-13 00:41:15 +02:00
parent c492a4122c
commit 602dfbabc2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
headphones/deluge.py
View File

@@ -62,8 +62,8 @@ def addTorrent(link, data=None):
metainfo = str(base64.b64encode(f.read()))
# Extract torrent name from .torrent
try:
name_length = int(re.findall('name([0-9]*)\:.*?\:', base64.b64encode(metainfo))[0])
name = re.findall('name[0-9]*\:(.*?)\:', base64.b64encode(metainfo))[0][:name_length]
name_length = int(re.findall('name([0-9]*)\:.*?\:', torrentfile)[0])
name = re.findall('name[0-9]*\:(.*?)\:', torrentfile)[0][:name_length]
except:
# get last part of link/path (name only)
name = link.split('\\')[-1].split('/')[-1]
@@ -87,14 +87,14 @@ def addTorrent(link, data=None):
else:
logger.debug('Deluge: Trying to GET ' + link + ' returned status ' + r.status_code)
return False
metainfo = str(base64.b64encode(torrentfile.decode('utf-8')))
if 'announce' not in metainfo[:40]:
metainfo = str(base64.b64encode(torrentfile))
if 'announce' not in torrentfile[:40]:
logger.debug('Deluge: Contents of ' + link + ' doesn\'t look like a torrent file')
return False
# Extract torrent name from .torrent
try:
name_length = int(re.findall('name([0-9]*)\:.*?\:', base64.b64encode(metainfo))[0])
name = re.findall('name[0-9]*\:(.*?)\:', base64.b64encode(metainfo))[0][:name_length]
name_length = int(re.findall('name([0-9]*)\:.*?\:', torrentfile)[0])
name = re.findall('name[0-9]*\:(.*?)\:', torrentfile)[0][:name_length]
except:
# get last part of link/path (name only)
name = link.split('\\')[-1].split('/')[-1]
@@ -286,7 +286,7 @@ def _add_torrent_file(result):
_get_auth()
post_data = json.dumps({"method": "core.add_torrent_file",
"params": [result['name'] + '.torrent', b64encode(result['content']), {}],
"params": [result['name'] + '.torrent', result['content'], {}],
"id": 2})
response = requests.post(delugeweb_url, data=post_data.encode('utf-8'), cookies=delugeweb_auth)
result['hash'] = json.loads(response.text)['result']