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 store mtimes in RAM

Browse Source 
This was originally done because of Apple's HFS+ having a one second
timestamp resolution. However APFS which has nanosecond resolution has
been out now for almost four years.
This commit is contained in:
Kovid Goyal 2021-06-28 06:17:37 +05:30
parent 4dc0502a29
commit ad36ac19c0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os, errno import os, errno
from io import BytesIO from io import BytesIO
from threading import Lock from threading import Lock
from contextlib import suppress
from polyglot.builtins import map, unicode_type from polyglot.builtins import map, unicode_type
from functools import partial from functools import partial
@ -37,14 +38,11 @@ lock = Lock()
# Get book formats/cover as a cached filesystem file {{{ # 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 = {}
rename_counter = 0 rename_counter = 0
def reset_caches(): def reset_caches():
mtimes.clear() pass
def open_for_write(fname): def open_for_write(fname):
@ -77,8 +75,13 @@ def create_file_copy(ctx, rd, prefix, library_id, book_id, ext, mtime, copy_func
fname = os.path.join(base, bname) fname = os.path.join(base, bname)
used_cache = 'no' used_cache = 'no'
def safe_mtime():
with suppress(OSError):
return os.path.getmtime(fname)
return 0
with lock: with lock:
previous_mtime = mtimes.get(bname) previous_mtime = safe_mtime()
if previous_mtime is None or previous_mtime < mtime: if previous_mtime is None or previous_mtime < mtime:
if previous_mtime is not None: if previous_mtime is not None:
# File exists and may be open, so we cannot change its # File exists and may be open, so we cannot change its
@ -94,7 +97,6 @@ def create_file_copy(ctx, rd, prefix, library_id, book_id, ext, mtime, copy_func
else: else:
os.remove(fname) os.remove(fname)
ans = open_for_write(fname) ans = open_for_write(fname)
mtimes[bname] = mtime
copy_func(ans) copy_func(ans)
ans.seek(0) ans.seek(0)
else: else:
@ -105,7 +107,6 @@ def create_file_copy(ctx, rd, prefix, library_id, book_id, ext, mtime, copy_func
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
ans = open_for_write(fname) ans = open_for_write(fname)
mtimes[bname] = mtime
copy_func(ans) copy_func(ans)
ans.seek(0) ans.seek(0)
if ctx.testing: if ctx.testing: