* docs: define ebook architecture matching audiobooks * docs: plan ebook audiobook-parity implementation * feat: add ebook scanner parser foundation * fix: harden ebook scanner foundation * fix: handle ebook isbn labels * fix: guard ebook subtree scans * feat: scan ebook libraries in core * fix: preserve ebook scan people credits * fix: refresh ebook scan metadata safely * feat: persist ebook series membership * test: cover ebook series persistence decisions * fix: address ebook scanner PR review * docs: clarify ebook foundation PR scope * feat: add ebook metadata enricher * fix: harden ebook poster cache * feat: wire ebook metadata sync task * feat: expose ebook library metadata setup * feat: add ebook catalog scope support * feat: add ebook detail view * feat: label ebook file versions by format * feat: use file-size copy for downloads * feat: use file language in download dialog * test: cover ebook detail authors and downloads * fix: drop narrator credits from ebook scanner merges * fix: align ebook collection filters with book media * fix: drop asin provider ids from ebook enrichment * fix: force ebook people refresh for stale narrators * chore: omit ebook planning docs from branch * feat: add ebook detail related content * feat: add ebook reader file entrypoint * feat: render ebooks with foliate reader * feat: persist ebook reader progress * feat: add ebook reader controls * feat: extract ebook pdf metadata * feat: favor scanner isbn during ebook enrichment * feat: extract fbz ebook metadata * feat: count cbz ebook pages * feat: show ebook file page counts * feat: show ebook download summaries * feat: switch ebook reader files * feat: prefer epub for ebook read action * feat: surface ebook reader progress * feat: sync ebook reader progress cache * feat: hide ebook read action for unsupported files * feat: filter ebook reader file selector * fix: serve fbz ebook archives with reader mime type * fix: detect fbz ebooks from compound filename * fix: authorize fbz ebooks from compound filename * fix: scope ebook catalog facets * fix: reject narrator queries for ebooks * fix: build ebook recommendation text from authors * fix: include ebooks in embedding eligibility * fix: include ebooks in recommendation media mix * fix: include ebooks in recently added recommendations * feat: include ebook progress in recommendation signals * feat: include ebooks in continue watching sections * feat: include ebooks in catalog progress metrics * fix: read ebook isbn from epub metadata * fix: filter ebook asin provider aliases * fix: fall back from unsupported ebook reader files * fix: sort ebook catalogs by reader progress * fix: filter ebook catalogs by reader progress * fix: include ebooks in last watched catalog filters * feat: reflect ebook reader progress in item user state * feat: share ebook progress state across item surfaces * feat: report ebook scan progress * fix: include ebook activity in recommendations * fix: expose ebook reader progress on item detail * fix: support ebook subtree scans * fix: honor profile header for ebook item progress * fix: add ebook library default sections * fix: route ebook continue cards to reader * fix: hide watched toggle for ebooks * fix: route ebook watch tonight cards to reader * fix: route ebook hero actions to reader * fix: detect archive ebook reader formats by filename * feat: cache embedded ebook covers during scan * fix: encode ebook hero reader links * fix: persist non-epub ebook reader progress * fix: scope narrator catalog badges to audiobooks * fix: merge ebook reader progress during item repair * fix: label ebook progress filters as read * fix: show ebook related rails as book covers * fix: remove txt ebook reader support * fix: reject txt ebook reader files * fix: label ebook advanced filters as read * fix: label ebook personalized sorts as read * fix: remove plain text reader loader path * test: cover ebook unread catalog rules * fix: preserve ebook reader library context * fix: link ebook genres with library scope * fix: encode related rail item links * fix: encode catalog card item links * fix: encode hero and continue item links * fix: encode watch tonight item links * fix: encode recommendation and search item links * test: cover ebook scan format set * fix: label ebook search results clearly * fix: make global search prompt media neutral * fix: encode catalog read API ids * fix: encode item API ids * fix: include ebook reader vendor in docker build * fix: make ebook reader build clean * fix: clean ebook embedded descriptions * docs: plan ebook reader shell parity * feat: add ebook reader shell controls * fix: widen ebook scrolled reader flow * fix: remove scrolled reader content width cap * docs: plan ebook reader full parity * feat: persist ebook reader config * feat: add ebook annotations and bookmarks * feat: add ebook reader tools and aids * feat: add ebook advanced reader settings * fix: keep ebook reader panel in viewport * fix: use foliate sizing units for ebook scroll flow * fix: keep ebook settings controls readable * fix: simplify ebook reader settings controls * feat(ebooks): extract local covers during scan (#98) * feat(ebooks): extract local covers during scan * fix(ebooks): read nullable poster paths during cover scan * fix(catalog): coalesce nullable media artwork fields * fix(ebooks): group sibling formats by book identity * fix(ebooks): tolerate legacy ebook metadata encodings * fix(ebooks): decode PDF hex metadata strings * fix(ebooks): harden local cover extraction and format grouping Address review findings on the local cover scan: - Restrict generic sidecar covers (cover.jpg, folder.png, ...) to single-book directories, always accept images named after the book file, and apply exactly one cover per reconcile with sidecar taking precedence over the embedded cover. - Replace the read-then-write poster update with an atomic conditional UPDATE (ItemRepository.SetLocalPoster) so provider/admin artwork is never clobbered by concurrent writers, and refresh locally owned posters when the extracted cover bytes change (thumbhash compare). - Preserve UTF-8 PDF Info strings (including a UTF-8 BOM) instead of forcing everything through Windows-1252; the cp1252 fallback now only applies to non-UTF-8 bytes. - Select EPUB covers by manifest media-type with properties="cover-image" outranking the EPUB2 meta name="cover" id, so XHTML cover pages no longer shadow the real image. - Order CBZ pages naturally (2.jpg before 10.jpg, ch2/ before ch10/) when picking the cover page, via a single O(n) min-scan. - Bump the ebook content group key scheme to version 2 and reprocess rows written under older versions so pre-existing libraries gain sibling-format grouping instead of accumulating duplicates. - Group different formats only (a same-format sibling with colliding sparse metadata stays a separate item) and stop a joining sibling's embedded metadata from overwriting a provider-matched item. - Decode any IANA-labelled OPF/FB2 XML charset (windows-1251, koi8-r, shift_jis, ...) via x/net/html/charset, and wire the charset reader into FB2 parsing which previously had none. - Strip the full .fb2.zip double extension from filename-derived titles and group keys. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: rxwatcher <rxwatcher@users.noreply.github.com> Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> * feat(ebooks): add reader profiles and ruler (#99) * feat(ebooks): extract local covers during scan * fix(ebooks): read nullable poster paths during cover scan * fix(catalog): coalesce nullable media artwork fields * fix(ebooks): group sibling formats by book identity * fix(ebooks): tolerate legacy ebook metadata encodings * fix(ebooks): decode PDF hex metadata strings * feat(ebooks): add reader profiles and ruler * fix(ebooks): address reader ruler and profile review findings - skip renderer setStyles/render when computed styles and attributes are unchanged, so ruler position updates no longer re-style the book view - drag the ruler via a local draft that commits on release, with the surface rect cached at pointer-down - migrate font values persisted before the generic stacks (Inter, Georgia, Merriweather, legacy serif) so the font select never renders blank, with a Custom fallback option for unknown values - make the ruler band click-through and move dragging to a dedicated keyboard-accessible slider handle so links and text selection keep working under the band - share font stacks between options and profiles via READER_FONT_STACKS - surface the active reading profile, move presets to the top of the settings panel, and drop the redundant profile button aria-labels Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ebooks): resolve prefer-const lint error in readest document lib `pnpm run lint` failed on the branch because `direction` is never reassigned in getDirection; split the destructure so only the reassigned `writingMode` stays mutable. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: rxwatcher <rxwatcher@users.noreply.github.com> Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> * Merge branch 'main' into work/ebooks-reader-base Brings the ebook integration branch up to date with main (audiobook library redesign, continue-watching rework and card affordances, quic-go bump, jellycompat fixes). Conflict resolutions favor main's generalized mechanisms and register ebooks with them: - media scope validation goes through IsValidMediaScope (now including "ebook" alongside main's "video" group scope), in Go and in the web filter/search types - continue-watching uses main's typed rails; reading-type sections pull resume points from ebook_reader_progress and the ebook library default section is wired to ContinueTypeConfig(ContinueTypeReading) - item_repo keeps main's derived select-list machinery (itemColumnExpr) and both poster accessors (GetPoster/SetLocalPoster for ebook covers, GetPosterPath for audiobook covers) - web cards/hero/watch-tonight adopt main's buildMediaPlayHref helpers, which now route ebooks to /reader/ebook and encode content ids; ebook affordances (BookOpen icon, Read verb, percent-read subtitle) carry over onto main's reworked components - LibraryForm ebook support ported into main's refactored useLibraryForm/libraryTypes modules Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(docker): copy foliate-js vendor into Dockerfile.dev frontend stage foliate-js is a file:vendor/foliate-js dependency, so pnpm install needs the vendor directory before the lockfile install layer. The production Dockerfile already copies it; the dev image was missed, breaking make dev-deploy with ENOENT on /app/web/vendor/foliate-js. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(ebooks): render Continue Reading sections as upright poster cards All-ebook continue sections previously fell through to the horizontal 16:9 wide card; include ebooks in the poster-variant check so book covers render in their natural 2:3 framing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ui): stop related-rail highlight ring clipping on detail pages Move the current-item ring onto the cover artwork with a themed ring-offset color (matching the sidebar profile highlight) and give the scroll container top headroom so the ring is not cut off by overflow-x-auto. Applies to both ebook and audiobook detail rails. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(scanner): harden ebook scanning against data loss and bad metadata - Reconcile missing ebook files like video/audio, with real per-root walk failure tracking (failed/unmounted roots are excluded from deletion), symlinked-root support via the shared logical walker, and the empty-root cleanup allowance before any destructive reconciliation. - Create ebook items as 'pending' so enrichment can promote them to 'matched' (backfill migration included), and protect matched items from re-scan clobbering: title/year skipped, people/series fill-empty only. - PDF metadata: scan head + tail windows (non-linearized PDFs keep the Info dict at the end), require proper key delimiters, head values win. - Cap plain .fb2 reads like .fbz entries; drop .md as an ebook format. - gofmt internal/scanner/audiobook.go (pre-existing drift). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ebooks): make enrichment failures non-terminal with dedicated backoff state - Provider errors now record a failure (capped retries) instead of stamping last_refreshed, which permanently excluded items after transient outages. - Unconfigured metadata chains and the scan-window membership race skip the item without stamping or burning a retry. - Failure tracking moves to a new ebook_enrichment_state table, decoupling it from media_items.refresh_failures (shared with metadata refresh debt). - Preserve non-author people credits when persisting enrichment results. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(catalog): gate ebook progress on hidden history and centralize threshold - Apply user_history_hidden_items gating (video semantics) to the ebook watched/in-progress filters, progress sort plan, and Continue Reading. - Continue Reading pages past dismissed items via the shared collector and dedupes items across pages (also fixes the video path's latent exposure). - Centralize the 0.9 finished threshold as models.EbookFinishedProgressThreshold with a single SQL-interpolated mirror in catalog. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(recommendations): correct watcher counting and wire ebook taste signals - itemWatchersQuery dedupes to distinct (watcher, item) rows so one binge-watcher can no longer satisfy minWatchers; the eligibility floor now counts distinct accounts rather than profiles. - Hidden-history gating on GetEbookReaderProgressForUser (signal reader). - Ebook reading produces canonical implicit taste signals (weighted like the equivalent movie progress ratio); ebooks join taste-seed candidates. - Stale GetRecentlyAddedItems doc comment corrected. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(api): harden ebook reader endpoints and serve a Content-Security-Policy - Serve a CSP on all SPA HTML responses: blob/srcdoc book iframes inherit it, so script-src 'self' 'wasm-unsafe-eval' blocks script execution from malicious book content (sandbox alone is defeated by the WebKit allow-scripts requirement). Threat model documented on the constant. - X-Content-Type-Options: nosniff on frontend, jellycompat, and ebook file responses; MIME resolution can no longer fall through to octet-stream for an admitted ebook file. - Annotation PATCH: presence-aware field semantics (absent keeps, present sets/clears), invariant re-validation on the merged row, and an atomic SELECT ... FOR UPDATE read-merge-write. - Request size caps (413) on progress/config/annotation writes; Content-Disposition via mime.FormatMediaType; hidden-history gating in the shared ebook progress lister; FK-cascade indexes for reader tables. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(api): native read-state endpoints for ebooks - POST/DELETE /watched/{id} accepts ebook content IDs: mark read upserts progress 1.0 preserving the reader's file/location (or picks the preferred reader file for never-opened books); mark unread mirrors video unwatch semantics and deletes the progress row. - /history/remove accepts ebooks: hides via user_history_hidden_items without touching the reading position (hidden != unread; next reading activity resurfaces the book, mirroring video re-watch). - Access-filter checks match the video branch; shared logic lives in ebook_read_state.go. Sort metrics/user-state thresholds use the shared constant; profile-header fallback deduplicated. Clients: response is {type: "ebook", affected_count: 1, played: bool}; the existing watched SSE event fires. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(web): harden the ebook reader UI - Open-flow race: cancellation checked after every await with full stale-run teardown (no wrong-file progress saves, no leaked views/blob URLs); book.destroy() on cleanup. - Progress: monotonic stale-response guard; visibilitychange flush uses the refresh-capable client, pagehide uses keepalive; per-book cross-format progress documented as deliberate. - Settings: side effects out of the setState updater; local edits no longer clobbered by late server config; pending saves flushed on unmount/pagehide. - TTS: generation token so Stop actually stops (Chromium/Firefox synthetic events); Media Session uninstalled on unmount. - External book links: http(s) only, opened with noopener,noreferrer. - apiBlob 512 MiB guard with a user-facing error; fraction bookmarks navigable; search-result key collisions fixed; dead e-ink code removed; getLibrarySortRelevanceScope deduplicated; md format dropped. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(web): mark read/unread affordances for ebooks - Item detail gets a Mark Read/Unread button; card menus drop the ebook gate and share type-aware labels/toasts (also dedupes audiobook wording). - Watched-state invalidation includes the reader progress query key so the Continue button and percent refresh after toggling. - Continue Reading dismiss copy for ebooks; dismissal path now URL-encodes item IDs (ebook content IDs can contain reserved characters). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: record the PR #124 review and hardening pass Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: rxwatcher <rxwatcher@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
413 lines
13 KiB
Go
413 lines
13 KiB
Go
package handlers
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"net/http"
|
|
"sort"
|
|
"strconv"
|
|
"sync"
|
|
|
|
apimw "github.com/Silo-Server/silo-server/internal/api/middleware"
|
|
"github.com/Silo-Server/silo-server/internal/catalog"
|
|
"github.com/Silo-Server/silo-server/internal/models"
|
|
"github.com/Silo-Server/silo-server/internal/recommendations"
|
|
"github.com/Silo-Server/silo-server/internal/sections"
|
|
)
|
|
|
|
// watchTonightSectionFetcher provides access to live Continue Watching
|
|
// and Next Up data for the Watch Tonight handler.
|
|
type watchTonightSectionFetcher interface {
|
|
FetchNextUpItems(ctx context.Context, userID int, profileID string, libraryID *int, libraryIDs []int, filter catalog.AccessFilter, limit int) ([]*models.MediaItem, map[string]sections.SectionItemMeta, error)
|
|
}
|
|
|
|
type watchTonightItemResponse struct {
|
|
sectionItemResponse
|
|
WatchTonightSource string `json:"watch_tonight_source"`
|
|
}
|
|
|
|
type watchTonightResponse struct {
|
|
Items []watchTonightItemResponse `json:"items"`
|
|
IsCold bool `json:"is_cold"`
|
|
}
|
|
|
|
// Source boost multipliers for ranking.
|
|
const (
|
|
boostCWInTaste = 1.40 // in-progress AND in taste pool
|
|
boostNextInTaste = 1.25 // next-up AND in taste pool
|
|
baseCWScore = 2.00 // in-progress items — always rank above pure recommendations (max ~1.2)
|
|
baseNextUpScore = 1.50 // next-up items — rank above recommendations but below in-progress
|
|
watchTonightLimit = 5
|
|
)
|
|
|
|
// HandleWatchTonight handles GET /recommendations/watch-tonight.
|
|
// It merges live Continue Watching / Next Up items with recommendation-engine
|
|
// candidates, applies taste-profile boosts, enriches, and returns a unified list.
|
|
func (h *RecommendationsHandler) HandleWatchTonight(w http.ResponseWriter, r *http.Request) {
|
|
userID := apimw.GetUserID(r.Context())
|
|
profileID := apimw.GetProfileID(r.Context())
|
|
filter := requestAccessFilter(r)
|
|
|
|
limit := watchTonightLimit
|
|
if l := r.URL.Query().Get("limit"); l != "" {
|
|
if n, err := strconv.Atoi(l); err == nil && n > 0 && n <= 20 {
|
|
limit = n
|
|
}
|
|
}
|
|
|
|
// Fan out: recommendation candidates + live CW/Next-Up in parallel.
|
|
var (
|
|
recResult recommendations.WatchTonightResult
|
|
recErr error
|
|
|
|
cwItems []scoredCWItem
|
|
nextUpItems []scoredCWItem
|
|
liveErr error
|
|
)
|
|
|
|
var wg sync.WaitGroup
|
|
wg.Add(2)
|
|
|
|
go func() {
|
|
defer wg.Done()
|
|
if h.reader != nil {
|
|
recResult, recErr = h.reader.GetWatchTonight(r.Context(), userID, profileID, limit*3, filter)
|
|
}
|
|
}()
|
|
|
|
go func() {
|
|
defer wg.Done()
|
|
cwItems, nextUpItems, liveErr = h.fetchLiveCWAndNextUp(r, userID, profileID, filter, limit)
|
|
}()
|
|
|
|
wg.Wait()
|
|
|
|
if recErr != nil {
|
|
slog.Error("WatchTonight: recommendations fetch failed", "user_id", userID, "error", recErr)
|
|
writeError(w, http.StatusInternalServerError, "internal_error", "Failed to fetch recommendations")
|
|
return
|
|
}
|
|
if liveErr != nil {
|
|
slog.Warn("WatchTonight: live CW/NextUp fetch failed, continuing with recs only", "user_id", userID, "error", liveErr)
|
|
}
|
|
|
|
// Filter out already-watched and low-rated items from rec candidates.
|
|
recResult.Items = h.filterRecommendations(r, userID, profileID, recResult.Items)
|
|
|
|
// Build taste set from recommendation items for boost lookups.
|
|
tasteSet := make(map[string]struct{}, len(recResult.Items))
|
|
for _, item := range recResult.Items {
|
|
tasteSet[item.MediaItemID] = struct{}{}
|
|
}
|
|
|
|
// Merge everything into a single scored list.
|
|
byID := make(map[string]mergedItem, len(recResult.Items)+len(cwItems)+len(nextUpItems))
|
|
|
|
// Insert recommendation items first.
|
|
for _, item := range recResult.Items {
|
|
byID[item.MediaItemID] = mergedItem{
|
|
scored: item,
|
|
source: "recommendation",
|
|
}
|
|
}
|
|
|
|
// Overlay CW items — these should always rank highly since the user
|
|
// actively started watching them.
|
|
for _, cw := range cwItems {
|
|
existing, exists := byID[cw.contentID]
|
|
if exists {
|
|
// Item is in both CW and recommendations — boost the rec score.
|
|
existing.scored.Score *= boostCWInTaste
|
|
existing.source = "continue_watching"
|
|
existing.meta = &cw.meta
|
|
byID[cw.contentID] = existing
|
|
} else {
|
|
// Item is in CW only — still high priority.
|
|
byID[cw.contentID] = mergedItem{
|
|
scored: recommendations.ScoredItem{
|
|
MediaItemID: cw.contentID,
|
|
Score: baseCWScore,
|
|
Reason: "continue_watching",
|
|
},
|
|
source: "continue_watching",
|
|
meta: &cw.meta,
|
|
}
|
|
}
|
|
}
|
|
|
|
// Overlay Next-Up items — next episode of something the user watched.
|
|
for _, nu := range nextUpItems {
|
|
existing, exists := byID[nu.contentID]
|
|
if exists {
|
|
if existing.source != "continue_watching" {
|
|
// Item is in both next-up and recommendations — boost.
|
|
existing.scored.Score *= boostNextInTaste
|
|
existing.source = "next_up"
|
|
existing.meta = &nu.meta
|
|
byID[nu.contentID] = existing
|
|
}
|
|
// CW wins over next-up for same item
|
|
} else {
|
|
// Item is in next-up only — still high priority.
|
|
byID[nu.contentID] = mergedItem{
|
|
scored: recommendations.ScoredItem{
|
|
MediaItemID: nu.contentID,
|
|
Score: baseNextUpScore,
|
|
Reason: "next_up",
|
|
},
|
|
source: "next_up",
|
|
meta: &nu.meta,
|
|
}
|
|
}
|
|
}
|
|
|
|
// Sort and trim.
|
|
merged := make([]mergedItem, 0, len(byID))
|
|
for _, m := range byID {
|
|
merged = append(merged, m)
|
|
}
|
|
sort.Slice(merged, func(i, j int) bool {
|
|
return merged[i].scored.Score > merged[j].scored.Score
|
|
})
|
|
if len(merged) > limit {
|
|
merged = merged[:limit]
|
|
}
|
|
|
|
// Collect content IDs for enrichment.
|
|
contentIDs := make([]string, len(merged))
|
|
for i, m := range merged {
|
|
contentIDs[i] = m.scored.MediaItemID
|
|
}
|
|
|
|
// Enrich with full media item details.
|
|
resp := watchTonightResponse{
|
|
Items: make([]watchTonightItemResponse, 0, len(merged)),
|
|
IsCold: recResult.IsCold && len(cwItems) == 0 && len(nextUpItems) == 0,
|
|
}
|
|
|
|
if len(contentIDs) == 0 {
|
|
writeJSON(w, http.StatusOK, resp)
|
|
return
|
|
}
|
|
|
|
itemMap, overlayMap, stateMap, enrichedEpMeta := h.enrichItems(r, userID, profileID, filter, contentIDs)
|
|
|
|
for _, m := range merged {
|
|
mi, ok := itemMap[m.scored.MediaItemID]
|
|
if !ok || mi == nil {
|
|
continue
|
|
}
|
|
|
|
item := h.buildSectionItem(r, mi, overlayMap, stateMap)
|
|
item.ItemSource = m.source
|
|
|
|
// Apply CW/Next-Up metadata (position, duration, progress).
|
|
if m.meta != nil {
|
|
item.PositionSeconds = m.meta.PositionSeconds
|
|
item.DurationSeconds = m.meta.DurationSeconds
|
|
item.ProgressUpdatedAt = m.meta.ProgressUpdatedAt
|
|
if m.meta.SeriesID != nil {
|
|
item.SeriesID = *m.meta.SeriesID
|
|
}
|
|
if m.meta.SeriesTitle != "" {
|
|
item.SeriesTitle = m.meta.SeriesTitle
|
|
}
|
|
if m.meta.SeasonNumber != nil {
|
|
item.SeasonNumber = m.meta.SeasonNumber
|
|
}
|
|
if m.meta.EpisodeNumber != nil {
|
|
item.EpisodeNumber = m.meta.EpisodeNumber
|
|
}
|
|
}
|
|
|
|
// Fill in episode metadata from the enrichment step for items that came
|
|
// through the episodes table (CW/Next-Up episodes).
|
|
if epMeta, ok := enrichedEpMeta[m.scored.MediaItemID]; ok {
|
|
if epMeta.SeriesID != nil && item.SeriesID == "" {
|
|
item.SeriesID = *epMeta.SeriesID
|
|
}
|
|
if epMeta.SeriesTitle != "" && item.SeriesTitle == "" {
|
|
item.SeriesTitle = epMeta.SeriesTitle
|
|
}
|
|
if epMeta.SeasonNumber != nil && item.SeasonNumber == nil {
|
|
item.SeasonNumber = epMeta.SeasonNumber
|
|
}
|
|
if epMeta.EpisodeNumber != nil && item.EpisodeNumber == nil {
|
|
item.EpisodeNumber = epMeta.EpisodeNumber
|
|
}
|
|
}
|
|
|
|
resp.Items = append(resp.Items, watchTonightItemResponse{
|
|
sectionItemResponse: item,
|
|
WatchTonightSource: m.source,
|
|
})
|
|
}
|
|
|
|
writeJSON(w, http.StatusOK, resp)
|
|
}
|
|
|
|
type mergedItem struct {
|
|
scored recommendations.ScoredItem
|
|
source string // "continue_watching", "next_up", "recommendation"
|
|
meta *sections.SectionItemMeta
|
|
}
|
|
|
|
type scoredCWItem struct {
|
|
contentID string
|
|
meta sections.SectionItemMeta
|
|
}
|
|
|
|
// fetchLiveCWAndNextUp fetches live Continue Watching and Next Up items from the user store.
|
|
func (h *RecommendationsHandler) fetchLiveCWAndNextUp(r *http.Request, userID int, profileID string, filter catalog.AccessFilter, limit int) (cwItems, nextUpItems []scoredCWItem, err error) {
|
|
if h.storeProvider == nil || userID <= 0 || profileID == "" {
|
|
return nil, nil, nil
|
|
}
|
|
|
|
ctx := r.Context()
|
|
|
|
// Fetch in-progress items from user store.
|
|
store, err := h.storeProvider.ForUser(ctx, userID)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
progressEntries, err := store.ListProgress(ctx, profileID, "in_progress", limit, 0)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
for _, entry := range progressEntries {
|
|
position := entry.PositionSeconds
|
|
duration := entry.DurationSeconds
|
|
updatedAt := entry.UpdatedAt
|
|
cwItems = append(cwItems, scoredCWItem{
|
|
contentID: entry.MediaItemID,
|
|
meta: sections.SectionItemMeta{
|
|
PositionSeconds: &position,
|
|
DurationSeconds: &duration,
|
|
ProgressUpdatedAt: &updatedAt,
|
|
ItemSource: "in_progress",
|
|
},
|
|
})
|
|
}
|
|
|
|
// Fetch next-up items.
|
|
if h.WatchTonightFetcher != nil {
|
|
nuItems, nuMeta, nuErr := h.WatchTonightFetcher.FetchNextUpItems(ctx, userID, profileID, nil, nil, filter, limit)
|
|
if nuErr != nil {
|
|
slog.Warn("WatchTonight: next-up fetch failed", "user_id", userID, "error", nuErr)
|
|
} else {
|
|
for _, item := range nuItems {
|
|
meta, ok := nuMeta[item.ContentID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
nextUpItems = append(nextUpItems, scoredCWItem{
|
|
contentID: item.ContentID,
|
|
meta: meta,
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
return cwItems, nextUpItems, nil
|
|
}
|
|
|
|
// enrichItems fetches full MediaItem objects, overlay summaries, and user states
|
|
// for the given content IDs. Handles both movies/series (from media_items) and
|
|
// episodes (from episodes table) since CW/Next-Up items are episode content IDs.
|
|
func (h *RecommendationsHandler) enrichItems(r *http.Request, userID int, profileID string, filter catalog.AccessFilter, contentIDs []string) (
|
|
itemMap map[string]*models.MediaItem,
|
|
overlayMap map[string]*models.OverlaySummary,
|
|
stateMap map[string]*itemUserStateResponse,
|
|
episodeMeta map[string]sections.SectionItemMeta,
|
|
) {
|
|
if h.Fetcher == nil || len(contentIDs) == 0 {
|
|
return nil, nil, nil, nil
|
|
}
|
|
|
|
ctx := r.Context()
|
|
|
|
// Fetch movies/series from media_items table.
|
|
mediaItems, err := h.Fetcher.FetchItemsByContentIDs(ctx, contentIDs, filter)
|
|
if err != nil {
|
|
slog.Error("WatchTonight: fetch items failed", "error", err)
|
|
return nil, nil, nil, nil
|
|
}
|
|
|
|
itemMap = make(map[string]*models.MediaItem, len(mediaItems)*2)
|
|
for _, mi := range mediaItems {
|
|
itemMap[mi.ContentID] = mi
|
|
}
|
|
|
|
// Also fetch episodes — CW/Next-Up content IDs are typically episode IDs.
|
|
episodeItems, epMeta, epErr := h.Fetcher.FetchEpisodesByContentIDs(ctx, contentIDs, filter)
|
|
if epErr != nil {
|
|
slog.Error("WatchTonight: fetch episodes failed", "error", epErr)
|
|
} else {
|
|
for _, item := range episodeItems {
|
|
itemMap[item.ContentID] = item
|
|
}
|
|
episodeMeta = epMeta
|
|
mediaItems = append(mediaItems, episodeItems...)
|
|
}
|
|
|
|
overlays, err := h.Fetcher.ListOverlaySummaries(ctx, contentIDs, filter)
|
|
if err != nil {
|
|
slog.Error("WatchTonight: overlay summaries failed", "error", err)
|
|
} else {
|
|
overlayMap = overlays
|
|
}
|
|
|
|
if h.storeProvider != nil {
|
|
store, storeErr := h.storeProvider.ForUser(ctx, userID)
|
|
if storeErr == nil && store != nil {
|
|
states, stateErr := resolveItemUserStatesWithOptions(ctx, store, profileID, h.EpisodeRepo, mediaItems, itemUserStateOptions{
|
|
UserID: userID,
|
|
EbookProgressStore: h.EbookProgress,
|
|
})
|
|
if stateErr == nil {
|
|
stateMap = states
|
|
}
|
|
}
|
|
}
|
|
|
|
return itemMap, overlayMap, stateMap, episodeMeta
|
|
}
|
|
|
|
// buildSectionItem constructs a sectionItemResponse from a MediaItem,
|
|
// applying presigning and overlay/state lookups.
|
|
func (h *RecommendationsHandler) buildSectionItem(r *http.Request, mi *models.MediaItem, overlayMap map[string]*models.OverlaySummary, stateMap map[string]*itemUserStateResponse) sectionItemResponse {
|
|
item := sectionItemResponse{
|
|
ContentID: mi.ContentID,
|
|
Type: mi.Type,
|
|
Title: mi.Title,
|
|
Year: mi.Year,
|
|
Genres: mi.Genres,
|
|
Status: mi.Status,
|
|
RatingIMDB: mi.RatingIMDB,
|
|
RatingTMDB: mi.RatingTMDB,
|
|
RatingRTCritic: mi.RatingRTCritic,
|
|
RatingRTAudience: mi.RatingRTAudience,
|
|
OriginalLanguage: mi.OriginalLanguage,
|
|
Overview: mi.Overview,
|
|
PosterThumbhash: mi.PosterThumbhash,
|
|
BackdropThumbhash: mi.BackdropThumbhash,
|
|
}
|
|
if item.Genres == nil {
|
|
item.Genres = []string{}
|
|
}
|
|
if h.DetailSvc != nil {
|
|
item.PosterURL = h.DetailSvc.PresignURL(r.Context(), featuredPosterPath(mi.PosterPath), "featured")
|
|
item.BackdropURL = h.DetailSvc.PresignURL(r.Context(), featuredBackdropPath(mi.BackdropPath), "featured")
|
|
item.LogoURL = h.DetailSvc.PresignURL(r.Context(), mi.LogoPath, "featured")
|
|
}
|
|
if overlayMap != nil {
|
|
item.OverlaySummary = overlayMap[mi.ContentID]
|
|
}
|
|
if stateMap != nil {
|
|
item.UserState = stateMap[mi.ContentID]
|
|
}
|
|
return item
|
|
}
|