Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Fix icon theme download not working

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-26 09:00:57 +05:30
parent 73493976e8
commit 099b0cd726
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/icon_theme.py
View File

@ -34,7 +34,7 @@ from calibre.utils.img import image_from_data, Canvas, optimize_png, optimize_jp
from calibre.utils.zipfile import ZipFile, ZIP_STORED from calibre.utils.zipfile import ZipFile, ZIP_STORED
from calibre.utils.filenames import atomic_rename from calibre.utils.filenames import atomic_rename
from lzma.xz import compress, decompress from lzma.xz import compress, decompress
from polyglot.builtins import iteritems, map, range, reraise, filter from polyglot.builtins import iteritems, map, range, reraise, filter, as_bytes
from polyglot import http_client from polyglot import http_client
from polyglot.queue import Queue, Empty from polyglot.queue import Queue, Empty
@ -468,13 +468,14 @@ def get_cover(metadata):
raise raise
return b'' return b''
etag, cached = safe_read(etag_file), safe_read(cover_file) etag, cached = safe_read(etag_file), safe_read(cover_file)
etag = etag.decode('utf-8')
cached, etag = download_cover(metadata['cover-url'], etag, cached) cached, etag = download_cover(metadata['cover-url'], etag, cached)
if cached: if cached:
with open(cover_file, 'wb') as f: with open(cover_file, 'wb') as f:
f.write(cached) f.write(cached)
if etag: if etag:
with open(etag_file, 'wb') as f: with open(etag_file, 'wb') as f:
f.write(etag) f.write(as_bytes(etag))
return cached or b'' return cached or b''