* 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>
323 lines
11 KiB
Go
323 lines
11 KiB
Go
// Package smartcoll implements the rule-based Smart Collection DSL for
|
|
// silo's ABS audiobook surface. Audiobook-domain field catalog
|
|
// (title, author, narrator, series, genre, year, rating, language,
|
|
// publisher, added_at, duration_seconds, plus personalized: finished,
|
|
// in_progress, last_played, abandoned, bookmark_count).
|
|
//
|
|
// All evaluation happens Go-side (see evaluator.go); SQL pushdown is
|
|
// a deferred follow-up (parent spec §10).
|
|
package smartcoll
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
// QueryDefinition is the wire-shape stored in smart_collection.query_def.
|
|
// Mirrors the host's QueryDefinition exactly except for the audiobook
|
|
// field catalog and the absence of media_scope (audiobook libraries
|
|
// are single-type already; podcast libraries handle their own shelves).
|
|
type QueryDefinition struct {
|
|
LibraryIDs []int64 `json:"library_ids,omitempty"`
|
|
Match string `json:"match"`
|
|
Groups []QueryGroup `json:"groups"`
|
|
Sort QuerySort `json:"sort"`
|
|
Limit *int `json:"limit,omitempty"`
|
|
}
|
|
|
|
// QueryGroup combines a list of rules with a per-group all/any boolean
|
|
// combinator. Top-level QueryDefinition.Match combines groups; per-
|
|
// group QueryGroup.Match combines rules.
|
|
type QueryGroup struct {
|
|
Match string `json:"match"`
|
|
Rules []QueryRule `json:"rules"`
|
|
}
|
|
|
|
// QueryRule is one filter clause: field + op + value. value is any so
|
|
// it tolerates strings, numbers, booleans, and 2-tuples for `between`.
|
|
type QueryRule struct {
|
|
Field string `json:"field"`
|
|
Op string `json:"op"`
|
|
Value any `json:"value"`
|
|
}
|
|
|
|
// QuerySort picks the result ordering. `relevance` is reserved for a
|
|
// future embedding-similarity sort; today it falls back to added_at.
|
|
type QuerySort struct {
|
|
Field string `json:"field"`
|
|
Order string `json:"order"`
|
|
}
|
|
|
|
// defaultSortField is the fallback ordering when none is supplied —
|
|
// newest-first added_at, mirroring real ABS catalog defaults.
|
|
const defaultSortField = "added_at"
|
|
|
|
// queryFieldDef is the catalog entry that pins (a) the wire field name
|
|
// to (b) the set of operators that field can use and (c) whether the
|
|
// field requires user/profile scope. Personalized fields touch
|
|
// per-user state (progress / bookmarks / play counts) and can only
|
|
// be evaluated against the requesting user.
|
|
type queryFieldDef struct {
|
|
validOps map[string]bool
|
|
isArray bool // field holds an array (e.g. genres) — affects "contains"
|
|
personalized bool // requires per-user state
|
|
}
|
|
|
|
// querySortDef is the catalog entry for one sortable column —
|
|
// defaultOrder (when caller omits Order) and a personalized flag for
|
|
// sorts that read per-user state.
|
|
type querySortDef struct {
|
|
defaultOrder string
|
|
personalized bool
|
|
}
|
|
|
|
// queryFieldAliases lets older clients keep working when we canonicalise
|
|
// a field name — alias keys map to the canonical entry in
|
|
// queryFieldDefs. "rating" → "rating_imdb" is the host pattern; we map
|
|
// "narrators" / "authors" plurals back to singular here.
|
|
var queryFieldAliases = map[string]string{
|
|
"authors": "author",
|
|
"narrators": "narrator",
|
|
"genres": "genre",
|
|
}
|
|
|
|
// querySortAliases analogous to queryFieldAliases for the sort field
|
|
// catalog. Keeps URL-style "recently-added" / "sort_title" client
|
|
// vocab usable.
|
|
var querySortAliases = map[string]string{
|
|
"sort_title": "title",
|
|
"recently_added": "added_at",
|
|
"duration": "duration_seconds",
|
|
}
|
|
|
|
// queryFieldDefs is the audiobook-domain rule field catalog. Mirror of
|
|
// the host's queryFieldDefs but adapted from video → audio fields.
|
|
// Personalized fields (finished / in_progress / last_played /
|
|
// abandoned / bookmark_count) require a user_id at evaluate time —
|
|
// the validator rejects them when no profile scope is provided.
|
|
var queryFieldDefs = map[string]queryFieldDef{
|
|
"title": {validOps: map[string]bool{"is": true, "is_not": true, "contains": true}},
|
|
"author": {validOps: map[string]bool{"is": true, "is_not": true, "contains": true}, isArray: true},
|
|
"narrator": {validOps: map[string]bool{"is": true, "is_not": true, "contains": true}, isArray: true},
|
|
"series": {validOps: map[string]bool{"is": true, "is_not": true, "contains": true}, isArray: true},
|
|
"genre": {validOps: map[string]bool{"is": true, "is_not": true, "contains": true}, isArray: true},
|
|
"year": {validOps: map[string]bool{"is": true, "is_not": true, "gt": true, "gte": true, "lt": true, "lte": true, "between": true}},
|
|
"rating": {validOps: map[string]bool{"gt": true, "gte": true, "lt": true, "lte": true, "between": true}},
|
|
"language": {validOps: map[string]bool{"is": true, "is_not": true}},
|
|
"publisher": {validOps: map[string]bool{"is": true, "is_not": true, "contains": true}},
|
|
"added_at": {validOps: map[string]bool{"gt": true, "lt": true, "between": true, "in_last": true}},
|
|
"duration_seconds": {validOps: map[string]bool{"gt": true, "gte": true, "lt": true, "lte": true, "between": true}},
|
|
"finished": {validOps: map[string]bool{"is": true}, personalized: true},
|
|
"in_progress": {validOps: map[string]bool{"is": true}, personalized: true},
|
|
"last_played": {validOps: map[string]bool{"gt": true, "gte": true, "lt": true, "lte": true, "between": true, "in_last": true}, personalized: true},
|
|
"abandoned": {validOps: map[string]bool{"is": true}, personalized: true},
|
|
"bookmark_count": {validOps: map[string]bool{"gt": true, "gte": true, "lt": true, "lte": true, "between": true}, personalized: true},
|
|
}
|
|
|
|
// querySortDefs is the audiobook sort catalog. `random` is a sentinel
|
|
// that shuffles the result deterministically per-query (seeded by the
|
|
// collection id so successive page loads are stable).
|
|
var querySortDefs = map[string]querySortDef{
|
|
"title": {defaultOrder: "asc"},
|
|
"added_at": {defaultOrder: "desc"},
|
|
"year": {defaultOrder: "desc"},
|
|
"duration_seconds": {defaultOrder: "desc"},
|
|
"rating": {defaultOrder: "desc"},
|
|
"random": {defaultOrder: "asc"},
|
|
"progress": {defaultOrder: "desc", personalized: true},
|
|
"last_played": {defaultOrder: "desc", personalized: true},
|
|
"plays": {defaultOrder: "desc", personalized: true},
|
|
}
|
|
|
|
// Normalize lowercases + trims field/op/match values, applies aliases,
|
|
// dedupes library_ids, and supplies sort defaults. Idempotent — calling
|
|
// Normalize twice produces the same value.
|
|
func (q QueryDefinition) Normalize() QueryDefinition {
|
|
out := q
|
|
out.Match = normalizeMatch(out.Match)
|
|
out.LibraryIDs = normalizeLibraryIDs(out.LibraryIDs)
|
|
out.Sort = NormalizeSort(out.Sort)
|
|
if out.Groups == nil {
|
|
out.Groups = []QueryGroup{}
|
|
}
|
|
for i := range out.Groups {
|
|
out.Groups[i].Match = normalizeMatch(out.Groups[i].Match)
|
|
if out.Groups[i].Rules == nil {
|
|
out.Groups[i].Rules = []QueryRule{}
|
|
}
|
|
for j := range out.Groups[i].Rules {
|
|
field := strings.ToLower(strings.TrimSpace(out.Groups[i].Rules[j].Field))
|
|
if canon, ok := queryFieldAliases[field]; ok {
|
|
field = canon
|
|
}
|
|
out.Groups[i].Rules[j].Field = field
|
|
out.Groups[i].Rules[j].Op = strings.ToLower(strings.TrimSpace(out.Groups[i].Rules[j].Op))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// Validate reports the first structural error in a QueryDefinition.
|
|
// Pass allowPersonalized=true when the caller is a user-scoped request
|
|
// (the evaluator has a user_id available); false when validating an
|
|
// admin-template definition that needs to be reusable across users.
|
|
func (q QueryDefinition) Validate(allowPersonalized bool) error {
|
|
n := q.Normalize()
|
|
for _, id := range n.LibraryIDs {
|
|
if id <= 0 {
|
|
return fmt.Errorf("library_ids must contain positive ids")
|
|
}
|
|
}
|
|
if n.Match != "all" && n.Match != "any" {
|
|
return fmt.Errorf("match must be 'all' or 'any'")
|
|
}
|
|
for i, g := range n.Groups {
|
|
if g.Match != "all" && g.Match != "any" {
|
|
return fmt.Errorf("groups[%d].match must be 'all' or 'any'", i)
|
|
}
|
|
for j, r := range g.Rules {
|
|
def, ok := queryFieldDefs[r.Field]
|
|
if !ok {
|
|
return fmt.Errorf("groups[%d].rules[%d].field %q is not supported", i, j, r.Field)
|
|
}
|
|
if def.personalized && !allowPersonalized {
|
|
return fmt.Errorf("groups[%d].rules[%d].field %q requires user scope", i, j, r.Field)
|
|
}
|
|
if !def.validOps[r.Op] {
|
|
return fmt.Errorf("groups[%d].rules[%d].op %q is not valid for field %q", i, j, r.Op, r.Field)
|
|
}
|
|
}
|
|
}
|
|
if n.Sort.Field != "" {
|
|
def, ok := querySortDefs[n.Sort.Field]
|
|
if !ok {
|
|
return fmt.Errorf("sort.field %q is not supported", n.Sort.Field)
|
|
}
|
|
if def.personalized && !allowPersonalized {
|
|
return fmt.Errorf("sort.field %q requires user scope", n.Sort.Field)
|
|
}
|
|
}
|
|
if n.Sort.Order != "" && n.Sort.Order != "asc" && n.Sort.Order != "desc" {
|
|
return fmt.Errorf("sort.order must be 'asc' or 'desc'")
|
|
}
|
|
if n.Limit != nil && *n.Limit <= 0 {
|
|
return fmt.Errorf("limit must be positive")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// NormalizeSort applies aliasing + default-order to a QuerySort.
|
|
// Empty Field falls back to defaultSortField; empty Order falls back to
|
|
// the field's defaultOrder from querySortDefs.
|
|
func NormalizeSort(s QuerySort) QuerySort {
|
|
out := QuerySort{
|
|
Field: strings.ToLower(strings.TrimSpace(s.Field)),
|
|
Order: strings.ToLower(strings.TrimSpace(s.Order)),
|
|
}
|
|
if canon, ok := querySortAliases[out.Field]; ok {
|
|
out.Field = canon
|
|
}
|
|
if out.Field == "" {
|
|
out.Field = defaultSortField
|
|
}
|
|
if out.Order == "" {
|
|
if def, ok := querySortDefs[out.Field]; ok {
|
|
out.Order = def.defaultOrder
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// MarshalJSON keeps the JSON-tag-defined shape stable across normalise
|
|
// roundtrips. Defined so callers can rely on Marshal(Normalize(x))
|
|
// being the canonical wire form.
|
|
func (q QueryDefinition) MarshalJSON() ([]byte, error) {
|
|
type alias QueryDefinition
|
|
return json.Marshal(alias(q.Normalize()))
|
|
}
|
|
|
|
// FieldDefs returns the field catalog so other packages (the evaluator,
|
|
// the validator, eventually a wizard UI surface) can introspect
|
|
// supported fields + ops + whether they're personalized.
|
|
func FieldDefs() map[string]struct {
|
|
ValidOps []string
|
|
IsArray bool
|
|
Personalized bool
|
|
} {
|
|
out := make(map[string]struct {
|
|
ValidOps []string
|
|
IsArray bool
|
|
Personalized bool
|
|
}, len(queryFieldDefs))
|
|
for field, def := range queryFieldDefs {
|
|
ops := make([]string, 0, len(def.validOps))
|
|
for op := range def.validOps {
|
|
ops = append(ops, op)
|
|
}
|
|
sort.Strings(ops)
|
|
out[field] = struct {
|
|
ValidOps []string
|
|
IsArray bool
|
|
Personalized bool
|
|
}{
|
|
ValidOps: ops,
|
|
IsArray: def.isArray,
|
|
Personalized: def.personalized,
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// SortFields returns the sort catalog as a name → {defaultOrder,
|
|
// personalized} map.
|
|
func SortFields() map[string]struct {
|
|
DefaultOrder string
|
|
Personalized bool
|
|
} {
|
|
out := make(map[string]struct {
|
|
DefaultOrder string
|
|
Personalized bool
|
|
}, len(querySortDefs))
|
|
for field, def := range querySortDefs {
|
|
out[field] = struct {
|
|
DefaultOrder string
|
|
Personalized bool
|
|
}{
|
|
DefaultOrder: def.defaultOrder,
|
|
Personalized: def.personalized,
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func normalizeMatch(m string) string {
|
|
n := strings.ToLower(strings.TrimSpace(m))
|
|
if n == "" {
|
|
return "all"
|
|
}
|
|
return n
|
|
}
|
|
|
|
func normalizeLibraryIDs(ids []int64) []int64 {
|
|
if len(ids) == 0 {
|
|
return nil
|
|
}
|
|
seen := make(map[int64]struct{}, len(ids))
|
|
out := make([]int64, 0, len(ids))
|
|
for _, id := range ids {
|
|
if id <= 0 {
|
|
out = append(out, id)
|
|
continue
|
|
}
|
|
if _, ok := seen[id]; ok {
|
|
continue
|
|
}
|
|
seen[id] = struct{}{}
|
|
out = append(out, id)
|
|
}
|
|
sort.Slice(out, func(i, j int) bool { return out[i] < out[j] })
|
|
return out
|
|
}
|