35442e4aff
Four extractions, each chosen because the two halves have different callers,
different failure modes or different testing needs. Not a line-count exercise.
internal/home out of internal/media
- media serves item RESOURCES (detail, file, cover, progress); home computes
AGGREGATES (the five shelves). The 2328-line package was doing both.
- media keeps POST /items/{id}/view because it is item-scoped and must stay in
the package that authorizes the item; it imports home.RecordView for that one
thing. home does not import media.
- Verified live: all five shelves non-empty, and two consecutive /home calls
return different explore ids, which is the non-determinism the Explore rewrite
exists for.
internal/scanner out of internal/library
- The scanner walks the filesystem and reconciles; library CRUD is an admin HTTP
surface. Different callers (a job vs a request), different failure modes.
- The registry deliberately STAYED in internal/library: three of its four callers
are not the scanner (modules register types, handlers serve the list, metadata
reads the group mode, subsonic calls CleanTitle). It is a property of the kind,
not of the scan. The one genuinely scanner-owned helper became
library.ExtensionsFor.
- Two tests moved with the code rather than being rewritten; they now exercise
the boundary by calling library.ListMissing across it.
- Verified live: first scan updates, rescan reports unchanged=N, so change
detection still short-circuits.
internal/providers out of internal/metadata
- Providers talk to third-party APIs; the enrich job owns the matching policy and
the database writes. The split's whole point is that a provider is testable
WITHOUT a database, so a DB-free test was added and OpenLibrary gained a
BaseURL override to make it possible.
- providers imports zero internal packages — a true leaf.
- The matching policy (searchTitle, artistHint, pickBest) is untouched. It exists
because real false matches were found.
dto packages out of internal/jellyfin and internal/subsonic
- The wire types and their mapping are now separate from the handler logic, so
the contract with clients we do not control is reviewable on its own.
- Both dto packages are PURE: zero references to sql.DB or net/http, verified by
grep. That is what makes them reviewable.
- No field name, tag or error code changed.
internal/arch did its job: it failed the build twice during this phase, once for
each new package that was not yet placed in a layer. That is the rule working,
not an obstacle.
Verified: gofmt clean, build exit 0, vet exit 0, 23 packages pass, svelte-check
0/0, and end to end against a running server — home shelves, a queued scan
reporting unchanged, Jellyfin /Items, and Subsonic ping.
Process note: one agent (dto) stopped mid-task and left the tree red — the dto
packages unlayered and its test still referencing constants that had moved. The
arch test caught it immediately. I finished it by hand: exported constant
references in the test, and both dto packages placed at layer 3.
Still open from Phase 1: internal/jellyfin has no test files, catalog is
item-centric while Subsonic is file-first, and subsonic loadAlbum now scopes to
the item's own library.
39 lines
1.6 KiB
Go
39 lines
1.6 KiB
Go
// Package media serves generic item RESOURCES: the browse list, one item's
|
|
// detail, its raw file, cover art, progress, credits and view counts. It knows
|
|
// nothing about any specific media format; modules register cover extractors
|
|
// and expose their own metadata endpoints.
|
|
//
|
|
// What the landing screen shows is deliberately NOT here. The home shelves are
|
|
// AGGREGATES over many items rather than one resource, they answer a different
|
|
// question, and they have different callers, so they live in internal/home.
|
|
//
|
|
// Item and file ACCESS does not live here any more — it lives in
|
|
// internal/catalog, so that the web app, the modules, Jellyfin and Subsonic all
|
|
// share one implementation of "may this user read this item" instead of five.
|
|
// The names below are kept as aliases so existing callers do not have to move
|
|
// in the same step; new code should import catalog directly.
|
|
package media
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/mithral/vellum/internal/catalog"
|
|
)
|
|
|
|
// Item is one media item plus the root of its library. See catalog.Item.
|
|
type Item = catalog.Item
|
|
|
|
// FileEntry is one physical file backing an item, with its codec facts.
|
|
// See catalog.File.
|
|
type FileEntry = catalog.File
|
|
|
|
// ErrItemNotFound means no item matched, or the caller may not read it. The two
|
|
// are deliberately indistinguishable so a handler cannot leak the existence of
|
|
// another user's library. See catalog.ErrNotFound.
|
|
var ErrItemNotFound = catalog.ErrNotFound
|
|
|
|
// FileCount returns how many files back an item.
|
|
func FileCount(ctx context.Context, db *sql.DB, itemID int64) (int, error) {
|
|
return catalog.FileCount(ctx, db, itemID)
|
|
}
|