* 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>
495 lines
16 KiB
Go
495 lines
16 KiB
Go
package catalog
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/models"
|
|
)
|
|
|
|
func TestValidateCatalogQueryRequest_AllowsLastAirDateSort(t *testing.T) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{
|
|
Match: "all",
|
|
Sort: QuerySort{Field: "last_air_date", Order: "desc"},
|
|
},
|
|
}
|
|
|
|
if err := validateCatalogQueryRequest(req, false); err != nil {
|
|
t.Fatalf("expected last_air_date sort to be accepted, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestValidateCatalogQueryRequest_AllowsEpisodeMediaScope(t *testing.T) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{
|
|
MediaScope: "episode",
|
|
Match: "all",
|
|
Sort: QuerySort{Field: "title", Order: "asc"},
|
|
},
|
|
}
|
|
|
|
if err := validateCatalogQueryRequest(req, true); err != nil {
|
|
t.Fatalf("expected episode media scope to be accepted, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestValidateCatalogQueryRequest_AllowsEbookMediaScope(t *testing.T) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{
|
|
MediaScope: "ebook",
|
|
Match: "all",
|
|
Sort: QuerySort{Field: "title", Order: "asc"},
|
|
},
|
|
}
|
|
|
|
if err := validateCatalogQueryRequest(req, true); err != nil {
|
|
t.Fatalf("expected ebook media scope to be accepted, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestValidateCatalogQueryRequest_AllowsAddedAtFilter(t *testing.T) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{
|
|
Match: "all",
|
|
Groups: []QueryGroup{{
|
|
Match: "all",
|
|
Rules: []QueryRule{{Field: "added_at", Op: "in_last", Value: "1y"}},
|
|
}},
|
|
Sort: QuerySort{Field: "title", Order: "asc"},
|
|
},
|
|
}
|
|
|
|
if err := validateCatalogQueryRequest(req, true); err != nil {
|
|
t.Fatalf("expected added_at filter to be accepted, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestValidateCatalogQueryRequest_RejectsPersonalizedSortWithoutProfileScopedSurface(t *testing.T) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{
|
|
Match: "all",
|
|
Sort: QuerySort{Field: "progress", Order: "desc"},
|
|
},
|
|
}
|
|
|
|
if err := validateCatalogQueryRequest(req, false); err == nil {
|
|
t.Fatal("expected progress sort to be rejected for shared query sources")
|
|
}
|
|
}
|
|
|
|
func TestValidateCatalogQueryRequest_AllowsPersonalizedSortWithProfileScopedSurface(t *testing.T) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{
|
|
Match: "all",
|
|
Sort: QuerySort{Field: "progress", Order: "desc"},
|
|
},
|
|
}
|
|
|
|
if err := validateCatalogQueryRequest(req, true); err != nil {
|
|
t.Fatalf("expected progress sort to be accepted for profile-scoped query source, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestCatalogRuleMatchesItem_InLastDateFields(t *testing.T) {
|
|
recentRelease := time.Now().UTC().AddDate(0, 0, -10).Format("2006-01-02")
|
|
oldRelease := time.Now().UTC().AddDate(-2, 0, 0).Format("2006-01-02")
|
|
recentItem := &models.MediaItem{
|
|
CreatedAt: time.Now().AddDate(0, 0, -10),
|
|
ReleaseDate: &recentRelease,
|
|
}
|
|
oldItem := &models.MediaItem{
|
|
CreatedAt: time.Now().AddDate(-2, 0, 0),
|
|
ReleaseDate: &oldRelease,
|
|
}
|
|
|
|
if !catalogRuleMatchesItem(recentItem, QueryRule{Field: "added_at", Op: "in_last", Value: "1y"}) {
|
|
t.Fatal("expected recent added_at to match 1y in_last")
|
|
}
|
|
if catalogRuleMatchesItem(oldItem, QueryRule{Field: "added_at", Op: "in_last", Value: "1y"}) {
|
|
t.Fatal("expected old added_at not to match 1y in_last")
|
|
}
|
|
if !catalogRuleMatchesItem(recentItem, QueryRule{Field: "release_date", Op: "in_last", Value: "1y"}) {
|
|
t.Fatal("expected recent release_date to match 1y in_last")
|
|
}
|
|
if catalogRuleMatchesItem(oldItem, QueryRule{Field: "release_date", Op: "in_last", Value: "1y"}) {
|
|
t.Fatal("expected old release_date not to match 1y in_last")
|
|
}
|
|
}
|
|
|
|
// concurrentCallBarrier records the maximum number of callers observed
|
|
// in-flight at the same time. Each call into the stubbed facet fetcher invokes
|
|
// hit, which:
|
|
//
|
|
// 1. increments an in-flight counter and records a new maximum if applicable;
|
|
// 2. blocks until the configured target of concurrent callers has arrived (or
|
|
// a safety timeout fires) so the maxSeen counter has a chance to climb to
|
|
// the target before any caller returns;
|
|
// 3. decrements the in-flight counter on the way out.
|
|
//
|
|
// assertConcurrent fails the test if fewer than target callers were ever
|
|
// in-flight simultaneously.
|
|
type concurrentCallBarrier struct {
|
|
t *testing.T
|
|
target int32
|
|
inFlight atomic.Int32
|
|
maxSeen atomic.Int32
|
|
releaseC chan struct{}
|
|
once sync.Once
|
|
}
|
|
|
|
func newConcurrentCallBarrier(t *testing.T, target int) *concurrentCallBarrier {
|
|
t.Helper()
|
|
return &concurrentCallBarrier{
|
|
t: t,
|
|
target: int32(target),
|
|
releaseC: make(chan struct{}),
|
|
}
|
|
}
|
|
|
|
func (b *concurrentCallBarrier) markReleased() {
|
|
b.once.Do(func() {
|
|
close(b.releaseC)
|
|
})
|
|
}
|
|
|
|
// hit is invoked from inside a stubbed facet call.
|
|
func (b *concurrentCallBarrier) hit() {
|
|
current := b.inFlight.Add(1)
|
|
defer b.inFlight.Add(-1)
|
|
|
|
for {
|
|
prev := b.maxSeen.Load()
|
|
if current <= prev || b.maxSeen.CompareAndSwap(prev, current) {
|
|
break
|
|
}
|
|
}
|
|
|
|
if current >= b.target {
|
|
// Once at least `target` callers are in-flight, release every blocked
|
|
// caller (including this one) so they can return.
|
|
b.markReleased()
|
|
return
|
|
}
|
|
|
|
// Wait for the target to be reached, or for a safety timeout. The timeout
|
|
// keeps the test from hanging if parallelism is broken.
|
|
select {
|
|
case <-b.releaseC:
|
|
case <-time.After(2 * time.Second):
|
|
// Safety net so a regression doesn't deadlock the test forever.
|
|
b.markReleased()
|
|
}
|
|
}
|
|
|
|
func (b *concurrentCallBarrier) assertConcurrent(t *testing.T) {
|
|
t.Helper()
|
|
if got := b.maxSeen.Load(); got < b.target {
|
|
t.Fatalf("expected at least %d concurrent facet callers, observed max %d", b.target, got)
|
|
}
|
|
}
|
|
|
|
// stubFacetFetcher implements facetFetcher and routes every call through a
|
|
// barrier hit so a test can observe parallelism.
|
|
type stubFacetFetcher struct {
|
|
hit func()
|
|
}
|
|
|
|
func (s *stubFacetFetcher) DistinctArrayColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) DistinctScalarColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) Resolutions(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) JSONBLanguages(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) SubtitleLanguages(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) PeopleByKind(ctx context.Context, kind models.PersonKind, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) AudiobookSeries(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.hit()
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) SearchDistinctArrayColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
s.hit()
|
|
return nil, false, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) SearchDistinctScalarColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
s.hit()
|
|
return nil, false, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) SearchPeopleByKind(ctx context.Context, kind models.PersonKind, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
s.hit()
|
|
return nil, false, nil
|
|
}
|
|
|
|
func (s *stubFacetFetcher) SearchAudiobookSeries(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
s.hit()
|
|
return nil, false, nil
|
|
}
|
|
|
|
type recordingFacetFetcher struct {
|
|
mu sync.Mutex
|
|
peopleKinds []models.PersonKind
|
|
searchPeopleKind models.PersonKind
|
|
searchMediaScope string
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) DistinctArrayColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) DistinctScalarColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) Resolutions(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) JSONBLanguages(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) SubtitleLanguages(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) PeopleByKind(ctx context.Context, kind models.PersonKind, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
s.mu.Lock()
|
|
s.peopleKinds = append(s.peopleKinds, kind)
|
|
s.mu.Unlock()
|
|
if kind == models.PersonKindAuthor {
|
|
return []string{"Author"}, nil
|
|
}
|
|
return []string{"Narrator"}, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) AudiobookSeries(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string) ([]string, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) SearchDistinctArrayColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
return nil, false, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) SearchDistinctScalarColumn(ctx context.Context, column string, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
return nil, false, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) SearchPeopleByKind(ctx context.Context, kind models.PersonKind, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
s.mu.Lock()
|
|
s.searchPeopleKind = kind
|
|
s.searchMediaScope = mediaScope
|
|
s.mu.Unlock()
|
|
return []string{"Author"}, false, nil
|
|
}
|
|
|
|
func (s *recordingFacetFetcher) SearchAudiobookSeries(ctx context.Context, filters BrowseFilters, baseRelation string, mediaScope string, prefix string, limit int) ([]string, bool, error) {
|
|
return nil, false, nil
|
|
}
|
|
|
|
// countingExecutor is a previewExecutor stub that records the number of
|
|
// PreviewPage calls and the AccessFilter passed in (so tests can confirm
|
|
// NamePrefix made it through). It returns an empty result set so the resolver
|
|
// path under test can run without a database.
|
|
type countingExecutor struct {
|
|
previewCalls int
|
|
lastNamePrefix string
|
|
lastLimit int
|
|
}
|
|
|
|
func (c *countingExecutor) PreviewPage(
|
|
_ context.Context,
|
|
_ QueryDefinition,
|
|
access AccessFilter,
|
|
limit int,
|
|
_ int,
|
|
_ bool,
|
|
) ([]*models.MediaItem, int, bool, error) {
|
|
c.previewCalls++
|
|
c.lastNamePrefix = access.NamePrefix
|
|
c.lastLimit = limit
|
|
return []*models.MediaItem{}, 0, false, nil
|
|
}
|
|
|
|
// newTestResolver wires the supplied previewExecutor into a resolver via the
|
|
// test seam so previewQuerySource can be exercised without a database.
|
|
func newTestResolver(exec previewExecutor) *CatalogResolver {
|
|
return &CatalogResolver{
|
|
previewExecutorForScope: func(scope string, snapshot *time.Time) previewExecutor {
|
|
return exec
|
|
},
|
|
}
|
|
}
|
|
|
|
// TestPreviewQuerySource_NamePrefix_DoesNotFetchAllRows asserts that the
|
|
// preview path makes a single PreviewPage call with NamePrefix forwarded into
|
|
// AccessFilter, instead of the previous fetch-all + Go-side filter pattern
|
|
// that called Preview twice (count + full set).
|
|
func TestPreviewQuerySource_NamePrefix_DoesNotFetchAllRows(t *testing.T) {
|
|
exec := &countingExecutor{}
|
|
resolver := newTestResolver(exec)
|
|
|
|
_, err := resolver.previewQuerySource(context.Background(),
|
|
CatalogRequest{NamePrefix: "T", Limit: 20}, AccessFilter{})
|
|
if err != nil {
|
|
t.Fatalf("previewQuerySource error: %v", err)
|
|
}
|
|
if exec.previewCalls != 1 {
|
|
t.Fatalf("expected 1 PreviewPage call; got %d", exec.previewCalls)
|
|
}
|
|
if exec.lastNamePrefix != "T" {
|
|
t.Fatalf("expected NamePrefix=%q to be forwarded into AccessFilter; got %q", "T", exec.lastNamePrefix)
|
|
}
|
|
if exec.lastLimit != 20 {
|
|
t.Fatalf("expected limit=20 to reach the executor; got %d", exec.lastLimit)
|
|
}
|
|
}
|
|
|
|
// TestListFiltersWithOptions_RunsFacetQueriesConcurrently asserts that the
|
|
// resolver runs the facet lookups in parallel rather than serializing them.
|
|
// We expect at least 6 concurrent in-flight callers (the configured cap).
|
|
func TestListFiltersWithOptions_RunsFacetQueriesConcurrently(t *testing.T) {
|
|
const expectedConcurrent = 6
|
|
barrier := newConcurrentCallBarrier(t, expectedConcurrent)
|
|
|
|
resolver := &CatalogResolver{
|
|
browseRepo: &BrowseRepository{},
|
|
facets: &stubFacetFetcher{hit: barrier.hit},
|
|
}
|
|
|
|
req := CatalogRequest{Source: CatalogSourceQuery}
|
|
|
|
if _, err := resolver.ListFiltersWithOptions(
|
|
context.Background(),
|
|
req,
|
|
AccessFilter{},
|
|
CatalogFilterOptions{IncludeTechnical: true},
|
|
); err != nil {
|
|
t.Fatalf("ListFiltersWithOptions returned error: %v", err)
|
|
}
|
|
|
|
barrier.assertConcurrent(t)
|
|
}
|
|
|
|
func TestListFiltersWithOptions_EbookScopeSkipsNarratorFacet(t *testing.T) {
|
|
facets := &recordingFacetFetcher{}
|
|
resolver := &CatalogResolver{
|
|
browseRepo: &BrowseRepository{},
|
|
facets: facets,
|
|
}
|
|
|
|
result, err := resolver.ListFiltersWithOptions(
|
|
context.Background(),
|
|
CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{MediaScope: "ebook"},
|
|
},
|
|
AccessFilter{},
|
|
CatalogFilterOptions{},
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("ListFiltersWithOptions returned error: %v", err)
|
|
}
|
|
|
|
facets.mu.Lock()
|
|
defer facets.mu.Unlock()
|
|
for _, kind := range facets.peopleKinds {
|
|
if kind == models.PersonKindNarrator {
|
|
t.Fatal("ebook filters should not request narrator facets")
|
|
}
|
|
}
|
|
if len(result.Narrators) != 0 {
|
|
t.Fatalf("ebook filters returned narrators = %v, want empty", result.Narrators)
|
|
}
|
|
}
|
|
|
|
func TestSearchFacet_EbookScopeForwardsMediaScope(t *testing.T) {
|
|
facets := &recordingFacetFetcher{}
|
|
resolver := &CatalogResolver{
|
|
browseRepo: &BrowseRepository{},
|
|
facets: facets,
|
|
}
|
|
|
|
result, err := resolver.SearchFacet(
|
|
context.Background(),
|
|
CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{MediaScope: "ebook"},
|
|
},
|
|
AccessFilter{},
|
|
"author",
|
|
"Au",
|
|
20,
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("SearchFacet returned error: %v", err)
|
|
}
|
|
if len(result.Matches) != 1 || result.Matches[0] != "Author" {
|
|
t.Fatalf("matches = %v, want Author", result.Matches)
|
|
}
|
|
|
|
facets.mu.Lock()
|
|
defer facets.mu.Unlock()
|
|
if facets.searchPeopleKind != models.PersonKindAuthor {
|
|
t.Fatalf("searchPeopleKind = %v, want author", facets.searchPeopleKind)
|
|
}
|
|
if facets.searchMediaScope != "ebook" {
|
|
t.Fatalf("search mediaScope = %q, want ebook", facets.searchMediaScope)
|
|
}
|
|
}
|
|
|
|
func TestSearchFacet_EbookScopeRejectsNarratorFacet(t *testing.T) {
|
|
resolver := &CatalogResolver{
|
|
browseRepo: &BrowseRepository{},
|
|
facets: &recordingFacetFetcher{},
|
|
}
|
|
|
|
_, err := resolver.SearchFacet(
|
|
context.Background(),
|
|
CatalogRequest{
|
|
Source: CatalogSourceQuery,
|
|
Query: QueryDefinition{MediaScope: "ebook"},
|
|
},
|
|
AccessFilter{},
|
|
"narrator",
|
|
"Na",
|
|
20,
|
|
)
|
|
if err == nil {
|
|
t.Fatal("expected narrator facet to be rejected for ebook scope")
|
|
}
|
|
}
|