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: Port thumbnail cache

Browse Source 
All db tests now pass on python3
This commit is contained in:
Kovid Goyal 2019-04-14 15:14:24 +05:30
parent cb117bf118
commit 1f86d92f7a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/db/utils.py
View File

@ -164,7 +164,7 @@ class ThumbnailCache(object):
invalidate = set() invalidate = set()
try: try:
with open(os.path.join(self.location, 'invalidate'), 'rb') as f: with open(os.path.join(self.location, 'invalidate'), 'rb') as f:
raw = f.read() raw = f.read().decode('utf-8')
except EnvironmentError as err: except EnvironmentError as err:
if getattr(err, 'errno', None) != errno.ENOENT: if getattr(err, 'errno', None) != errno.ENOENT:
self.log('Failed to read thumbnail invalidate data:', as_unicode(err)) self.log('Failed to read thumbnail invalidate data:', as_unicode(err))
@ -208,7 +208,7 @@ class ThumbnailCache(object):
def _invalidate_sizes(self): def _invalidate_sizes(self):
if self.size_changed: if self.size_changed:
size = self.thumbnail_size size = self.thumbnail_size
remove = (key for key, entry in iteritems(self.items) if size != entry.thumbnail_size) remove = tuple(key for key, entry in iteritems(self.items) if size != entry.thumbnail_size)
for key in remove: for key in remove:
self._remove(key) self._remove(key)
self.size_changed = False self.size_changed = False