* docs(audiobooks): design spec for plugin absorption Plan to absorb silo-plugin-audiobooks into silo-server as a first-party feature. Audiobooks land in silo's existing SPA; ABS clients connect directly. Hard constraints: reuse existing tables (media_items, media_files, user_watch_progress, user_playback_sessions, people, item_people, library_collections); only two new tables (abs_sessions, podcast_feeds) and at most one column add (media_libraries.kind); silo's main :8080 listener handles ABS Socket.io natively. Out of scope: audiobook requests flow, smart collections, share links, external recommender, custom metadata providers, separate audiobook SPA. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): implementation plan sub-plan 1 (discovery + schema) First of six sub-plans for the absorption. Six tasks: a discovery audit that resolves the spec's Risk questions, four idempotent SQL migrations (abs_sessions, podcast_feeds, media_libraries.kind, audiobooks.enabled feature flag), and an empty-but-compiling internal/audiobooks package scaffolded into cmd/silo. Lands as a strict no-op for users (feature flag defaults to false). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): discovery findings for absorption sub-plan 1 Locks schema/code decisions for migrations 139-142 and downstream sub-plans. Resolves open Risk questions from the absorption design spec. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): migration 139 add abs_sessions table Parallel of jellycompat_sessions for Audiobookshelf-compatible clients. Lets ABS mobile/desktop apps maintain a device-bound session that silo's audiobooks/abs handlers will validate. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(audiobooks): match codebase conventions in migration 139 Lowercases type keywords in the abs_sessions CREATE TABLE body to match neighboring migrations, fixes the client_version column alignment, and replaces the misleading "parallel to jellycompat_sessions" header comment with a more accurate description of the table's role. Cosmetic only — the running schema is unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): migration 140 add podcast_feeds table Side table on media_items for RSS-subscribed podcasts. Holds feed URL, ETag/Last-Modified for conditional fetches, last-refresh timestamp, and the per-feed refresh interval consumed by the upcoming podcastfeed.Refresher scheduled task. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(audiobooks): uppercase PRIMARY KEY in migration 140 Aligns with the codebase convention (type keywords lowercase, constraint keywords uppercase) established in migration 139's post-style-fix form. Cosmetic only — running schema is unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(audiobooks): migration 141 no-op for media_folders.type Sub-plan 1 originally reserved migration 141 to add a 'kind' column to media_libraries discriminating audiobook/podcast libraries. Discovery audit (sub-plan 1 Task 1) found that the actual table is media_folders and it already has a type text NOT NULL column with no CHECK constraint or enum, so 'audiobooks' and 'podcasts' can be added as future values without DDL. Landing this migration as a documented no-op preserves the version numbering audit trail and pins the decision in git history. The matching down migration is also a no-op. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): migration 142 add audiobooks.enabled flag Server-settings row that gates the absorbed audiobooks feature. Defaults to 'false' so sub-plan 1 lands as a strict no-op; subsequent sub-plans branch on this flag and operators flip it to 'true' at cutover. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): scaffold internal/audiobooks package Empty-but-compiling Service that reads the audiobooks.enabled feature flag from server_settings. Wired into cmd/silo so the package is referenced from the binary; no routes mounted, no scheduled tasks registered, no DB writes. Subsequent sub-plans hang scanner branches, ABS handlers, Socket.io, podcast refresher, and SPA pages off this Service. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(audiobooks): cosmetic cleanups in scaffolded package Two pre-emptive cleanups flagged by code review before sub-plan 2 copies the patterns: 1. Sort the internal/audiobooks import after internal/adminjob in cmd/silo/main.go (alphabetical). 2. Drop the redundant "audiobooks: " prefix from the Enabled() error wrap; matches how every other top-level service package (watchstate, scanqueue, metadata, etc.) formats errors. No behavior change. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): implementation plan sub-plan 2 (scanner) Second of six sub-plans. 10 tasks: PersonKind constants for Author and Narrator, audio-extension recognizer, library-type helpers, a walkLogicalTree refactor (movieLibrary bool -> typed walkMode), chapter extraction via ffprobe, single-file and multi-file audiobook parsers, scanner write path producing media_items.type='audiobook', and a filesystem podcast parser (RSS deferred to sub-plan 5). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): add Author and Narrator PersonKind constants Discovery audit confirmed item_people.kind is unconstrained smallint with values 1-6 in use. Reserve 7 = Author, 8 = Narrator for audiobook people-links written by the upcoming scanner branches. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): add audio-extension recognizer for scanner Mirrors the existing videoExtensions/SupportsVideoFile pair. Used by upcoming audiobook and podcast scanner branches to filter directory walks. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): library-type recognizers for scanner dispatch isAudiobookLibraryType and isPodcastLibraryType match singular and plural forms case-insensitively, mirroring isMovieLibraryType. Used by upcoming scanner walk branches (Task 4) that filter audio files into audiobook and podcast libraries. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(scanner): replace movieLibrary bool with typed walkMode Lets walkLogicalTree dispatch on multiple library shapes (video, movie, audiobook, podcast) without proliferating boolean flags. Behavior for existing video and movie libraries is unchanged; audiobook and podcast modes will be consumed by the upcoming audiobook.go and podcast.go parsers in later tasks of this sub-plan. walkModeFor() derives the mode from a media_folders.type string; unknown types default to walkModeVideo to preserve prior behavior for any caller still passing a raw type. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): expose ffprobe format tags on ProbeData The audiobook scanner needs format-level tags (title, artist, album, date) for media_items metadata; ffprobe already parses them in ffprobeFormat.Tags but ProbeData previously discarded them. Add FormatTags map[string]string to ProbeData, populate it in convertProbeData via a new normalizeFormatTags helper that lowercases keys and trims values. Adds a fixture audiobook .m4b with embedded chapters (Intro/Outro) and format tags, and a test that verifies ProbeFile() returns both correctly. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): parser for single-file audiobook folders parseAudiobookFolder reads tags + chapters via the existing ProbeFile (now that Task 5 exposes FormatTags on ProbeData) and produces a parsedAudiobook struct. Title falls back from "title" tag to "album"; author from "artist" -> "album_artist" -> "composer"; series from "album" -> "series" -> "mvnm" (Movement Name, used by some MP4 tools). Year parsed from "date" or "year" tags, tolerating ISO dates and parenthesized forms. Single-file case only; multi-file folders (one audio file per chapter) return a placeholder error and arrive in Task 7. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): multi-file audiobook folder support Folders containing N audio files (one per chapter/part) get one parsedAudiobookFile per file; each file's chapter list is synthesized as a single chapter with title = filename stem. Title/author/series/ year come from the first file's tags. Also drops the duplicate pickFirstNonEmpty helper added in Task 6 in favor of the existing firstNonEmpty already in probe.go. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): scanner write path produces audiobook media_items ScanAudiobookFolder walks an audiobooks-typed media folder and treats each immediate subdirectory as one audiobook. For each parsed audiobook it upserts: - one media_items row with type='audiobook' - one media_files row per audio file (with chapters JSONB) - author/narrator links in item_people (kind=7, kind=8) Adds itemRepo and personRepo to the Scanner struct, wired from fileRepo.Pool() in NewScanner — no constructor signature change needed. ScanFolder dispatches to this path when folder.Type='audiobooks', bypassing the per-file movie/TV pipeline because audiobooks are folder-scoped entities. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): filesystem podcast scanner ScanPodcastFolder walks a podcasts-typed media folder, treating each subdirectory as a podcast show and each audio file inside as an episode. Writes media_items.type='podcast' + episodes rows + media_files rows. RSS-subscribed feeds (podcast_feeds table) arrive in sub-plan 5; this task covers filesystem-only ingestion. ScanFolder dispatches to this path when folder.Type='podcasts'. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): implementation plan sub-plan 5 (podcasts) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): expose audiobooks/podcasts library types in admin UI Adds 'Audiobooks' and 'Podcasts' options to the library-type dropdown in the admin libraries page so operators can flag a folder as an audiobook or podcast library. Extends contentLevelsForType() so the admin UI's downstream filtering treats those types correctly (audiobook -> ['audiobook'], podcasts -> ['podcast', 'podcast_episode']). Backend scanner branches for these types were already wired in sub-plan 2. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 139_abs_sessions to 147 for origin/main merge origin/main adds 139_media_requests at the same number our local audiobook branch had used for abs_sessions. Renumber ours to 147 to free up 139 for the upstream migration. The schema_versions row is updated in lockstep on the running database so the migrator sees the abs_sessions migration as already applied at its new version. Migrations 140-146 (podcast feeds, media_folders kind noop, audiobook feature flag, abs playback sessions, podcast episode guid, audiobook series, audiobook title cleanup) stay where they are — they don't collide with anything on origin/main. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 140_podcast_feeds to 157 for origin/main merge origin/main added 140_user_permissions at the same version this branch had used for podcast_feeds. Renumber ours to 157 (next free above the collections-unify migration at 156) so 140 is free for the upstream migration. schema_versions on the running database is updated in lockstep so the migrator sees podcast_feeds as already applied at its new version. Same pattern asd59c1cb(renumber 139_abs_sessions to 147 for the prior main merge). Pending migrations after this rename: 132 (downloaded subtitles admin index, main), 140 (user_permissions, main), and 156 (unify_user_collections, this branch). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 141_media_folders_kind_noop to 159 for origin/main merge Same shape aseb8f67d(the 140→157 renumber from the previous main merge). origin/main added 141_episode_title_sort_index at the same version this branch had used for media_folders_kind_noop. Renumber ours to 159 (next free above the audiobook_series truncate at 158) so 141 is open for the upstream migration. schema_versions on the running database is updated in lockstep so the migrator sees media_folders_kind_noop as already applied at its new version. Pending migrations on silo-prod after this rename: 141 (episode_title_sort_index, main) and any other newer ones from main that the branch hasn't picked up yet. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 142_audiobooks_feature_flag to 160 for origin/main merge Companion to 3c6f062's 141 renumber — origin/main also added 142_episode_catalog_entries (alongside 141_episode_title_sort_index) at a version this branch had used for the audiobooks feature flag. Renumber ours to 160 so 142 is open for the upstream migration; schema_versions on silo-prod is updated in lockstep so the migrator sees audiobooks_feature_flag as already applied at its new version. This was the only remaining collision (verified by checking for duplicate version prefixes across migrations/). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(audiobooks): address foundation review comments * fix(audiobooks): tighten scanner identity handling * fix(audiobooks): propagate scanner cancellation * chore(audiobooks): adopt goose migration layout * docs(audiobooks): implementation plan sub-plan 3 (API + frontend MVP) Third of six sub-plans. 9 tasks: three REST endpoints (list/detail/ progress), TanStack Query hooks + types, three React pages (Library/Detail/Player), and navigation integration. Scoped to MVP — author/series indices, smart collections, share links, and other nice-to-haves from the spec are deferred. Streaming reuses silo's existing /api/v1/stream/{session_id}; no new transcode code. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): list endpoint at GET /api/v1/audiobooks Paginated list of media_items with type='audiobook' scoped to the caller's accessible libraries via the existing access filter. Mirrors silo's existing list-style handlers for movies and series. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): detail endpoint at GET /api/v1/audiobooks/{id} Returns the media_items row, its media_files (with chapters JSONB), author/narrator extracted from item_people (kinds 7/8), and the caller's per-profile listening progress from user_watch_progress. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): progress endpoint at POST /api/v1/audiobooks/{id}/progress UPSERTs user_watch_progress for the caller's (user_id, profile_id, content_id). Body carries position_seconds; clients are expected to post every 5-10s during playback plus on pause/seek (matching silo's existing video progress cadence). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): frontend types and TanStack Query hooks TypeScript types match the JSON shapes from the new /api/v1/audiobooks endpoints (list, detail, progress). Three hooks: useAudiobookLibrary (list), useAudiobook (detail), and useReportAudiobookProgress (mutation that invalidates the detail query on success so progress updates reflect immediately). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): library grid page at /audiobooks Renders a paginated grid of audiobook cards using the useAudiobookLibrary hook. Each card links to /audiobooks/book/{id}. Cards show poster, title, and year; falls back to a "No cover" placeholder when the audiobook has no poster_url. Empty state hints to operators that they need to set a library's type to 'audiobooks'. Routes themselves are wired in Task 8 (navigation integration). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): detail page with chapter list Renders cover, title, author, narrator, year, and overview alongside a chapter list. Clicking a chapter opens an inline sticky AudiobookPlayer at that chapter's start. A "Resume" button restarts playback at the saved progress position if present. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): HTML5 audio player with chapter navigation Single-file audiobook playback for MVP. Multi-file queuing arrives in a follow-up. Streams via the existing /api/v1/direct-download GET endpoint. Position is reported to /api/v1/audiobooks/{id}/progress every 10s while playing plus on pause/seek/end. Skip-30s, playback rate select, chapter list panel. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): wire navigation and routes Adds an Audiobooks entry to the sidebar and registers the two new routes (/audiobooks for the library grid, /audiobooks/book/:id for detail). The player renders inline inside the detail page; no dedicated player route is required for MVP. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(audiobooks): address native API review comments * feat(audiobooks): add ABS compatibility and polish * fix(audiobooks): stabilize ABS playback progress reporting * fix(audiobooks): clean up ABS branch review fixes * chore(audiobooks): adopt goose layout for ABS migrations * fix(audiobooks): align player seek bar props * feat(audiobooks): make libraries first-class catalog items * feat(admin): add server restart endpoint * fix(audiobooks): address review comment findings --------- Co-authored-by: RXWatcher <14085001+RXWatcher@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
443 lines
12 KiB
Go
443 lines
12 KiB
Go
package catalog
|
|
|
|
import (
|
|
"fmt"
|
|
"net/url"
|
|
"regexp"
|
|
"slices"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
var (
|
|
catalogGroupMatchPattern = regexp.MustCompile(`^groups\[(\d+)\]\[match\]$`)
|
|
catalogGroupRulePattern = regexp.MustCompile(`^groups\[(\d+)\]\[rules\]\[(\d+)\]\[(field|op|value)\]$`)
|
|
catalogGroupRuleValuePattern = regexp.MustCompile(`^groups\[(\d+)\]\[rules\]\[(\d+)\]\[value\]\[(\d+)\]$`)
|
|
)
|
|
|
|
type catalogOverlay struct {
|
|
searchQuery string
|
|
namePrefix string
|
|
query QueryDefinition
|
|
hasExplicitSort bool
|
|
}
|
|
|
|
type catalogGroupBuilder struct {
|
|
match string
|
|
rules map[int]*catalogRuleBuilder
|
|
}
|
|
|
|
type catalogRuleBuilder struct {
|
|
field string
|
|
op string
|
|
values []any
|
|
indexedValues map[int]any
|
|
}
|
|
|
|
// ParseCatalogRequest converts catalog URL params into a normalized request.
|
|
func ParseCatalogRequest(values url.Values) (CatalogRequest, error) {
|
|
req := CatalogRequest{
|
|
Source: CatalogSource(strings.ToLower(strings.TrimSpace(values.Get("source")))),
|
|
Limit: 20,
|
|
}
|
|
if req.Source == "" {
|
|
req.Source = CatalogSourceQuery
|
|
}
|
|
|
|
if limit := ParseIntParam(values.Get("limit")); limit > 0 {
|
|
req.Limit = limit
|
|
}
|
|
if req.Limit > 100 {
|
|
req.Limit = 100
|
|
}
|
|
req.Offset = max(ParseIntParam(values.Get("offset")), 0)
|
|
req.SkipTotal = parseCatalogSkipTotal(values.Get("include_total"))
|
|
|
|
if raw := strings.TrimSpace(values.Get("snapshot")); raw != "" {
|
|
t, err := time.Parse(time.RFC3339Nano, raw)
|
|
if err != nil {
|
|
return CatalogRequest{}, fmt.Errorf("invalid snapshot timestamp: %w", err)
|
|
}
|
|
req.SnapshotAt = &t
|
|
}
|
|
|
|
switch req.Source {
|
|
case CatalogSourceQuery:
|
|
overlay, err := parseCatalogOverlay(values)
|
|
if err != nil {
|
|
return CatalogRequest{}, err
|
|
}
|
|
req.NamePrefix = overlay.namePrefix
|
|
req.SearchQuery = overlay.searchQuery
|
|
req.Query = overlay.query
|
|
req.UseSourceOrder = false
|
|
if !overlay.hasExplicitSort {
|
|
req.Query.Sort = defaultCatalogQuerySort(req.SearchQuery)
|
|
}
|
|
case CatalogSourceFavorites, CatalogSourceWatchlist, CatalogSourceHistory:
|
|
overlay, err := parseCatalogOverlay(values)
|
|
if err != nil {
|
|
return CatalogRequest{}, err
|
|
}
|
|
req.NamePrefix = overlay.namePrefix
|
|
req.SearchQuery = overlay.searchQuery
|
|
req.Query = overlay.query
|
|
req.UseSourceOrder = !overlay.hasExplicitSort
|
|
case CatalogSourcePerson:
|
|
req.PersonID = ParseInt64Param(values.Get("person_id"))
|
|
if req.PersonID <= 0 {
|
|
return CatalogRequest{}, fmt.Errorf("person_id is required")
|
|
}
|
|
overlay, err := parseCatalogOverlay(values)
|
|
if err != nil {
|
|
return CatalogRequest{}, err
|
|
}
|
|
req.NamePrefix = overlay.namePrefix
|
|
req.SearchQuery = overlay.searchQuery
|
|
req.Query = overlay.query
|
|
req.UseSourceOrder = !overlay.hasExplicitSort
|
|
case CatalogSourceSection:
|
|
scope := strings.ToLower(strings.TrimSpace(values.Get("scope")))
|
|
if scope == "" {
|
|
scope = "library"
|
|
}
|
|
if scope != "home" && scope != "library" {
|
|
return CatalogRequest{}, fmt.Errorf("scope must be 'home' or 'library'")
|
|
}
|
|
req.Scope = scope
|
|
req.SectionID = strings.TrimSpace(values.Get("section_id"))
|
|
if req.SectionID == "" {
|
|
return CatalogRequest{}, fmt.Errorf("section_id is required")
|
|
}
|
|
if scope == "library" {
|
|
libraryID := ParseIntParam(values.Get("library_id"))
|
|
if libraryID <= 0 {
|
|
return CatalogRequest{}, fmt.Errorf("library_id is required for library sections")
|
|
}
|
|
req.LibraryID = libraryID
|
|
}
|
|
if hasCatalogOverlayParams(values, scope == "library") {
|
|
return CatalogRequest{}, fmt.Errorf("source %q does not allow overlay params", req.Source)
|
|
}
|
|
req.UseSourceOrder = true
|
|
case CatalogSourceLibraryCollection, CatalogSourceUserCollection:
|
|
req.CollectionID = strings.TrimSpace(values.Get("collection_id"))
|
|
if req.CollectionID == "" {
|
|
return CatalogRequest{}, fmt.Errorf("collection_id is required")
|
|
}
|
|
if hasCatalogOverlayParams(values, false) {
|
|
return CatalogRequest{}, fmt.Errorf("source %q does not allow overlay params", req.Source)
|
|
}
|
|
req.UseSourceOrder = true
|
|
default:
|
|
return CatalogRequest{}, fmt.Errorf("unsupported catalog source %q", req.Source)
|
|
}
|
|
|
|
return req, nil
|
|
}
|
|
|
|
func parseCatalogSkipTotal(raw string) bool {
|
|
raw = strings.TrimSpace(raw)
|
|
if raw == "" {
|
|
return false
|
|
}
|
|
includeTotal, err := strconv.ParseBool(raw)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return !includeTotal
|
|
}
|
|
|
|
func parseCatalogOverlay(values url.Values) (catalogOverlay, error) {
|
|
def := QueryDefinition{
|
|
Match: normalizeCatalogMatch(values.Get("match")),
|
|
Groups: []QueryGroup{},
|
|
}
|
|
|
|
searchQuery := strings.TrimSpace(values.Get("q"))
|
|
if libraryID := ParseIntParam(values.Get("library_id")); libraryID > 0 {
|
|
def.LibraryIDs = []int{libraryID}
|
|
}
|
|
if mediaScope := parseCatalogMediaScope(values.Get("type")); mediaScope != "" {
|
|
def.MediaScope = mediaScope
|
|
}
|
|
if queryLimit := ParseIntParam(values.Get("query_limit")); queryLimit > 0 {
|
|
def.Limit = &queryLimit
|
|
}
|
|
|
|
implicitRules := make([]QueryRule, 0, 4)
|
|
if genre := strings.TrimSpace(values.Get("genre")); genre != "" {
|
|
implicitRules = append(implicitRules, QueryRule{Field: "genre", Op: "contains", Value: genre})
|
|
}
|
|
if status := strings.TrimSpace(values.Get("status")); status != "" {
|
|
implicitRules = append(implicitRules, QueryRule{Field: "status", Op: "is", Value: status})
|
|
}
|
|
|
|
yearMin := ParseIntParam(values.Get("year_min"))
|
|
yearMax := ParseIntParam(values.Get("year_max"))
|
|
switch {
|
|
case yearMin > 0 && yearMax > 0:
|
|
implicitRules = append(implicitRules, QueryRule{Field: "year", Op: "between", Value: []any{yearMin, yearMax}})
|
|
case yearMin > 0:
|
|
implicitRules = append(implicitRules, QueryRule{Field: "year", Op: "gte", Value: yearMin})
|
|
case yearMax > 0:
|
|
implicitRules = append(implicitRules, QueryRule{Field: "year", Op: "lte", Value: yearMax})
|
|
}
|
|
|
|
if len(implicitRules) > 0 {
|
|
def.Groups = append(def.Groups, QueryGroup{
|
|
Match: "all",
|
|
Rules: implicitRules,
|
|
})
|
|
}
|
|
|
|
if ratings := ParseContentRatings(values.Get("content_rating")); len(ratings) == 1 {
|
|
def.Groups = append(def.Groups, QueryGroup{
|
|
Match: "all",
|
|
Rules: []QueryRule{{Field: "content_rating", Op: "is", Value: ratings[0]}},
|
|
})
|
|
} else if len(ratings) > 1 {
|
|
rules := make([]QueryRule, 0, len(ratings))
|
|
for _, rating := range ratings {
|
|
rules = append(rules, QueryRule{Field: "content_rating", Op: "is", Value: rating})
|
|
}
|
|
def.Groups = append(def.Groups, QueryGroup{Match: "any", Rules: rules})
|
|
}
|
|
|
|
explicitGroups, err := parseCatalogGroups(values)
|
|
if err != nil {
|
|
return catalogOverlay{}, err
|
|
}
|
|
def.Groups = append(def.Groups, explicitGroups...)
|
|
|
|
hasExplicitSort := values.Get("sort") != "" || values.Get("order") != ""
|
|
if hasExplicitSort {
|
|
def.Sort = normalizeExplicitCatalogSort(values.Get("sort"), values.Get("order"))
|
|
}
|
|
|
|
return catalogOverlay{
|
|
searchQuery: searchQuery,
|
|
namePrefix: strings.TrimSpace(values.Get("name_prefix")),
|
|
query: def,
|
|
hasExplicitSort: hasExplicitSort,
|
|
}, nil
|
|
}
|
|
|
|
func parseCatalogGroups(values url.Values) ([]QueryGroup, error) {
|
|
groupBuilders := map[int]*catalogGroupBuilder{}
|
|
|
|
for key, rawValues := range values {
|
|
if matches := catalogGroupMatchPattern.FindStringSubmatch(key); matches != nil {
|
|
groupIdx, _ := strconv.Atoi(matches[1])
|
|
builder := ensureCatalogGroupBuilder(groupBuilders, groupIdx)
|
|
if len(rawValues) > 0 {
|
|
builder.match = rawValues[0]
|
|
}
|
|
continue
|
|
}
|
|
|
|
if matches := catalogGroupRulePattern.FindStringSubmatch(key); matches != nil {
|
|
groupIdx, _ := strconv.Atoi(matches[1])
|
|
ruleIdx, _ := strconv.Atoi(matches[2])
|
|
fieldName := matches[3]
|
|
rule := ensureCatalogRuleBuilder(groupBuilders, groupIdx, ruleIdx)
|
|
switch fieldName {
|
|
case "field":
|
|
if len(rawValues) > 0 {
|
|
rule.field = rawValues[0]
|
|
}
|
|
case "op":
|
|
if len(rawValues) > 0 {
|
|
rule.op = rawValues[0]
|
|
}
|
|
case "value":
|
|
rule.values = make([]any, 0, len(rawValues))
|
|
for _, value := range rawValues {
|
|
rule.values = append(rule.values, parseCatalogScalar(value))
|
|
}
|
|
}
|
|
continue
|
|
}
|
|
|
|
if matches := catalogGroupRuleValuePattern.FindStringSubmatch(key); matches != nil {
|
|
groupIdx, _ := strconv.Atoi(matches[1])
|
|
ruleIdx, _ := strconv.Atoi(matches[2])
|
|
valueIdx, _ := strconv.Atoi(matches[3])
|
|
rule := ensureCatalogRuleBuilder(groupBuilders, groupIdx, ruleIdx)
|
|
if len(rawValues) == 0 {
|
|
continue
|
|
}
|
|
if rule.indexedValues == nil {
|
|
rule.indexedValues = map[int]any{}
|
|
}
|
|
rule.indexedValues[valueIdx] = parseCatalogScalar(rawValues[0])
|
|
}
|
|
}
|
|
|
|
if len(groupBuilders) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
groupIndexes := make([]int, 0, len(groupBuilders))
|
|
for idx := range groupBuilders {
|
|
groupIndexes = append(groupIndexes, idx)
|
|
}
|
|
slices.Sort(groupIndexes)
|
|
|
|
groups := make([]QueryGroup, 0, len(groupIndexes))
|
|
for _, groupIdx := range groupIndexes {
|
|
builder := groupBuilders[groupIdx]
|
|
ruleIndexes := make([]int, 0, len(builder.rules))
|
|
for idx := range builder.rules {
|
|
ruleIndexes = append(ruleIndexes, idx)
|
|
}
|
|
slices.Sort(ruleIndexes)
|
|
|
|
rules := make([]QueryRule, 0, len(ruleIndexes))
|
|
for _, ruleIdx := range ruleIndexes {
|
|
ruleBuilder := builder.rules[ruleIdx]
|
|
rules = append(rules, QueryRule{
|
|
Field: ruleBuilder.field,
|
|
Op: ruleBuilder.op,
|
|
Value: ruleBuilder.value(),
|
|
})
|
|
}
|
|
|
|
groups = append(groups, QueryGroup{
|
|
Match: normalizeCatalogMatch(builder.match),
|
|
Rules: rules,
|
|
})
|
|
}
|
|
|
|
return groups, nil
|
|
}
|
|
|
|
func ensureCatalogGroupBuilder(groups map[int]*catalogGroupBuilder, groupIdx int) *catalogGroupBuilder {
|
|
builder := groups[groupIdx]
|
|
if builder == nil {
|
|
builder = &catalogGroupBuilder{rules: map[int]*catalogRuleBuilder{}}
|
|
groups[groupIdx] = builder
|
|
}
|
|
return builder
|
|
}
|
|
|
|
func ensureCatalogRuleBuilder(groups map[int]*catalogGroupBuilder, groupIdx, ruleIdx int) *catalogRuleBuilder {
|
|
group := ensureCatalogGroupBuilder(groups, groupIdx)
|
|
rule := group.rules[ruleIdx]
|
|
if rule == nil {
|
|
rule = &catalogRuleBuilder{}
|
|
group.rules[ruleIdx] = rule
|
|
}
|
|
return rule
|
|
}
|
|
|
|
func (r *catalogRuleBuilder) value() any {
|
|
if len(r.indexedValues) > 0 {
|
|
indexes := make([]int, 0, len(r.indexedValues))
|
|
for idx := range r.indexedValues {
|
|
indexes = append(indexes, idx)
|
|
}
|
|
slices.Sort(indexes)
|
|
|
|
values := make([]any, 0, len(indexes))
|
|
for _, idx := range indexes {
|
|
values = append(values, r.indexedValues[idx])
|
|
}
|
|
return values
|
|
}
|
|
|
|
if len(r.values) == 1 {
|
|
return r.values[0]
|
|
}
|
|
if len(r.values) > 1 {
|
|
return r.values
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func hasCatalogOverlayParams(values url.Values, ignoreLibraryID bool) bool {
|
|
for key, rawValues := range values {
|
|
if len(rawValues) == 0 {
|
|
continue
|
|
}
|
|
if strings.HasPrefix(key, "groups[") {
|
|
return true
|
|
}
|
|
|
|
switch key {
|
|
case "source", "scope", "section_id", "collection_id", "title", "limit", "offset", "snapshot":
|
|
continue
|
|
case "library_id":
|
|
if ignoreLibraryID {
|
|
continue
|
|
}
|
|
return true
|
|
case "q", "name_prefix", "match", "type", "genre", "year_min", "year_max", "content_rating", "status", "sort", "order", "query_limit":
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func normalizeCatalogMatch(raw string) string {
|
|
if strings.EqualFold(strings.TrimSpace(raw), "any") {
|
|
return "any"
|
|
}
|
|
return "all"
|
|
}
|
|
|
|
func parseCatalogMediaScope(raw string) string {
|
|
switch strings.ToLower(strings.TrimSpace(raw)) {
|
|
case "movie", "series", "episode", "audiobook":
|
|
return strings.ToLower(strings.TrimSpace(raw))
|
|
default:
|
|
return ""
|
|
}
|
|
}
|
|
|
|
func defaultCatalogQuerySort(searchQuery string) QuerySort {
|
|
if strings.TrimSpace(searchQuery) != "" {
|
|
return QuerySort{Field: "relevance", Order: "desc"}
|
|
}
|
|
return QuerySort{Field: "title", Order: "asc"}
|
|
}
|
|
|
|
func normalizeExplicitCatalogSort(field, order string) QuerySort {
|
|
normalizedField := strings.ToLower(strings.TrimSpace(field))
|
|
normalizedOrder := strings.ToLower(strings.TrimSpace(order))
|
|
|
|
if normalizedField == "relevance" {
|
|
if normalizedOrder == "" {
|
|
normalizedOrder = "desc"
|
|
}
|
|
return QuerySort{Field: normalizedField, Order: normalizedOrder}
|
|
}
|
|
|
|
normalized := NormalizeQuerySort(QuerySort{Field: normalizedField, Order: normalizedOrder})
|
|
if normalizedField == "" {
|
|
normalized.Field = ""
|
|
}
|
|
return normalized
|
|
}
|
|
|
|
func parseCatalogScalar(raw string) any {
|
|
trimmed := strings.TrimSpace(raw)
|
|
switch strings.ToLower(trimmed) {
|
|
case "true":
|
|
return true
|
|
case "false":
|
|
return false
|
|
}
|
|
|
|
if i, err := strconv.Atoi(trimmed); err == nil {
|
|
return i
|
|
}
|
|
if f, err := strconv.ParseFloat(trimmed, 64); err == nil {
|
|
return f
|
|
}
|
|
|
|
return trimmed
|
|
}
|