codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#2875][Web] Fix: WebUI Json dumps Error 

* A torrent file contains an uncommon field 'filehash' which must be hex encoded
   to allow dumping the torrent info to json. Otherwise it will fail with:
   UnicodeDecodeError: 'utf8' codec can't decode byte 0xe5 in position 0: invalid continuation byte
This commit is contained in:
bendikro 2016-10-19 10:09:22 +02:00 committed by Calum Lind
parent f739269dfd
commit 5394ac5604
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deluge/ui/common.py
View File

@ -110,9 +110,11 @@ class TorrentInfo(object):
f["path"] = path f["path"] = path
f["index"] = index f["index"] = index
if "sha1" in f and len(f["sha1"]) == 20: if "sha1" in f and len(f["sha1"]) == 20:
f["sha1"] = f["sha1"].encode('hex') f["sha1"] = f["sha1"].encode('hex')
if "ed2k" in f and len(f["ed2k"]) == 16: if "ed2k" in f and len(f["ed2k"]) == 16:
f["ed2k"] = f["ed2k"].encode('hex') f["ed2k"] = f["ed2k"].encode('hex')
if "filehash" in f and len(f["filehash"]) == 20:
f["filehash"] = f["filehash"].encode('hex')
paths[path] = f paths[path] = f
dirname = os.path.dirname(path) dirname = os.path.dirname(path)
while dirname: while dirname: