gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-22 08:53:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3023 from noam09/develop

Browse Source 
Deluge encoding issues with unicode torrent names
This commit is contained in:
AdeHub
2017-09-22 08:54:58 +12:00
committed by GitHub
parent 539db608e2 68c551c828
commit 9b3d7f3bbb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/deluge.py
+8 -3
View File
@@ -170,7 +170,10 @@ def addTorrent(link, data=None, name=None):
# remove '.torrent' suffix # remove '.torrent' suffix
if name[-len('.torrent'):] == '.torrent': if name[-len('.torrent'):] == '.torrent':
name = name[:-len('.torrent')] name = name[:-len('.torrent')]
logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name, str(torrentfile)[:40])) try:
logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name, str(torrentfile)[:40]))
except UnicodeDecodeError:
logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name.decode('utf-8'), str(torrentfile)[:40]))
result = {'type': 'torrent', result = {'type': 'torrent',
'name': name, 'name': name,
'content': torrentfile} 'content': torrentfile}
@@ -468,7 +471,8 @@ def _add_torrent_file(result):
try: try:
# content is torrent file contents that needs to be encoded to base64 # content is torrent file contents that needs to be encoded to base64
post_data = json.dumps({"method": "core.add_torrent_file", post_data = json.dumps({"method": "core.add_torrent_file",
"params": [result['name'] + '.torrent', b64encode(result['content'].encode('utf8')), {}], "params": [result['name'] + '.torrent',
b64encode(result['content'].encode('utf8')), {}],
"id": 2}) "id": 2})
response = requests.post(delugeweb_url, data=post_data.encode('utf-8'), cookies=delugeweb_auth, response = requests.post(delugeweb_url, data=post_data.encode('utf-8'), cookies=delugeweb_auth,
verify=deluge_verify_cert, headers=headers) verify=deluge_verify_cert, headers=headers)
@@ -481,7 +485,8 @@ def _add_torrent_file(result):
# this time let's try leaving the encoding as is # this time let's try leaving the encoding as is
logger.debug('Deluge: There was a decoding issue, let\'s try again') logger.debug('Deluge: There was a decoding issue, let\'s try again')
post_data = json.dumps({"method": "core.add_torrent_file", post_data = json.dumps({"method": "core.add_torrent_file",
"params": [result['name'] + '.torrent', b64encode(result['content']), {}], "params": [result['name'].decode('utf8') + '.torrent',
b64encode(result['content']), {}],
"id": 22}) "id": 22})
response = requests.post(delugeweb_url, data=post_data.encode('utf-8'), cookies=delugeweb_auth, response = requests.post(delugeweb_url, data=post_data.encode('utf-8'), cookies=delugeweb_auth,
verify=deluge_verify_cert, headers=headers) verify=deluge_verify_cert, headers=headers)