* feat(metadata,scanner): trailers and extras for movies and series Remote provider videos (TMDB trailers/teasers/featurettes/...) are fetched through the unified match/refresh pipeline into the new item_videos table, filtered per-library via media_folders.trailer_kinds, merged across providers with site/provider dedup, and lockable via FieldVideos. The movie scanner stops discarding supplemental directories (Trailers/, Featurettes/, Behind The Scenes/, ...) and classifies them — plus Jellyfin-style filename suffixes (-trailer, -behindthescenes, ...) and series-root supplemental dirs — into the new media_extras entity backed by ordinary media_files rows (extra_id ownership, content_id/episode_id NULL so existing version/matching queries stay structurally blind to extras). Series Extras/SxxExx season-0 mapping is unchanged. Extras are playable watch targets via a GetWatchDetail fallback tier (episodes precedent), with contentid.ForLocal minting stable ids. API: ItemDetail gains additive videos/extras arrays (single + batch parity); library settings expose trailer_kinds. jellycompat now populates RemoteTrailers, LocalTrailerCount/SpecialFeatureCount, and serves real /LocalTrailers + /SpecialFeatures items playable through PlaybackInfo. Requires silo-plugin-sdk v0.9.0 (VideoRecord) before go.mod can bump; builds locally via go.work against the SDK feat/metadata-videos branch. Part of trailers/extras capability work. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(web): trailers and extras sections, library trailer-kinds setting TrailersSection (YouTube thumbnails + youtube-nocookie modal) and ExtrasSection (plays extras through the standard watch controller) on movie and series detail pages; admin library form gains a trailer-kinds allow-list synced with the server default (all provider kinds), now also honored on library create. Part of trailers/extras capability work. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(scanner): scan extra_id in scanMediaFiles; review cleanups scanMediaFiles (the plural row scanner behind GetByContentID/GetByFolder/ GetByExtraID and 20+ other queries) was missing the scan destination for the new extra_id column, which would have failed every media-file read at runtime with a column/destination count mismatch. Also: extend the batch equivalence test to seed item_videos/media_extras so the new videos/extras prefetch wiring is actually proven; drop the one-off pgxRows interface for the repo-wide pgx.Rows convention; reuse formatClock instead of a third duration formatter in ExtrasSection. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore(deps): bump silo-plugin-sdk to v0.9.0 for VideoRecord Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(matching): exclude extras files from match queues and bulk content linking Dev verification caught extras media_files rows (content_id NULL by design) being swept into the movie/series match queues and the root-claim bulk relink: a '-featurette' suffix extra was matched onto its parent as a version, and a Trailers/ file minted a spurious local skeleton item that shadowed the extra's watch target. Add 'extra_id IS NULL' to the queue eligibility conditions, root/group claim relinks, observed-root content assignment, and the admin unmatched-files listing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(playback): authorize local extras files through their parent item Dev verification: playback/start (and the shared MediaFileAuthorizer used by markers/subtitles/ebook reader) resolved file ownership only via episode_id/content_id, so extras files (extra_id only) 404ed. Add an ExtraLookup tier that resolves media_extras and gates on the parent item's access, mirroring the episode->series pattern. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(catalog): resolve local extras through GetItemDetail for compat playback jellycompat PlaybackInfo (and any per-item consumer resolving arbitrary content ids) goes through GetItemDetail, which lacked the extras tier that GetWatchDetail has — so Jellyfin clients got zero MediaSources for extras. Add buildExtraItemDetail (minimal detail + ordinary playback surface, parent-gated access) as the fourth resolution tier, and map the extra type to Jellyfin's Video kind. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(web): allow youtube-nocookie embeds in CSP; trailer modal a11y The frontend CSP's frame-src blocked the trailer modal's youtube-nocookie.com iframe (found on dev verification). Also add the missing sr-only DialogDescription and drop the redundant allowFullScreen attribute. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: address PR review findings for trailers/extras - Extras watch/item detail no longer stamp SeriesID/SeriesTitle for movie-owned extras (players key episodic post-roll flows off series_id); series-owned extras keep them (Codex). - processExtraFiles resolves the parent and upserts media_extras before the unchanged fast-path, and the fast-path now also compares mtime, so rematched parents / reclassified kinds / same-size replacements converge (Codex + CodeRabbit). - media_files upsert clears content/episode linkage atomically when extra_id is set (ownership mutual exclusion in one statement); the now-redundant MarkFileAsExtra helper is removed (CodeRabbit). - ScanFile's extras branch runs syncPresentLibraryState + reconcileLibraryMemberships so converting a primary file to an extra cleans stale library membership immediately (CodeRabbit). - media_extras migration adds the media_files FK as NOT VALID + VALIDATE to avoid a full-scan exclusive lock on large tables (CodeRabbit). - trailer_kinds input is trimmed/lowercased/deduped and unknown values are dropped instead of silently widening the allow-list to 'other' (CodeRabbit). - Extras authorization branches match the episode branch's posture: unconfigured lookup is a config error, nil extra is a 404 (CodeRabbit). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
61 lines
2.2 KiB
Go
61 lines
2.2 KiB
Go
package naming
|
|
|
|
import (
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
// extraSuffixKinds maps the Jellyfin/Plex filename-suffix convention onto the
|
|
// shared extra-kind vocabulary (models.ExtraKind values). The suffix is the
|
|
// final "-token" (or ".token") of the stem: "Movie (2020)-trailer.mkv".
|
|
var extraSuffixKinds = map[string]string{
|
|
"trailer": "trailer",
|
|
"teaser": "teaser",
|
|
"featurette": "featurette",
|
|
"clip": "clip",
|
|
"behindthescenes": "behind_the_scenes",
|
|
"bloopers": "bloopers",
|
|
"deleted": "deleted_scene",
|
|
"deletedscene": "deleted_scene",
|
|
"interview": "other",
|
|
"scene": "other",
|
|
"short": "other",
|
|
"extra": "other",
|
|
"other": "other",
|
|
}
|
|
|
|
// ParseExtraSuffix reports whether the file name (or stem) carries a
|
|
// Jellyfin/Plex-style extras suffix, returning the mapped extra kind. Only
|
|
// the exact final token after the last '-' or '.' separator counts, so titles
|
|
// merely containing words like "scene" do not misclassify.
|
|
func ParseExtraSuffix(fileName string) (kind string, ok bool) {
|
|
stem := strings.TrimSuffix(filepath.Base(fileName), filepath.Ext(fileName))
|
|
idx := strings.LastIndexAny(stem, "-.")
|
|
if idx <= 0 || idx == len(stem)-1 {
|
|
return "", false
|
|
}
|
|
token := strings.ToLower(strings.TrimSpace(stem[idx+1:]))
|
|
mapped, found := extraSuffixKinds[token]
|
|
if !found {
|
|
return "", false
|
|
}
|
|
// A bare suffix with no title ("trailer.mkv" handled by ExtraTitleFromFile
|
|
// callers via directory classification) still counts: idx>0 ensures some
|
|
// title text precedes the separator.
|
|
return mapped, true
|
|
}
|
|
|
|
// ExtraTitleFromFile derives a human-readable extra title from a file path,
|
|
// stripping a recognized extras suffix when present.
|
|
func ExtraTitleFromFile(filePath string) string {
|
|
stem := strings.TrimSuffix(filepath.Base(filePath), filepath.Ext(filePath))
|
|
if idx := strings.LastIndexAny(stem, "-."); idx > 0 && idx < len(stem)-1 {
|
|
token := strings.ToLower(strings.TrimSpace(stem[idx+1:]))
|
|
if _, found := extraSuffixKinds[token]; found {
|
|
stem = stem[:idx]
|
|
}
|
|
}
|
|
stem = strings.NewReplacer(".", " ", "_", " ").Replace(stem)
|
|
return strings.Join(strings.Fields(stem), " ")
|
|
}
|