diff --git a/database/vocabulary.py b/database/vocabulary.py index 971112bd..206d13f6 100644 --- a/database/vocabulary.py +++ b/database/vocabulary.py @@ -66,7 +66,6 @@ def _tag_rows(page: str, order: str = "page.id") -> str: ) -_TAG_PAGE = _tag_rows("SELECT id,name FROM tags WHERE id>? ORDER BY id LIMIT ?") # #444 tag sorts: sort -> (key expression on tags/counted, direction). Ties and # "created" follow the id, so every order is total and keyset pages are exact. TAG_SORTS = { diff --git a/py/api/images.py b/py/api/images.py index 519f3751..afa4f319 100644 --- a/py/api/images.py +++ b/py/api/images.py @@ -39,10 +39,8 @@ from .thumbnail_encode import ( PREVIEW_HELD, EncoderClosed, PreviewWriteHeld, - replace_unless_held, run_encoder, sweep_stray_temps, - temp_sibling, thumbnail_frame, writer_settings, write_thumbnail, @@ -339,11 +337,6 @@ def _thumbnail_batch_size(workers): return max(4, workers * 2) -# Preview files are written by thumbnail_encode in the configured format -# (thumbnail_settings, #317); these names stay importable from here. -_temp_sibling = temp_sibling -_replace_unless_held = replace_unless_held - # A preview that could not be replaced (#249 S5 M6). Windows refuses to rename # over a file another process has open (WinError 5 or 32), such as a preview # the gallery is serving; the old preview stays and the file counts as an error.