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

Fix /get cache not working on filesystems with low mtime precision

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-16 09:53:15 +05:30
parent 043d345287
commit 866d5ce048
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/srv/content.py
View File

@ -32,6 +32,10 @@ lock = Lock()
# Get book formats/cover as a cached filesystem file {{{
# We cannot store mtimes in the filesystem since some operating systems (OS X)
# have only one second precision for mtimes
mtimes = {}
def create_file_copy(ctx, rd, prefix, library_id, book_id, ext, mtime, copy_func, extra_etag_data=''):
''' We cannot copy files directly from the library folder to the output
socket, as this can potentially lock the library for an extended period. So
@ -45,14 +49,12 @@ def create_file_copy(ctx, rd, prefix, library_id, book_id, ext, mtime, copy_func
library_id = library_id.replace('\\', '_').replace('/', '_')
bname = '%s-%s-%s.%s' % (prefix, library_id, book_id, ext)
fname = os.path.join(base, bname)
do_copy = True
mtime = timestampfromdt(mtime)
# TODO: Implement locking for this cache
try:
ans = lopen(fname, 'r+b')
do_copy = os.fstat(ans.fileno()).st_mtime < mtime
except EnvironmentError:
previous_mtime = mtimes.get(bname)
used_cache = 'no'
if previous_mtime is None or previous_mtime < mtime:
try:
ans = lopen(fname, 'w+b')
except EnvironmentError:
@ -61,11 +63,14 @@ def create_file_copy(ctx, rd, prefix, library_id, book_id, ext, mtime, copy_func
except EnvironmentError:
pass
ans = lopen(fname, 'w+b')
if do_copy:
copy_func(ans)
ans.seek(0)
mtimes[bname] = mtime
else:
ans = lopen(fname, 'rb')
used_cache = 'yes'
if ctx.testing:
rd.outheaders['Used-Cache'] = 'no' if do_copy else 'yes'
rd.outheaders['Used-Cache'] = used_cache
return rd.filesystem_file_with_custom_etag(ans, prefix, library_id, book_id, mtime, extra_etag_data)
def cover(ctx, rd, library_id, db, book_id, width=None, height=None):