forked from akai/readest
ed8956e9ed
* feat(koplugin/library): data layer + busted harness + design doc - LibraryStore: per-user SQLite index merging cloud + local books by partial-md5 hash. listBooks/listBookshelfBooks/listBookshelfGroups, upsertBook with cloud_present/local_present OR-merge + _force/clear sentinels, parseSyncRow, getChangedBooks for tombstone push. - EXTS table mirroring web's document.ts. - busted harness with KOReader stubs (G_reader_settings, DataStorage, lua-ljsqlite3 against :memory:); spec_helper, exts_spec, smoke_spec, librarystore_spec covering schema, sort, group nesting, dedupe. - Library design doc + spec README. - pnpm test:lua wired through root + app package.json; lint-koplugin recurses into library/ + spec/. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(koplugin/library): cloud sync — push, pull, upload, delete, downloads - Spore methods: pullBooks (incremental /sync), getDownloadUrl, getUploadUrl, listFiles, deleteFile. - syncbooks.lua: pushBook + pushChangedBooks (advances watermark to max(updated_at, deleted_at)), syncBooks(opts, mode) for push/pull/both, downloadBook + downloadCover (sync socket.http with file sink; cover download via fork+poll with single-slot queue + visible-page filter + coalesced refresh), uploadBook (presigned-PUT flow + best-effort cover), deleteCloudFiles (list-then-delete-each, mirrors cloudService.deleteBook). - SyncAuth.withFreshToken wrapper resolves the ensureClient race; 401/403 unified across syncconfig + syncannotations. - Cloud + local book covers shared by partial-md5 hash; cover.png cached at <settings>/readest_covers/<hash>.png with sentinel for known 404s. - syncbooks_spec covers row-to-wire conversion + file_key shape. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(koplugin/library): local discovery — sidecar scanner + cover provider - localscanner.lightScan iterates ReadHistory entries, reads partial_md5_checksum from .sdr sidecars, and upserts local rows. Slow filesystem walks deferred to fullSidecarWalk (24h-gated). - coverprovider wraps BookInfoManager:getBookInfo for local books with graceful FakeCover fallback when coverbrowser is absent. - localscanner_spec + coverprovider_spec. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(koplugin/library): UI — widget, item, view menu, FileManager hooks - librarywidget: full-screen Menu mixed in with CoverMenu + Mosaic/List per zen_ui's group_view pattern. Title-bar tap → view menu, search via left icon, drill-in/back for grouping. Async cloud sync deferred via scheduleIn so the menu paints before HTTP fires. - libraryitem: BIM patch for cloud-only (readest-cloud://) and group (readest-group://) URIs; group-cover composer (2x2 mosaic for grid, same in list) with cache key derived from the actual first-N hashes for content-based invalidation; ListMenuItem update + paintTo patches for wider list-mode cover strip and cloud-up/down icon overlay. - libraryviewmenu: ButtonDialog with View/Group by/Sort by/Actions. Default Group by = Groups (parity with web), values authors/groups. - librarypaint: partial-page e-ink repaint shim adapted from zen_ui. - main.lua: Library menu entry, dispatcher actions (Open Library / Push / Pull as general; progress + annotations as reader-only), "Add to Readest" button in FileManager's long-press file dialog (dedupe by partial_md5; bumps updated_at when present, inserts a fresh local-only row otherwise; un-tombstones via _clear_fields). Push books on Library open when auto_sync is on, pull-only otherwise. - Long-press action sheet with Readest BookDetailView parity: Remove from Cloud & Device / Cloud Only / Device Only, Upload to Cloud, Download Book / Cover / All. - Cloud-down + cloud-up SVG icons (LiaCloudDownloadAltSolid / LiaCloudUploadAltSolid) painted in the right-side wpageinfo slot. - i18n catalog updated for new strings. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(koplugin/library): split libraryitem into focused modules libraryitem.lua had grown to 1018 lines mixing five unrelated concerns. Split along the natural seams: cloud_covers — readest-cloud:// URI scheme, on-disk <hash>.png cache, single-slot async download queue, visible-page filter group_covers — readest-group:// URI scheme, 2x2 mosaic composer with content-derived cache key (first-N hashes), cell layout table cloud_icons — bundled cloud-up/cloud-down SVG loader, IconWidget cache, paint-overlay positioning list_strip — list-mode group row builder (4-cover wider strip replacing ListMenu's square cover slot) bim_patch — BookInfoManager:getBookInfo router (cloud / group / local) + ListMenuItem update + paintTo patches; owns the _library_local_paths set and orig BIM reference libraryitem.lua is now 141 lines: just the entry-table constructors (entry_from_row, entry_from_group, entry_back) plus thin install / set_visible_hashes delegates. Each new module is 88-216 lines. No behavior change — same 113 specs pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(koplugin): co-locate dev tooling, ship-zip exclusions, CI job split - apps/readest.koplugin/scripts/build-koplugin.mjs: local sideloading build with the same exclusions the release workflow uses. - Move lint-koplugin + test-koplugin from apps/readest-app/scripts/ to apps/readest.koplugin/scripts/. All koplugin dev tooling now lives with the koplugin and is excluded from the published release zip. - Rename to .mjs so Node treats them as ESM without the reparse warning (the i18n CommonJS scripts stay .js). - Release workflow: zip -r exclusions for scripts/, docs/, spec/, .busted so dev artifacts don't ship to end users. - PR workflow: split build_web_app into build_web_app + test_web_app for parallelism. The test job installs luarocks + busted + lsqlite3complete and runs pnpm test:lua. test-koplugin.mjs now hard-fails (instead of soft-skipping) when CI=true and a tool is missing — a broken CI toolchain previously exited 0 silently. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
117 lines
4.9 KiB
Lua
117 lines
4.9 KiB
Lua
-- coverprovider.lua
|
|
-- Resolves a Library row to a renderable cover. For local books we lean on
|
|
-- the bundled coverbrowser.koplugin's BookInfoManager (it already has a
|
|
-- battle-tested extraction subprocess + zstd-compressed BLOB cache); for
|
|
-- cloud-only books we download `cover.png` from Readest storage and render
|
|
-- it via plain ImageWidget{file=path}.
|
|
--
|
|
-- Hard dependency on coverbrowser, mirroring zen_ui's pattern: at plugin
|
|
-- init we check `coverbrowser_loaded()`. If the user has it disabled, the
|
|
-- caller offers to enable it; until then, every cell renders FakeCover
|
|
-- (no degraded grid mode).
|
|
--
|
|
-- The pure helpers (coverbrowser_loaded, cached_cover_path, MISSING) are
|
|
-- exported and unit-tested. The actual blitbuffer-returning calls
|
|
-- (get_local_cover, get_cloud_cover) require live KOReader and are
|
|
-- exercised manually.
|
|
|
|
local logger = require("logger")
|
|
|
|
local M = {}
|
|
|
|
-- ---------------------------------------------------------------------------
|
|
-- Constants
|
|
-- ---------------------------------------------------------------------------
|
|
-- Sentinel written into books.cover_path when a cloud cover download
|
|
-- returned 404. Distinguishable from any real path so callers can short-
|
|
-- circuit FakeCover rendering without re-attempting the download every
|
|
-- frame.
|
|
M.MISSING = "_missing"
|
|
|
|
-- ---------------------------------------------------------------------------
|
|
-- coverbrowser_loaded
|
|
-- ---------------------------------------------------------------------------
|
|
-- True if `require("covermenu")` will resolve. coverbrowser.koplugin is the
|
|
-- only thing that ships the covermenu module, so this doubles as a "is the
|
|
-- plugin enabled?" check.
|
|
function M.coverbrowser_loaded()
|
|
if package.loaded["covermenu"] then return true end
|
|
if package.preload["covermenu"] then return true end
|
|
-- pcall(require) costs <1ms but populates package.loaded on success;
|
|
-- callers shouldn't pay that cost twice.
|
|
local ok = pcall(require, "covermenu")
|
|
return ok == true
|
|
end
|
|
|
|
-- ---------------------------------------------------------------------------
|
|
-- cached_cover_path
|
|
-- ---------------------------------------------------------------------------
|
|
-- Where we store a downloaded cloud cover. Flat layout under the plugin's
|
|
-- cache dir, keyed by hash so collisions can't happen.
|
|
function M.cached_cover_path(covers_dir, hash)
|
|
if not covers_dir or covers_dir == "" then return nil end
|
|
if not hash or hash == "" then return nil end
|
|
return covers_dir .. "/" .. hash .. ".png"
|
|
end
|
|
|
|
-- ---------------------------------------------------------------------------
|
|
-- get_local_cover(file_path) → blitbuffer or nil
|
|
-- ---------------------------------------------------------------------------
|
|
-- Live-KOReader-only. Looks up the book in BookInfoManager's cache; if it's
|
|
-- not there, kicks off background extraction (which writes the bb back into
|
|
-- BIM next time the user paints). Returns nil immediately on cache miss so
|
|
-- the caller can render FakeCover meanwhile.
|
|
function M.get_local_cover(file_path)
|
|
if not file_path then return nil end
|
|
local ok, BIM = pcall(require, "bookinfomanager")
|
|
if not ok or not BIM then return nil end
|
|
|
|
local info = BIM:getBookInfo(file_path, true)
|
|
if info and info.cover_bb then return info.cover_bb end
|
|
|
|
-- Cache miss: ask BIM to extract in the background.
|
|
BIM:extractInBackground({ { file_path } })
|
|
return nil
|
|
end
|
|
|
|
-- ---------------------------------------------------------------------------
|
|
-- get_cloud_cover(book, opts, on_ready) — async; opts must include sync auth
|
|
-- + a covers_dir + a settings table.
|
|
-- ---------------------------------------------------------------------------
|
|
-- If the cover is already on disk, returns its path synchronously.
|
|
-- Otherwise schedules a download via syncbooks.downloadCover and invokes
|
|
-- on_ready(path_or_missing) when it completes. on_ready may be nil when the
|
|
-- caller just wants to kick off the prefetch.
|
|
function M.get_cloud_cover(book, opts, on_ready)
|
|
if not book or not book.hash then
|
|
if on_ready then on_ready(nil) end
|
|
return nil
|
|
end
|
|
|
|
local lfs = require("libs/libkoreader-lfs")
|
|
local cached = M.cached_cover_path(opts.covers_dir, book.hash)
|
|
if cached and lfs.attributes(cached, "mode") == "file" then
|
|
return cached
|
|
end
|
|
|
|
-- Don't retry a known-missing cover (avoids a 404 storm on every paint).
|
|
if book.cover_path == M.MISSING then return nil end
|
|
|
|
local syncbooks = require("library.syncbooks")
|
|
syncbooks.downloadCover(book, opts, function(success, path_or_err, status)
|
|
if success then
|
|
if on_ready then on_ready(path_or_err) end
|
|
else
|
|
if status == 404 then
|
|
if on_ready then on_ready(M.MISSING) end
|
|
else
|
|
logger.dbg("ReadestLibrary cover download failed:", path_or_err, status)
|
|
if on_ready then on_ready(nil) end
|
|
end
|
|
end
|
|
end)
|
|
return nil -- caller renders FakeCover until on_ready fires
|
|
end
|
|
|
|
return M
|