* fix(ebooks): fold author hint into metadata search query
The ebook enricher loaded each item's author but buildEbookSearchQuery
dropped it, and metadata.SearchQuery had no field to carry it — so the
plugin only ever received the title. Title-only searches collide or miss,
leaving items without metadata or a cover.
Add SearchQuery.Author and fold it into the plugin search query text
(the SearchMetadataRequest contract carries a single free-text Query, so
no proto change is needed). Gated to callers that set Author (ebooks);
movie/TV search is unchanged.
Verified live against OpenLibrary/GoogleBooks: improves disambiguation on
clean titles. Note: messy filename-derived titles (series prefixes,
trailing "(… Book N)") still need title normalization, and a large tail
of niche/self-published ebooks is simply absent from the free sources —
neither is addressed here.
AI-use disclosure: authored with Claude Code.
(cherry picked from commit ba1265909c4fb87e1a8eab64b0b0c183aa95acc1)
* feat(scanner): extract MOBI/AZW/AZW3 metadata from EXTH headers
These formats previously had no parser — parseEbookFile returned only the
format string, so title fell back to the filename with no author and no
ISBN, leaving ~21k books unmatchable by the metadata enricher.
Parse the Palm Database container (PDB header → record 0 → PalmDOC +
MOBI header → EXTH block) and extract title, authors, ISBN, publisher,
and language. EXTH is located by its magic rather than the header flag,
and field offsets (encoding @12, full-name @0x44/0x48) were verified
against real .mobi/.azw3 files.
Verified live against real library files:
azw3 → title "The Sea", author "A H Lee"
mobi → title "Brotherband 3: The Hunters", author "John Flanagan",
ISBN 9781742750637
AI-use disclosure: authored with Claude Code.
(cherry picked from commit 7af194b711de97bc79855f08a9a4f9732c49db74)
* fix(ebooks): recover author from path and clean provider search title
- ebookAuthorFromPath: recover an author for ".../<Author>/<Title>/<Title> -
<Author>.ext" layouts when the file embeds none, gated on two agreeing
path signals (grandparent dir == filename suffix) so magazines/courses
never get a junk author; strip the suffix from a path-derived title.
- cleanEbookSearchTitle: normalize filesystem-mangled titles before search
(underscore->space, drop trailing " - <author>") to lift hit rate.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit 36a16cb58c3e5276aa4c0bdf8577008070f6abea)
* fix(scanner): gate path-author on person-name shape
ebookAuthorFromPath's grandparent==suffix corroboration also matched
inverted layouts ("<Title>/<Author>/<Author> - <Title>"), assigning the
title as the author. Require the candidate directory to look like a person
name (comma form, or all-capitalized tokens plus name particles) so series
and title folders ("De legenden van de Alfen") are rejected, and return the
canonical directory form for proper casing.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit ff720bd268a23bff0e94c70f15cb7ecfb8efcb1f)
* fix(ebooks): strip series/book-number parentheticals from search title
cleanEbookSearchTitle now peels trailing "(... Book N)", "[#3]", "(2019)"
groups that don't belong in a provider title query, while leaving
meaningful parentheticals ("(Illustrated)") intact. Enrichment-side only.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit 2273636c04fd9ef483003a9558972a2104fdd3a6)
* fix(ebooks): keep volume number in search title and dedup provider IDs
Two distinct ebooks (e.g. series volumes named only by series + book
number) were collapsing onto a single provider work, then fighting over
the same media_item_provider_ids row:
- cleanEbookSearchTitle stripped trailing "(... Book N)" / "[#3]" groups
entirely, so every volume of a series searched as the bare series name
and matched the same provider work. The plugin search contract carries
only a single free-text Query, so the volume number is now UNWRAPPED
into the query (brackets dropped, words kept) instead of discarded,
giving distinct volumes distinct searches. Bare-year groups are still
dropped (SearchQuery.Year carries them); meaningful parentheticals
("(Illustrated)") still survive.
- collectEbookMetadata now consults FindContentIDByProviderIDs before
accumulating a search-result provider ID. An ID already owned by a
different content item is skipped, so the loser is not mis-tagged with
the winner's metadata and ReplaceByContentID no longer violates the
(provider, provider_id, item_type) unique constraint. The previous
behavior logged duplicate-key errors every sweep and re-enriched the
failing item forever (CPU/RAM churn). A failed ownership check is
surfaced as a provider error so the item retries rather than terminally
stamping as "no match".
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 942fdef6cb0e167b2d9223e9a968b3010b7b3ec8)
* fix(ebooks): address CodeRabbit review on PR #185
- cleanEbookSearchTitle: anchor author-suffix strip to a trailing match
(optionally followed by a series/volume parenthetical) so a mid-title
" - <token>" no longer truncates valid title text
- ebook scan: strip the recovered author suffix using normalized comparison
so case/spacing variants (e.g. "a. f. carter") don't leave a duplicate
- parseMOBIEXTH: bound parsing to the declared EXTH length so a corrupt
record count can't read full-text bytes as junk metadata
- add regression test for a non-trailing " - <token>" in the title
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 0f45af8143e04dfd5b4a5ee3e949dcd943eedbd1)
* fix(audiobooks): pass author in search query and retry on provider errors
Set SearchQuery.Author so the host adapter folds author into the
plugin free-text query (parity with ebooks). Track provider errors
during enrichment; when nothing matched and a provider errored, return
an error without stamping last_refreshed so the sweep retries instead
of terminally burning the item on a transient failure.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit f45dd2104c5d6415324e80f91f6684bc39858459)
* fix(scanner): consolidate fragmented multi-file audiobook content_ids on rescan
audiobookFolderShouldSkip used ListByObservedRootPath which returns all
files for a root path regardless of content_id. When a multi-file audiobook
had files fragmented across multiple content_ids (e.g. from concurrent
refreshes), the file count matched disk so the skip check returned true
and the reconcile never ran to merge them.
Now verifies all DB files share the same content_id before skipping; any
fragmentation forces a full reconcile which consolidates to one content_id
via FindContentIDByRootPath → upsertAudiobookMediaFiles.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit e91c33e88a7d09e802e6afd8af246c6c954d0498)
* fix(ingest): skip concurrent match drainer for audiobook/podcast/ebook/manga libraries
The concurrent scoped match drainer ran during scan for all library types.
For audiobook libraries, the scanner assigns content_ids by folder root
(one item per multi-file folder). Running the drainer concurrently caused
it to process files with content_id=NULL (cleared by complete refresh)
as individual items, creating one media_item per file instead of one per
folder. This manifested as 41-file audiobooks fragmenting into dozens of
orphaned single-file content_ids on every refresh.
These library types use scanner-driven grouping; the post-scan drain step
handles them correctly. Returning nil matchScopes skips the concurrent
drainer entirely for these types.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 93ae9d22ce315874fa22a958b88ca1766075695f)
* fix(abs): match real audiobookshelf auth + session-sync contract
Align the ABS-compat auth flow with real audiobookshelf (v2.26+) so
third-party clients (yaabsa, Plappa, native iOS) authenticate and sync
playback correctly:
- login/refresh: always emit user.accessToken; x-return-tokens gates
only the refresh token (body vs HttpOnly refresh_token cookie)
- /auth/refresh returns the full login envelope (was a thin token map)
- /me returns the full user object (toOldJSONForBrowser), shared with
login/authorize via a single absUserObject() builder
- /logout returns 200 {redirect_url:null} and clears the cookie (was 204)
- add POST /session/{sid}/sync (real ABS heartbeat path); it was
PATCH-only, so the official client's sync POST 404'd and playback
progress never synced
Verified against advplyr/audiobookshelf server/{Auth.js,models/User.js,
controllers,routers}. Unit tests updated/added; full abs suite green.
Not yet live-verified.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 336e932471d4be021d82299106a120611783836a)
* fix(abs): conform browse/list items to real audiobookshelf minified shape
Strict ABS clients (yaabsa, Plappa) crash or drop items when the browse
list shape only approximates real audiobookshelf. Match the serializers:
- add media.id + media.libraryItemId (= ContentID) to LibraryItemMedia;
yaabsa BookMedia.id is required non-null and was missing → the whole
item failed to parse ("Null is not a subtype of String")
- rebuild the minified list shape to LibraryItem.toOldJSONMinified +
Book.toOldJSONMinified + oldMetadataToJSONMinified key-for-key (ino,
path, isFile, numFiles/size, media.{id,tags,numTracks,numAudioFiles,
numChapters,size,ebookFormat}, flat author/series metadata)
- force media.numTracks/numAudioFiles >= 1 in the browse projection so
Plappa doesn't drop items reporting 0 audio files
- default /items list to minified (real ABS list is always minified);
minified=0 opts into the full shape
Verified against advplyr/audiobookshelf models/{Book,LibraryItem}.js.
Adds minified_test.go key-set conformance guards; abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 6c9387a8c4b60be3dbe541049ed8c06344b10717)
* fix(abs): conform /items/{id} detail to real audiobookshelf expanded shape
Match real audiobookshelf LibraryItem.toOldJSONExpanded +
Book.toOldJSONExpanded + oldMetadataToJSONExpanded so strict clients
decode the item-detail page with the same model they use elsewhere:
- add expanded outer keys to LibraryItem (oldLibraryItemId, lastScan,
scanVersion, libraryFiles, size) and populate libraryFiles + summed
size from the item's media files in the detail builder
- add media.size (Book.toOldJSONExpanded)
- make the typed Metadata the full expanded superset: subtitle,
titleIgnorePrefix, authorName, authorNameLF, narratorName, seriesName,
descriptionPlain, publishedDate, asin, language, abridged; drop the
omitempty that previously dropped description/publishedYear/isbn/
publisher when empty (a missing key crashes strict clients)
Verified against advplyr/audiobookshelf models/Book.js + LibraryItem.js.
Adds items_detail_test.go expanded key-set guard; abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 8bd485f0291e9db9f32e13a68609a68ee8a945ec)
* fix(abs): conform authors/series endpoints to real audiobookshelf shapes
Match the real audiobookshelf serializers so strict clients decode the
authors/series browse + detail responses:
- GET /libraries/{id}/authors now branches like LibraryController.getAuthors:
bare { authors: [...] } when not paginated, paged { results, total, ... }
only when limit+page are present (was always paged → clients keying on
`authors` got keyNotFound)
- author objects carry the full Author.toOldJSON key set (id, asin, name,
description, imagePath, libraryId, addedAt, updatedAt, numBooks); silo has
no analog for asin/description/imagePath/timestamps so they are null/0
- series objects carry the full Series.toOldJSON key set (adds
nameIgnorePrefix, description, libraryId, addedAt, updatedAt)
- series/author books are now FULL minified library items (real ABS shape)
instead of thin {id,media:{metadata:{title}}} stubs that crash Plappa;
author items moved to the real-ABS `libraryItems` key
Verified against advplyr/audiobookshelf controllers/LibraryController.js and
models/{Author,Series}.js. Tests updated + envelope-branch guard added; abs
suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 8a22eb0900ed881d500ded315a508e1a07da14f3)
* fix(abs): add libraryId to collection/playlist objects (real ABS shape)
Real audiobookshelf Collection.toOldJSON and Playlist.toOldJSON both carry
a libraryId; silo's emitters omitted it, so a strict client modeling the
object with a required libraryId crashed. silo collections/playlists are
cross-library user-personal, so emit the virtual audiobook library id.
The books[]/items[] entries already carry the full LibraryItem shape and
inherit the browse-conformance fixes (media.id etc.). Envelopes were
already correct (paged for library-scoped, {collections}/{playlists} for
global).
Verified against advplyr/audiobookshelf models/{Collection,Playlist}.js.
Envelope key-set tests updated; abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit f7d2ff0565f05c3a6ef7f36f2b1f252bd373fa7a)
* fix(abs): conform library object + /libraries/{id} to real audiobookshelf
The library object was only {id,name,mediaType}; real audiobookshelf
Library.toOldJSON has 12 keys, so a strict client decoding the library
model crashed on the missing ones. Also GET /libraries/{id} always wrapped
the object in { library: ... }, but real ABS returns it directly unless
?include=filterdata is requested.
- audiobookLibraryMap now emits the full Library.toOldJSON shape (folders[]
as LibraryFolder.toOldJSON, displayOrder, icon, provider, settings,
lastScan, lastScanVersion, createdAt, lastUpdate). This also enriches the
libraries[] on the login envelope, which shares the builder.
- handleLibraryDetail returns the library object DIRECTLY without include,
and wraps in { filterdata, issues, numUserPlaylists,
customMetadataProviders, library } (adds the missing
customMetadataProviders) with include=filterdata.
GET /libraries already returned { libraries: [...] } (correct). Verified
against advplyr/audiobookshelf models/Library.js +
controllers/LibraryController.js. Adds libraries_shape_test.go; abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit d05a2f2af1caf21a4ad04577a4787ba02cff091c)
* fix(abs): conform personalized recent-series shelf to real ABS series shape
The /libraries/{id}/personalized "Recent Series" shelf emitted thin
{id,name,numBooks,libraryId,books:[]} entities with an always-empty cover
stack. Emit the full real-ABS series object (seriesObjectABS, adds
nameIgnorePrefix/description/addedAt/updatedAt) with minified book items
(seriesBookMinified) — the same shape as /libraries/{id}/series so the
shelf card decodes identically and shows real covers.
Book shelves already used full minified items; the shelves array is a bare
array (matches real ABS getUserPersonalizedShelves). abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 7c586f8c923cbc481f6f94e304af48dee379a999)
* fix(abs): conform listening-sessions to real audiobookshelf PlaybackSession shape
silo's /me/listening-sessions returned a thin 5-field session object
(id, libraryItemId, userId, timeListening, currentTime) wrapped in the
generic pagedEnvelope shape ({results,sortBy,filterBy,minified}). Real
audiobookshelf clients (Flutter/Swift strict decoders) expect the
MeController.getListeningSessions envelope
({total,numPages,page,itemsPerPage,sessions}) and each session to carry
the full PlaybackSession.toJSON() key set, so the missing keys (notably
mediaType, mediaMetadata, displayTitle, displayAuthor, coverPath,
duration, chapters, deviceInfo, playMethod, mediaPlayer, serverVersion,
date, dayOfWeek, startTime, startedAt, updatedAt, libraryId, bookId,
episodeId) crashed with keyNotFound errors.
Both handleListeningSessions and handleListeningSessionDetail now build
the response via a shared sessionToABS() that reuses
buildSiloPlayMediaMetadata (already used by /play) to hydrate
mediaMetadata/displayTitle/displayAuthor from MediaStore, batching
lookups via GetAudiobooksByIDs for the list endpoint. Lookups are
best-effort: a missing/inaccessible item falls back to a stub
MediaItem so every key is still emitted, never a crash.
Verified against advplyr/audiobookshelf server/controllers/MeController.js
(getListeningSessions) and server/objects/PlaybackSession.js (toJSON())
on GitHub master.
Known placeholders (real ABS fields we can't populate without extra
cost): chapters (empty array — would require a per-session media-files
fetch), duration (0 — total book duration isn't tracked on the session
row), startTime (0 — not persisted separately from currentTime),
deviceInfo (static "unknown" device, matching the /play endpoint's
existing placeholder — no device info is persisted per session).
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 9471497c99b96c8d3defc6c8112c913f7c55924b)
* feat(abs): add offline session sync endpoints (/session/local, /session/local-all)
The official ABS mobile app records playback while offline and POSTs those
PlaybackSession objects back on reconnect via SessionController.syncLocal and
syncLocalSessions. silo was missing both endpoints, so offline listening
progress was silently lost. Add them to the bearerAuth-protected session group
(both /abs/api and /api prefixes) alongside /session/{sid}/sync and /close.
POST /session/local decodes one PlaybackSession and updates the caller's resume
position via ProgressStore.UpdateProgressPosition (the same call handleSessionSync
uses), emitting user_item_progress_updated. POST /session/local-all decodes
{sessions:[...]} and loops each robustly — a malformed or unknown item marks that
one result failed without sinking the batch — returning {results:[...]}. No new
store persistence or migration; podcast/episode sessions are accepted as no-ops.
Verified against advplyr/audiobookshelf server/controllers/SessionController.js
and server/managers/PlaybackSessionManager.js.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 008a4df948d855a4bfe62b24f89bfc484f088033)
* fix(abs): conform library search + items-in-progress to real audiobookshelf
Real ABS's libraryItemsBookFilters.search() (delegated from
LibraryController.search) returns { book, narrators, tags, genres,
series, authors } with no "podcast" key for a book library, and each
book entry is only { libraryItem } — no matchKey/matchText, which our
handler was inventing. Search now matches those keys, drops the
fabricated matchKey/matchText fields, and best-effort populates
authors/series buckets via client-side substring filtering over the
existing aggregate listers (narrators/tags/genres stay empty-but-present
since silo has no backing aggregation query for them yet).
MeController.getAllLibraryItemsInProgress wraps items as
{ ...libraryItem.toOldJSONMinified(), progressLastUpdate }; our handler
was emitting a hand-rolled subset of fields plus a nested
userMediaProgress object that doesn't exist in the real response.
items-in-progress now reuses the existing Minify() projection and merges
a flat progressLastUpdate (ms) field to match.
Verified against advplyr/audiobookshelf controllers/{Library,Me}Controller.js
and server/utils/queries/{libraryItemsBookFilters,authorFilters}.js.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 998ff55f3cf27d504f0e5aec8c7c29fa57f10247)
* fix(abs): /ping returns success:true and /status carries authMethods
The ABS apps validate a server address by reading response.success from
GET /ping; silo returned {pong:true,...} with no `success`, so the app
reported "unable to reach" even though the server responded 200. Also
/status was missing authMethods/authFormData, which the app reads to render
the login form.
- /ping now includes {"success": true} (pong/server/version kept as extras)
- /status now returns {app,serverVersion,isInit,language,authMethods,
authFormData} matching real audiobookshelf Server.js
Verified against advplyr/audiobookshelf server/Server.js. Adds
ping_status_test.go; abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit df732d09355303608bc4d5fc2138555e37497a02)
* fix(abs): mount login + auth/refresh under /api prefix
Clients that post to /api/login (and /api/auth/refresh) got a 404 because
login/refresh were only mounted at root and /abs/api — while the rest of the
authenticated ABS surface (/api/me, /api/authorize, /api/libraries, covers)
is served under both /api and /abs/api. The 404 surfaced in the client as a
generic "unknown error occurred" on sign-in.
Mount /login and /auth/refresh under all three prefixes ("", /api, /abs/api),
matching the authenticated groups.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 18071e180b02131cda354303eadd1ff3a0708065)
* fix(abs): accept form-encoded login bodies (not just JSON)
Real audiobookshelf (express body-parser + passport local) accepts both
application/json and application/x-www-form-urlencoded credential bodies.
Silo only json-decoded the body, so a form-encoded client got 400 "invalid
request body" — surfaced in the app as a generic "unknown error" on sign-in
(confirmed live: JSON creds -> 200, identical form-encoded creds -> 400).
Buffer the body once, try JSON, then fall back to url.ParseQuery for the
form-encoded case.
Adds login_body_test.go (form + JSON both reach the validator). abs suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 408dc33debb7a7ee363778094511ccfdd1ee70d2)
* fix(abs): emit full real-ABS serverSettings (OpenID/auth fields)
silo's login/authorize serverSettings omitted the auth + OpenID fields that
real audiobookshelf ServerSettings.toJSONForBrowser includes
(authLoginCustomMessage, authOpenID*, rateLimitLogin*, backupPath,
allowedOrigins). OIDC-aware strict clients (Prologue, iOS/Swift) decode
serverSettings into a model that requires those keys, so their absence throws
keyNotFound and the ENTIRE login response fails to decode — the client stays
on the login screen with a generic "unknown error" even though the server
returned 200. Simpler clients that don't model OpenID were unaffected.
Emit real ABS's OIDC-disabled defaults; authActiveAuthMethods still advertises
only "local" so no client initiates the OpenID flow.
Diagnosed from a packet capture (Prologue posts /login? with X-Return-Tokens
and gets a 200 it can't decode) + real ABS ServerSettings.js. Verified against
advplyr/audiobookshelf.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 283826c952824e97233e46e057f37385ddc3054b)
* fix(abs): GET /me returns the real display username, not the userID
/me built its user object from the token claims and passed the numeric
userID as the username, so clients saw "98" instead of "puksthepirate".
Login gets the display name from the credential validator, but /me only has
the token, so it needs a lookup.
Add an optional UsernameResolver to the abs Dependencies; wire it from the
concrete SiloCredValidator (which holds the pgx pool) via a new
ResolveUsername method that mirrors Validate's display-name logic — the
profile name when a profile is set and named, else the account username.
handleMe uses it and falls back to the userID when unresolved.
abs package compiles + tests pass; the audiobooks package (service.go,
cred_validator.go) could not be linked locally (pre-existing bimg/libvips
pkg-config gap) and is validated at the Docker build.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 39ff3e3350aad087757f7fb0e94d5a7f10c08ae5)
* fix(abs): always emit AudioTrack keys + correct media.duration
Two item-detail issues that made Prologue report "Unable to load book
contents" (can't press Start Listening):
- AudioTrack used omitempty on chapters/metaTags/format/bitRate/codec/
metadata/etc, so empty values dropped those keys. Real ABS AudioFile/
AudioTrack always emit them; strict clients (Prologue, yaabsa) decode
tracks into a required-field model and throw keyNotFound on the missing
keys, failing the whole track decode. Removed omitempty and emit
chapters/metaTags as [] / {} (non-nil) in both track builders.
- media.duration used the item's Runtime, which is often stale/mis-scanned
(e.g. 222s for a 3.7h book) and desyncs the player scrubber. Now sum the
track durations (real ABS: sum of audio file durations), falling back to
Runtime only when there are no tracks.
Verified against advplyr/audiobookshelf models/Book.js (AudioFile/AudioTrack)
via a live packet capture of Prologue's item-detail decode failure. abs
suite green.
AI-use: implemented with Claude Code (Opus 4.8).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 8210ed2fc63e782f158b4168ef693e671ae19638)
* perf(abs): push down library browse filters + author counts MV
The ABS audiobook library-serving path was slow on large libraries
(~255k items): /libraries/{id}/items?filter=authors.{id} loaded and
hydrated the whole library into Go before filtering (~4.8s each), and
/libraries/{id}/authors ran a full GroupAggregate + COUNT(DISTINCT)
per page (~53s full sync) — slow enough to trip ABS client sync
timeouts (e.g. Prologue).
- Push author/series/narrator/no-series filters into indexed SQL
EXISTS predicates in ListAudiobooks; paginate + COUNT in SQL.
Semantically equivalent to the prior Go-side filter (kind=7 author,
kind=8 narrator, exact-case match, no-series sentinel).
- Add covering index media_items(content_id, type) so the count/list
type check runs index-only (CONCURRENTLY, NO TRANSACTION — no
write-lock on the live table).
- Serve /authors from a materialized view (abs_audiobook_author_counts)
refreshed every 15min, with a live-query fallback when the view is
empty/unrefreshed so the endpoint never blanks on a fresh deploy.
Conformance preserved: keeps authorObjectABS/seriesObjectABS shapes and
the limit&&page envelope decision; adds a regression test for the
bare {authors:[...]} envelope on limit-only requests.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 0d55754051dd3ad016b3cec6a0921307071d3219)
* perf(abs): index-back audiobook search via trigram GIN
SearchAudiobooks matched the raw media_items.title with ILIKE '%q%'
OR'd with an author/narrator EXISTS. The un-indexed raw-title column
plus the OR forced a full seq scan of the ~255k-item library on every
search (~560ms on library 18).
Reshape into a UNION of two index-driven arms that reuse the search
infrastructure the rest of the catalog already relies on: the title arm
matches media_items.title_normalized (idx_media_items_title_normalized_trgm)
via the shared normalize_search_text(), the people arm matches people.name
(idx_people_name_trgm). GROUP BY content_id keeps the best rank when an
item matches both; a normalize_search_text($2) <> '' guard stops a
punctuation-only query from degenerating into ILIKE '%%'.
No new index or migration — the trigram indexes already existed and were
simply unused. ~560ms -> ~35ms, both indexes engaged, no seq scan.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 98bbd1712719ecd03e4db87f840774cec788f177)
* perf(abs): index-ordered item paging + cached library count
The unfiltered /libraries/{id}/items path that ABS clients page through
to sync a library recomputed COUNT(*) over the whole library on every
page (~150ms each) and ordered by LOWER(sort_title), LOWER(title) — an
expression matching no index, forcing a full in-memory sort of all
~255k rows per page (~324ms shallow, ~543ms deep). A full sync is
thousands of pages, so both costs dominated indexing time.
- Order by lower(coalesce(nullif(btrim(sort_title),''), title)),
content_id so the page is served by an ordered index scan on the
existing idx_media_items_sort_key (~324ms -> ~1ms). content_id (PK)
is a stable tiebreaker, making sequential pagination deterministic —
the prior ordering could skip/repeat rows when sort keys collided.
- Memoize the per-page COUNT in a 60s TTL cache keyed on the fully
rendered count SQL + bound args, so it covers every input the WHERE
depends on (library, pushed-down filter, all access predicates) and
can't drift as access logic evolves. Expired entries swept on write.
No new index or migration — reuses idx_media_items_sort_key.
total may lag up to 60s during an active scan; clients re-sync.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
(cherry picked from commit 32e26c2f99a1ffc071f600071c2ea7ddcd3397b4)
* fix(abs): address PR review — access-aware authors, offline progress create, cookie refresh, body limits
- media_store: ListLibraryAuthors bypassed per-item access when reading the
author materialized view (keyed by library only), leaking authors of books
hidden by a content-rating cap or excluded media types. Take the access-aware
live path whenever the filter carries an item-level predicate.
- session_local: offline sync used UPDATE-only UpdateProgressPosition, so a book
listened to entirely offline (no progress row yet) had its position silently
dropped while still reporting progressSynced. Create the row via UpsertProgress
when none exists; keep the monotonic update path for existing rows.
- login: handleRefresh never read the refresh_token cookie, so cookie-flow ABS
clients got 400 refreshToken required once the access token expired. Read the
cookie as a third source after header and body.
- session_local: cap /session/local and /session/local-all request bodies at
1 MiB via io.LimitReader, matching the rest of the package.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
1454 lines
46 KiB
Go
1454 lines
46 KiB
Go
package scanner
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
"unicode"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/idgen"
|
|
"github.com/Silo-Server/silo-server/internal/imageutil"
|
|
"github.com/Silo-Server/silo-server/internal/models"
|
|
"github.com/Silo-Server/silo-server/internal/titleutil"
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgconn"
|
|
)
|
|
|
|
type ebookSQLExecutor interface {
|
|
Exec(ctx context.Context, sql string, arguments ...any) (pgconn.CommandTag, error)
|
|
}
|
|
|
|
type filesystemMediaItemReader interface {
|
|
GetByIDs(ctx context.Context, ids []string) ([]*models.MediaItem, error)
|
|
}
|
|
|
|
func ebookScanWorkers() int {
|
|
if v := os.Getenv("SILO_EBOOK_SCAN_WORKERS"); v != "" {
|
|
if n, err := strconv.Atoi(v); err == nil && n > 0 {
|
|
return n
|
|
}
|
|
}
|
|
return audiobookScanWorkers()
|
|
}
|
|
|
|
func (s *Scanner) ScanEbookFolder(ctx context.Context, folder *models.MediaFolder) error {
|
|
if s == nil || folder == nil {
|
|
return fmt.Errorf("ScanEbookFolder: nil scanner or folder")
|
|
}
|
|
return s.scanEbookPaths(ctx, folder, folder.Paths, true)
|
|
}
|
|
|
|
// ebookRootScan captures the walk outcome for one configured library root.
|
|
type ebookRootScan struct {
|
|
root string
|
|
files []string
|
|
rootErr error // root stat failed, or the root is not a directory
|
|
walkFailures int // entries within the subtree the walk could not read or resolve
|
|
}
|
|
|
|
// failed reports whether the walk under this root is known to be incomplete.
|
|
// Files found under a failed root are still indexed, but the root is excluded
|
|
// from missing-file reconciliation: a transient mount/permission problem (or
|
|
// a mid-walk subtree error) must not cascade into marking — and, with
|
|
// empty_trash_after_scan, deleting — everything under it.
|
|
func (r *ebookRootScan) failed() bool {
|
|
return r.rootErr != nil || r.walkFailures > 0
|
|
}
|
|
|
|
// collectEbookRootScans walks every configured root with the shared
|
|
// logical-tree walker (so symlinked roots and symlinked subdirectories
|
|
// resolve and scan exactly like the video pipeline) and records per-root walk
|
|
// failures. The only error returned is context cancellation.
|
|
func collectEbookRootScans(ctx context.Context, folderID int, roots []string) ([]ebookRootScan, error) {
|
|
scans := make([]ebookRootScan, 0, len(roots))
|
|
visitedPhysicalDirs := make(map[string]struct{})
|
|
for _, root := range roots {
|
|
if err := ctx.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
cleanRoot := filepath.Clean(strings.TrimSpace(root))
|
|
if cleanRoot == "" || cleanRoot == "." {
|
|
continue
|
|
}
|
|
scan := ebookRootScan{root: cleanRoot}
|
|
info, statErr := os.Stat(cleanRoot)
|
|
switch {
|
|
case statErr != nil:
|
|
// Unmounted/missing/permission-broken root: failed, not empty.
|
|
scan.rootErr = fmt.Errorf("stat root: %w", statErr)
|
|
case !info.IsDir():
|
|
scan.rootErr = fmt.Errorf("root is not a directory after symlink resolution")
|
|
}
|
|
if statErr == nil {
|
|
if err := walkLogicalTree(ctx, cleanRoot, cleanRoot, walkModeEbook, visitedPhysicalDirs, &scan.files, &scan.walkFailures); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if scan.failed() {
|
|
slog.Warn("ebook scan: root walk incomplete; root excluded from missing-file reconciliation",
|
|
"folder_id", folderID,
|
|
"root", cleanRoot,
|
|
"walk_failures", scan.walkFailures,
|
|
"error", scan.rootErr,
|
|
)
|
|
}
|
|
scans = append(scans, scan)
|
|
}
|
|
return scans, nil
|
|
}
|
|
|
|
// splitEbookReconcileRoots partitions walked roots into the set that may take
|
|
// part in missing-file reconciliation and reports whether any reconcilable
|
|
// root saw at least one ebook on disk.
|
|
func splitEbookReconcileRoots(scans []ebookRootScan) (reconcileRoots []string, sawFiles bool) {
|
|
reconcileRoots = make([]string, 0, len(scans))
|
|
for i := range scans {
|
|
scan := &scans[i]
|
|
if scan.failed() {
|
|
continue
|
|
}
|
|
if len(scan.files) > 0 {
|
|
sawFiles = true
|
|
}
|
|
reconcileRoots = append(reconcileRoots, scan.root)
|
|
}
|
|
return reconcileRoots, sawFiles
|
|
}
|
|
|
|
func (s *Scanner) scanEbookPaths(ctx context.Context, folder *models.MediaFolder, roots []string, fullScan bool) error {
|
|
if s == nil || folder == nil {
|
|
return fmt.Errorf("scanEbookPaths: nil scanner or folder")
|
|
}
|
|
scans, err := collectEbookRootScans(ctx, folder.ID, roots)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Every discovered file is indexed, including files under roots whose
|
|
// walk partially failed: indexing is additive and safe, only the
|
|
// destructive reconciliation below is restricted to cleanly walked roots.
|
|
var candidates []string
|
|
for i := range scans {
|
|
candidates = append(candidates, scans[i].files...)
|
|
}
|
|
|
|
if len(candidates) == 0 {
|
|
return s.reconcileEbookScan(ctx, folder, scans, nil, fullScan)
|
|
}
|
|
|
|
workers := ebookScanWorkers()
|
|
slog.Info("ebook scan: starting",
|
|
"folder_id", folder.ID,
|
|
"candidates", len(candidates),
|
|
"workers", workers,
|
|
)
|
|
reportEbookScanProgress(ctx, folder.ID, len(candidates), 0, 0, 0)
|
|
|
|
ch := make(chan string, workers*2)
|
|
groupLocks := newEbookGroupLocks()
|
|
var (
|
|
wg sync.WaitGroup
|
|
processed int64
|
|
failed int64
|
|
skipped int64
|
|
failMu sync.Mutex
|
|
failures []error
|
|
cancelErr error
|
|
)
|
|
start := time.Now()
|
|
for i := 0; i < workers; i++ {
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
for path := range ch {
|
|
if ctx.Err() != nil {
|
|
return
|
|
}
|
|
if err := s.reconcileEbookFile(ctx, folder, path, &skipped, groupLocks); err != nil {
|
|
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
|
|
failMu.Lock()
|
|
if cancelErr == nil {
|
|
cancelErr = err
|
|
}
|
|
failMu.Unlock()
|
|
return
|
|
}
|
|
atomic.AddInt64(&failed, 1)
|
|
failMu.Lock()
|
|
failures = append(failures, fmt.Errorf("%s: %w", path, err))
|
|
failMu.Unlock()
|
|
slog.Warn("ebook scan: file failed",
|
|
"folder_id", folder.ID,
|
|
"path", path,
|
|
"error", err,
|
|
)
|
|
}
|
|
n := atomic.AddInt64(&processed, 1)
|
|
if n%500 == 0 || n == int64(len(candidates)) {
|
|
failedCount := atomic.LoadInt64(&failed)
|
|
skippedCount := atomic.LoadInt64(&skipped)
|
|
slog.Info("ebook scan: progress",
|
|
"folder_id", folder.ID,
|
|
"processed", n,
|
|
"failed", failedCount,
|
|
"skipped", skippedCount,
|
|
"total", len(candidates),
|
|
"elapsed_sec", int(time.Since(start).Seconds()),
|
|
)
|
|
reportEbookScanProgress(ctx, folder.ID, len(candidates), int(n), int(failedCount), int(skippedCount))
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
for _, p := range candidates {
|
|
select {
|
|
case ch <- p:
|
|
case <-ctx.Done():
|
|
close(ch)
|
|
wg.Wait()
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
close(ch)
|
|
wg.Wait()
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
if cancelErr != nil {
|
|
return cancelErr
|
|
}
|
|
|
|
slog.Info("ebook scan: completed",
|
|
"folder_id", folder.ID,
|
|
"processed", atomic.LoadInt64(&processed),
|
|
"failed", atomic.LoadInt64(&failed),
|
|
"skipped", atomic.LoadInt64(&skipped),
|
|
"elapsed_sec", int(time.Since(start).Seconds()),
|
|
)
|
|
if processedCount := atomic.LoadInt64(&processed); processedCount > 0 {
|
|
failedCount := atomic.LoadInt64(&failed)
|
|
skippedCount := atomic.LoadInt64(&skipped)
|
|
if failedCount > 0 && skippedCount == 0 && failedCount == processedCount {
|
|
return fmt.Errorf("ebook scan failed for every attempted folder_id=%d: %w", folder.ID, errors.Join(failures...))
|
|
}
|
|
}
|
|
|
|
seenPaths := make(map[string]bool, len(candidates))
|
|
for _, p := range candidates {
|
|
seenPaths[p] = true
|
|
}
|
|
return s.reconcileEbookScan(ctx, folder, scans, seenPaths, fullScan)
|
|
}
|
|
|
|
// ebookCleanupGuardRepo is the slice of catalog.FolderRepository the
|
|
// empty-root cleanup guard needs.
|
|
type ebookCleanupGuardRepo interface {
|
|
ConsumeEmptyCleanupAllowance(ctx context.Context, id int) (bool, error)
|
|
SetScanWarning(ctx context.Context, id int, code, message string, warnedAt time.Time) error
|
|
}
|
|
|
|
// ebookEmptyCleanupAllowed mirrors the video pipeline's empty-root guard: a
|
|
// scan that saw zero ebooks while the DB still has rows under the scanned
|
|
// roots may only reconcile (and therefore delete) when the operator has
|
|
// explicitly confirmed the cleanup. Subtree scans never consume the
|
|
// folder-level allowance; the next full scan converges them.
|
|
func ebookEmptyCleanupAllowed(ctx context.Context, repo ebookCleanupGuardRepo, folderID int, fullScan bool) (bool, error) {
|
|
if !fullScan || repo == nil {
|
|
return false, nil
|
|
}
|
|
allowed, err := repo.ConsumeEmptyCleanupAllowance(ctx, folderID)
|
|
if err != nil {
|
|
return false, fmt.Errorf("checking empty cleanup confirmation for folder %d: %w", folderID, err)
|
|
}
|
|
if !allowed {
|
|
if err := repo.SetScanWarning(ctx, folderID,
|
|
"empty_root",
|
|
"Scan found 0 media files; cleanup was skipped until deletion is confirmed.",
|
|
time.Now().UTC(),
|
|
); err != nil {
|
|
return false, fmt.Errorf("recording empty-root warning for folder %d: %w", folderID, err)
|
|
}
|
|
}
|
|
return allowed, nil
|
|
}
|
|
|
|
// reconcileEbookScan applies the post-walk safety policy and then performs
|
|
// missing-file reconciliation for the roots that walked cleanly.
|
|
func (s *Scanner) reconcileEbookScan(ctx context.Context, folder *models.MediaFolder, scans []ebookRootScan, seenPaths map[string]bool, fullScan bool) error {
|
|
reconcileRoots, sawFiles := splitEbookReconcileRoots(scans)
|
|
if len(reconcileRoots) == 0 {
|
|
if len(scans) > 0 {
|
|
slog.Warn("ebook scan: every root walk failed; skipping missing-file reconciliation",
|
|
"folder_id", folder.ID,
|
|
)
|
|
}
|
|
return nil
|
|
}
|
|
if s.fileRepo == nil || s.libraryRepo == nil {
|
|
return nil
|
|
}
|
|
|
|
if !sawFiles {
|
|
existingCount := 0
|
|
for _, root := range reconcileRoots {
|
|
existing, err := s.fileRepo.GetByFolderAndPathPrefix(ctx, folder.ID, root)
|
|
if err != nil {
|
|
return fmt.Errorf("listing existing ebook files for %q: %w", root, err)
|
|
}
|
|
existingCount += len(existing)
|
|
}
|
|
if existingCount > 0 {
|
|
var guard ebookCleanupGuardRepo
|
|
if s.folderRepo != nil {
|
|
guard = s.folderRepo
|
|
}
|
|
allowed, err := ebookEmptyCleanupAllowed(ctx, guard, folder.ID, fullScan)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !allowed {
|
|
slog.Warn("ebook scan: walk saw zero ebooks but the database has files under the scanned roots; skipping reconciliation until cleanup is confirmed",
|
|
"folder_id", folder.ID,
|
|
"existing_files", existingCount,
|
|
"full_scan", fullScan,
|
|
)
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := s.reconcileMissingEbookFiles(ctx, folder, reconcileRoots, seenPaths); err != nil {
|
|
return err
|
|
}
|
|
if fullScan && s.folderRepo != nil {
|
|
// The cleanup either ran with files present or was explicitly
|
|
// confirmed; any prior empty-root warning is stale now.
|
|
if err := s.folderRepo.ClearScanWarning(ctx, folder.ID); err != nil {
|
|
return fmt.Errorf("clearing scan warning for folder %d: %w", folder.ID, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// reconcileMissingEbookFiles mirrors the video/audio scan cleanup: DB files
|
|
// under the scanned roots that were not seen on disk are marked missing, the
|
|
// folder trash is optionally emptied, and library memberships are reconciled
|
|
// so items with no remaining files are removed (renames therefore converge on
|
|
// the newly indexed path instead of leaving a stale duplicate item).
|
|
func (s *Scanner) reconcileMissingEbookFiles(ctx context.Context, folder *models.MediaFolder, roots []string, seenPaths map[string]bool) error {
|
|
if s.fileRepo == nil || s.libraryRepo == nil || len(roots) == 0 {
|
|
return nil
|
|
}
|
|
|
|
now := time.Now().UTC()
|
|
missing := 0
|
|
for _, root := range roots {
|
|
existing, err := s.fileRepo.GetByFolderAndPathPrefix(ctx, folder.ID, root)
|
|
if err != nil {
|
|
return fmt.Errorf("listing existing ebook files for %q: %w", root, err)
|
|
}
|
|
for _, mf := range existing {
|
|
if mf == nil || seenPaths[mf.FilePath] {
|
|
continue
|
|
}
|
|
if mf.MissingSince == nil {
|
|
if err := s.fileRepo.MarkMissing(ctx, mf.ID, now); err != nil {
|
|
slog.Error("ebook scan: failed to mark file missing",
|
|
"folder_id", folder.ID,
|
|
"path", mf.FilePath,
|
|
"error", err,
|
|
)
|
|
continue
|
|
}
|
|
}
|
|
missing++
|
|
}
|
|
}
|
|
|
|
if s.emptyTrashAfterScan {
|
|
trashed, err := s.fileRepo.DeleteMissingByFolder(ctx, folder.ID)
|
|
if err != nil {
|
|
return fmt.Errorf("emptying trash for folder %d: %w", folder.ID, err)
|
|
}
|
|
if trashed > 0 {
|
|
slog.Info("ebook scan: emptied trash", "folder_id", folder.ID, "deleted", trashed)
|
|
}
|
|
}
|
|
|
|
removedMemberships, deletedItems, orphanedImageDirs, err := s.reconcileLibraryMemberships(ctx, folder.ID)
|
|
if err != nil {
|
|
return fmt.Errorf("reconciling library membership for folder %d: %w", folder.ID, err)
|
|
}
|
|
|
|
// Best-effort S3 image cleanup for orphaned items.
|
|
if s.s3Client != nil && len(orphanedImageDirs) > 0 {
|
|
bucket := s.s3Client.Bucket()
|
|
for _, dir := range orphanedImageDirs {
|
|
_, _ = s.s3Client.DeletePrefix(ctx, bucket, dir)
|
|
}
|
|
}
|
|
|
|
if missing > 0 || removedMemberships > 0 || deletedItems > 0 {
|
|
slog.Info("ebook scan: reconciled missing files",
|
|
"folder_id", folder.ID,
|
|
"missing", missing,
|
|
"memberships_removed", removedMemberships,
|
|
"items_deleted", deletedItems,
|
|
)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func reportEbookScanProgress(ctx context.Context, folderID int, total, processed, failed, skipped int) {
|
|
reportProgress(ctx, ProgressUpdate{
|
|
Phase: "ebook_scan",
|
|
Message: fmt.Sprintf("Scanning ebooks in folder %d", folderID),
|
|
CurrentScope: strconv.Itoa(folderID),
|
|
TotalFiles: total,
|
|
FilesDiscovered: total,
|
|
FilesProcessed: processed,
|
|
Errors: failed,
|
|
Unchanged: skipped,
|
|
})
|
|
}
|
|
|
|
func (s *Scanner) reconcileEbookFile(ctx context.Context, folder *models.MediaFolder, filePath string, skipped *int64, groupLocks *ebookGroupLocks) error {
|
|
info, err := os.Stat(filePath)
|
|
if err != nil {
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("stat ebook file %s: %w", filePath, err)
|
|
}
|
|
size := info.Size()
|
|
modifiedAt := normalizeFileModifiedAt(info.ModTime())
|
|
|
|
existingContentID, isUnchanged, skipErr := s.ebookFileShouldSkip(ctx, folder, filePath, size, modifiedAt)
|
|
if skipErr != nil {
|
|
slog.Warn("ebook scan: skip-check failed, falling through",
|
|
"folder_id", folder.ID,
|
|
"path", filePath,
|
|
"error", skipErr,
|
|
)
|
|
} else if isUnchanged {
|
|
s.autoLinkLiteraryWork(ctx, existingContentID)
|
|
atomic.AddInt64(skipped, 1)
|
|
return nil
|
|
}
|
|
|
|
parsed, err := parseEbookFile(filePath)
|
|
if err != nil {
|
|
return fmt.Errorf("parse ebook file %s: %w", filePath, err)
|
|
}
|
|
if parsed.Title == "" {
|
|
parsed.Title = ebookTitleFromPath(filePath)
|
|
}
|
|
if len(parsed.Authors) == 0 {
|
|
if author := ebookAuthorFromPath(filePath); author != "" {
|
|
parsed.Authors = []string{author}
|
|
// A path-derived title carries the same " - Author" suffix; drop it
|
|
// so the title, group key, and enrichment query stay clean. Compare
|
|
// normalized so case/spacing variants (e.g. "a. f. carter") match
|
|
// the recovered author and don't leave a duplicated suffix.
|
|
if idx := strings.LastIndex(parsed.Title, " - "); idx >= 0 {
|
|
suffixAuthor := strings.TrimSpace(parsed.Title[idx+len(" - "):])
|
|
if normalizeEbookIdentityPart(suffixAuthor) == normalizeEbookIdentityPart(author) {
|
|
parsed.Title = strings.TrimSpace(parsed.Title[:idx])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
groupKey := ebookContentGroupKey(&parsed, filePath)
|
|
unlock := groupLocks.lock(groupKey)
|
|
defer unlock()
|
|
|
|
contentID, curated, err := s.upsertEbookMediaItem(ctx, folder.ID, filePath, &parsed, groupKey)
|
|
if err != nil {
|
|
return fmt.Errorf("upsert ebook item: %w", err)
|
|
}
|
|
if err := s.upsertEbookMediaFile(ctx, folder, contentID, filePath, size, modifiedAt, &parsed, groupKey); err != nil {
|
|
return fmt.Errorf("upsert ebook file: %w", err)
|
|
}
|
|
if err := applyEbookLocalCover(ctx, s.itemRepo, s.imageCacher, contentID, filePath, &parsed); err != nil {
|
|
slog.Warn("ebook scan: local cover upload failed",
|
|
"folder_id", folder.ID,
|
|
"content_id", contentID,
|
|
"path", filePath,
|
|
"error", err,
|
|
)
|
|
}
|
|
if err := s.upsertEbookPeople(ctx, contentID, &parsed, curated); err != nil {
|
|
return fmt.Errorf("upsert ebook people: %w", err)
|
|
}
|
|
if err := s.upsertEbookSeries(ctx, contentID, &parsed, curated); err != nil {
|
|
return fmt.Errorf("upsert ebook series: %w", err)
|
|
}
|
|
if err := insertEbookLibraryMembership(ctx, s.fileRepo.Pool(), contentID, folder.ID); err != nil {
|
|
return fmt.Errorf("upsert ebook library membership: %w", err)
|
|
}
|
|
if parsed.ISBN != "" {
|
|
if err := insertEbookISBNProviderID(ctx, s.fileRepo.Pool(), contentID, parsed.ISBN); err != nil {
|
|
return fmt.Errorf("upsert ebook ISBN provider id: %w", err)
|
|
}
|
|
}
|
|
s.autoLinkLiteraryWork(ctx, contentID)
|
|
slog.Info("ebook scan: indexed",
|
|
"folder_id", folder.ID,
|
|
"content_id", contentID,
|
|
"title", parsed.Title,
|
|
"authors", parsed.Authors,
|
|
"path", filePath,
|
|
)
|
|
return nil
|
|
}
|
|
|
|
func (s *Scanner) autoLinkLiteraryWork(ctx context.Context, contentID string) {
|
|
if s == nil || s.literaryWorkLinker == nil || strings.TrimSpace(contentID) == "" {
|
|
return
|
|
}
|
|
workID, linked, err := s.literaryWorkLinker.AutoLinkContent(ctx, contentID)
|
|
if err != nil {
|
|
slog.Warn("literary work auto-link failed", "content_id", contentID, "error", err)
|
|
return
|
|
}
|
|
if linked {
|
|
slog.Info("literary work auto-linked", "content_id", contentID, "work_id", workID)
|
|
}
|
|
}
|
|
|
|
func (s *Scanner) ebookFileShouldSkip(ctx context.Context, folder *models.MediaFolder, filePath string, size int64, modifiedAt time.Time) (string, bool, error) {
|
|
if s.fileRepo == nil || s.itemRepo == nil {
|
|
return "", false, nil
|
|
}
|
|
existing, err := s.fileRepo.ListByObservedRootPath(ctx, folder.ID, filePath)
|
|
if err != nil {
|
|
return "", false, fmt.Errorf("list existing files: %w", err)
|
|
}
|
|
if len(existing) != 1 {
|
|
return "", false, nil
|
|
}
|
|
mf := existing[0]
|
|
if mf.FilePath != filePath || mf.FileSize != size || mf.FileModifiedAt == nil || !sameFileModifiedAt(mf.FileModifiedAt, modifiedAt) {
|
|
return "", false, nil
|
|
}
|
|
if mf.ContentID == "" {
|
|
return "", false, nil
|
|
}
|
|
if mf.GroupKeyVersion != ebookGroupKeyVersion {
|
|
// The grouping scheme changed since this row was written; reprocess
|
|
// once so the stored key is rewritten under the current scheme and
|
|
// sibling-format lookups can find it again.
|
|
return "", false, nil
|
|
}
|
|
statuses, err := s.itemRepo.GetStatusByIDs(ctx, []string{mf.ContentID})
|
|
if err != nil {
|
|
return "", false, fmt.Errorf("get item status: %w", err)
|
|
}
|
|
if strings.EqualFold(strings.TrimSpace(statuses[mf.ContentID]), "unmatched") {
|
|
return "", false, nil
|
|
}
|
|
return mf.ContentID, true, nil
|
|
}
|
|
|
|
// upsertEbookMediaItem resolves or creates the media item for the file and
|
|
// reports whether the item's metadata is curated (provider-matched), in which
|
|
// case dependent writes (people, series) must be fill-empty only.
|
|
func (s *Scanner) upsertEbookMediaItem(ctx context.Context, folderID int, filePath string, book *parsedEbook, groupKey string) (string, bool, error) {
|
|
if s.itemRepo == nil {
|
|
return "", false, fmt.Errorf("itemRepo not configured on Scanner")
|
|
}
|
|
if s.fileRepo == nil {
|
|
return "", false, fmt.Errorf("fileRepo not configured on Scanner")
|
|
}
|
|
|
|
existingID, err := s.fileRepo.FindContentIDByRootPath(ctx, folderID, filePath, "ebook")
|
|
if err != nil {
|
|
return "", false, fmt.Errorf("find ebook by root path: %w", err)
|
|
}
|
|
if existingID != "" {
|
|
curated, err := updateExistingEbookMediaItem(ctx, s.itemRepo, s.itemRepo, existingID, book)
|
|
if err != nil {
|
|
return "", false, err
|
|
}
|
|
return existingID, curated, nil
|
|
}
|
|
if existing := s.findEbookByFilePath(ctx, filePath); existing != nil {
|
|
if ebookItemHasCuratedMetadata(existing) {
|
|
return existing.ContentID, true, nil
|
|
}
|
|
applyEbookToMediaItem(existing, book)
|
|
if existing.SortTitle == "" {
|
|
existing.SortTitle = titleutil.DeriveDefaultSortTitle(existing.Title)
|
|
}
|
|
if err := s.itemRepo.Upsert(ctx, existing); err != nil {
|
|
return "", false, err
|
|
}
|
|
return existing.ContentID, false, nil
|
|
}
|
|
if existing := s.findEbookByContentGroupKey(ctx, folderID, groupKey, book.Format, filePath); existing != nil {
|
|
// The sibling file joins the group either way, but curated metadata
|
|
// on a provider-matched item must not be clobbered by whatever this
|
|
// file happens to embed.
|
|
if ebookItemHasCuratedMetadata(existing) {
|
|
return existing.ContentID, true, nil
|
|
}
|
|
applyEbookToMediaItem(existing, book)
|
|
if existing.SortTitle == "" {
|
|
existing.SortTitle = titleutil.DeriveDefaultSortTitle(existing.Title)
|
|
}
|
|
if err := s.itemRepo.Upsert(ctx, existing); err != nil {
|
|
return "", false, err
|
|
}
|
|
return existing.ContentID, false, nil
|
|
}
|
|
contentID, err := resolveEbookMediaItem(ctx, s.fileRepo, s.itemRepo, folderID, filePath, book)
|
|
if err != nil {
|
|
return "", false, err
|
|
}
|
|
return contentID, false, nil
|
|
}
|
|
|
|
func resolveEbookMediaItem(
|
|
ctx context.Context,
|
|
rootFinder filesystemRootContentFinder,
|
|
itemWriter filesystemMediaItemWriter,
|
|
folderID int,
|
|
filePath string,
|
|
book *parsedEbook,
|
|
) (string, error) {
|
|
if rootFinder == nil {
|
|
return "", fmt.Errorf("root content finder not configured")
|
|
}
|
|
if itemWriter == nil {
|
|
return "", fmt.Errorf("media item writer not configured")
|
|
}
|
|
existingID, err := rootFinder.FindContentIDByRootPath(ctx, folderID, filePath, "ebook")
|
|
if err != nil {
|
|
return "", fmt.Errorf("find ebook by root path: %w", err)
|
|
}
|
|
if existingID != "" {
|
|
return existingID, nil
|
|
}
|
|
|
|
cleanTitle := strings.TrimSpace(book.Title)
|
|
if cleanTitle == "" {
|
|
cleanTitle = ebookTitleFromPath(filePath)
|
|
}
|
|
return createEbookMediaItem(ctx, itemWriter, book, cleanTitle)
|
|
}
|
|
|
|
func createEbookMediaItem(ctx context.Context, itemWriter filesystemMediaItemWriter, book *parsedEbook, cleanTitle string) (string, error) {
|
|
id, err := idgen.NextID()
|
|
if err != nil {
|
|
return "", fmt.Errorf("generate content_id: %w", err)
|
|
}
|
|
item := &models.MediaItem{
|
|
ContentID: id,
|
|
Type: "ebook",
|
|
// Explicit "pending" (the item upsert writes the literal status, so the
|
|
// DB default never applies): enrichment promotes it to "matched", which
|
|
// arms ebookItemHasCuratedMetadata against file-metadata clobbering.
|
|
Status: "pending",
|
|
Title: cleanTitle,
|
|
SortTitle: titleutil.DeriveDefaultSortTitle(cleanTitle),
|
|
Year: book.Year,
|
|
}
|
|
applyEbookToMediaItem(item, book)
|
|
if item.SortTitle == "" {
|
|
item.SortTitle = titleutil.DeriveDefaultSortTitle(item.Title)
|
|
}
|
|
if err := itemWriter.Upsert(ctx, item); err != nil {
|
|
return "", err
|
|
}
|
|
return id, nil
|
|
}
|
|
|
|
// updateExistingEbookMediaItem refreshes a known item from file metadata and
|
|
// reports whether the item's metadata is curated (and was therefore left
|
|
// untouched).
|
|
func updateExistingEbookMediaItem(ctx context.Context, itemReader filesystemMediaItemReader, itemWriter filesystemMediaItemWriter, contentID string, book *parsedEbook) (bool, error) {
|
|
if itemReader == nil {
|
|
return false, fmt.Errorf("media item reader not configured")
|
|
}
|
|
if itemWriter == nil {
|
|
return false, fmt.Errorf("media item writer not configured")
|
|
}
|
|
items, err := itemReader.GetByIDs(ctx, []string{contentID})
|
|
if err != nil {
|
|
return false, fmt.Errorf("get ebook media item %s: %w", contentID, err)
|
|
}
|
|
if len(items) == 0 || items[0] == nil {
|
|
return false, fmt.Errorf("ebook media item %s not found", contentID)
|
|
}
|
|
item := items[0]
|
|
if ebookItemHasCuratedMetadata(item) {
|
|
// A matched item's metadata was curated by a provider or a person;
|
|
// re-parsing the file (mtime change, group-key version bump) must not
|
|
// clobber it with embedded file metadata.
|
|
return true, nil
|
|
}
|
|
applyEbookToMediaItem(item, book)
|
|
if item.SortTitle == "" {
|
|
item.SortTitle = titleutil.DeriveDefaultSortTitle(item.Title)
|
|
}
|
|
return false, itemWriter.Upsert(ctx, item)
|
|
}
|
|
|
|
// ebookItemHasCuratedMetadata reports whether the item's metadata is owned by
|
|
// a provider match (or manual curation) and therefore must not be overwritten
|
|
// by metadata embedded in scanned files.
|
|
func ebookItemHasCuratedMetadata(item *models.MediaItem) bool {
|
|
return item != nil && strings.EqualFold(strings.TrimSpace(item.Status), "matched")
|
|
}
|
|
|
|
func applyEbookToMediaItem(item *models.MediaItem, book *parsedEbook) {
|
|
item.Type = "ebook"
|
|
if title := strings.TrimSpace(book.Title); title != "" {
|
|
item.Title = title
|
|
}
|
|
if book.Year > 0 {
|
|
item.Year = book.Year
|
|
}
|
|
if book.Description != "" && (item.Overview == "" || looksLikeHTML(item.Overview)) {
|
|
item.Overview = book.Description
|
|
}
|
|
if book.Publisher != "" {
|
|
item.Studios = mergeUniqueStrings(item.Studios, []string{book.Publisher})
|
|
}
|
|
if len(book.Genres) > 0 {
|
|
item.Genres = mergeUniqueStrings(item.Genres, book.Genres)
|
|
}
|
|
if !book.PublishedAt.IsZero() && item.ReleaseDate == nil {
|
|
rd := book.PublishedAt.UTC().Format("2006-01-02")
|
|
item.ReleaseDate = &rd
|
|
}
|
|
if book.Language != "" && item.OriginalLanguage == "" {
|
|
item.OriginalLanguage = book.Language
|
|
}
|
|
}
|
|
|
|
func (s *Scanner) findEbookByFilePath(ctx context.Context, filePath string) *models.MediaItem {
|
|
if s.fileRepo == nil {
|
|
return nil
|
|
}
|
|
var existingID string
|
|
err := s.fileRepo.Pool().QueryRow(ctx, `
|
|
SELECT mf.content_id
|
|
FROM media_files mf
|
|
JOIN media_items mi ON mi.content_id = mf.content_id
|
|
WHERE mf.file_path = $1
|
|
AND mi.type = 'ebook'
|
|
LIMIT 1
|
|
`, filePath).Scan(&existingID)
|
|
if err != nil || existingID == "" {
|
|
return nil
|
|
}
|
|
items, err := s.itemRepo.GetByIDs(ctx, []string{existingID})
|
|
if err != nil || len(items) == 0 {
|
|
return nil
|
|
}
|
|
return items[0]
|
|
}
|
|
|
|
// findEbookByContentGroupKey locates an existing item that a sibling format of
|
|
// the same book should join. Grouping merges *different* formats only: an item
|
|
// that already owns another file of the same format is excluded, so two
|
|
// distinct books whose sparse metadata collides on the same key (e.g. every
|
|
// volume carrying the series name as its title) stay separate items instead of
|
|
// silently merging.
|
|
func (s *Scanner) findEbookByContentGroupKey(ctx context.Context, folderID int, groupKey string, format string, filePath string) *models.MediaItem {
|
|
if s.fileRepo == nil || s.itemRepo == nil || strings.TrimSpace(groupKey) == "" {
|
|
return nil
|
|
}
|
|
var existingID string
|
|
err := s.fileRepo.Pool().QueryRow(ctx, `
|
|
SELECT mf.content_id
|
|
FROM media_files mf
|
|
JOIN media_items mi ON mi.content_id = mf.content_id
|
|
WHERE mf.media_folder_id = $1
|
|
AND mf.group_key_version = $2
|
|
AND mf.content_group_key = $3
|
|
AND mf.missing_since IS NULL
|
|
AND mi.type = 'ebook'
|
|
AND NOT EXISTS (
|
|
SELECT 1 FROM media_files dup
|
|
WHERE dup.content_id = mf.content_id
|
|
AND dup.missing_since IS NULL
|
|
AND lower(dup.container) = lower($4)
|
|
AND dup.file_path <> $5
|
|
)
|
|
ORDER BY CASE WHEN lower(trim(mi.status)) = 'matched' THEN 0 ELSE 1 END,
|
|
mf.id ASC
|
|
LIMIT 1
|
|
`, folderID, ebookGroupKeyVersion, groupKey, format, filePath).Scan(&existingID)
|
|
if err != nil || existingID == "" {
|
|
return nil
|
|
}
|
|
items, err := s.itemRepo.GetByIDs(ctx, []string{existingID})
|
|
if err != nil || len(items) == 0 {
|
|
return nil
|
|
}
|
|
return items[0]
|
|
}
|
|
|
|
// ebookGroupKeyVersion versions the ebookContentGroupKey scheme. Bump it
|
|
// whenever the key shape changes so rows keyed under an older scheme are
|
|
// reprocessed and re-keyed (see ebookFileShouldSkip) instead of silently never
|
|
// matching sibling-format lookups again.
|
|
const ebookGroupKeyVersion = 2
|
|
|
|
func (s *Scanner) upsertEbookMediaFile(ctx context.Context, folder *models.MediaFolder, contentID string, filePath string, size int64, modifiedAt time.Time, book *parsedEbook, groupKey string) error {
|
|
mf := buildEbookMediaFile(folder, contentID, filePath, size, modifiedAt, book, groupKey)
|
|
if _, err := s.fileRepo.Upsert(ctx, mf); err != nil {
|
|
return fmt.Errorf("upsert media file %s: %w", filePath, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func buildEbookMediaFile(folder *models.MediaFolder, contentID string, filePath string, size int64, modifiedAt time.Time, book *parsedEbook, groupKey string) models.MediaFile {
|
|
return models.MediaFile{
|
|
ContentID: contentID,
|
|
MediaFolderID: folder.ID,
|
|
CanonicalRootPath: filePath,
|
|
ObservedRootPath: filePath,
|
|
ContentGroupKey: groupKey,
|
|
GroupKeyVersion: ebookGroupKeyVersion,
|
|
BaseTitle: book.Title,
|
|
BaseYear: book.Year,
|
|
BaseType: "ebook",
|
|
IdentityConfidence: ebookIdentityConfidence(book),
|
|
FilePath: filePath,
|
|
FileSize: size,
|
|
FileModifiedAt: &modifiedAt,
|
|
Container: book.Format,
|
|
Duration: book.PageCount,
|
|
ProbeSource: "local",
|
|
}
|
|
}
|
|
|
|
func ebookContentGroupKey(book *parsedEbook, filePath string) string {
|
|
if book != nil {
|
|
if isbn := normalizeEbookISBN(book.ISBN); isbn != "" {
|
|
return "ebook:isbn:" + isbn
|
|
}
|
|
}
|
|
|
|
title := ""
|
|
authors := []string(nil)
|
|
if book != nil {
|
|
title = strings.TrimSpace(book.Title)
|
|
authors = book.Authors
|
|
}
|
|
if title == "" {
|
|
title = ebookTitleFromPath(filePath)
|
|
}
|
|
normalizedTitle := normalizeEbookIdentityPart(title)
|
|
if normalizedTitle == "" {
|
|
cleanPath := strings.TrimSpace(filepath.Clean(filePath))
|
|
if cleanPath == "." {
|
|
return ""
|
|
}
|
|
return "ebook:path:" + cleanPath
|
|
}
|
|
|
|
normalizedAuthors := make([]string, 0, len(authors))
|
|
seenAuthors := make(map[string]struct{}, len(authors))
|
|
for _, author := range authors {
|
|
normalized := normalizeEbookIdentityPart(author)
|
|
if normalized == "" {
|
|
continue
|
|
}
|
|
if _, ok := seenAuthors[normalized]; ok {
|
|
continue
|
|
}
|
|
seenAuthors[normalized] = struct{}{}
|
|
normalizedAuthors = append(normalizedAuthors, normalized)
|
|
}
|
|
sort.Strings(normalizedAuthors)
|
|
if len(normalizedAuthors) > 0 {
|
|
return "ebook:title_author:" + normalizedTitle + "|" + strings.Join(normalizedAuthors, ",")
|
|
}
|
|
|
|
dir := strings.TrimSpace(filepath.Clean(filepath.Dir(filePath)))
|
|
if dir == "." {
|
|
dir = ""
|
|
}
|
|
return "ebook:title:" + normalizedTitle + "|dir:" + normalizeEbookIdentityPart(dir)
|
|
}
|
|
|
|
func ebookTitleFromPath(filePath string) string {
|
|
base := filepath.Base(filePath)
|
|
if base == "." || base == string(filepath.Separator) {
|
|
return ""
|
|
}
|
|
// ".fb2.zip" is a double extension that filepath.Ext (and the
|
|
// normalized ".fbz" format token) would leave half-stripped.
|
|
if strings.HasSuffix(strings.ToLower(base), ".fb2.zip") {
|
|
return base[:len(base)-len(".fb2.zip")]
|
|
}
|
|
return strings.TrimSuffix(base, filepath.Ext(base))
|
|
}
|
|
|
|
// ebookAuthorFromPath recovers an author for libraries that shelve books as
|
|
// ".../<Author>/<Title>/<Title> - <Author>.ext" but embed no author in the file
|
|
// (common for PDF/MOBI/AZW3). It returns a value only when two independent path
|
|
// signals agree: the grandparent directory name and the filename's trailing
|
|
// " - X" segment. Authorless layouts — magazines, language courses, flat dumps —
|
|
// satisfy neither or only one signal, so they never get a junk author that would
|
|
// poison the enrichment search.
|
|
func ebookAuthorFromPath(filePath string) string {
|
|
base := ebookTitleFromPath(filePath)
|
|
idx := strings.LastIndex(base, " - ")
|
|
if idx < 0 {
|
|
return ""
|
|
}
|
|
fromName := strings.TrimSpace(base[idx+len(" - "):])
|
|
if fromName == "" {
|
|
return ""
|
|
}
|
|
grandparent := strings.TrimSpace(filepath.Base(filepath.Dir(filepath.Dir(filePath))))
|
|
switch grandparent {
|
|
case "", ".", string(filepath.Separator):
|
|
return ""
|
|
}
|
|
if normalizeEbookIdentityPart(fromName) != normalizeEbookIdentityPart(grandparent) {
|
|
return ""
|
|
}
|
|
// Position alone cannot tell author from title: some libraries shelve
|
|
// books as "<Title>/<Author>/<Author> - <Title>" (inverted) which also
|
|
// satisfies the grandparent==suffix check and would assign the title as
|
|
// the author. Require the candidate to look like a person name; series and
|
|
// title folders ("De legenden van de Alfen") fail this and are rejected.
|
|
if !looksLikePersonName(grandparent) {
|
|
return ""
|
|
}
|
|
// Return the directory form, which carries canonical casing ("A. F. Carter"
|
|
// rather than a lowercased filename suffix).
|
|
return grandparent
|
|
}
|
|
|
|
// looksLikePersonName reports whether value is shaped like an author name. A
|
|
// "Last, First" comma form is accepted outright; otherwise every token must be
|
|
// capitalized or a known name particle (van, de, von, ...). Title/series
|
|
// strings contain lowercase content words and so are rejected.
|
|
func looksLikePersonName(value string) bool {
|
|
value = strings.TrimSpace(value)
|
|
if value == "" {
|
|
return false
|
|
}
|
|
if strings.ContainsAny(value, "0123456789") {
|
|
return false
|
|
}
|
|
if strings.Contains(value, ",") {
|
|
return true
|
|
}
|
|
particles := map[string]struct{}{
|
|
"van": {}, "von": {}, "de": {}, "der": {}, "den": {}, "het": {}, "di": {},
|
|
"da": {}, "del": {}, "della": {}, "la": {}, "le": {}, "el": {}, "du": {},
|
|
"dos": {}, "das": {}, "bin": {}, "al": {}, "ter": {}, "te": {}, "ten": {},
|
|
"op": {}, "'t": {},
|
|
}
|
|
hasUpper := false
|
|
for _, token := range strings.Fields(value) {
|
|
r := []rune(token)[0]
|
|
if unicode.IsUpper(r) {
|
|
hasUpper = true
|
|
continue
|
|
}
|
|
if _, ok := particles[strings.ToLower(token)]; ok {
|
|
continue
|
|
}
|
|
return false
|
|
}
|
|
return hasUpper
|
|
}
|
|
|
|
func normalizeEbookIdentityPart(value string) string {
|
|
value = strings.ToLower(strings.TrimSpace(value))
|
|
var b strings.Builder
|
|
previousSpace := false
|
|
for _, r := range value {
|
|
if unicode.IsLetter(r) || unicode.IsDigit(r) {
|
|
b.WriteRune(r)
|
|
previousSpace = false
|
|
continue
|
|
}
|
|
if unicode.IsSpace(r) || r == '&' || r == '-' || r == '_' || r == ':' || r == '/' || r == '\\' || r == ',' || r == '.' {
|
|
if b.Len() > 0 && !previousSpace {
|
|
b.WriteByte(' ')
|
|
previousSpace = true
|
|
}
|
|
}
|
|
}
|
|
return strings.TrimSpace(b.String())
|
|
}
|
|
|
|
type ebookGroupLocks struct {
|
|
mu sync.Mutex
|
|
locks map[string]*sync.Mutex
|
|
}
|
|
|
|
func newEbookGroupLocks() *ebookGroupLocks {
|
|
return &ebookGroupLocks{locks: make(map[string]*sync.Mutex)}
|
|
}
|
|
|
|
func (l *ebookGroupLocks) lock(key string) func() {
|
|
if l == nil || strings.TrimSpace(key) == "" {
|
|
return func() {}
|
|
}
|
|
l.mu.Lock()
|
|
groupLock := l.locks[key]
|
|
if groupLock == nil {
|
|
groupLock = &sync.Mutex{}
|
|
l.locks[key] = groupLock
|
|
}
|
|
l.mu.Unlock()
|
|
|
|
groupLock.Lock()
|
|
return groupLock.Unlock
|
|
}
|
|
|
|
// localEbookPosterPrefix mirrors the storage layout produced by
|
|
// imagecache.CacheEbookCover ("local/ebooks/{contentID}/poster/..."); it marks
|
|
// posters this pipeline owns and is therefore allowed to refresh.
|
|
const localEbookPosterPrefix = "local/ebooks/"
|
|
|
|
type ebookCoverMetadataStore interface {
|
|
GetPoster(ctx context.Context, contentID string) (posterPath string, posterThumbhash string, err error)
|
|
SetLocalPoster(ctx context.Context, contentID, posterPath, thumbhash, localPrefix string) (bool, error)
|
|
}
|
|
|
|
// applyEbookLocalCover records the best locally available cover for the file:
|
|
// a sidecar image that belongs to this book wins over the embedded cover, and
|
|
// exactly one cover is applied per reconcile. A sidecar discovery error does
|
|
// not block the embedded fallback.
|
|
func applyEbookLocalCover(ctx context.Context, store ebookCoverMetadataStore, cacher ebookCoverCacher, contentID string, ebookFilePath string, book *parsedEbook) error {
|
|
if store == nil || cacher == nil || contentID == "" {
|
|
return nil
|
|
}
|
|
var data []byte
|
|
var sidecarErr error
|
|
if ebookFilePath != "" {
|
|
cover, _, err := findSidecarBookCover(ebookFilePath)
|
|
if err != nil {
|
|
sidecarErr = err
|
|
} else if cover != nil {
|
|
data = cover.Bytes
|
|
}
|
|
}
|
|
if len(data) == 0 && book != nil && book.Cover != nil {
|
|
data = book.Cover.Bytes
|
|
}
|
|
if len(data) == 0 {
|
|
return sidecarErr
|
|
}
|
|
return errors.Join(sidecarErr, cacheEbookCoverBytes(ctx, store, cacher, contentID, data))
|
|
}
|
|
|
|
func cacheEbookCoverBytes(ctx context.Context, store ebookCoverMetadataStore, cacher ebookCoverCacher, contentID string, data []byte) error {
|
|
if len(data) == 0 {
|
|
return nil
|
|
}
|
|
existingPath, existingThumbhash, err := store.GetPoster(ctx, contentID)
|
|
if err != nil {
|
|
return fmt.Errorf("get ebook poster for cover: %w", err)
|
|
}
|
|
existingPath = strings.TrimSpace(existingPath)
|
|
if existingPath != "" {
|
|
// Provider or manually applied artwork always wins over scan covers.
|
|
if !strings.HasPrefix(existingPath, localEbookPosterPrefix) {
|
|
return nil
|
|
}
|
|
// Re-extracted bytes of an unchanged cover hash identically; skip
|
|
// the variant regeneration and upload churn. A replaced cover hashes
|
|
// differently and falls through to refresh the stale poster.
|
|
if thumbhash, err := imageutil.Thumbhash(data); err == nil && thumbhash == existingThumbhash {
|
|
return nil
|
|
}
|
|
}
|
|
basePath, ext, thumbhash, err := cacher.CacheEbookCover(ctx, data, contentID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
posterPath := strings.TrimRight(basePath, "/") + "/original" + ext
|
|
if _, err := store.SetLocalPoster(ctx, contentID, posterPath, thumbhash, localEbookPosterPrefix); err != nil {
|
|
return fmt.Errorf("set ebook local poster: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var sidecarCoverNames = []string{"cover", "folder", "front", "poster", "thumbnail"}
|
|
var sidecarCoverExtensions = []string{".jpg", ".jpeg", ".png", ".webp", ".avif", ".gif", ".bmp"}
|
|
|
|
// findSidecarBookCover looks for cover art next to the ebook file. An image
|
|
// named after the book file always belongs to it; the generic artwork names
|
|
// (cover.jpg, folder.png, ...) are trusted only when this is the directory's
|
|
// sole ebook, so one cover.jpg in a flat multi-book folder is not applied to
|
|
// every book in it.
|
|
func findSidecarBookCover(ebookFilePath string) (*parsedEbookCover, string, error) {
|
|
if ebookFilePath == "" {
|
|
return nil, "", nil
|
|
}
|
|
entries, err := os.ReadDir(filepath.Dir(ebookFilePath))
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
byName := make(map[string]string, len(entries))
|
|
ebookCount := 0
|
|
for _, entry := range entries {
|
|
if entry.IsDir() {
|
|
continue
|
|
}
|
|
if SupportsEbookFile(entry.Name()) {
|
|
ebookCount++
|
|
}
|
|
byName[strings.ToLower(entry.Name())] = filepath.Join(filepath.Dir(ebookFilePath), entry.Name())
|
|
}
|
|
|
|
var candidates []string
|
|
if base := strings.ToLower(ebookTitleFromPath(ebookFilePath)); base != "" {
|
|
for _, ext := range sidecarCoverExtensions {
|
|
candidates = append(candidates, base+ext)
|
|
}
|
|
}
|
|
if ebookCount <= 1 {
|
|
for _, name := range sidecarCoverNames {
|
|
for _, ext := range sidecarCoverExtensions {
|
|
candidates = append(candidates, name+ext)
|
|
}
|
|
}
|
|
}
|
|
for _, candidate := range candidates {
|
|
path := byName[candidate]
|
|
if path == "" {
|
|
continue
|
|
}
|
|
data, err := readSidecarCover(path)
|
|
if err != nil {
|
|
return nil, path, err
|
|
}
|
|
return &parsedEbookCover{
|
|
ContentType: ebookImageContentType(path),
|
|
Bytes: data,
|
|
}, path, nil
|
|
}
|
|
return nil, "", nil
|
|
}
|
|
|
|
func readSidecarCover(path string) ([]byte, error) {
|
|
file, err := os.Open(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer file.Close()
|
|
info, err := file.Stat()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if info.Size() > maxEPUBMetadataEntrySize {
|
|
return nil, fmt.Errorf("sidecar cover too large: %s", path)
|
|
}
|
|
data, err := io.ReadAll(io.LimitReader(file, maxEPUBMetadataEntrySize+1))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(data) > maxEPUBMetadataEntrySize {
|
|
return nil, fmt.Errorf("sidecar cover too large: %s", path)
|
|
}
|
|
if len(data) == 0 {
|
|
return nil, fmt.Errorf("sidecar cover empty: %s", path)
|
|
}
|
|
return data, nil
|
|
}
|
|
|
|
func insertEbookLibraryMembership(ctx context.Context, exec ebookSQLExecutor, contentID string, folderID int) error {
|
|
_, err := exec.Exec(ctx, `
|
|
INSERT INTO media_item_libraries (content_id, media_folder_id, first_seen_at)
|
|
VALUES ($1, $2, NOW())
|
|
ON CONFLICT (content_id, media_folder_id) DO NOTHING
|
|
`, contentID, folderID)
|
|
return err
|
|
}
|
|
|
|
func insertEbookISBNProviderID(ctx context.Context, exec ebookSQLExecutor, contentID string, isbn string) error {
|
|
_, err := exec.Exec(ctx, `
|
|
INSERT INTO media_item_provider_ids (content_id, provider, provider_id, item_type)
|
|
VALUES ($1, 'isbn', $2, 'ebook')
|
|
ON CONFLICT DO NOTHING
|
|
`, contentID, isbn)
|
|
return err
|
|
}
|
|
|
|
type ebookCredit struct {
|
|
Name string
|
|
Kind models.PersonKind
|
|
}
|
|
|
|
func ebookPeopleCreditsEqual(existing []models.ItemPerson, desired []ebookCredit) bool {
|
|
existingAuthors := make([]models.ItemPerson, 0, len(existing))
|
|
for _, p := range existing {
|
|
if p.Kind == models.PersonKindNarrator {
|
|
return false
|
|
}
|
|
if p.Kind == models.PersonKindAuthor {
|
|
existingAuthors = append(existingAuthors, p)
|
|
}
|
|
}
|
|
if len(existingAuthors) != len(desired) {
|
|
return false
|
|
}
|
|
type key struct {
|
|
name string
|
|
kind models.PersonKind
|
|
}
|
|
have := make(map[key]struct{}, len(existingAuthors))
|
|
for _, p := range existingAuthors {
|
|
have[key{strings.ToLower(strings.TrimSpace(p.Person.Name)), p.Kind}] = struct{}{}
|
|
}
|
|
for _, d := range desired {
|
|
k := key{strings.ToLower(strings.TrimSpace(d.Name)), d.Kind}
|
|
if _, ok := have[k]; !ok {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
type ebookResolvedAuthor struct {
|
|
ID int64
|
|
Name string
|
|
}
|
|
|
|
func mergeEbookPeople(existing []models.ItemPerson, authors []ebookResolvedAuthor) []models.ItemPerson {
|
|
people := make([]models.ItemPerson, 0, len(existing)+len(authors))
|
|
for _, p := range existing {
|
|
if p.Kind == models.PersonKindAuthor || p.Kind == models.PersonKindNarrator {
|
|
continue
|
|
}
|
|
p.SortOrder = len(people)
|
|
people = append(people, p)
|
|
}
|
|
for _, author := range authors {
|
|
people = append(people, models.ItemPerson{
|
|
Person: models.Person{ID: author.ID, Name: author.Name},
|
|
Kind: models.PersonKindAuthor,
|
|
SortOrder: len(people),
|
|
})
|
|
}
|
|
return people
|
|
}
|
|
|
|
func ebookPeopleForReplace(existing []models.ItemPerson, getErr error, authors []ebookResolvedAuthor) ([]models.ItemPerson, error) {
|
|
if getErr != nil {
|
|
return nil, fmt.Errorf("get ebook people: %w", getErr)
|
|
}
|
|
return mergeEbookPeople(existing, authors), nil
|
|
}
|
|
|
|
// ebookPeopleWriteAllowed reports whether file-embedded authors may be written
|
|
// for the item. Curated (provider-matched) items are fill-empty only: file
|
|
// metadata may supply authors when the item has none, but must never replace
|
|
// provider-enriched author credits.
|
|
func ebookPeopleWriteAllowed(curated bool, existing []models.ItemPerson) bool {
|
|
if !curated {
|
|
return true
|
|
}
|
|
for _, p := range existing {
|
|
if p.Kind == models.PersonKindAuthor {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
func (s *Scanner) upsertEbookPeople(ctx context.Context, contentID string, book *parsedEbook, curated bool) error {
|
|
if s.personRepo == nil {
|
|
return fmt.Errorf("personRepo not configured on Scanner")
|
|
}
|
|
if s.itemRepo == nil {
|
|
return fmt.Errorf("itemRepo not configured on Scanner")
|
|
}
|
|
|
|
var desired []ebookCredit
|
|
for _, author := range book.Authors {
|
|
if name := strings.TrimSpace(author); name != "" {
|
|
desired = append(desired, ebookCredit{Name: name, Kind: models.PersonKindAuthor})
|
|
}
|
|
}
|
|
if len(desired) == 0 {
|
|
return nil
|
|
}
|
|
|
|
existing, err := s.itemRepo.GetPeople(ctx, contentID)
|
|
if err != nil {
|
|
return fmt.Errorf("get ebook people: %w", err)
|
|
}
|
|
if !ebookPeopleWriteAllowed(curated, existing) {
|
|
return nil
|
|
}
|
|
if ebookPeopleCreditsEqual(existing, desired) {
|
|
return nil
|
|
}
|
|
|
|
authors := make([]ebookResolvedAuthor, 0, len(desired))
|
|
for _, c := range desired {
|
|
personID, err := s.personRepo.FindOrCreate(ctx, models.Person{Name: c.Name})
|
|
if err != nil {
|
|
return fmt.Errorf("find-or-create person %q: %w", c.Name, err)
|
|
}
|
|
authors = append(authors, ebookResolvedAuthor{ID: personID, Name: c.Name})
|
|
}
|
|
people, err := ebookPeopleForReplace(existing, nil, authors)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return s.itemRepo.ReplacePeople(ctx, contentID, people)
|
|
}
|
|
|
|
func (s *Scanner) upsertEbookSeries(ctx context.Context, contentID string, book *parsedEbook, curated bool) error {
|
|
if s == nil {
|
|
return fmt.Errorf("Scanner not configured")
|
|
}
|
|
if s.fileRepo == nil {
|
|
return fmt.Errorf("fileRepo not configured on Scanner")
|
|
}
|
|
|
|
var currentName *string
|
|
var currentIdx *float64
|
|
err := s.fileRepo.Pool().QueryRow(ctx, `
|
|
SELECT series_name, series_index FROM ebook_series WHERE content_id = $1
|
|
`, contentID).Scan(¤tName, ¤tIdx)
|
|
|
|
plan, err := planEbookSeriesWrite(book, currentName, currentIdx, err, curated)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
switch plan.Kind {
|
|
case ebookSeriesWriteNone:
|
|
return nil
|
|
case ebookSeriesWriteDelete:
|
|
if _, delErr := s.fileRepo.Pool().Exec(ctx,
|
|
`DELETE FROM ebook_series WHERE content_id = $1`, contentID); delErr != nil {
|
|
return fmt.Errorf("delete ebook_series row: %w", delErr)
|
|
}
|
|
return nil
|
|
case ebookSeriesWriteUpsert:
|
|
var idx any
|
|
if plan.Index != nil {
|
|
idx = *plan.Index
|
|
}
|
|
if _, err := s.fileRepo.Pool().Exec(ctx, `
|
|
INSERT INTO ebook_series (content_id, series_name, series_index, updated_at)
|
|
VALUES ($1, $2, $3, NOW())
|
|
ON CONFLICT (content_id) DO UPDATE SET
|
|
series_name = EXCLUDED.series_name,
|
|
series_index = EXCLUDED.series_index,
|
|
updated_at = NOW()
|
|
`, contentID, plan.Name, idx); err != nil {
|
|
return fmt.Errorf("upsert ebook_series row: %w", err)
|
|
}
|
|
return nil
|
|
default:
|
|
return fmt.Errorf("unknown ebook_series write kind: %d", plan.Kind)
|
|
}
|
|
}
|
|
|
|
func ebookSeriesDesired(book *parsedEbook) (string, *float64) {
|
|
if book == nil {
|
|
return "", nil
|
|
}
|
|
return strings.TrimSpace(book.Series), parseSeriesIndex(book.SeriesIndex)
|
|
}
|
|
|
|
type ebookSeriesWriteKind int
|
|
|
|
const (
|
|
ebookSeriesWriteNone ebookSeriesWriteKind = iota
|
|
ebookSeriesWriteDelete
|
|
ebookSeriesWriteUpsert
|
|
)
|
|
|
|
type ebookSeriesWritePlan struct {
|
|
Kind ebookSeriesWriteKind
|
|
Name string
|
|
Index *float64
|
|
}
|
|
|
|
// planEbookSeriesWrite decides how the ebook_series row should change for
|
|
// file-embedded series metadata. fillOnly applies to curated
|
|
// (provider-matched) items: the file may supply a series when the item has
|
|
// none, but must never replace or delete an existing (provider-enriched) row.
|
|
func planEbookSeriesWrite(book *parsedEbook, currentName *string, currentIdx *float64, queryErr error, fillOnly bool) (ebookSeriesWritePlan, error) {
|
|
if queryErr != nil {
|
|
if !errors.Is(queryErr, pgx.ErrNoRows) {
|
|
return ebookSeriesWritePlan{}, fmt.Errorf("query ebook_series: %w", queryErr)
|
|
}
|
|
currentName = nil
|
|
currentIdx = nil
|
|
}
|
|
|
|
desiredName, desiredIdx := ebookSeriesDesired(book)
|
|
if desiredName == "" {
|
|
if currentName == nil || fillOnly {
|
|
return ebookSeriesWritePlan{Kind: ebookSeriesWriteNone}, nil
|
|
}
|
|
return ebookSeriesWritePlan{Kind: ebookSeriesWriteDelete}, nil
|
|
}
|
|
|
|
if currentName != nil {
|
|
if fillOnly {
|
|
return ebookSeriesWritePlan{Kind: ebookSeriesWriteNone}, nil
|
|
}
|
|
if *currentName == desiredName && floatPtrEqual(currentIdx, desiredIdx) {
|
|
return ebookSeriesWritePlan{Kind: ebookSeriesWriteNone}, nil
|
|
}
|
|
}
|
|
|
|
return ebookSeriesWritePlan{
|
|
Kind: ebookSeriesWriteUpsert,
|
|
Name: desiredName,
|
|
Index: desiredIdx,
|
|
}, nil
|
|
}
|
|
|
|
func ebookIdentityConfidence(book *parsedEbook) string {
|
|
if book == nil {
|
|
return "low"
|
|
}
|
|
|
|
score := 0
|
|
if book.Title != "" {
|
|
score++
|
|
}
|
|
if len(book.Authors) > 0 {
|
|
score++
|
|
}
|
|
if book.Year > 0 {
|
|
score++
|
|
}
|
|
if book.ISBN != "" {
|
|
score++
|
|
}
|
|
|
|
switch {
|
|
case score >= 4:
|
|
return "high"
|
|
case score > 0:
|
|
return "medium"
|
|
default:
|
|
return "low"
|
|
}
|
|
}
|