forked from akai/readest
15c0a7a2f2
Group cells in the Readest Library view rendered as FakeCover even when their child books had perfectly good cloud covers — the queue that fetches <hash>.png covers was only primed for cloud-only book entries on the visible page, so children of group entries were never requested. A later partial composite (3/4 covers) was also written to a content-fingerprinted disk cache and kept serving forever, since the fingerprint stayed the same after the 4th cover landed. Two fixes wired together: - libraryitem.set_visible_hashes now expands visible group entries to include their first-N children's hashes, so trigger_download's visibility filter no longer rejects them. - group_covers.child_cover_bb queues a cloud-cover download when the fallback path misses for a cloud-present book. Capped at 4 per group by the existing cells_for(shape) limit. Disk caching of composites is dropped entirely; mosaics are recomposed in memory each paint. New spec/library/group_covers_spec.lua locks the contract for URI round-trip, child_cover_bb's missing-cover branches, and libraryitem's group-children expansion. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
170 lines
6.9 KiB
Lua
170 lines
6.9 KiB
Lua
-- group_covers.lua
|
|
-- macOS-style folder previews: a 2x2 mosaic of the first N child book
|
|
-- covers, served as a synthetic readest-group:// URI through the
|
|
-- patched BookInfoManager. Composites are recomposed in memory on every
|
|
-- paint — no on-disk cache. Earlier versions cached PNGs under
|
|
-- <settings>/readest_group_covers/, content-fingerprinted by child
|
|
-- hashes, but any partial composite written while children's covers
|
|
-- were still downloading would freeze: the fingerprint stayed the same
|
|
-- once all four arrived, so the partial PNG kept serving forever.
|
|
-- Recomposing each paint is cheap (4 small covers + scale + blit) and
|
|
-- side-steps that cache-coherency surface entirely.
|
|
|
|
local cloud_covers = require("library.cloud_covers")
|
|
|
|
local M = {}
|
|
|
|
M.URI_PREFIX = "readest-group://"
|
|
|
|
-- Layouts:
|
|
-- "grid" — 2x2, 360x480 (3:4 — typical book-cover aspect).
|
|
-- "list" — 2x2, 480x480 (square — matches ListMenu's rigid square
|
|
-- cover slot, so the composite fills it vertically and each
|
|
-- mini-cover stays book-shaped instead of getting squished).
|
|
M.LAYOUTS = {
|
|
grid = { target_w = 360, target_h = 480, cols = 2, rows = 2 },
|
|
list = { target_w = 480, target_h = 480, cols = 2, rows = 2 },
|
|
}
|
|
|
|
-- "Asimov" → "417369..." — filesystem-safe regardless of slashes,
|
|
-- colons, etc. in the original group value.
|
|
local function hex_encode(s)
|
|
return (s:gsub(".", function(c) return string.format("%02x", string.byte(c)) end))
|
|
end
|
|
|
|
local function hex_decode(hex)
|
|
return (hex:gsub("..", function(h) return string.char(tonumber(h, 16)) end))
|
|
end
|
|
|
|
-- shape ∈ {"grid", "list"} — controls the composite layout. Defaults
|
|
-- to "grid" for backward compat with older callers.
|
|
function M.build_uri(group_by, value, shape)
|
|
return M.URI_PREFIX .. group_by .. ":" .. hex_encode(value)
|
|
.. ":" .. (shape or "grid") .. ".png"
|
|
end
|
|
|
|
-- Returns group_by, value, shape; nil if not a group URI.
|
|
function M.parse_uri(uri)
|
|
if uri:sub(1, #M.URI_PREFIX) ~= M.URI_PREFIX then return nil end
|
|
local body = uri:sub(#M.URI_PREFIX + 1)
|
|
if body:sub(-4) == ".png" then body = body:sub(1, -5) end
|
|
local parts = {}
|
|
for p in body:gmatch("[^:]+") do parts[#parts + 1] = p end
|
|
if #parts < 2 then return nil end
|
|
local group_by = parts[1]
|
|
local hex = parts[2]
|
|
local shape = parts[3] or "grid"
|
|
local value = hex_decode(hex)
|
|
return group_by, value, shape
|
|
end
|
|
|
|
-- Pull a usable cover bb for a single child book during composition.
|
|
-- Tries (in order):
|
|
-- 1. local file via the original BIM cache (already-cached only;
|
|
-- no extraction triggered)
|
|
-- 2. cloud cover .png we previously downloaded
|
|
-- Returns nil if neither path produces one. Caller owns the bb.
|
|
--
|
|
-- When (2) misses for a cloud-present book, queue a cloud-cover download
|
|
-- so a subsequent paint can complete the mosaic. Without this hook a
|
|
-- freshly-pulled library renders every group as FakeCover until the user
|
|
-- drills into each one, because cloud_covers' download queue is only
|
|
-- primed for cloud-only book entries on the visible page — group cells
|
|
-- never appear there themselves, so their children's covers were never
|
|
-- requested.
|
|
function M.child_cover_bb(book, orig_getBookInfo, BIM)
|
|
if not book then return nil end
|
|
if book.local_present == 1 and book.file_path and orig_getBookInfo then
|
|
local ok, info = pcall(orig_getBookInfo, BIM, book.file_path, true)
|
|
if ok and info and info.has_cover and info.cover_bb then
|
|
-- BIM hands us a cached bb whose ownership it keeps; we copy
|
|
-- before scaling so the BIM cache stays intact when our
|
|
-- composition pipeline frees what it received.
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local copy = Blitbuffer.new(info.cover_bb:getWidth(),
|
|
info.cover_bb:getHeight(),
|
|
info.cover_bb:getType())
|
|
copy:blitFrom(info.cover_bb, 0, 0, 0, 0,
|
|
info.cover_bb:getWidth(), info.cover_bb:getHeight())
|
|
return copy
|
|
end
|
|
end
|
|
if not book.hash or book.hash == "" then return nil end
|
|
local bb = cloud_covers.load_cover_bb(book.hash)
|
|
if bb then return bb end
|
|
if (book.cloud_present or 0) == 1 then
|
|
cloud_covers.trigger_download(book.hash)
|
|
end
|
|
return nil
|
|
end
|
|
|
|
-- Compose up to N child covers into a mosaic, returning a fresh bb that
|
|
-- the caller (ImageWidget) takes ownership of. Returns nil if no child
|
|
-- produced a cover. Intentionally regenerated on every paint — see the
|
|
-- module-level comment.
|
|
local function compose(books, shape, orig_getBookInfo, BIM)
|
|
if #books == 0 then return nil end
|
|
local layout = M.LAYOUTS[shape] or M.LAYOUTS.grid
|
|
local target_w, target_h = layout.target_w, layout.target_h
|
|
local cols, rows = layout.cols, layout.rows
|
|
local max_cells = cols * rows
|
|
local expected = math.min(max_cells, #books)
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local target = Blitbuffer.new(target_w, target_h, Blitbuffer.TYPE_BBRGB32)
|
|
target:fill(Blitbuffer.COLOR_WHITE)
|
|
|
|
local gap = 8
|
|
local cell_w = math.floor((target_w - (cols - 1) * gap) / cols)
|
|
local cell_h = math.floor((target_h - (rows - 1) * gap) / rows)
|
|
local placed = 0
|
|
|
|
for i = 1, expected do
|
|
local book = books[i]
|
|
local cover = M.child_cover_bb(book, orig_getBookInfo, BIM)
|
|
if cover then
|
|
local row = math.floor((i - 1) / cols)
|
|
local col = (i - 1) % cols
|
|
local dx = col * (cell_w + gap)
|
|
local dy = row * (cell_h + gap)
|
|
local ok_scale, scaled = pcall(cover.scale, cover, cell_w, cell_h)
|
|
if ok_scale and scaled then
|
|
target:blitFrom(scaled, dx, dy, 0, 0, cell_w, cell_h)
|
|
scaled:free()
|
|
placed = placed + 1
|
|
end
|
|
cover:free()
|
|
end
|
|
end
|
|
|
|
if placed == 0 then
|
|
target:free()
|
|
return nil
|
|
end
|
|
return target
|
|
end
|
|
|
|
-- Cells-per-mosaic for a given shape. Used by callers to know how many
|
|
-- books to fetch from the store.
|
|
function M.cells_for(shape)
|
|
local layout = M.LAYOUTS[shape] or M.LAYOUTS.grid
|
|
return layout.cols * layout.rows
|
|
end
|
|
|
|
-- High-level: query the store, compose a fresh mosaic, return (bb,
|
|
-- books). books is the resolved list (so callers can reuse it without a
|
|
-- second query). bb is freshly composed every call — see the module
|
|
-- header for why we deliberately don't cache.
|
|
function M.serve_or_compose(group_by, value, shape,
|
|
store, settings, orig_getBookInfo, BIM)
|
|
if not store then return nil, {} end
|
|
local n = M.cells_for(shape)
|
|
local books = store:listBooksInGroup(group_by, value, n, {
|
|
sort_by = settings and settings.library_sort_by,
|
|
sort_asc = settings and settings.library_sort_ascending == true,
|
|
})
|
|
return compose(books, shape, orig_getBookInfo, BIM), books
|
|
end
|
|
|
|
return M
|