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

Dont use pickle for the db thumbnail cache index

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-14 20:17:58 +05:30
parent 6b9d4a16d5
commit 7fcf90ba97
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
import os, errno, cPickle, sys, re import os, errno, sys, re
from locale import localeconv from locale import localeconv
from collections import OrderedDict, namedtuple from collections import OrderedDict, namedtuple
from polyglot.builtins import map, unicode_type, string_or_bytes from polyglot.builtins import map, unicode_type, string_or_bytes
@ -202,7 +202,7 @@ class ThumbnailCache(object):
except EnvironmentError as err: except EnvironmentError as err:
self.log('Failed to read thumbnail cache dir:', as_unicode(err)) self.log('Failed to read thumbnail cache dir:', as_unicode(err))
self.items = OrderedDict(sorted(items, key=lambda x:order.get(hash(x[0]), 0))) self.items = OrderedDict(sorted(items, key=lambda x:order.get(x[0], 0)))
self._apply_size() self._apply_size()
def _invalidate_sizes(self): def _invalidate_sizes(self):
@ -228,17 +228,20 @@ class ThumbnailCache(object):
def _write_order(self): def _write_order(self):
if hasattr(self, 'items'): if hasattr(self, 'items'):
try: try:
with open(os.path.join(self.location, 'order'), 'wb') as f: data = '\n'.join(group_id + ' ' + unicode_type(book_id) for (group_id, book_id) in self.items)
f.write(cPickle.dumps(tuple(map(hash, self.items)), -1)) with lopen(os.path.join(self.location, 'order'), 'wb') as f:
f.write(data.encode('utf-8'))
except EnvironmentError as err: except EnvironmentError as err:
self.log('Failed to save thumbnail cache order:', as_unicode(err)) self.log('Failed to save thumbnail cache order:', as_unicode(err))
def _read_order(self): def _read_order(self):
order = {} order = {}
try: try:
with open(os.path.join(self.location, 'order'), 'rb') as f: with lopen(os.path.join(self.location, 'order'), 'rb') as f:
order = cPickle.loads(f.read()) for line in f.read().decode('utf-8').splitlines():
order = {k:i for i, k in enumerate(order)} parts = line.split(' ', 1)
if len(parts) == 2:
order[(parts[0], int(parts[1]))] = len(order)
except Exception as err: except Exception as err:
if getattr(err, 'errno', None) != errno.ENOENT: if getattr(err, 'errno', None) != errno.ENOENT:
self.log('Failed to load thumbnail cache order:', as_unicode(err)) self.log('Failed to load thumbnail cache order:', as_unicode(err))