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

Encode UTF-8 Before Base64ing

Browse Source 
- I was using UTF-8 when I started out, don't know why I changed it back
then... Oh well, hopefully this solves the encoding problems (note to
self: you can't base64 unicode)
This commit is contained in:
Noam
2016-02-18 19:35:48 +02:00
parent 396e75ed2d
commit 41aee3d6bb
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/deluge.py
+6 -14
View File
@@ -297,7 +297,7 @@ def _add_torrent_magnet(result):
"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)
result['hash'] = json.loads(response.text)['result'] result['hash'] = json.loads(response.text)['result']
logger.debug('Deluge: Response was %s' % json.loads(response.text)['result']) logger.debug('Deluge: Response was %s' % str(json.loads(response.text)['result']))
return json.loads(response.text)['result'] return json.loads(response.text)['result']
except Exception as e: except Exception as e:
logger.error('Deluge: Adding torrent magnet failed: %s' % str(e)) logger.error('Deluge: Adding torrent magnet failed: %s' % str(e))
@@ -313,7 +313,7 @@ def _add_torrent_url(result):
"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)
result['hash'] = json.loads(response.text)['result'] result['hash'] = json.loads(response.text)['result']
logger.debug('Deluge: Response was %s' % json.loads(response.text)['result']) logger.debug('Deluge: Response was %s' % str(json.loads(response.text)['result']))
return json.loads(response.text)['result'] return json.loads(response.text)['result']
except Exception as e: except Exception as e:
logger.error('Deluge: Adding torrent URL failed: %s' % str(e)) logger.error('Deluge: Adding torrent URL failed: %s' % str(e))
@@ -325,20 +325,12 @@ def _add_torrent_file(result):
_get_auth() _get_auth()
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
try: 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']), {}], "id": 2})
"id": 2})
except Exception as e:
logger.error('Deluge: Encoding issue? Trying again with UTF8 (%s)' % str(e))
formatted_lines = traceback.format_exc().splitlines()
logger.error('; '.join(formatted_lines))
post_data = json.dumps({"method": "core.add_torrent_file",
"params": [result['name'] + '.torrent', b64encode(result['content'].encode('utf-8')), {}],
"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)
result['hash'] = json.loads(response.text)['result'] result['hash'] = json.loads(response.text)['result']
logger.debug('Deluge: Response was ' + json.loads(response.text)['result']) logger.debug('Deluge: Response was %s' % str(json.loads(response.text)['result']))
return json.loads(response.text)['result'] return json.loads(response.text)['result']
except Exception as e: except Exception as e:
logger.error('Deluge: Adding torrent file failed: %s' % str(e)) logger.error('Deluge: Adding torrent file failed: %s' % str(e))