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 calculating book hashes for the server

Browse Source 
This has the unfortunate side-effect of making existing caches stale,
but cant be helped, given the instability of pickle as a serialization
format.
This commit is contained in:
Kovid Goyal 2019-03-15 15:06:26 +05:30
parent 74497a4ff8
commit c98cc3383d
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/srv/books.py
View File

@ -7,7 +7,6 @@ from __future__ import (unicode_literals, division, absolute_import,
from hashlib import sha1 from hashlib import sha1
from functools import partial from functools import partial
from threading import RLock, Lock from threading import RLock, Lock
from cPickle import dumps
import errno, os, tempfile, shutil, time, json as jsonlib import errno, os, tempfile, shutil, time, json as jsonlib
from calibre.constants import cache_dir, iswindows from calibre.constants import cache_dir, iswindows
@ -17,6 +16,7 @@ from calibre.srv.render_book import RENDER_VERSION
from calibre.srv.errors import HTTPNotFound, BookNotFound from calibre.srv.errors import HTTPNotFound, BookNotFound
from calibre.srv.routes import endpoint, json from calibre.srv.routes import endpoint, json
from calibre.srv.utils import get_library_data, get_db from calibre.srv.utils import get_library_data, get_db
from calibre.utils.serialize import json_dumps
cache_lock = RLock() cache_lock = RLock()
queued_jobs = {} queued_jobs = {}
@ -49,7 +49,7 @@ def books_cache_dir():
def book_hash(library_uuid, book_id, fmt, size, mtime): def book_hash(library_uuid, book_id, fmt, size, mtime):
raw = dumps((library_uuid, book_id, fmt.upper(), size, mtime, RENDER_VERSION)) raw = json_dumps((library_uuid, book_id, fmt.upper(), size, mtime, RENDER_VERSION))
return sha1(raw).hexdigest().decode('ascii') return sha1(raw).hexdigest().decode('ascii')