* docs: design spec for manga library type (host sub-project) Forks the ebooks library type into a 'manga' type: series detected from the folder tree as a first-class type='manga' item, .cbz/.cbr chapters stay readable ebook items linked via a new manga_chapters table, browse shows series cards, enrichment targets the series item at content level 'manga'. Hands off to a follow-on plugin spec for the manga metadata source. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs: implementation plan for manga library type (host) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(scanner): manga filename index/volume parser * feat(scanner): manga series-name-from-folder detection Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs(plan): align manga DB/scanner tasks to scanner pure-planner pattern (no test-DB) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(scanner): manga parser corpus regression Add TestParseMangaIndexCorpus — 36 real-world scanlation filenames covering bare chapter, decimal chapter, v/vol-prefix volume, and c/ch-prefix chapter patterns; asserts <5% miss rate. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(db): manga_chapters link table Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(scanner): manga_chapters repository + pure chapter-write mapping Adds mangaChapterWrite (pure, unit-tested), upsertMangaChapter, and listMangaChapters following the ebook/audiobook thin-SQL pattern. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(scanner): recognize manga library type Add isMangaLibraryType helper (unexported, matching the style of isEbookLibraryType / isAudiobookLibraryType) with a corresponding TestIsMangaLibraryType unit test. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(api): manga library content level Map library type "manga" to content level ["manga"] in metadataContentLevelsForLibraryType so that seedDefaultChain seeds a manga-level metadata provider chain when a manga library is created. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(scanner): route manga libraries to a manga scan path Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(scanner): group manga chapters under a manga series item Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(scanner): give manga series item a library membership so it browses Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(catalog): browse manga libraries as series Accept "manga" as a valid media_scope so a manga library browses only its type='manga' series items; the per-chapter type='ebook' items are naturally excluded because MediaScopeItemTypes("manga") expands to {"manga"}. Add the manga default library sections (scoped to media_scope='manga') so the library feed shows series cards. Refresh the two media_scope validation error messages. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(catalog): manga series detail lists chapters For a type='manga' item, attach its chapters to the detail response via a new MangaDetailExtension. fetchMangaChapters joins manga_chapters to media_items on the chapter content ID, scopes to the series, and orders by chapter_index (NULLS LAST) then sort_title — matching the scanner's chapter ordering. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): manga detail types + library browse scoping Add MangaChapter/MangaDetailExtension TS types mirroring the host catalog structs, wire manga? onto ItemDetail, and admit "manga" as a QueryDefinition.media_scope. Scope manga libraries to media_scope=manga in browse (host expands it to type=manga series items) while reusing the ebook sort universe via getLibrarySortRelevanceScope. Add isMangaLibraryType. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): manga series detail with volume-grouped chapter list Add MangaContent detail view: a DetailHero series header plus a chapter list grouped by volume. groupMangaChapters (pure, unit-tested) buckets chapters by their volume token, orders chapters within a group by chapter_index (nulls last) and orders groups by their minimum index; loose (volume-less) chapters collapse into a trailing "Chapters" group. Each chapter links to the existing ebook reader by content_id alone (file_id is optional — the reader resolves the file server-side), reusing buildMediaPlayHref. Admit "manga" into ItemDetail.type and wire the detail switch. Continue-reading is deferred (needs per-chapter progress fan-out / a last-read timestamp not in the current payload). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(web): handle manga in playable-type + collection filter-scope unions Adding "manga" to the shared ItemDetail["type"] and QueryDefinition["media_scope"] unions leaked into consumers with narrower local types, breaking the production tsc build. Fixes: - mediaNavigation: admit "manga" into PlayableMediaType. Manga series are not directly playable (you open the detail page and read a chapter, itself an ebook item), so buildMediaPlayHref falls through to the item href for them, like series/season. - FilterRuleEditor: add "manga" to FilterRuleMediaScope and relabel "watched" -> "Read" for manga as well as ebook (manga is read). - CollectionGuidedRulesEditor: add "manga" to GuidedFormState.mediaScope, a "Manga" media-type option, ebook-like "Read Status" labels, and map manga -> ebook sort-relevance scope (manga has no dedicated sort scope). - CatalogFilterBar (cascading leak surfaced after the above): add a "Manga" scope option and map manga -> ebook sort-relevance scope in both scope handlers. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): offer manga as a library type in the create dialog Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(scanner): strip scene-release junk from manga series names Add cleanMangaSeriesName which repeatedly strips trailing parenthetical groups (year, year-range, Digital, release-group tags) then trims any dangling dash, so folder names like "404 Demons (Digital) (Oak)" resolve to "404 Demons". Wire it into mangaSeriesFromPath so both the series title and the mangaSeriesGroupKey identity key use the cleaned value. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): flat volume/chapter manga list; nest only multi-chapter volumes Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(scanner): parse manga index after stripping series-name prefix Numbers inside a series title (e.g. "404 Demons", "365 Days to the Wedding") were wrongly grabbed as the chapter number because parseMangaIndex matched the first bare number in the full filename. mangaIndexForFile now strips the series-name prefix before delegating to parseMangaIndex, so only the number that follows the title is used. reconcileMangaFile in manga_scan.go is updated to call mangaIndexForFile instead of parseMangaIndex directly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(scanner): stop missing-file reconcile from deleting manga series items Manga series items are file-less virtual parents; the shared ReconcileFolderMembership swept them every scan because they have no media_file. Exclude type='manga' from file-presence membership reconciliation, and add a manga-scan step that deletes only series with zero remaining chapters. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(ebooks): exclude manga chapters from individual ebook enrichment Manga chapters are type='ebook' parts of a series; the ebook enrichment sweep was searching each one against book sources (Gutenberg/Anna's/etc.) and failing in a pointless storm. Exclude items with a manga_chapters link; series-level enrichment is handled separately. * docs: design spec for manga metadata plugin + series enrichment (sub-project 2) New silo-plugin-manga-metadata (AniList, high-confidence matching) + a host MangaEnricher for type='manga' series; default-enabled metadata source for manga libraries. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs: implementation plan for manga metadata plugin + series enrichment Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(db): manga_enrichment_state table Mirrors ebook_enrichment_state: dedicated failure counter for the manga enrichment sweep so it does not contend with media_items.refresh_failures. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(manga): series enricher (claims type='manga', resolves manga chain) * feat(manga): sync_manga_metadata task + enricher wiring * feat(catalog): expose manga chapter/volume counts in browse Add manga_chapter_count and manga_volume_count to browse cards so the frontend can render a Vols N / Ch N chip on manga series. The counts come from two index-backed correlated subqueries over manga_chapters in the browse SELECT (mangaCountColumns), scanned positionally before added_at and nilled out for non-manga rows. Threaded through models.MediaItem and exposed on the itemListResponse JSON card. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(sections): scope manga home recent sections to type=manga series A manga library mixes type='manga' series with type='ebook' chapters, so the auto-generated home 'Recently Added/Released in <Library>' rows surfaced the junk chapter filenames. Add GeneratedHomeLibraryRecentConfigScoped which emits the modern QueryDefinition shape (library_ids + media_scope) so a manga library's generated home rows filter to type='manga' only. Other library types are unchanged. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(catalog): exclude manga chapters from browse/section/search surfaces Manga CHAPTER items (type='ebook' rows linked into a type='manga' series via manga_chapters) were leaking into catalog browse, section resolution, and search as standalone items showing junk filenames. They are internal sub-units of the series and only the series should appear. There is no single shared item-listing chokepoint: browse, the query/preview executor, and search each build their own WHERE. Add a shared, index-backed anti-join predicate (manga_chapters.chapter_content_id is the PK) via mangaChapterExclusionWhere and wire it into all three builders. By-id fetch paths that legitimately resolve chapters (ebook reader, continue-reading, series detail chapter list) use separate queries and are unaffected. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(scanner): use #NN as the manga volume for Vol.YYYY #NN releases mangaVolYearIssue early-return was returning the year token (e.g. "Vol.2003") as the volume label, which the frontend couldn't prettify to "Volume N". Now returns "v<issue>" (e.g. "v04") so the existing frontend regex ^v?(\d+)$ renders it as "Volume 4" correctly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(web): manga count chip on posters Add an optional manga_chapter_count / manga_volume_count to the browse item type and render a top-right "Vols N" / "Ch N" chip on ItemCard, strictly gated on type==='manga'. The label prefers "Vols" when the volume count dominates, "Ch" otherwise; the chip is hidden when the chapter count is missing or non-positive. No other card type renders it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(web): manga reader back returns to series (no loop) The ebook reader's back action defaulted to the chapter's own item detail (/item/<chapter>), whose back returned to the reader — an infinite loop for manga chapters. The reader now honors an explicit backTo search param when present, navigating there instead. Absent for normal ebooks, so their back behavior is unchanged. Only manga chapter rows pass backTo, keeping the fix manga-only. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): manga chapter row actions (read/mark-read/download) Each manga chapter/volume row now offers Read (the existing reader link, now carrying a backTo to the series), Mark-read (the shared watched-state mutation per chapter content_id), and Download (lazily fetches the chapter's file versions on demand and opens the shared DownloadVersionPicker, gated on user.download_allowed). The volume-unit / loose-chapter / section structure from buildMangaList is unchanged. Scoped to MangaContent only; EbookContent is untouched. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(web): validate reader backTo param is a safe in-app relative path Prevents open-redirect / javascript:-URI XSS from a crafted ?backTo= URL. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(catalog): include per-chapter read state in manga detail Manga chapters are ebook items, so a chapter is "read" when the viewer's ebook_reader_progress row crosses the finished threshold. fetchMangaChapters now LEFT JOINs that table scoped to the AccessFilter's user_id/profile_id and exposes a per-chapter Read bool on MangaChapter, threaded through buildMangaExtension. The detail payload previously carried no read state, so the row toggle always started unread. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(web): manga rows reflect read state on load MangaChapter now carries an optional read flag from the detail payload, and MangaRow seeds its mark-read toggle from chapter.read instead of always starting unread. The optimistic toggle + shared watched mutation are unchanged; only the initial value is seeded. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(sections): exclude manga chapters from recently-added/released/random + other library-listing sections Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(sections): manga recently-added/released cards show the latest volume's cover * fix(manga): keep enrichment honest about no-match vs enriched, batch 50->200 - sweep stats now separate enriched / no_match / failed: a stamped no-match was counted (and logged) as an enrichment, which masked a collapse of the real match rate during the backfill - batch size 50 -> 200 (SILO_MANGA_ENRICH_BATCH overrides): with the plugin serving GetMetadata from its search cache an item costs one rate-limited AniList request, so a sweep still fits the 5-minute task interval Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(manga): size enrich batch to the 5-minute interval at AniList's real budget 140 items x ~2.1s/request fits the interval; an overlong sweep makes the task manager drop the next trigger and the effective rate falls below the AniList budget. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(catalog): manga count chip data missing from library browse manga_chapter_count/manga_volume_count were only added to BrowseRepository, but /library/{id}?tab=library flows through previewQuerySource -> QueryExecutor.PreviewPage, which selects qualifiedListItemColumns and scans with scanItems - so manga cards never carried the counts and the Vols/Ch poster chip stayed hidden. Append mangaCountColumns to the preview-page SELECT and scan them via a new scanItemsWithMangaCounts (nil for non-manga rows, mirroring scanBrowseItems). Extract listItemScanDests so the three scan variants share one destination list instead of duplicating the 48-column scan. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(web): manga chip reads 'X Volumes · X Chapters', menu verbs say Read - chip: show distinct-volume and loose-chapter counts side by side instead of the single 'Vols N'/'Ch N' heuristic; mangaCountColumns now counts DISTINCT volume tokens (rows sharing a volume are one volume) and only un-volumed rows as chapters - watched-state labels: type='manga' fell through to the video default, so the card dot menu and detail page said 'Mark Watched' - manga now uses the ebook reading verbs (Mark Read / Mark Unread, 'Marked as read' toast) - format MangaContent.test.tsx (pre-existing prettier miss) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(manga): backdrop enrichment - banner hero art + backdrop-only backfill - cache remote backdrops like posters (cacheRemoteImages generalizes the poster-only path; failures keep the provider URL, which still renders) - claim arm for enriched items missing a backdrop: fetched by stored provider ID (search skipped - no rate spend, no re-match risk) and only the backdrop is written; stamping after the attempt keeps banner-less series from being re-claimed every sweep - backfill = one-time SQL clearing last_refreshed for poster-set/ backdrop-empty manga Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(manga): reading-loop UX - continue CTA, next chapter, series-aware cards, file details Fixes the four high-priority findings from the manga UX review plus a file-inspector request: - H1: series hero gets a Continue / Start Reading / Read Again CTA targeting the first unread chapter (firstUnreadChapter over the ordered list), plus an overflow menu (View Details, admin Refresh Metadata) - H2: the reader resolves its owning manga series (chapter detail now carries series_id/series_title) and offers next-chapter navigation: a header next button and an end-of-book floating CTA at >=99.5% progress; back defaults to the series even without a backTo param - H3: chapter rows show a persistent read check + muted title, and the mark-read mutation carries series_id so the series detail cache invalidates (read states no longer revert on revisit) - H4: continue-reading cards for manga chapters present the series: sections payload resolves chapter->series linkage, the card heading/image link to the series, and meta lines launch the reader - View Details: manga series menus (card dot menu + detail overflow) open a file inspector showing folder paths and per-chapter file names/sizes via GET /catalog/items/{id}/manga-files; paths are stripped for viewers without file-path visibility (item-versions policy) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(manga): UX mediums - richer detail page, smarter list, manga sort scope Second batch from the manga UX review (M1-M7): - M1: multi-chapter volume sections are collapsible (fully read sections start collapsed) with sticky headers, and long series get a 'Jump to <next unread>' anchor above the list - M2: the series hero shows the author line (HeroCrewLine learns Author credits with person links; DetailHero now renders crewLine and genre chips independently) and Volumes/Chapters badges - M3: browse-card count chip abbreviates to '12 Vol - 3 Ch' so it fits narrow cards without occluding covers - M4: manga gets its own sort scope: Duration/Bitrate (meaningless for file-less series rows) disappear, reading labels (Date Read / Reads) apply, Author stays - M5: global search labels manga results 'Manga' instead of the raw type - M6: chapters carry the viewer's reading fraction; part-read rows show an inline progress bar + percent - M7: chapter rows show the extracted cover thumbnail (presigned poster_url on the chapters payload) instead of a generic icon Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(manga): UX lows - volume token dedupe, comic reader chrome, empty-state hint - buildMangaList buckets volumes by canonical numeric token so mixed release naming (v01 + 1) yields one Volume 1 instead of duplicates - cbz/cbr readers start with the side panel closed and hide prose-only chrome (reading ruler, TTS, typography/font controls, hyphenation, writing mode) while keeping comic-relevant settings (theme, brightness, margin, right-to-left, spread, flow) - manga empty state mentions chapters appear after the library scan Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(manga): publication status badge via new SDK status field - vendor the unpublished plugin SDK (adds MetadataItem.status) under internal/compat/ with a relative go.mod replace, following the zishang520-webtransport-go convention; swap to the published module before the upstream PR - map plugin status into MetadataResult.ShowStatus, persist it during manga enrichment, and show it as the hero status badge (show_status was already on the detail payload and MetadataBadges) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(manga): generalize backdrop pass to secondary fields (backdrop + status) The backdrop-only claim arm becomes a secondary-fields pass: enriched items missing a backdrop and/or publication status are claimed, fetched by stored provider ID, and only the missing secondary fields are written. Lets the new status field backfill across the already-enriched library instead of applying only to future enrichments. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(metadata): merge ShowStatus through MergeMetadata/MergeGlobalMetadata The new MetadataResult.ShowStatus never reached the accumulated result the manga enricher persists from - the field-by-field merges didn't know it, so the status backfill pass obtained nothing. Regression-tested on both paths. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(manga): keep scanner identity IDs out of the metadata flow filterMangaProviderIDs passed the scanner's manga_series identity row through, so the search-skip-when-already-matched guard saw provider IDs on every item and never searched: unmatched items went straight to a by-ID fetch with no usable ID and were stamped as terminal no-match without a single provider request (and the MangaDex fallback was never consulted). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: gitignore docker-compose.override.yml (local deployment override) The override unpublishes the bundled redis/postgres host ports (ports: !override []). It is a per-deployment, local-only file: ignoring it keeps a rebase from main and git clean -fd from disturbing it, and keeps it out of any PR. Its accidental absence once exposed Redis to the internet. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(manga): code-review fixes — no-match guard, sort comparator, volume-count consistency - enrichWithProviders: set accumulator.HasMetadata after a provider result merges (MergeMetadata doesn't propagate it). Without this, a confident match carrying only genres/authors/status/year but no cover and no overview failed the no-match check and was discarded + terminally stamped. - byChapterIndex: both un-indexed chapters yield POSITIVE_INFINITY, so the subtraction was Infinity-Infinity=NaN (Array.sort treats NaN as 0, leaving order undefined). Compare explicitly for a stable order. - MangaContent volume/chapter badges: derive counts from the rendered buildMangaList entries (which canonicalize v01 ≡ 1) instead of raw distinct volume tokens, so the badge can no longer say '2 Volumes' over one row. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(manga): clarify the enrichment claim's secondary arm is admin-reset-only The secondary arm (poster present, backdrop/status missing) requires last_refreshed IS NULL, so it is only reachable when an operator resets last_refreshed to backfill a newly-added field — not an automatic periodic re-check (which would re-fetch banner-less series every sweep). Documents the intent so it does not read as dead code. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(manga): collapse continue-reading chapters per series; batch provider-id lookup - Continue Reading now collapses multiple in-progress chapters of the same manga into one card (most recently read kept), mirroring the episode→series collapse. The reading section resolves chapter→series linkage into itemMeta (applyMangaChapterSeriesMeta) and runs the shared collapseContinueWatchingSeriesCandidates, which the reading path previously skipped. - claimBatch resolves provider IDs for the whole batch in one query via the new ProviderIDRepository.GetByContentIDs (content_id = ANY), replacing the per-item GetByContentID N+1. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(web): manga publication-status chip on browse cards + more legible chips - Color-coded publication status pill (Ongoing/Completed/Hiatus/Cancelled/ Upcoming) in the manga card's top-left corner, mirroring the vol/chapter count chip top-right. Strictly manga-gated; show_status was already on the browse payload. - New .glass-chip (78% surface vs glass-subtle's 40%) for the manga count + status pills so the labels stay legible over busy cover art. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * build(manga): depend on published silo-plugin-sdk v0.7.0 Replace the vendored internal/compat/silo-plugin-sdk copy with a normal dependency on the published SDK module at v0.7.0, which adds MetadataItem.status (publication/airing status) consumed by the manga status badge at internal/metadata/plugin_provider.go. - go.mod: pin v0.7.0, drop the local-path replace directive - remove the vendored internal/compat/silo-plugin-sdk tree - Dockerfile: drop the vendored-SDK COPY - strip the manga design docs/plans from docs/superpowers (internal) Requires Silo-Server/silo-plugin-sdk#4 merged and tagged v0.7.0. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(manga): exclude chapters from the matcher's unmatched-item lister Manga chapters are type='ebook' items that stay status='pending' by design - provider metadata lives on the type='manga' series item. The scan-final RetryUnmatchedItemsByFolderAndPathPrefix listed all of them and ran a rate-limited ebook-plugin search per chapter: 31,564 chapters x ~1s = 8h46m appended to a 2-minute manga library scan (observed live), every one a guaranteed no-match. Earlier runs never survived to completion, so the library's last_scanned_at stayed NULL forever. Add the same manga_chapters NOT EXISTS guard the ebook enricher's claim query already uses. Verified live: the same library now scans in 27s with retried_items=0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(scanner): never probe-repair ebook/comic files (ebook+manga detail-page killer) NeedsCriticalProbeRepair was always true for BaseType 'ebook' files (epub, pdf, cbz, cbr — incl. manga chapters): buildEbookMediaFile leaves ProbeUpdatedAt nil and they have no audio/video, so probeEnsurer.Ensure spawned ffprobe per file on every detail/watch load and never converged (ffprobe errors on zip/rar, result never persisted). Short-circuit probe-repair for ebook base type — they're read directly and never use the transcode/playback probe pipeline. SHARED fix: benefits both the ebooks and manga library types. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf+fix(ebooks): parallelize detail extension + preserve finished read-state - buildEbookExtension ran its 3 related-content queries (series, also-by-author, similar) sequentially; run them concurrently like buildAudiobookExtension so ebook detail latency is the slowest query, not their sum. - PGEbookReaderProgressStore.Upsert did an unconditional SET progress=EXCLUDED; a routine autosave (e.g. reopening a finished book) could drop it below the 0.9 finished threshold and silently un-mark it read (and clear the manga chapter checkmark, which rides on the same row). Guard: once finished, progress only moves on an explicit unread (row delete); below threshold it tracks freely. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf(manga): batch chapter presign, index volume counts, quiet scan log - fetchMangaChapters presigned each chapter poster individually; a long-running series has hundreds of chapters. Batch them in one PresignImageURLs call, and add the missing rows.Err() check (was silently returning partial lists). - The browse manga count chip's count(DISTINCT volume) subquery wasn't covered by manga_chapters_series (series_content_id, chapter_index); add idx_manga_chapters_series_volume (series_content_id, volume) so both count subqueries are index-only. - Downgrade the per-chapter "manga scan: indexed" log from Info to Debug (one line per .cbz; the 500-file progress log already covers operator visibility). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(manga): address PR #138 code-review findings Folds PR #142 into the manga branch (already done via fast-forward) and remediates the issues surfaced in the #138 code review. Correctness: - Preserve the scanner's manga_series identity anchor through enrichment. ReplaceByContentID's DELETE was unconditional, so the first successful enrichment wiped the manga_series provider-id row the scanner relies on for idempotency, causing duplicate series + metadata loss on the next scan. excludedProviderIDs now also means "not deleted", and the DELETE preserves those rows. (internal/catalog/provider_id_repo.go) - Fall back to the series cover when the latest chapter has no poster. Poster columns default to '' (not NULL), so the manga series-card poster override blanked cards via a plain COALESCE; wrap operands in NULLIF. (internal/sections/fetcher.go) - Keep backTo a real query param on reader links when libraryId is absent. It was string-concatenated with '&', producing a malformed URL on deep-links; route it through the query helper instead. (web/src/lib/mediaNavigation.ts, EbookReader.tsx, MangaContent.tsx) Quality: - Hide manga chapters from favorites/watchlist browse, matching the exclusion enforced on every other listing surface. (internal/catalog/favorites_browse.go) - Centralize the manga chapter exclusion predicate into a single exported catalog.MangaChapterExclusionWhere, removing four duplicated copies. (catalog, sections, ebooks) - Skip the two manga count subqueries on browse scopes that cannot contain manga (non-manga type filters), substituting NULL placeholders. (internal/catalog/browse.go) - Normalize provider publication status (AniList/MangaDex/SDK variants) into a stable label set so show_status carries one manga value-domain. (internal/manga/enrichment.go) Adds unit tests for the poster NULLIF contract, browse gating, and status normalization. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore: regenerate go.sum after rebase onto main Drops stale silo-plugin-sdk v0.6.0 and other leftover hashes from the intermediate rebased states; go.mod is now on the published v0.7.0 tag. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(scanner): adapt manga scan to ebookFileShouldSkip 3-value signature main changed ebookFileShouldSkip to also return the existing content ID; the manga scan path only needs the unchanged flag, so discard the new return. Resolves a silent semantic conflict from the rebase onto main. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Silo Server Developer <warmasterx555@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
3255 lines
103 KiB
Go
3255 lines
103 KiB
Go
package sections
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log/slog"
|
|
"maps"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
"golang.org/x/sync/singleflight"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/catalog"
|
|
"github.com/Silo-Server/silo-server/internal/models"
|
|
"github.com/Silo-Server/silo-server/internal/overlays"
|
|
"github.com/Silo-Server/silo-server/internal/recommendations"
|
|
"github.com/Silo-Server/silo-server/internal/sections/recipes"
|
|
"github.com/Silo-Server/silo-server/internal/userstore"
|
|
)
|
|
|
|
// SectionWithItems is a resolved section populated with query results.
|
|
type SectionWithItems struct {
|
|
ResolvedSection
|
|
Items []*models.MediaItem `json:"items"`
|
|
TotalCount int `json:"total_count"`
|
|
ItemMeta map[string]SectionItemMeta
|
|
}
|
|
|
|
// SectionItemMeta carries optional per-item metadata for richer section UIs.
|
|
type SectionItemMeta struct {
|
|
SeriesID *string
|
|
SeriesTitle string
|
|
SeasonNumber *int
|
|
EpisodeNumber *int
|
|
Badges []string
|
|
PositionSeconds *float64
|
|
DurationSeconds *float64
|
|
ProgressUpdatedAt *string
|
|
ItemSource string // "in_progress" or "next_up"
|
|
SortTimestamp time.Time // when the preceding episode was completed (for ordering)
|
|
}
|
|
|
|
const recentSeasonPremiereBadgeWindowDays = 14
|
|
const editorialCandidateCacheTTL = 24 * time.Hour
|
|
const fetchAllMaxConcurrency = 4
|
|
const slowSectionFetchThreshold = 500 * time.Millisecond
|
|
const slowAggregateFetchThreshold = time.Second
|
|
|
|
type recommendationReader interface {
|
|
GetForYouMain(ctx context.Context, userID int, profileID string, limit int, filter catalog.AccessFilter) (*recommendations.ForYouRow, error)
|
|
GetBecauseYouWatched(ctx context.Context, userID int, profileID, sourceItemID string, limit int, filter catalog.AccessFilter) ([]recommendations.ScoredItem, error)
|
|
GetSimilarUsersLiked(ctx context.Context, userID int, profileID string, limit int, filter catalog.AccessFilter) ([]recommendations.ScoredItem, error)
|
|
GetTasteMatchRow(ctx context.Context, userID int, profileID, genre string, limit int, filter catalog.AccessFilter) (*recommendations.ForYouRow, error)
|
|
}
|
|
|
|
// trendingSnapshotGetter is the read side of the trending snapshot table.
|
|
// Satisfied by *TrendingSnapshotRepository.
|
|
type trendingSnapshotGetter interface {
|
|
Get(ctx context.Context, source, window string) (TrendingSnapshot, bool, error)
|
|
}
|
|
|
|
// Fetcher runs section queries against the database.
|
|
type Fetcher struct {
|
|
pool *pgxpool.Pool
|
|
progressFilter *catalog.ContinueWatchingProgressFilter
|
|
StoreProvider userstore.UserStoreProvider
|
|
CollectionRepo *catalog.LibraryCollectionRepository
|
|
RecommendationRepo *recommendations.Repo // retained for non-reader call sites
|
|
RecommendationReader recommendationReader
|
|
NextUpRepo *catalog.NextUpRepository
|
|
AudiobookNextRepo *catalog.AudiobookNextRepository
|
|
|
|
// TrendingSnapshots reads the persisted external-trending snapshots that
|
|
// back the trending_discover section. Nil renders that section empty.
|
|
// Snapshots are produced out-of-band by TrendingRefresher, so the read path
|
|
// never calls the upstream provider.
|
|
TrendingSnapshots trendingSnapshotGetter
|
|
|
|
candidateCacheMu sync.Mutex
|
|
candidateCache *editorialCandidateCache
|
|
candidateGroup singleflight.Group
|
|
|
|
// Clock returns the current time. Defaults to recipes.RealClock{}.
|
|
// Tests inject recipes.FixedClock for deterministic seasonal/editorial behavior.
|
|
Clock recipes.Clock
|
|
}
|
|
|
|
// NewFetcher creates a new section Fetcher.
|
|
func NewFetcher(pool *pgxpool.Pool) *Fetcher {
|
|
return &Fetcher{
|
|
pool: pool,
|
|
progressFilter: catalog.NewContinueWatchingProgressFilter(pool),
|
|
Clock: recipes.RealClock{},
|
|
}
|
|
}
|
|
|
|
type editorialCandidateLoader func(context.Context, string, *int, []int, catalog.AccessFilter) ([]string, error)
|
|
|
|
type editorialCandidateCache struct {
|
|
mu sync.RWMutex
|
|
entries map[string]editorialCandidateCacheEntry
|
|
}
|
|
|
|
type editorialCandidateCacheEntry struct {
|
|
candidates []string
|
|
expiresAt time.Time
|
|
}
|
|
|
|
func newEditorialCandidateCache() *editorialCandidateCache {
|
|
return &editorialCandidateCache{entries: make(map[string]editorialCandidateCacheEntry)}
|
|
}
|
|
|
|
func (c *editorialCandidateCache) get(key string, now time.Time) ([]string, bool) {
|
|
if c == nil {
|
|
return nil, false
|
|
}
|
|
|
|
c.mu.RLock()
|
|
entry, ok := c.entries[key]
|
|
c.mu.RUnlock()
|
|
if !ok || !now.Before(entry.expiresAt) {
|
|
return nil, false
|
|
}
|
|
return append([]string(nil), entry.candidates...), true
|
|
}
|
|
|
|
func (c *editorialCandidateCache) set(key string, candidates []string, expiresAt time.Time) {
|
|
if c == nil {
|
|
return
|
|
}
|
|
|
|
c.mu.Lock()
|
|
c.entries[key] = editorialCandidateCacheEntry{
|
|
candidates: append([]string(nil), candidates...),
|
|
expiresAt: expiresAt,
|
|
}
|
|
c.mu.Unlock()
|
|
}
|
|
|
|
func (f *Fetcher) ensureEditorialCandidateCache() *editorialCandidateCache {
|
|
f.candidateCacheMu.Lock()
|
|
defer f.candidateCacheMu.Unlock()
|
|
if f.candidateCache == nil {
|
|
f.candidateCache = newEditorialCandidateCache()
|
|
}
|
|
return f.candidateCache
|
|
}
|
|
|
|
func (f *Fetcher) now() time.Time {
|
|
if f != nil && f.Clock != nil {
|
|
return f.Clock.Now()
|
|
}
|
|
return time.Now()
|
|
}
|
|
|
|
func (f *Fetcher) cachedEditorialCandidates(ctx context.Context, subjectType string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter, ttl time.Duration, loader editorialCandidateLoader) ([]string, error) {
|
|
if ttl <= 0 {
|
|
return loader(ctx, subjectType, libraryID, libraryIDs, filter)
|
|
}
|
|
|
|
cache := f.ensureEditorialCandidateCache()
|
|
key := editorialCandidateCacheKey(subjectType, libraryID, libraryIDs, filter)
|
|
now := f.now()
|
|
if candidates, ok := cache.get(key, now); ok {
|
|
return candidates, nil
|
|
}
|
|
|
|
value, err, _ := f.candidateGroup.Do(key, func() (any, error) {
|
|
now := f.now()
|
|
if candidates, ok := cache.get(key, now); ok {
|
|
return candidates, nil
|
|
}
|
|
candidates, err := loader(ctx, subjectType, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cache.set(key, candidates, now.Add(ttl))
|
|
return append([]string(nil), candidates...), nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
candidates, _ := value.([]string)
|
|
return append([]string(nil), candidates...), nil
|
|
}
|
|
|
|
func editorialCandidateCacheKey(subjectType string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) string {
|
|
var b strings.Builder
|
|
b.WriteString("subject=")
|
|
b.WriteString(strings.ToLower(strings.TrimSpace(subjectType)))
|
|
|
|
b.WriteString("|library=")
|
|
if libraryID == nil {
|
|
b.WriteString("all")
|
|
} else {
|
|
b.WriteString(strconv.Itoa(*libraryID))
|
|
}
|
|
|
|
b.WriteString("|libraries=")
|
|
writeOptionalSortedInts(&b, libraryIDs)
|
|
|
|
b.WriteString("|disabled=")
|
|
writeSortedInts(&b, filter.DisabledLibraryIDs)
|
|
|
|
b.WriteString("|rating=")
|
|
b.WriteString(filter.MaxContentRating)
|
|
return b.String()
|
|
}
|
|
|
|
func writeOptionalSortedInts(b *strings.Builder, values []int) {
|
|
if values == nil {
|
|
b.WriteString("<nil>")
|
|
return
|
|
}
|
|
if len(values) == 0 {
|
|
b.WriteString("<empty>")
|
|
return
|
|
}
|
|
writeSortedInts(b, values)
|
|
}
|
|
|
|
func writeSortedInts(b *strings.Builder, values []int) {
|
|
if len(values) == 0 {
|
|
return
|
|
}
|
|
sorted := append([]int(nil), values...)
|
|
sort.Ints(sorted)
|
|
for i, value := range sorted {
|
|
if i > 0 {
|
|
b.WriteByte(',')
|
|
}
|
|
b.WriteString(strconv.Itoa(value))
|
|
}
|
|
}
|
|
|
|
// FetchOne runs one section query and returns it with items.
|
|
func (f *Fetcher) FetchOne(ctx context.Context, resolved ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) (SectionWithItems, error) {
|
|
start := time.Now()
|
|
var result SectionWithItems
|
|
var err error
|
|
defer func() {
|
|
f.logSlowSectionFetch(resolved, libraryID, libraryIDs, result, time.Since(start), err)
|
|
}()
|
|
|
|
if resolved.SectionType == SectionContinueWatching {
|
|
result, err = f.fetchContinueWatchingSection(ctx, resolved, libraryID, libraryIDs, userID, profileID, filter)
|
|
return result, err
|
|
}
|
|
if resolved.SectionType == SectionNextUp {
|
|
result, err = f.fetchNextUpSection(ctx, resolved, libraryID, libraryIDs, userID, profileID, filter)
|
|
return result, err
|
|
}
|
|
if resolved.SectionType == SectionNextInSeries {
|
|
result, err = f.fetchNextInSeriesSection(ctx, resolved, libraryID, libraryIDs, userID, profileID, filter)
|
|
return result, err
|
|
}
|
|
if resolved.SectionType == SectionEditorialSpotlight {
|
|
var items []*models.MediaItem
|
|
var total int
|
|
var title string
|
|
items, total, title, err = f.fetchEditorialSpotlightWithTitle(ctx, resolved, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return SectionWithItems{}, err
|
|
}
|
|
if title != "" {
|
|
resolved.Title = title
|
|
}
|
|
result = SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: items,
|
|
TotalCount: total,
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
var items []*models.MediaItem
|
|
var total int
|
|
items, total, err = f.fetchSection(ctx, resolved, libraryID, libraryIDs, userID, profileID, filter)
|
|
if err != nil {
|
|
return SectionWithItems{}, err
|
|
}
|
|
|
|
// Apply seasonal title override when the active theme has a custom name.
|
|
// Done here (rather than inside fetchSeasonalThemed) so the section's
|
|
// stored Title is preserved as the fallback used by callers that bypass
|
|
// SectionWithItems construction.
|
|
if resolved.SectionType == SectionSeasonalThemed && len(items) > 0 {
|
|
if title := f.seasonalTitleOverride(resolved); title != "" {
|
|
resolved.Title = title
|
|
}
|
|
}
|
|
|
|
result = SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: items,
|
|
TotalCount: total,
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func (f *Fetcher) logSlowSectionFetch(resolved ResolvedSection, libraryID *int, libraryIDs []int, result SectionWithItems, duration time.Duration, err error) {
|
|
if duration < slowSectionFetchThreshold {
|
|
return
|
|
}
|
|
attrs := []any{
|
|
"section_id", resolved.ID,
|
|
"type", resolved.SectionType,
|
|
"title", resolved.Title,
|
|
"item_count", len(result.Items),
|
|
"total_count", result.TotalCount,
|
|
"duration_ms", duration.Milliseconds(),
|
|
}
|
|
if libraryID != nil {
|
|
attrs = append(attrs, "library_id", *libraryID)
|
|
}
|
|
if libraryIDs != nil {
|
|
attrs = append(attrs, "library_ids", append([]int(nil), libraryIDs...))
|
|
}
|
|
if err != nil {
|
|
attrs = append(attrs, "error", err)
|
|
}
|
|
slog.Warn("slow section fetch", attrs...)
|
|
}
|
|
|
|
// seasonalTitleOverride returns the per-theme display name override for a
|
|
// seasonal section, or "" when no override applies.
|
|
func (f *Fetcher) seasonalTitleOverride(resolved ResolvedSection) string {
|
|
if len(resolved.Config) == 0 {
|
|
return ""
|
|
}
|
|
var p recipes.SeasonalThemedParams
|
|
if err := json.Unmarshal(resolved.Config, &p); err != nil {
|
|
return ""
|
|
}
|
|
if len(p.ThemeTitles) == 0 {
|
|
return ""
|
|
}
|
|
now := time.Now()
|
|
if f.Clock != nil {
|
|
now = f.Clock.Now()
|
|
}
|
|
return recipes.SeasonalTitleOverride(p, now)
|
|
}
|
|
|
|
func (f *Fetcher) fetchContinueWatchingSection(ctx context.Context, resolved ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) (SectionWithItems, error) {
|
|
if f.StoreProvider == nil || userID <= 0 || profileID == "" {
|
|
return SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: []*models.MediaItem{},
|
|
TotalCount: 0,
|
|
ItemMeta: map[string]SectionItemMeta{},
|
|
}, nil
|
|
}
|
|
|
|
store, err := f.StoreProvider.ForUser(ctx, userID)
|
|
if err != nil {
|
|
return SectionWithItems{}, fmt.Errorf("getting user store: %w", err)
|
|
}
|
|
|
|
limit := resolved.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
continueType := ContinueTypeFromConfig(resolved.Config)
|
|
|
|
cfgFilters := ParseConfigFilters(resolved.Config)
|
|
configLibraryIDs := cfgFilters.LibraryIDs()
|
|
|
|
effectiveLibID := libraryID
|
|
effectiveLibraryIDs := libraryIDs
|
|
if effectiveLibID == nil && len(configLibraryIDs) > 0 {
|
|
effectiveLibraryIDs = configLibraryIDs
|
|
}
|
|
|
|
dismissals := f.listContinueWatchingDismissals(ctx, store, profileID)
|
|
orderedItems := make([]*models.MediaItem, 0, limit)
|
|
itemMeta := make(map[string]SectionItemMeta)
|
|
|
|
// Ebook resume points live in ebook_reader_progress rather than the
|
|
// watch-progress store, so reading sections pull from that table and skip
|
|
// the next-up handling below.
|
|
if continueType == ContinueTypeReading {
|
|
orderedItems, err = f.collectContinueProgressItems(ctx, store, profileID, dismissals, continueType, effectiveLibID, effectiveLibraryIDs, filter, limit, orderedItems, itemMeta,
|
|
func(pageLimit, offset int) ([]userstore.WatchProgress, error) {
|
|
entries, err := f.listEbookContinueWatchingProgress(ctx, userID, profileID, pageLimit, offset)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("listing ebook reader progress: %w", err)
|
|
}
|
|
return entries, nil
|
|
})
|
|
if err != nil {
|
|
return SectionWithItems{}, err
|
|
}
|
|
// Manga chapters are ebook items linked to a series; collapse multiple
|
|
// in-progress chapters of the same manga to a single card (keeping the
|
|
// most recently read), mirroring the episode→series collapse. Resolve
|
|
// the linkage into itemMeta so the shared collapse can group by series.
|
|
if len(orderedItems) > 1 {
|
|
f.applyMangaChapterSeriesMeta(ctx, orderedItems, itemMeta)
|
|
orderedItems = collapseContinueWatchingSeriesCandidates(orderedItems, itemMeta)
|
|
}
|
|
return SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: orderedItems,
|
|
TotalCount: len(orderedItems),
|
|
ItemMeta: itemMeta,
|
|
}, nil
|
|
}
|
|
|
|
orderedItems, err = f.collectContinueProgressItems(ctx, store, profileID, dismissals, continueType, effectiveLibID, effectiveLibraryIDs, filter, limit, orderedItems, itemMeta,
|
|
func(pageLimit, offset int) ([]userstore.WatchProgress, error) {
|
|
entries, err := store.ListProgress(ctx, profileID, "in_progress", pageLimit, offset)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("listing progress: %w", err)
|
|
}
|
|
return entries, nil
|
|
})
|
|
if err != nil {
|
|
return SectionWithItems{}, err
|
|
}
|
|
|
|
nextUpMode := ""
|
|
if ContinueTypeAllowsNextUp(continueType) {
|
|
nextUpMode, _ = store.GetSetting(ctx, "next_up_mode")
|
|
if nextUpMode == "" {
|
|
nextUpMode = "combined"
|
|
}
|
|
}
|
|
if ContinueTypeAllowsNextUp(continueType) && nextUpMode == "combined" {
|
|
nextUpItems, nextUpMeta, nextUpErr := f.FetchNextUpItems(ctx, userID, profileID, effectiveLibID, effectiveLibraryIDs, filter, limit)
|
|
if nextUpErr != nil {
|
|
slog.Error("fetching next-up items", "error", nextUpErr)
|
|
} else {
|
|
orderedItems = append(orderedItems, nextUpItems...)
|
|
maps.Copy(itemMeta, nextUpMeta)
|
|
}
|
|
}
|
|
|
|
if nextUpMode == "combined" && len(orderedItems) > 1 {
|
|
orderedItems = collapseContinueWatchingSeriesCandidates(orderedItems, itemMeta)
|
|
}
|
|
|
|
if nextUpMode == "combined" && len(orderedItems) > 1 {
|
|
sort.SliceStable(orderedItems, func(i, j int) bool {
|
|
left := itemMeta[orderedItems[i].ContentID].SortTimestamp
|
|
right := itemMeta[orderedItems[j].ContentID].SortTimestamp
|
|
return left.After(right)
|
|
})
|
|
}
|
|
|
|
if orderedItems == nil {
|
|
orderedItems = []*models.MediaItem{}
|
|
}
|
|
|
|
return SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: orderedItems,
|
|
TotalCount: len(orderedItems),
|
|
ItemMeta: itemMeta,
|
|
}, nil
|
|
}
|
|
|
|
// collectContinueProgressItems pages through in-progress entries from
|
|
// listPage, drops dismissed entries, resolves the remainder to media items,
|
|
// and appends them to orderedItems until limit is reached, the source is
|
|
// exhausted, or continueProgressMaxScanned entries have been scanned. Paging
|
|
// past the requested limit matters because dismissal filtering and
|
|
// library/access scoping happen after the source query: trimming at the
|
|
// source LIMIT would under-fill the section whenever dismissals exist.
|
|
func (f *Fetcher) collectContinueProgressItems(
|
|
ctx context.Context,
|
|
store userstore.UserStore,
|
|
profileID string,
|
|
dismissals catalog.HomeDismissalIndex,
|
|
continueType ContinueType,
|
|
libraryID *int,
|
|
libraryIDs []int,
|
|
filter catalog.AccessFilter,
|
|
limit int,
|
|
orderedItems []*models.MediaItem,
|
|
itemMeta map[string]SectionItemMeta,
|
|
listPage func(pageLimit, offset int) ([]userstore.WatchProgress, error),
|
|
) ([]*models.MediaItem, error) {
|
|
// LIMIT/OFFSET pages over a live, updated_at-ordered source: a progress
|
|
// write between page fetches shifts rows across page boundaries, so the
|
|
// same content_id can be returned on two consecutive pages. Track what has
|
|
// already been appended so a card never appears twice in one section.
|
|
seen := make(map[string]struct{}, limit)
|
|
for _, item := range orderedItems {
|
|
seen[item.ContentID] = struct{}{}
|
|
}
|
|
for offset := 0; len(orderedItems) < limit && offset < continueProgressMaxScanned; offset += continueProgressPageSize {
|
|
pageLimit := continueProgressPageSize
|
|
if remaining := continueProgressMaxScanned - offset; remaining < pageLimit {
|
|
pageLimit = remaining
|
|
}
|
|
progressEntries, err := listPage(pageLimit, offset)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(progressEntries) == 0 {
|
|
break
|
|
}
|
|
rawProgressCount := len(progressEntries)
|
|
progressEntries = dismissals.FilterProgress(progressEntries)
|
|
|
|
pageItems, pageMeta, err := f.fetchContinueProgressItems(ctx, store, profileID, progressEntries, continueType, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
orderedItems = appendUniqueContinueItems(orderedItems, pageItems, seen, limit)
|
|
maps.Copy(itemMeta, pageMeta)
|
|
if rawProgressCount < pageLimit {
|
|
break
|
|
}
|
|
}
|
|
return orderedItems, nil
|
|
}
|
|
|
|
// appendUniqueContinueItems appends pageItems to orderedItems up to limit,
|
|
// skipping content IDs already recorded in seen and recording every appended
|
|
// ID. Pages come from a live LIMIT/OFFSET scan, so without this guard an item
|
|
// shifted across a page boundary by a concurrent progress write would surface
|
|
// twice in the same section.
|
|
func appendUniqueContinueItems(orderedItems, pageItems []*models.MediaItem, seen map[string]struct{}, limit int) []*models.MediaItem {
|
|
for _, item := range pageItems {
|
|
if len(orderedItems) >= limit {
|
|
break
|
|
}
|
|
if _, dup := seen[item.ContentID]; dup {
|
|
continue
|
|
}
|
|
seen[item.ContentID] = struct{}{}
|
|
orderedItems = append(orderedItems, item)
|
|
}
|
|
return orderedItems
|
|
}
|
|
|
|
// ebookContinueWatchingProgressQuery lists in-progress ebook resume points for
|
|
// Continue Reading. Like the video path (pgstore ListProgress "in_progress"),
|
|
// rows the user hid via user_history_hidden_items are excluded while reading
|
|
// activity after hidden_before counts again.
|
|
var ebookContinueWatchingProgressQuery = fmt.Sprintf(`
|
|
SELECT content_id, progress::double precision, updated_at
|
|
FROM ebook_reader_progress
|
|
WHERE user_id = $1
|
|
AND profile_id = $2
|
|
AND progress > 0
|
|
AND progress < %s
|
|
AND NOT EXISTS (
|
|
SELECT 1
|
|
FROM user_history_hidden_items hhi
|
|
WHERE hhi.user_id = ebook_reader_progress.user_id
|
|
AND hhi.profile_id = ebook_reader_progress.profile_id
|
|
AND hhi.media_item_id = ebook_reader_progress.content_id
|
|
AND ebook_reader_progress.updated_at <= hhi.hidden_before
|
|
)
|
|
ORDER BY updated_at DESC, content_id ASC
|
|
LIMIT $3 OFFSET $4
|
|
`, catalog.EbookFinishedProgressThresholdSQL)
|
|
|
|
func (f *Fetcher) listEbookContinueWatchingProgress(ctx context.Context, userID int, profileID string, limit, offset int) ([]userstore.WatchProgress, error) {
|
|
if f.pool == nil || userID <= 0 || profileID == "" || limit <= 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
rows, err := f.pool.Query(ctx, ebookContinueWatchingProgressQuery, userID, profileID, limit, offset)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
entries := make([]userstore.WatchProgress, 0)
|
|
for rows.Next() {
|
|
var contentID string
|
|
var progress float64
|
|
var updatedAt time.Time
|
|
if err := rows.Scan(&contentID, &progress, &updatedAt); err != nil {
|
|
return nil, err
|
|
}
|
|
entries = append(entries, userstore.WatchProgress{
|
|
MediaItemID: contentID,
|
|
PositionSeconds: progress,
|
|
DurationSeconds: 1,
|
|
UpdatedAt: updatedAt.UTC().Format(time.RFC3339),
|
|
})
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
return entries, nil
|
|
}
|
|
|
|
const (
|
|
continueProgressPageSize = 100
|
|
continueProgressMaxScanned = 1000
|
|
)
|
|
|
|
func (f *Fetcher) fetchContinueProgressItems(ctx context.Context, store userstore.UserStore, profileID string, entries []userstore.WatchProgress, continueType ContinueType, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, map[string]SectionItemMeta, error) {
|
|
if len(entries) == 0 {
|
|
return nil, map[string]SectionItemMeta{}, nil
|
|
}
|
|
|
|
contentIDs := make([]string, 0, len(entries))
|
|
for _, entry := range entries {
|
|
contentIDs = append(contentIDs, entry.MediaItemID)
|
|
}
|
|
|
|
mediaItems, err := f.fetchItemsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
episodeItems, episodeMeta, err := f.fetchEpisodeTargetsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
itemByID := make(map[string]*models.MediaItem, len(mediaItems)+len(episodeItems))
|
|
for _, item := range mediaItems {
|
|
itemByID[item.ContentID] = item
|
|
}
|
|
for _, item := range episodeItems {
|
|
itemByID[item.ContentID] = item
|
|
}
|
|
|
|
matchingEntries := make([]userstore.WatchProgress, 0, len(entries))
|
|
hasEpisodeEntries := false
|
|
for _, entry := range entries {
|
|
item, ok := itemByID[entry.MediaItemID]
|
|
if !ok || !ContinueTypeMatchesItem(continueType, item.Type) {
|
|
continue
|
|
}
|
|
if item.Type == "episode" {
|
|
hasEpisodeEntries = true
|
|
}
|
|
matchingEntries = append(matchingEntries, entry)
|
|
}
|
|
if ContinueTypeAllowsNextUp(continueType) && hasEpisodeEntries {
|
|
supersededEpisodeProgress, err := f.progressFilter.SupersededEpisodeProgressIDs(ctx, store, profileID, matchingEntries)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
matchingEntries = catalog.FilterSupersededProgress(matchingEntries, supersededEpisodeProgress)
|
|
}
|
|
|
|
itemMeta := make(map[string]SectionItemMeta, len(matchingEntries))
|
|
orderedItems := make([]*models.MediaItem, 0, len(matchingEntries))
|
|
for _, entry := range matchingEntries {
|
|
item, ok := itemByID[entry.MediaItemID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
meta := episodeMeta[entry.MediaItemID]
|
|
position := entry.PositionSeconds
|
|
duration := entry.DurationSeconds
|
|
meta.PositionSeconds = &position
|
|
meta.DurationSeconds = &duration
|
|
progressUpdatedAt := entry.UpdatedAt
|
|
meta.ProgressUpdatedAt = &progressUpdatedAt
|
|
meta.ItemSource = "in_progress"
|
|
if updatedAt, parseErr := time.Parse(time.RFC3339, entry.UpdatedAt); parseErr == nil {
|
|
meta.SortTimestamp = updatedAt
|
|
}
|
|
itemMeta[entry.MediaItemID] = meta
|
|
orderedItems = append(orderedItems, item)
|
|
}
|
|
|
|
return orderedItems, itemMeta, nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchNextUpSection(ctx context.Context, resolved ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) (SectionWithItems, error) {
|
|
emptyResult := SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: []*models.MediaItem{},
|
|
TotalCount: 0,
|
|
ItemMeta: map[string]SectionItemMeta{},
|
|
}
|
|
|
|
if f.StoreProvider == nil || userID <= 0 || profileID == "" {
|
|
return emptyResult, nil
|
|
}
|
|
|
|
store, err := f.StoreProvider.ForUser(ctx, userID)
|
|
if err != nil {
|
|
return SectionWithItems{}, fmt.Errorf("getting user store: %w", err)
|
|
}
|
|
|
|
// Only resolve if user preference is "separate"
|
|
nextUpMode, _ := store.GetSetting(ctx, "next_up_mode")
|
|
if nextUpMode != "separate" {
|
|
return emptyResult, nil
|
|
}
|
|
|
|
limit := resolved.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
items, meta, err := f.FetchNextUpItems(ctx, userID, profileID, libraryID, libraryIDs, filter, limit)
|
|
if err != nil {
|
|
return SectionWithItems{}, err
|
|
}
|
|
if items == nil {
|
|
items = []*models.MediaItem{}
|
|
}
|
|
if meta == nil {
|
|
meta = map[string]SectionItemMeta{}
|
|
}
|
|
|
|
return SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: items,
|
|
TotalCount: len(items),
|
|
ItemMeta: meta,
|
|
}, nil
|
|
}
|
|
|
|
// FetchNextUpItems returns the next unwatched episode per series for the given user profile.
|
|
// It delegates to NextUpRepository for the optimized LATERAL JOIN query, then resolves
|
|
// the full MediaItem objects via fetchEpisodeTargetsByContentIDs.
|
|
func (f *Fetcher) FetchNextUpItems(ctx context.Context, userID int, profileID string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter, limit int) ([]*models.MediaItem, map[string]SectionItemMeta, error) {
|
|
if f.NextUpRepo == nil {
|
|
return nil, nil, nil
|
|
}
|
|
|
|
results, err := f.NextUpRepo.ListNextUp(ctx, catalog.NextUpQuery{
|
|
UserID: userID,
|
|
ProfileID: profileID,
|
|
LibraryID: libraryID,
|
|
LibraryIDs: libraryIDs,
|
|
Limit: limit,
|
|
})
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if len(results) == 0 {
|
|
return nil, nil, nil
|
|
}
|
|
results = f.filterNextUpDismissals(ctx, userID, profileID, results)
|
|
if len(results) == 0 {
|
|
return nil, nil, nil
|
|
}
|
|
|
|
contentIDs := make([]string, len(results))
|
|
resultByID := make(map[string]catalog.NextUpResult, len(results))
|
|
for i, res := range results {
|
|
contentIDs[i] = res.ContentID
|
|
resultByID[res.ContentID] = res
|
|
}
|
|
|
|
episodeItems, episodeMeta, err := f.fetchEpisodeTargetsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("fetching episode targets for next-up: %w", err)
|
|
}
|
|
|
|
itemByID := make(map[string]*models.MediaItem, len(episodeItems))
|
|
for _, item := range episodeItems {
|
|
itemByID[item.ContentID] = item
|
|
}
|
|
|
|
meta := make(map[string]SectionItemMeta, len(results))
|
|
orderedItems := make([]*models.MediaItem, 0, len(results))
|
|
for _, res := range results {
|
|
m, ok := episodeMeta[res.ContentID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
m.ItemSource = "next_up"
|
|
m.SortTimestamp = res.CompletedAt
|
|
meta[res.ContentID] = m
|
|
|
|
item, ok := itemByID[res.ContentID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
orderedItems = append(orderedItems, item)
|
|
}
|
|
|
|
return orderedItems, meta, nil
|
|
}
|
|
|
|
// fetchNextInSeriesSection surfaces the next unstarted audiobook per series
|
|
// the profile has finished a book of. Candidates come from AudiobookNextRepo
|
|
// with library scoping pushed into the SQL — otherwise finished series whose
|
|
// next book lives in another library would consume the candidate limit and
|
|
// starve a library-scoped section. Content-rating access filtering happens
|
|
// while resolving candidate IDs to items, so the candidate query still
|
|
// over-fetches to compensate for that post-resolution trim.
|
|
func (f *Fetcher) fetchNextInSeriesSection(ctx context.Context, resolved ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) (SectionWithItems, error) {
|
|
emptyResult := SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: []*models.MediaItem{},
|
|
TotalCount: 0,
|
|
ItemMeta: map[string]SectionItemMeta{},
|
|
}
|
|
|
|
if f.AudiobookNextRepo == nil || userID <= 0 || profileID == "" {
|
|
return emptyResult, nil
|
|
}
|
|
|
|
limit := resolved.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
candidateLimit := limit * 3
|
|
if candidateLimit > 100 {
|
|
candidateLimit = 100
|
|
}
|
|
|
|
results, err := f.AudiobookNextRepo.ListNextInSeries(ctx, catalog.NextInSeriesQuery{
|
|
UserID: userID,
|
|
ProfileID: profileID,
|
|
Limit: candidateLimit,
|
|
LibraryID: libraryID,
|
|
LibraryIDs: effectiveFetchLibraryIDs(libraryIDs, filter),
|
|
DisabledLibraryIDs: filter.DisabledLibraryIDs,
|
|
})
|
|
if err != nil {
|
|
return SectionWithItems{}, err
|
|
}
|
|
if len(results) == 0 {
|
|
return emptyResult, nil
|
|
}
|
|
|
|
contentIDs := make([]string, len(results))
|
|
for i, res := range results {
|
|
contentIDs[i] = res.ContentID
|
|
}
|
|
|
|
items, err := f.fetchItemsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return SectionWithItems{}, fmt.Errorf("fetching next-in-series items: %w", err)
|
|
}
|
|
|
|
itemByID := make(map[string]*models.MediaItem, len(items))
|
|
for _, item := range items {
|
|
itemByID[item.ContentID] = item
|
|
}
|
|
|
|
meta := make(map[string]SectionItemMeta, len(results))
|
|
ordered := make([]*models.MediaItem, 0, limit)
|
|
for _, res := range results {
|
|
if len(ordered) >= limit {
|
|
break
|
|
}
|
|
item, ok := itemByID[res.ContentID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
m := SectionItemMeta{
|
|
SeriesTitle: res.SeriesName,
|
|
ItemSource: "next_in_series",
|
|
SortTimestamp: res.LastFinishedAt,
|
|
}
|
|
if res.SeriesIndex != nil {
|
|
if n := int(*res.SeriesIndex); float64(n) == *res.SeriesIndex {
|
|
m.Badges = append(m.Badges, fmt.Sprintf("Book %d", n))
|
|
}
|
|
}
|
|
meta[res.ContentID] = m
|
|
ordered = append(ordered, item)
|
|
}
|
|
|
|
return SectionWithItems{
|
|
ResolvedSection: resolved,
|
|
Items: ordered,
|
|
TotalCount: len(ordered),
|
|
ItemMeta: meta,
|
|
}, nil
|
|
}
|
|
|
|
func collapseContinueWatchingSeriesCandidates(items []*models.MediaItem, meta map[string]SectionItemMeta) []*models.MediaItem {
|
|
selectedBySeries := make(map[string]int)
|
|
result := make([]*models.MediaItem, 0, len(items))
|
|
|
|
for _, item := range items {
|
|
if item == nil {
|
|
continue
|
|
}
|
|
|
|
itemMeta := meta[item.ContentID]
|
|
if itemMeta.SeriesID == nil || *itemMeta.SeriesID == "" {
|
|
result = append(result, item)
|
|
continue
|
|
}
|
|
|
|
seriesID := *itemMeta.SeriesID
|
|
selectedIndex, ok := selectedBySeries[seriesID]
|
|
if !ok {
|
|
selectedBySeries[seriesID] = len(result)
|
|
result = append(result, item)
|
|
continue
|
|
}
|
|
|
|
current := result[selectedIndex]
|
|
if continueWatchingCandidatePreferred(itemMeta, meta[current.ContentID]) {
|
|
result[selectedIndex] = item
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func continueWatchingCandidatePreferred(candidate, current SectionItemMeta) bool {
|
|
candidateInProgress := candidate.ItemSource == "in_progress"
|
|
currentInProgress := current.ItemSource == "in_progress"
|
|
if candidateInProgress != currentInProgress {
|
|
return candidateInProgress
|
|
}
|
|
|
|
if candidateInProgress {
|
|
if !candidate.SortTimestamp.Equal(current.SortTimestamp) {
|
|
return candidate.SortTimestamp.After(current.SortTimestamp)
|
|
}
|
|
return episodeOrdinal(candidate) > episodeOrdinal(current)
|
|
}
|
|
|
|
return candidate.SortTimestamp.After(current.SortTimestamp)
|
|
}
|
|
|
|
func episodeOrdinal(meta SectionItemMeta) int {
|
|
season := 0
|
|
if meta.SeasonNumber != nil {
|
|
season = *meta.SeasonNumber
|
|
}
|
|
episode := 0
|
|
if meta.EpisodeNumber != nil {
|
|
episode = *meta.EpisodeNumber
|
|
}
|
|
return season*100000 + episode
|
|
}
|
|
|
|
func (f *Fetcher) listContinueWatchingDismissals(ctx context.Context, store userstore.UserStore, profileID string) catalog.HomeDismissalIndex {
|
|
dismissals, err := store.ListHomeDismissals(ctx, profileID, userstore.HomeSurfaceContinueWatching)
|
|
if err != nil {
|
|
slog.Error("listing continue watching dismissals", "profile_id", profileID, "error", err)
|
|
return catalog.HomeDismissalIndex{}
|
|
}
|
|
return catalog.NewHomeDismissalIndex(dismissals)
|
|
}
|
|
|
|
func (f *Fetcher) filterNextUpDismissals(ctx context.Context, userID int, profileID string, results []catalog.NextUpResult) []catalog.NextUpResult {
|
|
if len(results) == 0 || f.StoreProvider == nil || userID <= 0 || profileID == "" {
|
|
return results
|
|
}
|
|
|
|
store, err := f.StoreProvider.ForUser(ctx, userID)
|
|
if err != nil {
|
|
slog.Error("getting user store for next-up dismissals", "profile_id", profileID, "error", err)
|
|
return results
|
|
}
|
|
|
|
dismissals, err := store.ListHomeDismissals(ctx, profileID, userstore.HomeSurfaceNextUp)
|
|
if err != nil {
|
|
slog.Error("listing next-up dismissals", "profile_id", profileID, "error", err)
|
|
return results
|
|
}
|
|
if len(dismissals) == 0 {
|
|
return results
|
|
}
|
|
|
|
dismissedIDs := make(map[string]struct{}, len(dismissals))
|
|
for _, dismissal := range dismissals {
|
|
dismissedIDs[dismissal.MediaItemID] = struct{}{}
|
|
}
|
|
|
|
filtered := make([]catalog.NextUpResult, 0, len(results))
|
|
for _, result := range results {
|
|
if _, dismissed := dismissedIDs[result.ContentID]; dismissed {
|
|
continue
|
|
}
|
|
filtered = append(filtered, result)
|
|
}
|
|
return filtered
|
|
}
|
|
|
|
// FetchAll runs all section queries in parallel and returns sections with items.
|
|
func (f *Fetcher) FetchAll(ctx context.Context, resolved []ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) []SectionWithItems {
|
|
start := time.Now()
|
|
results := fetchAllWithRunner(ctx, resolved, fetchAllMaxConcurrency, func(ctx context.Context, sec ResolvedSection) (SectionWithItems, error) {
|
|
return f.FetchOne(ctx, sec, libraryID, libraryIDs, userID, profileID, filter)
|
|
})
|
|
duration := time.Since(start)
|
|
if duration >= slowAggregateFetchThreshold {
|
|
attrs := []any{
|
|
"section_count", len(resolved),
|
|
"duration_ms", duration.Milliseconds(),
|
|
}
|
|
if libraryID != nil {
|
|
attrs = append(attrs, "library_id", *libraryID)
|
|
}
|
|
if libraryIDs != nil {
|
|
attrs = append(attrs, "library_ids", append([]int(nil), libraryIDs...))
|
|
}
|
|
slog.Warn("slow aggregate section fetch", attrs...)
|
|
}
|
|
return results
|
|
}
|
|
|
|
type sectionFetchRunner func(context.Context, ResolvedSection) (SectionWithItems, error)
|
|
|
|
func fetchAllWithRunner(ctx context.Context, resolved []ResolvedSection, maxConcurrency int, runner sectionFetchRunner) []SectionWithItems {
|
|
if maxConcurrency <= 0 {
|
|
maxConcurrency = 1
|
|
}
|
|
|
|
results := make([]SectionWithItems, len(resolved))
|
|
sem := make(chan struct{}, maxConcurrency)
|
|
var wg sync.WaitGroup
|
|
|
|
for i, sec := range resolved {
|
|
i, sec := i, sec
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
sem <- struct{}{}
|
|
defer func() { <-sem }()
|
|
|
|
result, err := runner(ctx, sec)
|
|
if err != nil {
|
|
slog.Error("fetching section items", "section_id", sec.ID, "type", sec.SectionType, "error", err)
|
|
result = SectionWithItems{
|
|
ResolvedSection: sec,
|
|
Items: []*models.MediaItem{},
|
|
}
|
|
}
|
|
results[i] = result
|
|
}()
|
|
}
|
|
|
|
wg.Wait()
|
|
return results
|
|
}
|
|
|
|
// FetchItemsByContentIDs resolves content IDs to full MediaItem objects,
|
|
// applying the provided access filter across libraries.
|
|
func (f *Fetcher) FetchItemsByContentIDs(ctx context.Context, contentIDs []string, filter catalog.AccessFilter) ([]*models.MediaItem, error) {
|
|
return f.fetchItemsByContentIDs(ctx, contentIDs, nil, nil, filter)
|
|
}
|
|
|
|
// FetchEpisodesByContentIDs resolves episode content IDs to MediaItem objects
|
|
// with their parent series metadata. Returns the items and per-episode metadata
|
|
// (series title, season/episode numbers). Non-episode content IDs are silently ignored.
|
|
func (f *Fetcher) FetchEpisodesByContentIDs(ctx context.Context, contentIDs []string, filter catalog.AccessFilter) ([]*models.MediaItem, map[string]SectionItemMeta, error) {
|
|
return f.fetchEpisodeTargetsByContentIDs(ctx, contentIDs, nil, nil, filter)
|
|
}
|
|
|
|
// ListOverlaySummaries batches file lookups for section cards and derives the
|
|
// compact overlay summary per content ID.
|
|
func (f *Fetcher) ListOverlaySummaries(ctx context.Context, contentIDs []string, filter catalog.AccessFilter) (map[string]*models.OverlaySummary, error) {
|
|
summaries := make(map[string]*models.OverlaySummary, len(contentIDs))
|
|
if len(contentIDs) == 0 {
|
|
return summaries, nil
|
|
}
|
|
|
|
rows, err := f.pool.Query(ctx, `
|
|
SELECT content_id, episode_id, file_path, resolution, codec_audio, audio_tracks, hdr, video_tracks,
|
|
codec_video, audio_channels, container, subtitle_tracks, external_subtitles, edition_key
|
|
FROM media_files
|
|
WHERE (content_id = ANY($1) OR episode_id = ANY($1)) AND missing_since IS NULL
|
|
ORDER BY content_id ASC, episode_id ASC, id ASC
|
|
`, contentIDs)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("querying overlay summaries: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
requested := make(map[string]struct{}, len(contentIDs))
|
|
for _, contentID := range contentIDs {
|
|
requested[contentID] = struct{}{}
|
|
}
|
|
|
|
grouped := make(map[string][]*models.MediaFile, len(contentIDs))
|
|
for rows.Next() {
|
|
var contentID string
|
|
var episodeID *string
|
|
var filePath string
|
|
var resolution *string
|
|
var codecAudio *string
|
|
var audioTracksJSON []byte
|
|
var hdr bool
|
|
var videoTracksJSON []byte
|
|
var codecVideo *string
|
|
var audioChannels *int
|
|
var container *string
|
|
var subtitleTracksJSON []byte
|
|
var externalSubtitlesJSON []byte
|
|
var editionKey *string
|
|
|
|
if err := rows.Scan(
|
|
&contentID, &episodeID, &filePath, &resolution, &codecAudio, &audioTracksJSON, &hdr, &videoTracksJSON,
|
|
&codecVideo, &audioChannels, &container, &subtitleTracksJSON, &externalSubtitlesJSON, &editionKey,
|
|
); err != nil {
|
|
return nil, fmt.Errorf("scanning overlay summary row: %w", err)
|
|
}
|
|
|
|
file := &models.MediaFile{
|
|
ContentID: contentID,
|
|
FilePath: filePath,
|
|
HDR: hdr,
|
|
}
|
|
if episodeID != nil {
|
|
file.EpisodeID = *episodeID
|
|
}
|
|
if resolution != nil {
|
|
file.Resolution = *resolution
|
|
}
|
|
if codecAudio != nil {
|
|
file.CodecAudio = *codecAudio
|
|
}
|
|
if codecVideo != nil {
|
|
file.CodecVideo = *codecVideo
|
|
}
|
|
if audioChannels != nil {
|
|
file.AudioChannels = *audioChannels
|
|
}
|
|
if container != nil {
|
|
file.Container = *container
|
|
}
|
|
if editionKey != nil {
|
|
file.EditionKey = *editionKey
|
|
}
|
|
if len(audioTracksJSON) > 0 {
|
|
if err := json.Unmarshal(audioTracksJSON, &file.AudioTracks); err != nil {
|
|
return nil, fmt.Errorf("unmarshaling overlay audio tracks: %w", err)
|
|
}
|
|
}
|
|
if len(videoTracksJSON) > 0 {
|
|
if err := json.Unmarshal(videoTracksJSON, &file.VideoTracks); err != nil {
|
|
return nil, fmt.Errorf("unmarshaling overlay video tracks: %w", err)
|
|
}
|
|
}
|
|
if len(subtitleTracksJSON) > 0 {
|
|
if err := json.Unmarshal(subtitleTracksJSON, &file.SubtitleTracks); err != nil {
|
|
return nil, fmt.Errorf("unmarshaling overlay subtitle tracks: %w", err)
|
|
}
|
|
}
|
|
if len(externalSubtitlesJSON) > 0 {
|
|
if err := json.Unmarshal(externalSubtitlesJSON, &file.ExternalSubtitles); err != nil {
|
|
return nil, fmt.Errorf("unmarshaling overlay external subtitles: %w", err)
|
|
}
|
|
}
|
|
|
|
groupKey := contentID
|
|
if episodeID != nil {
|
|
if _, ok := requested[*episodeID]; ok {
|
|
groupKey = *episodeID
|
|
}
|
|
}
|
|
grouped[groupKey] = append(grouped[groupKey], file)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("iterating overlay summary rows: %w", err)
|
|
}
|
|
|
|
for contentID, files := range grouped {
|
|
files = catalog.FilterMediaFilesByAccess(files, filter)
|
|
if summary := overlays.BuildSummary(files); summary != nil {
|
|
summaries[contentID] = summary
|
|
}
|
|
}
|
|
|
|
return summaries, nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchSection(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
switch s.SectionType {
|
|
case SectionRecentlyAdded:
|
|
return f.fetchRecentlyAdded(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionRecentlyReleased:
|
|
return f.fetchRecentlyReleased(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionGenre, SectionCustomFilter:
|
|
return f.fetchFiltered(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionRandom:
|
|
return f.fetchRandom(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionCollection:
|
|
return f.fetchCollection(ctx, s, libraryID, libraryIDs, userID, profileID, filter)
|
|
case SectionRecommendedForYou, SectionBecauseYouWatched, SectionSimilarUsersLiked, SectionTasteMatch:
|
|
return f.fetchRecommendationSection(ctx, s, libraryID, libraryIDs, userID, profileID, filter)
|
|
case SectionHiddenGems:
|
|
return f.fetchHiddenGems(ctx, s, libraryID, libraryIDs, userID, profileID, filter)
|
|
case SectionCriticallyAcclaimed:
|
|
return f.fetchCriticallyAcclaimed(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionAwardWinners:
|
|
return f.fetchAwardWinners(ctx, s)
|
|
case SectionForgottenFavorites:
|
|
return f.fetchForgottenFavorites(ctx, s, libraryID, libraryIDs, userID, profileID, filter)
|
|
case SectionFormatShowcase:
|
|
return f.fetchFormatShowcase(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionEditorialSpotlight:
|
|
return f.fetchEditorialSpotlight(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionSeasonalThemed:
|
|
return f.fetchSeasonalThemed(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionMoodCollection:
|
|
return f.fetchMoodCollection(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionTrendingOnServer:
|
|
return f.fetchTrending(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionProfileActivityFeed:
|
|
return f.fetchProfileActivityFeed(ctx, s, libraryID, libraryIDs, profileID, filter)
|
|
case SectionNewToLibrary:
|
|
return f.fetchNewToLibrary(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionMostWatched:
|
|
return f.fetchMostWatched(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionTrendingDiscover:
|
|
return f.fetchTrendingDiscover(ctx, s, libraryID, libraryIDs, filter)
|
|
case SectionAdminCuratedList:
|
|
return f.fetchAdminCuratedList(ctx, s, libraryID, libraryIDs, filter)
|
|
default:
|
|
// Profile-scoped types (continue_watching, watchlist, favorites)
|
|
// will be wired later when user store integration is added.
|
|
return nil, 0, fmt.Errorf("unsupported section type: %s", s.SectionType)
|
|
}
|
|
}
|
|
|
|
func (f *Fetcher) fetchCollection(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
cfg := ParseCollectionConfig(s.Config)
|
|
|
|
// User collection path: resolve from the user's personal store.
|
|
if userCollID := strings.TrimSpace(cfg.UserCollectionID); userCollID != "" {
|
|
return f.fetchUserCollection(ctx, s, libraryID, libraryIDs, userID, profileID, filter, userCollID)
|
|
}
|
|
|
|
// Library collection path (existing behaviour).
|
|
if f.CollectionRepo == nil {
|
|
return nil, 0, fmt.Errorf("collection sections require a collection repository")
|
|
}
|
|
|
|
if strings.TrimSpace(cfg.LibraryCollectionID) == "" {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
if _, err := f.CollectionRepo.GetByID(ctx, cfg.LibraryCollectionID); err != nil {
|
|
return nil, 0, fmt.Errorf("loading library collection: %w", err)
|
|
}
|
|
|
|
collectionItems, err := f.CollectionRepo.ListItems(ctx, cfg.LibraryCollectionID)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("listing collection items: %w", err)
|
|
}
|
|
if len(collectionItems) == 0 {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 || limit > len(collectionItems) {
|
|
limit = len(collectionItems)
|
|
}
|
|
|
|
contentIDs := make([]string, 0, limit)
|
|
for _, item := range collectionItems[:limit] {
|
|
contentIDs = append(contentIDs, item.MediaItemID)
|
|
}
|
|
|
|
items, err := f.fetchItemsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
itemByID := make(map[string]*models.MediaItem, len(items))
|
|
for _, item := range items {
|
|
itemByID[item.ContentID] = item
|
|
}
|
|
|
|
orderedItems := make([]*models.MediaItem, 0, len(contentIDs))
|
|
for _, contentID := range contentIDs {
|
|
item, ok := itemByID[contentID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
orderedItems = append(orderedItems, item)
|
|
}
|
|
|
|
return orderedItems, len(orderedItems), nil
|
|
}
|
|
|
|
// fetchUserCollection resolves a personal (profile-scoped) user collection.
|
|
// For smart collections it delegates to fetchFiltered; for manual ones it
|
|
// fetches the stored item list and looks up the media items by content ID.
|
|
func (f *Fetcher) fetchUserCollection(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter, collectionID string) ([]*models.MediaItem, int, error) {
|
|
if f.StoreProvider == nil || userID <= 0 || profileID == "" {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
store, err := f.StoreProvider.ForUser(ctx, userID)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("getting user store for collection: %w", err)
|
|
}
|
|
|
|
collection, err := store.GetCollection(ctx, collectionID)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("loading user collection: %w", err)
|
|
}
|
|
|
|
// Verify the requesting profile can access this collection.
|
|
if collection.ProfileID != profileID && collection.CreatorProfileID != profileID {
|
|
canAccess := false
|
|
for _, allowed := range collection.AllowedProfileIDs {
|
|
if allowed == profileID {
|
|
canAccess = true
|
|
break
|
|
}
|
|
}
|
|
if !canAccess {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
}
|
|
|
|
// Smart / live-query collection: parse the query definition and use the
|
|
// filtered fetch path, mirroring resolveUserCollectionSource in catalog_resolver.
|
|
isSmartType := strings.EqualFold(strings.TrimSpace(collection.CollectionType), "smart")
|
|
hasQueryDef := len(strings.TrimSpace(collection.QueryDefinition)) > 0 &&
|
|
strings.TrimSpace(collection.QueryDefinition) != "{}" &&
|
|
strings.TrimSpace(collection.QueryDefinition) != "null"
|
|
if isSmartType || hasQueryDef {
|
|
var qd catalog.QueryDefinition
|
|
if err := json.Unmarshal([]byte(collection.QueryDefinition), &qd); err != nil {
|
|
return nil, 0, fmt.Errorf("parsing user collection query_definition: %w", err)
|
|
}
|
|
qd = qd.Normalize()
|
|
// Build a synthetic resolved section with the query definition as config.
|
|
cfgBytes, _ := json.Marshal(qd)
|
|
synth := ResolvedSection{
|
|
ID: s.ID,
|
|
SectionType: SectionCustomFilter,
|
|
Title: s.Title,
|
|
Featured: s.Featured,
|
|
ItemLimit: s.ItemLimit,
|
|
Config: cfgBytes,
|
|
Position: s.Position,
|
|
}
|
|
return f.fetchFiltered(ctx, synth, libraryID, libraryIDs, filter)
|
|
}
|
|
|
|
// Manual collection: fetch stored items.
|
|
collectionItems, err := store.ListCollectionItems(ctx, collectionID)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("listing user collection items: %w", err)
|
|
}
|
|
if len(collectionItems) == 0 {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 || limit > len(collectionItems) {
|
|
limit = len(collectionItems)
|
|
}
|
|
|
|
contentIDs := make([]string, 0, limit)
|
|
for _, item := range collectionItems[:limit] {
|
|
contentIDs = append(contentIDs, item.MediaItemID)
|
|
}
|
|
|
|
items, err := f.fetchItemsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
itemByID := make(map[string]*models.MediaItem, len(items))
|
|
for _, item := range items {
|
|
itemByID[item.ContentID] = item
|
|
}
|
|
|
|
orderedItems := make([]*models.MediaItem, 0, len(contentIDs))
|
|
for _, contentID := range contentIDs {
|
|
item, ok := itemByID[contentID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
orderedItems = append(orderedItems, item)
|
|
}
|
|
|
|
return orderedItems, len(orderedItems), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchRecommendationSection(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
if f.RecommendationReader == nil {
|
|
return []*models.MediaItem{}, 0, nil // graceful degradation
|
|
}
|
|
|
|
cfg := parseRecommendationSectionConfig(s.Config)
|
|
var scoredItems []recommendations.ScoredItem
|
|
switch s.SectionType {
|
|
case SectionRecommendedForYou:
|
|
row, err := f.RecommendationReader.GetForYouMain(ctx, userID, profileID, s.ItemLimit, filter)
|
|
if err != nil || row == nil {
|
|
return []*models.MediaItem{}, 0, err
|
|
}
|
|
scoredItems = row.Items
|
|
case SectionBecauseYouWatched:
|
|
items, err := f.RecommendationReader.GetBecauseYouWatched(ctx, userID, profileID, cfg.SourceItemID, s.ItemLimit, filter)
|
|
if err != nil {
|
|
return []*models.MediaItem{}, 0, err
|
|
}
|
|
scoredItems = items
|
|
case SectionSimilarUsersLiked:
|
|
items, err := f.RecommendationReader.GetSimilarUsersLiked(ctx, userID, profileID, s.ItemLimit, filter)
|
|
if err != nil {
|
|
return []*models.MediaItem{}, 0, err
|
|
}
|
|
scoredItems = items
|
|
case SectionTasteMatch:
|
|
if strings.TrimSpace(cfg.Genre) == "" {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
row, err := f.RecommendationReader.GetTasteMatchRow(ctx, userID, profileID, cfg.Genre, s.ItemLimit, filter)
|
|
if err != nil || row == nil {
|
|
return []*models.MediaItem{}, 0, err
|
|
}
|
|
scoredItems = row.Items
|
|
default:
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
if len(scoredItems) == 0 {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
// Resolve item IDs to full MediaItem objects
|
|
itemIDs := make([]string, len(scoredItems))
|
|
for i, item := range scoredItems {
|
|
itemIDs[i] = item.MediaItemID
|
|
}
|
|
|
|
mediaItems, err := f.fetchItemsByContentIDs(ctx, itemIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
orderedItems := orderMediaItems(mediaItems, itemIDs)
|
|
return orderedItems, len(orderedItems), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchHiddenGems(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.HiddenGemsParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
if p.MinRating == 0 {
|
|
p.MinRating = 7.5
|
|
}
|
|
|
|
// Require a valid user/profile to exclude watched items.
|
|
if userID <= 0 || profileID == "" {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
repo := catalog.NewDiscoveryRepository(f.pool)
|
|
items, err := repo.ListUnplayedHighRated(ctx, catalog.UnplayedFilter{
|
|
MinRating: p.MinRating,
|
|
Limit: s.ItemLimit,
|
|
UserID: userID,
|
|
ProfileID: profileID,
|
|
Filter: filter,
|
|
})
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchCriticallyAcclaimed(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.CriticallyAcclaimedParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
if p.MinScore == 0 {
|
|
p.MinScore = 8.0
|
|
}
|
|
|
|
repo := catalog.NewDiscoveryRepository(f.pool)
|
|
items, err := repo.ListByRatingThreshold(ctx, catalog.RatingFilter{
|
|
Min: p.MinScore,
|
|
Limit: s.ItemLimit,
|
|
LibraryID: libraryID,
|
|
Filter: filter,
|
|
})
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchAwardWinners(_ context.Context, s ResolvedSection) ([]*models.MediaItem, int, error) {
|
|
// TODO(awards-data): wire up once award metadata exists
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchForgottenFavorites(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, userID int, profileID string, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.ForgottenFavoritesParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
if p.LookbackDays <= 0 {
|
|
p.LookbackDays = 365
|
|
}
|
|
|
|
// Require a valid user/profile to check watch history.
|
|
if userID <= 0 || profileID == "" {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
repo := catalog.NewDiscoveryRepository(f.pool)
|
|
items, err := repo.ListForgottenFavorites(ctx, catalog.ForgottenFavoritesFilter{
|
|
LookbackDays: p.LookbackDays,
|
|
Limit: s.ItemLimit,
|
|
UserID: userID,
|
|
ProfileID: profileID,
|
|
Filter: filter,
|
|
})
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
// fetchFormatShowcase returns items that have at least one media file matching the
|
|
// requested stream format. Filtering is done against media_files columns:
|
|
// - 4k: resolution IN ('4k','uhd','2160p')
|
|
// - dolby_vision: EXISTS a video_tracks element with a non-empty dolby_vision field
|
|
// - hdr: hdr = true
|
|
//
|
|
// When no format is supplied all items with any of the above formats are returned.
|
|
func (f *Fetcher) fetchFormatShowcase(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.FormatShowcaseParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
|
|
// Build the per-format EXISTS subquery condition against media_files.
|
|
var formatCond string
|
|
switch p.Format {
|
|
case "4k":
|
|
formatCond = `EXISTS (
|
|
SELECT 1 FROM media_files mf
|
|
WHERE (mf.content_id = mi.content_id OR mf.episode_id = mi.content_id)
|
|
AND mf.missing_since IS NULL
|
|
AND LOWER(mf.resolution) IN ('4k','uhd','2160p')
|
|
)`
|
|
case "dolby_vision":
|
|
formatCond = `EXISTS (
|
|
SELECT 1 FROM media_files mf
|
|
WHERE (mf.content_id = mi.content_id OR mf.episode_id = mi.content_id)
|
|
AND mf.missing_since IS NULL
|
|
AND EXISTS (
|
|
SELECT 1 FROM jsonb_array_elements(COALESCE(mf.video_tracks, '[]'::jsonb)) AS vt
|
|
WHERE vt->>'dolby_vision' IS NOT NULL AND vt->>'dolby_vision' != ''
|
|
)
|
|
)`
|
|
case "hdr":
|
|
formatCond = `EXISTS (
|
|
SELECT 1 FROM media_files mf
|
|
WHERE (mf.content_id = mi.content_id OR mf.episode_id = mi.content_id)
|
|
AND mf.missing_since IS NULL
|
|
AND mf.hdr = true
|
|
)`
|
|
default:
|
|
// No format specified: return items matching any of the above formats.
|
|
formatCond = `EXISTS (
|
|
SELECT 1 FROM media_files mf
|
|
WHERE (mf.content_id = mi.content_id OR mf.episode_id = mi.content_id)
|
|
AND mf.missing_since IS NULL
|
|
AND (
|
|
LOWER(mf.resolution) IN ('4k','uhd','2160p')
|
|
OR mf.hdr = true
|
|
OR EXISTS (
|
|
SELECT 1 FROM jsonb_array_elements(COALESCE(mf.video_tracks, '[]'::jsonb)) AS vt
|
|
WHERE vt->>'dolby_vision' IS NOT NULL AND vt->>'dolby_vision' != ''
|
|
)
|
|
)
|
|
)`
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
conditions = append(conditions, formatCond)
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
whereClause := "WHERE " + strings.Join(conditions, " AND ")
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s %s ORDER BY mi.rating_imdb DESC NULLS LAST, mi.content_id ASC LIMIT $%d`,
|
|
itemColumns("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, limit)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("fetching format showcase: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
items, err := scanMediaItems(rows)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchAdminCuratedList(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.AdminCuratedListParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
if len(p.ItemIDs) == 0 {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
// Build conditions: content_id IN curated set + library scope + access filter.
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
conditions = append(conditions, fmt.Sprintf("mi.content_id = ANY($%d)", argIdx))
|
|
args = append(args, p.ItemIDs)
|
|
argIdx++
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
whereClause := "WHERE " + strings.Join(conditions, " AND ")
|
|
|
|
// Order by position in the curated array. Reuse the item-IDs parameter
|
|
// index (1) for array_position; do NOT pass the slice twice.
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s %s ORDER BY array_position($1::text[], mi.content_id)`,
|
|
itemColumns("mi"), fromClause, whereClause,
|
|
)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("fetching admin curated list: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
items, err := scanMediaItems(rows)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
// fetchEditorialSpotlight returns items for an editorial_spotlight section.
|
|
// When auto_rotate is true it selects a subject from a candidate list using a
|
|
// deterministic ISO-week hash; otherwise it uses the configured subject directly.
|
|
func (f *Fetcher) fetchEditorialSpotlight(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
items, total, _, err := f.fetchEditorialSpotlightWithTitle(ctx, s, libraryID, libraryIDs, filter)
|
|
return items, total, err
|
|
}
|
|
|
|
func (f *Fetcher) fetchEditorialSpotlightWithTitle(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, string, error) {
|
|
var p recipes.EditorialSpotlightParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
if p.SubjectType == "" {
|
|
return []*models.MediaItem{}, 0, "", nil
|
|
}
|
|
|
|
subject := p.Subject
|
|
if p.AutoRotate {
|
|
cands, err := f.cachedEditorialCandidates(ctx, p.SubjectType, libraryID, libraryIDs, filter, editorialCandidateCacheTTL, f.editorialCandidates)
|
|
if err != nil {
|
|
return nil, 0, "", fmt.Errorf("editorial_spotlight candidates: %w", err)
|
|
}
|
|
if len(cands) == 0 {
|
|
return []*models.MediaItem{}, 0, "", nil
|
|
}
|
|
days := editorialCadenceDays(p.RotationCadence)
|
|
// Build a value-based rotation key. Using `%v` on the *int would print
|
|
// the pointer address, which changes on every process restart and
|
|
// would break the deterministic-rotation contract.
|
|
libKey := "all"
|
|
if libraryID != nil {
|
|
libKey = strconv.Itoa(*libraryID)
|
|
}
|
|
key := fmt.Sprintf("%s|%s", p.SubjectType, libKey)
|
|
idx := recipes.RotationIndex(f.now(), key, len(cands), days)
|
|
subject = cands[idx]
|
|
}
|
|
|
|
if subject == "" {
|
|
return []*models.MediaItem{}, 0, "", nil
|
|
}
|
|
|
|
// Build a QueryDefinition with the subject filter and run it via the executor.
|
|
def, err := editorialBuildQueryDef(p.SubjectType, subject)
|
|
if err != nil {
|
|
return nil, 0, "", fmt.Errorf("editorial_spotlight build query: %w", err)
|
|
}
|
|
|
|
switch {
|
|
case libraryID != nil:
|
|
def.LibraryIDs = []int{*libraryID}
|
|
case libraryIDs != nil:
|
|
if len(def.LibraryIDs) == 0 {
|
|
def.LibraryIDs = append([]int(nil), libraryIDs...)
|
|
} else {
|
|
def.LibraryIDs = intersectLibraryIDs(def.LibraryIDs, libraryIDs)
|
|
}
|
|
}
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
def.Limit = &limit
|
|
|
|
executor := &catalog.QueryExecutor{Pool: f.pool}
|
|
items, _, _, err := executor.PreviewPage(ctx, def, filter, limit, 0, false)
|
|
if err != nil {
|
|
return nil, 0, "", fmt.Errorf("editorial_spotlight query: %w", err)
|
|
}
|
|
return items, len(items), editorialSpotlightDisplayTitle(s.Title, subject), nil
|
|
}
|
|
|
|
func editorialSpotlightDisplayTitle(baseTitle, subject string) string {
|
|
baseTitle = strings.TrimSpace(baseTitle)
|
|
subject = strings.TrimSpace(subject)
|
|
if subject == "" {
|
|
return baseTitle
|
|
}
|
|
if baseTitle == "" || strings.EqualFold(baseTitle, subject) {
|
|
return subject
|
|
}
|
|
suffix := " - " + subject
|
|
if strings.HasSuffix(baseTitle, suffix) {
|
|
return baseTitle
|
|
}
|
|
return baseTitle + suffix
|
|
}
|
|
|
|
// editorialCadenceDays converts a RotationCadence to a number of days for RotationIndex.
|
|
func editorialCadenceDays(c recipes.RotationCadence) int {
|
|
switch c {
|
|
case recipes.CadenceDaily:
|
|
return 1
|
|
case recipes.CadenceMonthly:
|
|
return 30
|
|
default: // weekly or empty
|
|
return 7
|
|
}
|
|
}
|
|
|
|
// editorialBuildQueryDef builds a QueryDefinition for the given subject type and subject value.
|
|
func editorialBuildQueryDef(subjectType, subject string) (catalog.QueryDefinition, error) {
|
|
var rule catalog.QueryRule
|
|
switch subjectType {
|
|
case "director":
|
|
rule = catalog.QueryRule{Field: "director", Op: "is", Value: subject}
|
|
case "actor":
|
|
rule = catalog.QueryRule{Field: "actor", Op: "is", Value: subject}
|
|
case "studio":
|
|
rule = catalog.QueryRule{Field: "studio", Op: "is", Value: subject}
|
|
case "era":
|
|
startYear, endYear, err := eraToYearRange(subject)
|
|
if err != nil {
|
|
return catalog.QueryDefinition{}, err
|
|
}
|
|
// release_date between uses string dates ("YYYY-01-01", "YYYY-12-31").
|
|
startISO := fmt.Sprintf("%d-01-01", startYear)
|
|
endISO := fmt.Sprintf("%d-12-31", endYear)
|
|
rule = catalog.QueryRule{Field: "release_date", Op: "between", Value: []any{startISO, endISO}}
|
|
default:
|
|
return catalog.QueryDefinition{}, fmt.Errorf("editorial_spotlight: unsupported subject_type %q", subjectType)
|
|
}
|
|
|
|
def := catalog.QueryDefinition{
|
|
Match: "all",
|
|
Groups: []catalog.QueryGroup{
|
|
{Match: "all", Rules: []catalog.QueryRule{rule}},
|
|
},
|
|
}
|
|
return def.Normalize(), nil
|
|
}
|
|
|
|
// eraToYearRange converts an era label like "1980s" to its start and end years.
|
|
func eraToYearRange(era string) (int, int, error) {
|
|
switch era {
|
|
case "1970s":
|
|
return 1970, 1979, nil
|
|
case "1980s":
|
|
return 1980, 1989, nil
|
|
case "1990s":
|
|
return 1990, 1999, nil
|
|
case "2000s":
|
|
return 2000, 2009, nil
|
|
case "2010s":
|
|
return 2010, 2019, nil
|
|
case "2020s":
|
|
return 2020, 2029, nil
|
|
default:
|
|
return 0, 0, fmt.Errorf("editorial_spotlight: unknown era %q", era)
|
|
}
|
|
}
|
|
|
|
// editorialCandidates returns the top subject names for auto-rotation, applying
|
|
// library scope and access filter so results are scoped to the user's libraries.
|
|
func (f *Fetcher) editorialCandidates(ctx context.Context, subjectType string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]string, error) {
|
|
switch subjectType {
|
|
case "director":
|
|
return f.topPersonCandidates(ctx, 2 /* PersonKindDirector */, libraryID, libraryIDs, filter)
|
|
case "actor":
|
|
return f.topPersonCandidates(ctx, 1 /* PersonKindActor */, libraryID, libraryIDs, filter)
|
|
case "studio":
|
|
return f.topStudioCandidates(ctx, libraryID, libraryIDs, filter)
|
|
case "era":
|
|
// Auto-rotate excludes the current decade — incomplete data + stylistic skew.
|
|
// "2020s" is still accepted as a manually-pinned subject via eraToYearRange.
|
|
return []string{"1970s", "1980s", "1990s", "2000s", "2010s"}, nil
|
|
case "franchise":
|
|
// TODO: franchise data not yet available; auto-rotate returns empty.
|
|
return nil, nil
|
|
default:
|
|
return nil, fmt.Errorf("editorial_spotlight: unsupported subject_type %q", subjectType)
|
|
}
|
|
}
|
|
|
|
const editorialCandidateLimit = 50
|
|
|
|
// topPersonCandidates returns the top N person names by item count for the given kind.
|
|
func (f *Fetcher) topPersonCandidates(ctx context.Context, kind int, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]string, error) {
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
whereClause := "WHERE 1=1"
|
|
if len(conditions) > 0 {
|
|
whereClause += " AND " + strings.Join(conditions, " AND ")
|
|
}
|
|
|
|
args = append(args, kind, editorialCandidateLimit)
|
|
// Weighted billing: SUM(1/(sort_order+1)) favors top-billed credits
|
|
// (TMDB convention: 0 = lead). HAVING MIN(sort_order) <= 5 excludes
|
|
// people who only ever appear in deep supporting roles.
|
|
query := fmt.Sprintf(`
|
|
SELECT p.name
|
|
FROM people p
|
|
JOIN item_people ip ON ip.person_id = p.id AND ip.kind = $%d
|
|
JOIN %s ON mi.content_id = ip.content_id
|
|
%s
|
|
GROUP BY p.name
|
|
HAVING MIN(ip.sort_order) <= 5
|
|
ORDER BY SUM(1.0 / (ip.sort_order + 1)) DESC, COUNT(*) DESC
|
|
LIMIT $%d
|
|
`, argIdx, fromClause, whereClause, argIdx+1)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("querying top persons (kind=%d): %w", kind, err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var names []string
|
|
for rows.Next() {
|
|
var name string
|
|
if err := rows.Scan(&name); err != nil {
|
|
return nil, fmt.Errorf("scanning person name: %w", err)
|
|
}
|
|
names = append(names, name)
|
|
}
|
|
return names, rows.Err()
|
|
}
|
|
|
|
// topStudioCandidates returns the top N studio names by item count.
|
|
func (f *Fetcher) topStudioCandidates(ctx context.Context, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]string, error) {
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
whereClause := ""
|
|
if len(conditions) > 0 {
|
|
whereClause = "AND " + strings.Join(conditions, " AND ")
|
|
}
|
|
|
|
args = append(args, editorialCandidateLimit)
|
|
query := fmt.Sprintf(`
|
|
SELECT studio
|
|
FROM (
|
|
SELECT unnest(mi.studios) AS studio
|
|
FROM %s
|
|
WHERE mi.studios IS NOT NULL
|
|
%s
|
|
) sub
|
|
GROUP BY studio
|
|
ORDER BY COUNT(*) DESC
|
|
LIMIT $%d
|
|
`, fromClause, whereClause, argIdx)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("querying top studios: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var studios []string
|
|
for rows.Next() {
|
|
var studio string
|
|
if err := rows.Scan(&studio); err != nil {
|
|
return nil, fmt.Errorf("scanning studio name: %w", err)
|
|
}
|
|
studios = append(studios, studio)
|
|
}
|
|
return studios, rows.Err()
|
|
}
|
|
|
|
type recommendationSectionConfig struct {
|
|
SourceItemID string `json:"source_item_id"`
|
|
Genre string `json:"genre"`
|
|
}
|
|
|
|
func parseRecommendationSectionConfig(config json.RawMessage) recommendationSectionConfig {
|
|
var cfg recommendationSectionConfig
|
|
if len(config) == 0 {
|
|
return cfg
|
|
}
|
|
_ = json.Unmarshal(config, &cfg)
|
|
return cfg
|
|
}
|
|
|
|
func orderMediaItems(items []*models.MediaItem, orderedIDs []string) []*models.MediaItem {
|
|
if len(items) <= 1 {
|
|
return items
|
|
}
|
|
byID := make(map[string]*models.MediaItem, len(items))
|
|
for _, item := range items {
|
|
byID[item.ContentID] = item
|
|
}
|
|
ordered := make([]*models.MediaItem, 0, len(items))
|
|
for _, id := range orderedIDs {
|
|
item, ok := byID[id]
|
|
if !ok {
|
|
continue
|
|
}
|
|
ordered = append(ordered, item)
|
|
}
|
|
return ordered
|
|
}
|
|
|
|
func (f *Fetcher) fetchRecentlyAdded(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
query, args := buildRecentlyAddedQuery(s, libraryID, libraryIDs, filter)
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
items, err := scanMediaItems(rows)
|
|
return items, len(items), err
|
|
}
|
|
|
|
type sectionQuery struct {
|
|
sql string
|
|
args []any
|
|
}
|
|
|
|
func buildRecentlyAddedQuery(s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) (string, []any) {
|
|
cfgFilters := ParseConfigFilters(s.Config)
|
|
|
|
// Backwards compat: support legacy "types" config field
|
|
var legacyCfg struct {
|
|
Types []string `json:"types"`
|
|
}
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &legacyCfg)
|
|
}
|
|
if cfgFilters.FilterType == "" && len(legacyCfg.Types) > 0 {
|
|
cfgFilters.FilterType = legacyCfg.Types[0]
|
|
}
|
|
|
|
if query, ok := buildRecentlyAddedSingleLibraryQuery(s, cfgFilters, libraryID, libraryIDs, filter); ok {
|
|
return query.sql, query.args
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
applyConfigTypeFilter("mi", cfgFilters.FilterType, &conditions, &args, &argIdx)
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, cfgFilters.LibraryIDs(), filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
whereClause := ""
|
|
if len(conditions) > 0 {
|
|
whereClause = "WHERE " + strings.Join(conditions, " AND ")
|
|
}
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s %s ORDER BY mi.created_at DESC, mi.content_id ASC LIMIT $%d`,
|
|
itemColumnsLatestMangaPoster("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, s.ItemLimit)
|
|
return query, args
|
|
}
|
|
|
|
func buildRecentlyAddedSingleLibraryQuery(s ResolvedSection, cfgFilters SectionConfigFilters, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) (sectionQuery, bool) {
|
|
configLibraryIDs := cfgFilters.LibraryIDs()
|
|
var singleLibraryID int
|
|
switch {
|
|
case libraryID != nil:
|
|
singleLibraryID = *libraryID
|
|
case len(configLibraryIDs) == 1:
|
|
singleLibraryID = configLibraryIDs[0]
|
|
default:
|
|
return sectionQuery{}, false
|
|
}
|
|
if singleLibraryID <= 0 {
|
|
return sectionQuery{}, false
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id = $%d", argIdx))
|
|
args = append(args, singleLibraryID)
|
|
argIdx++
|
|
|
|
if libraryIDs != nil {
|
|
if len(libraryIDs) == 0 {
|
|
conditions = append(conditions, "1 = 0")
|
|
} else {
|
|
placeholders := make([]string, len(libraryIDs))
|
|
for i, id := range libraryIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, id)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id IN (%s)", strings.Join(placeholders, ", ")))
|
|
}
|
|
}
|
|
|
|
if len(filter.DisabledLibraryIDs) > 0 {
|
|
placeholders := make([]string, len(filter.DisabledLibraryIDs))
|
|
for i, id := range filter.DisabledLibraryIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, id)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id NOT IN (%s)", strings.Join(placeholders, ", ")))
|
|
}
|
|
|
|
applyConfigTypeFilter("mi", cfgFilters.FilterType, &conditions, &args, &argIdx)
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
whereClause := "WHERE " + strings.Join(conditions, " AND ")
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM media_item_libraries mil JOIN media_items mi ON mi.content_id = mil.content_id %s ORDER BY mil.first_seen_at DESC, mil.content_id ASC LIMIT $%d`,
|
|
itemColumnsLatestMangaPoster("mi"), whereClause, argIdx,
|
|
)
|
|
args = append(args, s.ItemLimit)
|
|
return sectionQuery{sql: query, args: args}, true
|
|
}
|
|
|
|
func buildRecentlyReleasedQuery(s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) (string, []any) {
|
|
cfgFilters := ParseConfigFilters(s.Config)
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
applyConfigTypeFilter("mi", cfgFilters.FilterType, &conditions, &args, &argIdx)
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, cfgFilters.LibraryIDs(), filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
whereClause := ""
|
|
if len(conditions) > 0 {
|
|
whereClause = "WHERE " + strings.Join(conditions, " AND ")
|
|
}
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s %s ORDER BY mi.year DESC, mi.created_at DESC LIMIT $%d`,
|
|
itemColumnsLatestMangaPoster("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, s.ItemLimit)
|
|
return query, args
|
|
}
|
|
|
|
func (f *Fetcher) fetchRecentlyReleased(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
query, args := buildRecentlyReleasedQuery(s, libraryID, libraryIDs, filter)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
items, err := scanMediaItems(rows)
|
|
return items, len(items), err
|
|
}
|
|
|
|
func (f *Fetcher) fetchFiltered(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
def, err := ParseQueryDefinition(s.Config)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("parsing query definition: %w", err)
|
|
}
|
|
|
|
switch {
|
|
case libraryID != nil:
|
|
def.LibraryIDs = []int{*libraryID}
|
|
case libraryIDs != nil:
|
|
if len(def.LibraryIDs) == 0 {
|
|
def.LibraryIDs = append([]int(nil), libraryIDs...)
|
|
} else {
|
|
def.LibraryIDs = intersectLibraryIDs(def.LibraryIDs, libraryIDs)
|
|
}
|
|
}
|
|
|
|
if s.ItemLimit > 0 {
|
|
limit := s.ItemLimit
|
|
def.Limit = &limit
|
|
}
|
|
|
|
executor := &catalog.QueryExecutor{Pool: f.pool}
|
|
items, _, hasMore, err := executor.PreviewPage(ctx, def, filter, s.ItemLimit, 0, false)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
total := len(items)
|
|
if hasMore && s.ItemLimit > 0 && total <= s.ItemLimit {
|
|
total = s.ItemLimit + 1
|
|
}
|
|
|
|
return items, total, nil
|
|
}
|
|
|
|
func buildRandomQuery(s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) (string, []any, int) {
|
|
cfgFilters := ParseConfigFilters(s.Config)
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
applyConfigTypeFilter("mi", cfgFilters.FilterType, &conditions, &args, &argIdx)
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, cfgFilters.LibraryIDs(), filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
whereClause := ""
|
|
if len(conditions) > 0 {
|
|
whereClause = "WHERE " + strings.Join(conditions, " AND ")
|
|
}
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
queryLimit := limit + 1
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT candidate.content_id
|
|
FROM (
|
|
SELECT DISTINCT mi.content_id
|
|
FROM %s
|
|
%s
|
|
) candidate
|
|
ORDER BY RANDOM()
|
|
LIMIT $%d`,
|
|
fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, queryLimit)
|
|
return query, args, limit
|
|
}
|
|
|
|
func (f *Fetcher) fetchRandom(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
query, args, limit := buildRandomQuery(s, libraryID, libraryIDs, filter)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
var contentIDs []string
|
|
for rows.Next() {
|
|
var contentID string
|
|
if err := rows.Scan(&contentID); err != nil {
|
|
return nil, 0, fmt.Errorf("scanning random section content id: %w", err)
|
|
}
|
|
contentIDs = append(contentIDs, contentID)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
hasMore := len(contentIDs) > limit
|
|
if hasMore {
|
|
contentIDs = contentIDs[:limit]
|
|
}
|
|
|
|
items, err := f.fetchItemsByContentIDs(ctx, contentIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
ordered := orderMediaItems(items, contentIDs)
|
|
total := len(ordered)
|
|
if hasMore && total <= limit {
|
|
total = limit + 1
|
|
}
|
|
|
|
return ordered, total, nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchItemsByContentIDs(ctx context.Context, contentIDs []string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, error) {
|
|
if len(contentIDs) == 0 {
|
|
return []*models.MediaItem{}, nil
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
placeholders := make([]string, len(contentIDs))
|
|
for i, contentID := range contentIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, contentID)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mi.content_id IN (%s)", strings.Join(placeholders, ", ")))
|
|
|
|
effectiveLibraryIDs := effectiveFetchLibraryIDs(libraryIDs, filter)
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, effectiveLibraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s WHERE %s`,
|
|
itemColumns("mi"), fromClause, strings.Join(conditions, " AND "),
|
|
)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
return scanMediaItems(rows)
|
|
}
|
|
|
|
func (f *Fetcher) fetchEpisodeTargetsByContentIDs(ctx context.Context, contentIDs []string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, map[string]SectionItemMeta, error) {
|
|
if len(contentIDs) == 0 {
|
|
return []*models.MediaItem{}, map[string]SectionItemMeta{}, nil
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
placeholders := make([]string, len(contentIDs))
|
|
for i, contentID := range contentIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, contentID)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("e.content_id IN (%s)", strings.Join(placeholders, ", ")))
|
|
|
|
effectiveLibraryIDs := effectiveFetchLibraryIDs(libraryIDs, filter)
|
|
|
|
fromClause := "episodes e JOIN media_items si ON e.series_id = si.content_id LEFT JOIN seasons s ON s.content_id = e.season_id"
|
|
if libraryID != nil || effectiveLibraryIDs != nil {
|
|
fromClause += " JOIN media_item_libraries mil ON si.content_id = mil.content_id"
|
|
}
|
|
|
|
if libraryID != nil {
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id = $%d", argIdx))
|
|
args = append(args, *libraryID)
|
|
argIdx++
|
|
}
|
|
|
|
if effectiveLibraryIDs != nil {
|
|
if len(effectiveLibraryIDs) == 0 {
|
|
return []*models.MediaItem{}, map[string]SectionItemMeta{}, nil
|
|
}
|
|
placeholders = make([]string, len(effectiveLibraryIDs))
|
|
for i, id := range effectiveLibraryIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, id)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id IN (%s)", strings.Join(placeholders, ", ")))
|
|
}
|
|
|
|
catalog.ApplySectionAccessFilter("si", filter, &conditions, &args, &argIdx)
|
|
|
|
query := fmt.Sprintf(`
|
|
SELECT
|
|
e.content_id,
|
|
e.series_id,
|
|
e.title,
|
|
e.overview,
|
|
e.runtime,
|
|
e.rating_imdb,
|
|
COALESCE(NULLIF(s.poster_path, ''), NULLIF(si.poster_path, ''), NULLIF(e.still_path, ''), '') AS poster_path,
|
|
COALESCE(NULLIF(s.poster_thumbhash, ''), NULLIF(si.poster_thumbhash, ''), NULLIF(e.still_thumbhash, ''), '') AS poster_thumbhash,
|
|
e.season_number,
|
|
e.episode_number,
|
|
e.air_date,
|
|
si.title,
|
|
si.genres,
|
|
si.content_rating,
|
|
COALESCE(NULLIF(e.still_path, ''), NULLIF(si.backdrop_path, ''), '') AS backdrop_path,
|
|
COALESCE(NULLIF(e.still_thumbhash, ''), NULLIF(si.backdrop_thumbhash, ''), '') AS backdrop_thumbhash,
|
|
si.logo_path,
|
|
si.status
|
|
FROM %s
|
|
WHERE %s
|
|
`, fromClause, strings.Join(conditions, " AND "))
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
items := []*models.MediaItem{}
|
|
itemMeta := map[string]SectionItemMeta{}
|
|
for rows.Next() {
|
|
var (
|
|
item models.MediaItem
|
|
seriesID string
|
|
seasonNumber int
|
|
episodeNumber int
|
|
seriesTitle string
|
|
airDate *time.Time
|
|
)
|
|
item.Type = "episode"
|
|
err := rows.Scan(
|
|
&item.ContentID,
|
|
&seriesID,
|
|
&item.Title,
|
|
&item.Overview,
|
|
&item.Runtime,
|
|
&item.RatingIMDB,
|
|
&item.PosterPath,
|
|
&item.PosterThumbhash,
|
|
&seasonNumber,
|
|
&episodeNumber,
|
|
&airDate,
|
|
&seriesTitle,
|
|
&item.Genres,
|
|
&item.ContentRating,
|
|
&item.BackdropPath,
|
|
&item.BackdropThumbhash,
|
|
&item.LogoPath,
|
|
&item.Status,
|
|
)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("scanning episode section item: %w", err)
|
|
}
|
|
items = append(items, &item)
|
|
itemMeta[item.ContentID] = SectionItemMeta{
|
|
SeriesID: &seriesID,
|
|
SeriesTitle: seriesTitle,
|
|
SeasonNumber: &seasonNumber,
|
|
EpisodeNumber: &episodeNumber,
|
|
Badges: recentSeasonPremiereBadges(seasonNumber, episodeNumber, airDate),
|
|
}
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
return items, itemMeta, nil
|
|
}
|
|
|
|
func effectiveFetchLibraryIDs(libraryIDs []int, filter catalog.AccessFilter) []int {
|
|
if libraryIDs != nil {
|
|
return libraryIDs
|
|
}
|
|
if filter.AllowedLibraryIDs != nil {
|
|
return filter.AllowedLibraryIDs
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func recentSeasonPremiereBadges(seasonNumber, episodeNumber int, airDate *time.Time) []string {
|
|
if seasonNumber <= 1 || episodeNumber != 1 || airDate == nil {
|
|
return nil
|
|
}
|
|
|
|
nowDate := utcDay(time.Now().UTC())
|
|
premiereDate := utcDay(airDate.UTC())
|
|
windowStart := nowDate.AddDate(0, 0, -(recentSeasonPremiereBadgeWindowDays - 1))
|
|
if premiereDate.Before(windowStart) || premiereDate.After(nowDate) {
|
|
return nil
|
|
}
|
|
|
|
return []string{"season_premiere"}
|
|
}
|
|
|
|
func utcDay(t time.Time) time.Time {
|
|
return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, time.UTC)
|
|
}
|
|
|
|
// itemColumnsList returns the alias-prefixed SELECT columns matching
|
|
// scanMediaItems, in scan order. Mirrors catalog.browseItemColumns. The shared
|
|
// source of truth for itemColumns and its manga-poster-override variant.
|
|
func itemColumnsList(alias string) []string {
|
|
cols := []string{
|
|
"content_id", "type", "title", "sort_title", "original_title", "year", "genres",
|
|
"content_rating", "runtime", "overview", "tagline",
|
|
"rating_imdb", "rating_tmdb", "rating_rt_critic", "rating_rt_audience",
|
|
"imdb_id", "tmdb_id", "tvdb_id",
|
|
"poster_path", "poster_thumbhash", "backdrop_path", "backdrop_thumbhash", "logo_path",
|
|
"metadata_s3_path", "metadata_etag", "season_count",
|
|
"studios", "networks", "countries", "first_air_date", "last_air_date",
|
|
"show_status",
|
|
"matched_at", "status", "created_at", "updated_at",
|
|
}
|
|
prefixed := make([]string, len(cols))
|
|
for i, c := range cols {
|
|
prefixed[i] = alias + "." + c
|
|
}
|
|
return prefixed
|
|
}
|
|
|
|
// itemColumns returns the SELECT column list matching scanMediaItems.
|
|
// Mirrors catalog.browseItemColumns.
|
|
func itemColumns(alias string) string {
|
|
return strings.Join(itemColumnsList(alias), ", ")
|
|
}
|
|
|
|
// itemColumnsLatestMangaPoster returns the same SELECT column list as
|
|
// itemColumns (identical order and aliases, so scanMediaItems is unchanged) but
|
|
// overrides poster_path/poster_thumbhash for type='manga' SERIES rows: a manga
|
|
// series card shows the cover of its latest-added volume/chapter (the linked
|
|
// manga_chapters row with the greatest created_at) instead of the AniList series
|
|
// cover, falling back to the series' own poster when no chapter cover exists.
|
|
//
|
|
// Strictly gated on mi.type = 'manga' so movies/TV/audiobooks/ebooks keep their
|
|
// own poster exactly. Used only by the recently-added / recently-released
|
|
// section builders; all other queries keep itemColumns.
|
|
func itemColumnsLatestMangaPoster(alias string) string {
|
|
cols := itemColumnsList(alias)
|
|
for i, c := range cols {
|
|
switch c {
|
|
case alias + ".poster_path":
|
|
cols[i] = mangaLatestVolumePosterExpr(alias, "poster_path")
|
|
case alias + ".poster_thumbhash":
|
|
cols[i] = mangaLatestVolumePosterExpr(alias, "poster_thumbhash")
|
|
}
|
|
}
|
|
return strings.Join(cols, ", ")
|
|
}
|
|
|
|
// mangaLatestVolumePosterExpr emits the manga-gated CASE override for a single
|
|
// poster column, aliased back to the original column name so the scan order and
|
|
// column set are unchanged.
|
|
func mangaLatestVolumePosterExpr(alias, col string) string {
|
|
// NULLIF(...,'') on each operand: poster columns default to '' (empty
|
|
// string), not NULL, so a plain COALESCE would surface a cover-less latest
|
|
// chapter's empty poster instead of falling back to the series' own cover.
|
|
// Mirrors the episode poster expressions above; trailing '' keeps the THEN
|
|
// branch non-NULL.
|
|
return "CASE WHEN " + alias + ".type = 'manga' THEN COALESCE(NULLIF((" +
|
|
"SELECT c." + col + " FROM media_items c " +
|
|
"JOIN manga_chapters mc ON mc.chapter_content_id = c.content_id " +
|
|
"WHERE mc.series_content_id = " + alias + ".content_id " +
|
|
"ORDER BY c.created_at DESC, c.content_id DESC LIMIT 1), ''), " +
|
|
"NULLIF(" + alias + "." + col + ", ''), '') ELSE " + alias + "." + col + " END AS " + col
|
|
}
|
|
|
|
// scanMediaItems scans rows into MediaItem slices. Must match itemColumns order.
|
|
func scanMediaItems(rows pgx.Rows) ([]*models.MediaItem, error) {
|
|
var items []*models.MediaItem
|
|
for rows.Next() {
|
|
var item models.MediaItem
|
|
err := rows.Scan(
|
|
&item.ContentID, &item.Type, &item.Title, &item.SortTitle, &item.OriginalTitle,
|
|
&item.Year, &item.Genres, &item.ContentRating, &item.Runtime, &item.Overview, &item.Tagline,
|
|
&item.RatingIMDB, &item.RatingTMDB, &item.RatingRTCritic, &item.RatingRTAudience,
|
|
&item.ImdbID, &item.TmdbID, &item.TvdbID,
|
|
&item.PosterPath, &item.PosterThumbhash, &item.BackdropPath, &item.BackdropThumbhash, &item.LogoPath,
|
|
&item.MetadataS3Path, &item.MetadataEtag, &item.SeasonCount,
|
|
&item.Studios, &item.Networks, &item.Countries, &item.FirstAirDate, &item.LastAirDate,
|
|
&item.ShowStatus,
|
|
&item.MatchedAt, &item.Status, &item.CreatedAt, &item.UpdatedAt,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("scanning item: %w", err)
|
|
}
|
|
items = append(items, &item)
|
|
}
|
|
return items, rows.Err()
|
|
}
|
|
|
|
// trendingDiscoverEntry is a provider-agnostic external trending result.
|
|
type trendingDiscoverEntry struct {
|
|
tmdbID string
|
|
imdbID string
|
|
tvdbID string
|
|
mediaType string // "movie" | "tv"
|
|
}
|
|
|
|
// newTrendingEntry normalizes a provider entry into a trendingDiscoverEntry,
|
|
// stringifying the numeric external IDs and dropping any that are unset (<= 0).
|
|
func newTrendingEntry(tmdbID, tvdbID int, imdbID, mediaType string) trendingDiscoverEntry {
|
|
e := trendingDiscoverEntry{imdbID: imdbID, mediaType: mediaType}
|
|
if tmdbID > 0 {
|
|
e.tmdbID = strconv.Itoa(tmdbID)
|
|
}
|
|
if tvdbID > 0 {
|
|
e.tvdbID = strconv.Itoa(tvdbID)
|
|
}
|
|
return e
|
|
}
|
|
|
|
// fetchTrendingDiscover surfaces external global trending (TMDB or Trakt),
|
|
// mixing movies + series, matched to titles in the viewer's enabled libraries.
|
|
// The external fetch + ID resolution are cached briefly so it does not hit the
|
|
// upstream API on every home-page load.
|
|
func (f *Fetcher) fetchTrendingDiscover(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.TrendingDiscoverParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
source, window := canonicalTrendingKey(p.Source, p.Window)
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
orderedIDs, err := f.loadTrendingDiscoverContentIDs(ctx, source, window)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
if len(orderedIDs) == 0 {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
items, err := f.fetchItemsByContentIDs(ctx, orderedIDs, libraryID, libraryIDs, filter)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
// Re-order to trending rank (fetchItemsByContentIDs returns DB order) and
|
|
// truncate to the section's display limit.
|
|
ordered := orderMediaItems(items, orderedIDs)
|
|
if len(ordered) > limit {
|
|
ordered = ordered[:limit]
|
|
}
|
|
return ordered, len(ordered), nil
|
|
}
|
|
|
|
// loadTrendingDiscoverContentIDs returns the persisted, catalog-resolved content
|
|
// IDs for the canonical (source, window). It reads only the snapshot table; the
|
|
// upstream fetch happens out-of-band in TrendingRefresher. Returns nil when no
|
|
// snapshot reader is configured or no snapshot exists yet.
|
|
func (f *Fetcher) loadTrendingDiscoverContentIDs(ctx context.Context, source, window string) ([]string, error) {
|
|
if f.TrendingSnapshots == nil {
|
|
return nil, nil
|
|
}
|
|
snap, found, err := f.TrendingSnapshots.Get(ctx, source, window)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !found {
|
|
return nil, nil
|
|
}
|
|
return snap.ContentIDs, nil
|
|
}
|
|
|
|
// orderedTrendingContentIDs maps trending entries to library content IDs in
|
|
// trending order, preferring TVDB (series) > TMDB > IMDb, de-duplicated.
|
|
func orderedTrendingContentIDs(entries []trendingDiscoverEntry, movieLookup, seriesLookup *catalog.ExternalIDLookup) []string {
|
|
seen := make(map[string]struct{}, len(entries))
|
|
out := make([]string, 0, len(entries))
|
|
for _, e := range entries {
|
|
// Only movies and series are resolvable; skip anything else (TMDB
|
|
// trending/all also returns media_type "person").
|
|
var lookup *catalog.ExternalIDLookup
|
|
isSeries := e.mediaType == "tv"
|
|
switch e.mediaType {
|
|
case "movie":
|
|
lookup = movieLookup
|
|
case "tv":
|
|
lookup = seriesLookup
|
|
default:
|
|
continue
|
|
}
|
|
if lookup == nil {
|
|
continue
|
|
}
|
|
var id string
|
|
if isSeries && e.tvdbID != "" {
|
|
id = lookup.ByTVDB[e.tvdbID]
|
|
}
|
|
if id == "" && e.tmdbID != "" {
|
|
id = lookup.ByTMDB[e.tmdbID]
|
|
}
|
|
if id == "" && e.imdbID != "" {
|
|
id = lookup.ByIMDb[e.imdbID]
|
|
}
|
|
if id == "" {
|
|
continue
|
|
}
|
|
if _, dup := seen[id]; dup {
|
|
continue
|
|
}
|
|
seen[id] = struct{}{}
|
|
out = append(out, id)
|
|
}
|
|
return out
|
|
}
|
|
|
|
func (f *Fetcher) fetchTrending(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.TrendingParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
interval := "7 days"
|
|
switch p.Window {
|
|
case "24h":
|
|
interval = "24 hours"
|
|
case "7d", "":
|
|
interval = "7 days"
|
|
case "30d":
|
|
interval = "30 days"
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
conditions = append(conditions, fmt.Sprintf("uwh.watched_at > NOW() - $%d::interval", argIdx))
|
|
args = append(args, interval)
|
|
argIdx++
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
whereClause := "WHERE " + strings.Join(conditions, " AND ")
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s JOIN user_watch_history uwh ON uwh.media_item_id = mi.content_id %s GROUP BY mi.content_id ORDER BY COUNT(DISTINCT uwh.profile_id) DESC, COUNT(*) DESC LIMIT $%d`,
|
|
itemColumns("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, limit)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("fetching trending: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
items, err := scanMediaItems(rows)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchProfileActivityFeed(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, profileID string, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.ProfileActivityFeedParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
target := p.ProfileID
|
|
|
|
// Household mode (target == "") leaks all history when caller is unauthenticated.
|
|
if target == "" && profileID == "" {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
// CTE deduplicates per media_item_id and keeps the most-recent watched_at,
|
|
// so each item appears once and is ordered by latest-watch DESC.
|
|
var cteCond string
|
|
var cteWindow string
|
|
if target == "" {
|
|
cteCond = fmt.Sprintf("profile_id <> $%d", argIdx)
|
|
args = append(args, profileID)
|
|
argIdx++
|
|
cteWindow = "INTERVAL '7 days'"
|
|
} else {
|
|
cteCond = fmt.Sprintf("profile_id = $%d", argIdx)
|
|
args = append(args, target)
|
|
argIdx++
|
|
cteWindow = "INTERVAL '30 days'"
|
|
}
|
|
|
|
var conditions []string
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
whereClause := ""
|
|
if len(conditions) > 0 {
|
|
whereClause = "WHERE " + strings.Join(conditions, " AND ")
|
|
}
|
|
|
|
query := fmt.Sprintf(
|
|
`WITH most_recent AS (
|
|
SELECT media_item_id, MAX(watched_at) AS latest
|
|
FROM user_watch_history
|
|
WHERE %s AND watched_at > NOW() - %s
|
|
GROUP BY media_item_id
|
|
)
|
|
SELECT %s
|
|
FROM %s
|
|
JOIN most_recent mr ON mr.media_item_id = mi.content_id
|
|
%s
|
|
ORDER BY mr.latest DESC
|
|
LIMIT $%d`,
|
|
cteCond, cteWindow,
|
|
itemColumns("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, limit)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("fetching profile activity feed: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
items, err := scanMediaItems(rows)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchNewToLibrary(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.NewToLibraryParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
days := p.LookbackDays
|
|
if days <= 0 {
|
|
days = 30
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
conditions = append(conditions, fmt.Sprintf("mi.created_at > NOW() - ($%d || ' days')::interval", argIdx))
|
|
args = append(args, days)
|
|
argIdx++
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
whereClause := "WHERE " + strings.Join(conditions, " AND ")
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s %s ORDER BY mi.created_at DESC LIMIT $%d`,
|
|
itemColumns("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, limit)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("fetching new to library: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
items, err := scanMediaItems(rows)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func (f *Fetcher) fetchMostWatched(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.MostWatchedParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
interval := "7 days"
|
|
if p.Window == "month" {
|
|
interval = "30 days"
|
|
}
|
|
|
|
var conditions []string
|
|
var args []any
|
|
argIdx := 1
|
|
|
|
fromClause, libConditions, libArgs, newArgIdx := buildLibraryScope(libraryID, libraryIDs, nil, filter.DisabledLibraryIDs, argIdx)
|
|
conditions = append(conditions, libConditions...)
|
|
args = append(args, libArgs...)
|
|
argIdx = newArgIdx
|
|
catalog.ApplySectionAccessFilter("mi", filter, &conditions, &args, &argIdx)
|
|
|
|
conditions = append(conditions, catalog.MangaChapterExclusionWhere("mi"))
|
|
|
|
conditions = append(conditions, fmt.Sprintf("uwh.watched_at > NOW() - $%d::interval", argIdx))
|
|
args = append(args, interval)
|
|
argIdx++
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
|
|
whereClause := "WHERE " + strings.Join(conditions, " AND ")
|
|
|
|
query := fmt.Sprintf(
|
|
`SELECT %s FROM %s JOIN user_watch_history uwh ON uwh.media_item_id = mi.content_id %s GROUP BY mi.content_id ORDER BY COUNT(*) DESC LIMIT $%d`,
|
|
itemColumns("mi"), fromClause, whereClause, argIdx,
|
|
)
|
|
args = append(args, limit)
|
|
|
|
rows, err := f.pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("fetching most watched: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
items, err := scanMediaItems(rows)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
func buildLibraryScope(libraryID *int, libraryIDs []int, configLibraryIDs []int, disabledLibraryIDs []int, argIdx int) (string, []string, []any, int) {
|
|
fromClause := "media_items mi"
|
|
var conditions []string
|
|
var args []any
|
|
|
|
needsJoin := libraryID != nil || libraryIDs != nil || len(configLibraryIDs) > 0 || len(disabledLibraryIDs) > 0
|
|
|
|
if needsJoin {
|
|
fromClause = "media_items mi JOIN media_item_libraries mil ON mi.content_id = mil.content_id"
|
|
}
|
|
|
|
if libraryID != nil {
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id = $%d", argIdx))
|
|
args = append(args, *libraryID)
|
|
argIdx++
|
|
}
|
|
|
|
if len(configLibraryIDs) > 0 && libraryID == nil {
|
|
placeholders := make([]string, len(configLibraryIDs))
|
|
for i, id := range configLibraryIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, id)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id IN (%s)", strings.Join(placeholders, ", ")))
|
|
}
|
|
|
|
if libraryIDs != nil {
|
|
if len(libraryIDs) == 0 {
|
|
conditions = append(conditions, "1 = 0")
|
|
return fromClause, conditions, args, argIdx
|
|
}
|
|
placeholders := make([]string, len(libraryIDs))
|
|
for i, id := range libraryIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, id)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id IN (%s)", strings.Join(placeholders, ", ")))
|
|
}
|
|
|
|
if len(disabledLibraryIDs) > 0 {
|
|
placeholders := make([]string, len(disabledLibraryIDs))
|
|
for i, id := range disabledLibraryIDs {
|
|
placeholders[i] = fmt.Sprintf("$%d", argIdx)
|
|
args = append(args, id)
|
|
argIdx++
|
|
}
|
|
conditions = append(conditions, fmt.Sprintf("mil.media_folder_id NOT IN (%s)", strings.Join(placeholders, ", ")))
|
|
}
|
|
|
|
return fromClause, conditions, args, argIdx
|
|
}
|
|
|
|
func fetchSortClause(sort, order string) string {
|
|
dir := "DESC"
|
|
if order == "asc" {
|
|
dir = "ASC"
|
|
}
|
|
switch sort {
|
|
case "rating":
|
|
return fmt.Sprintf("ORDER BY mi.rating_imdb %s NULLS LAST", dir)
|
|
case "year":
|
|
return fmt.Sprintf("ORDER BY mi.year %s", dir)
|
|
case "title":
|
|
return fmt.Sprintf("ORDER BY mi.sort_title %s", dir)
|
|
default:
|
|
return fmt.Sprintf("ORDER BY mi.created_at %s", dir)
|
|
}
|
|
}
|
|
|
|
func intersectLibraryIDs(a, b []int) []int {
|
|
if len(a) == 0 || len(b) == 0 {
|
|
return nil
|
|
}
|
|
allowed := make(map[int]struct{}, len(b))
|
|
for _, value := range b {
|
|
allowed[value] = struct{}{}
|
|
}
|
|
var result []int
|
|
seen := make(map[int]struct{})
|
|
for _, value := range a {
|
|
if _, ok := allowed[value]; !ok {
|
|
continue
|
|
}
|
|
if _, ok := seen[value]; ok {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
result = append(result, value)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// applyConfigTypeFilter adds a WHERE condition for the config's filter_type.
|
|
func applyConfigTypeFilter(alias string, filterType string, conditions *[]string, args *[]any, argIdx *int) {
|
|
if filterType == "" {
|
|
return
|
|
}
|
|
*conditions = append(*conditions, fmt.Sprintf("%s.type = $%d", alias, *argIdx))
|
|
*args = append(*args, filterType)
|
|
*argIdx++
|
|
}
|
|
|
|
func matchesContinueWatchingFilter(filterType string, itemType string) bool {
|
|
switch filterType {
|
|
case "movie", "series", "episode":
|
|
return ContinueTypeMatchesItem(ContinueTypeWatching, itemType)
|
|
case "audiobook":
|
|
return ContinueTypeMatchesItem(ContinueTypeListening, itemType)
|
|
case "ebook":
|
|
return ContinueTypeMatchesItem(ContinueTypeReading, itemType)
|
|
default:
|
|
return true
|
|
}
|
|
}
|
|
|
|
// fetchSeasonalThemed returns items for a seasonal_themed section.
|
|
//
|
|
// Multi-theme mode (EnabledThemes set): picks the highest-priority enabled
|
|
// theme whose predicate matches now and queries items for that theme. Off-
|
|
// season (no enabled theme matches) the section is empty and gets suppressed
|
|
// by the API dispatcher.
|
|
//
|
|
// Legacy single-theme mode (Theme set, EnabledThemes empty): mode controls
|
|
// suppression — "auto" hides off-season, "pinned" always renders.
|
|
func (f *Fetcher) fetchSeasonalThemed(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.SeasonalThemedParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
|
|
now := time.Now()
|
|
if f.Clock != nil {
|
|
now = f.Clock.Now()
|
|
}
|
|
|
|
// Resolve which theme to use. Multi-theme mode wins when populated.
|
|
var theme string
|
|
switch {
|
|
case len(p.EnabledThemes) > 0:
|
|
theme = recipes.ActiveSeasonalTheme(p.EnabledThemes, now)
|
|
if theme == "" {
|
|
// No enabled theme is currently in season — hide the section.
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
case p.Theme != "":
|
|
// Legacy single-theme path with mode-based suppression.
|
|
pred, ok := recipes.SeasonalPredicates[p.Theme]
|
|
if !ok {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
mode := p.Mode
|
|
if mode == "" {
|
|
mode = "auto"
|
|
}
|
|
if mode == "auto" && !pred(now) {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
theme = p.Theme
|
|
default:
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
def, hasQuery := seasonalQueryDef(theme)
|
|
if !hasQuery {
|
|
// Theme exists but has no executable genre query yet (christmas,
|
|
// st_patricks, thanksgiving need keyword/tag column support).
|
|
// Return empty until that data lands.
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
// Apply library scope the same way fetchFiltered / fetchEditorialSpotlight do.
|
|
switch {
|
|
case libraryID != nil:
|
|
def.LibraryIDs = []int{*libraryID}
|
|
case libraryIDs != nil:
|
|
if len(def.LibraryIDs) == 0 {
|
|
def.LibraryIDs = append([]int(nil), libraryIDs...)
|
|
} else {
|
|
def.LibraryIDs = intersectLibraryIDs(def.LibraryIDs, libraryIDs)
|
|
}
|
|
}
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
def.Limit = &limit
|
|
|
|
executor := &catalog.QueryExecutor{Pool: f.pool}
|
|
items, _, _, err := executor.PreviewPage(ctx, def, filter, limit, 0, false)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("seasonal_themed query: %w", err)
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
// seasonalQueryDef returns a catalog.QueryDefinition for the given theme and
|
|
// whether an executable query exists. Themes that require a keyword/tag column
|
|
// (christmas, st_patricks, thanksgiving) return false until that data lands.
|
|
func seasonalQueryDef(theme string) (catalog.QueryDefinition, bool) {
|
|
newDef := func(rules ...catalog.QueryRule) catalog.QueryDefinition {
|
|
return catalog.QueryDefinition{
|
|
Match: "all",
|
|
Groups: []catalog.QueryGroup{
|
|
{Match: "any", Rules: rules},
|
|
},
|
|
}
|
|
}
|
|
rule := func(field, op, value string) catalog.QueryRule {
|
|
return catalog.QueryRule{Field: field, Op: op, Value: value}
|
|
}
|
|
|
|
switch theme {
|
|
case "halloween":
|
|
return newDef(
|
|
rule("genre", "contains", "Horror"),
|
|
rule("genre", "contains", "Thriller"),
|
|
), true
|
|
case "valentines":
|
|
return newDef(
|
|
rule("genre", "contains", "Romance"),
|
|
), true
|
|
case "summer", "summer_blockbuster":
|
|
return newDef(
|
|
rule("genre", "contains", "Action"),
|
|
rule("genre", "contains", "Adventure"),
|
|
), true
|
|
case "saturday_morning":
|
|
return newDef(
|
|
rule("genre", "contains", "Animation"),
|
|
rule("genre", "contains", "Family"),
|
|
), true
|
|
case "christmas", "st_patricks", "thanksgiving":
|
|
// TODO: needs keyword/tag column to filter by theme-specific keywords.
|
|
return catalog.QueryDefinition{}, false
|
|
default:
|
|
return catalog.QueryDefinition{}, false
|
|
}
|
|
}
|
|
|
|
// fetchMoodCollection returns items for a mood_collection section.
|
|
func (f *Fetcher) fetchMoodCollection(ctx context.Context, s ResolvedSection, libraryID *int, libraryIDs []int, filter catalog.AccessFilter) ([]*models.MediaItem, int, error) {
|
|
var p recipes.MoodCollectionParams
|
|
if len(s.Config) > 0 {
|
|
_ = json.Unmarshal(s.Config, &p)
|
|
}
|
|
|
|
info, ok := recipes.MoodByKey(p.Mood)
|
|
if !ok {
|
|
return []*models.MediaItem{}, 0, nil
|
|
}
|
|
|
|
// Build genre rules (OR'd together).
|
|
genreRules := make([]catalog.QueryRule, 0, len(info.GenresAny))
|
|
for _, genre := range info.GenresAny {
|
|
genreRules = append(genreRules, catalog.QueryRule{Field: "genre", Op: "contains", Value: genre})
|
|
}
|
|
|
|
def := catalog.QueryDefinition{
|
|
Match: "all",
|
|
Groups: []catalog.QueryGroup{
|
|
{Match: "any", Rules: genreRules},
|
|
{Match: "all", Rules: []catalog.QueryRule{
|
|
{Field: "rating_imdb", Op: "gte", Value: info.MinRating},
|
|
}},
|
|
},
|
|
}
|
|
|
|
switch {
|
|
case libraryID != nil:
|
|
def.LibraryIDs = []int{*libraryID}
|
|
case libraryIDs != nil:
|
|
if len(def.LibraryIDs) == 0 {
|
|
def.LibraryIDs = append([]int(nil), libraryIDs...)
|
|
} else {
|
|
def.LibraryIDs = intersectLibraryIDs(def.LibraryIDs, libraryIDs)
|
|
}
|
|
}
|
|
|
|
limit := s.ItemLimit
|
|
if limit <= 0 {
|
|
limit = 20
|
|
}
|
|
def.Limit = &limit
|
|
|
|
executor := &catalog.QueryExecutor{Pool: f.pool}
|
|
items, _, _, err := executor.PreviewPage(ctx, def, filter, limit, 0, false)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("mood_collection query: %w", err)
|
|
}
|
|
return items, len(items), nil
|
|
}
|
|
|
|
// mangaChapterSeriesMetaQuery resolves the owning manga series for chapter
|
|
// items (type='ebook' rows linked via manga_chapters) appearing on section
|
|
// cards, so continue-reading surfaces can show the series instead of the
|
|
// chapter's raw file title.
|
|
const mangaChapterSeriesMetaQuery = `
|
|
SELECT mc.chapter_content_id, mc.series_content_id, si.title
|
|
FROM manga_chapters mc
|
|
JOIN media_items si ON si.content_id = mc.series_content_id
|
|
WHERE mc.chapter_content_id = ANY($1)
|
|
`
|
|
|
|
// FetchMangaChapterSeriesMeta returns series linkage keyed by chapter content
|
|
// id. IDs that are not manga chapters simply have no entry.
|
|
func (f *Fetcher) FetchMangaChapterSeriesMeta(ctx context.Context, ids []string) (map[string]SectionItemMeta, error) {
|
|
meta := make(map[string]SectionItemMeta, len(ids))
|
|
if f == nil || f.pool == nil || len(ids) == 0 {
|
|
return meta, nil
|
|
}
|
|
rows, err := f.pool.Query(ctx, mangaChapterSeriesMetaQuery, ids)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
for rows.Next() {
|
|
var chapterID, seriesID, seriesTitle string
|
|
if err := rows.Scan(&chapterID, &seriesID, &seriesTitle); err != nil {
|
|
return nil, err
|
|
}
|
|
id := seriesID
|
|
meta[chapterID] = SectionItemMeta{SeriesID: &id, SeriesTitle: seriesTitle}
|
|
}
|
|
return meta, rows.Err()
|
|
}
|
|
|
|
// applyMangaChapterSeriesMeta resolves the owning manga series for any chapter
|
|
// (ebook) items in the set and merges SeriesID/SeriesTitle into the existing
|
|
// itemMeta, preserving the progress fields already populated there. Lets the
|
|
// shared series-collapse group multiple in-progress chapters of one manga.
|
|
func (f *Fetcher) applyMangaChapterSeriesMeta(ctx context.Context, items []*models.MediaItem, itemMeta map[string]SectionItemMeta) {
|
|
ids := make([]string, 0, len(items))
|
|
for _, item := range items {
|
|
if item != nil && item.Type == "ebook" && strings.TrimSpace(item.ContentID) != "" {
|
|
ids = append(ids, item.ContentID)
|
|
}
|
|
}
|
|
if len(ids) == 0 {
|
|
return
|
|
}
|
|
seriesMeta, err := f.FetchMangaChapterSeriesMeta(ctx, ids)
|
|
if err != nil {
|
|
slog.Warn("continue-reading: manga series linkage lookup failed", "error", err)
|
|
return
|
|
}
|
|
for chapterID, sm := range seriesMeta {
|
|
m := itemMeta[chapterID]
|
|
m.SeriesID = sm.SeriesID
|
|
m.SeriesTitle = sm.SeriesTitle
|
|
itemMeta[chapterID] = m
|
|
}
|
|
}
|