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.
150 lines
4 KiB
Go
150 lines
4 KiB
Go
package providers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// MusicBrainz matches albums. No API key, but it demands a descriptive
|
|
// User-Agent and a hard rate limit of one request per second.
|
|
type MusicBrainz struct {
|
|
Client *http.Client
|
|
|
|
// mu and lastCall enforce the 1 req/s ceiling. Enrichment is sequential
|
|
// today, but the limiter is here so a future parallel worker cannot trip
|
|
// the server into blocking us.
|
|
mu sync.Mutex
|
|
lastCall time.Time
|
|
}
|
|
|
|
// NewMusicBrainz builds the provider with a bounded HTTP client.
|
|
func NewMusicBrainz() *MusicBrainz {
|
|
return &MusicBrainz{Client: &http.Client{Timeout: 15 * time.Second}}
|
|
}
|
|
|
|
func (p *MusicBrainz) Name() string { return "musicbrainz" }
|
|
|
|
func (p *MusicBrainz) Kinds() []string { return []string{"music"} }
|
|
|
|
type mbRelease struct {
|
|
ID string `json:"id"`
|
|
Title string `json:"title"`
|
|
Date string `json:"date"`
|
|
Country string `json:"country"`
|
|
ArtistCredit []struct {
|
|
Name string `json:"name"`
|
|
Artist struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
} `json:"artist"`
|
|
} `json:"artist-credit"`
|
|
}
|
|
|
|
type mbResponse struct {
|
|
Releases []mbRelease `json:"releases"`
|
|
}
|
|
|
|
func (p *MusicBrainz) Search(ctx context.Context, q Query) ([]Candidate, error) {
|
|
if strings.TrimSpace(q.Title) == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
if err := p.waitTurn(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Lucene-ish query: exact-ish release match, optionally narrowed by artist.
|
|
query := `release:"` + escapeLucene(q.Title) + `"`
|
|
if q.Author != "" {
|
|
query += ` AND artist:"` + escapeLucene(q.Author) + `"`
|
|
}
|
|
params := url.Values{}
|
|
params.Set("query", query)
|
|
params.Set("fmt", "json")
|
|
params.Set("limit", "5")
|
|
|
|
endpoint := "https://musicbrainz.org/ws/2/release/?" + params.Encode()
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// MusicBrainz blocks generic user agents; a real contact string is required.
|
|
req.Header.Set("User-Agent", "Vellum/0.1 ( self-hosted media server )")
|
|
|
|
resp, err := p.Client.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("musicbrainz: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode == http.StatusServiceUnavailable {
|
|
return nil, fmt.Errorf("musicbrainz: rate limited (503)")
|
|
}
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, fmt.Errorf("musicbrainz: status %d", resp.StatusCode)
|
|
}
|
|
|
|
var parsed mbResponse
|
|
if err := json.NewDecoder(resp.Body).Decode(&parsed); err != nil {
|
|
return nil, fmt.Errorf("musicbrainz: decode: %w", err)
|
|
}
|
|
|
|
out := make([]Candidate, 0, len(parsed.Releases))
|
|
for _, r := range parsed.Releases {
|
|
if r.Title == "" || r.ID == "" {
|
|
continue
|
|
}
|
|
var artists []string
|
|
for _, ac := range r.ArtistCredit {
|
|
name := strings.TrimSpace(ac.Name)
|
|
if name == "" {
|
|
name = ac.Artist.Name
|
|
}
|
|
if name != "" {
|
|
artists = append(artists, name)
|
|
}
|
|
}
|
|
out = append(out, Candidate{
|
|
Provider: p.Name(),
|
|
ExternalID: r.ID,
|
|
Title: r.Title,
|
|
Authors: artists,
|
|
Year: parseYear(r.Date),
|
|
// Cover Art Archive serves artwork by release id, no key.
|
|
CoverURL: "https://coverartarchive.org/release/" + r.ID + "/front-500",
|
|
})
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// waitTurn blocks until at least one second has passed since the last call.
|
|
func (p *MusicBrainz) waitTurn(ctx context.Context) error {
|
|
p.mu.Lock()
|
|
defer p.mu.Unlock()
|
|
|
|
const minInterval = time.Second
|
|
if wait := minInterval - time.Since(p.lastCall); wait > 0 {
|
|
select {
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
case <-time.After(wait):
|
|
}
|
|
}
|
|
p.lastCall = time.Now()
|
|
return nil
|
|
}
|
|
|
|
// escapeLucene neutralises characters that would break a MusicBrainz query.
|
|
func escapeLucene(s string) string {
|
|
replacer := strings.NewReplacer(
|
|
`\`, `\\`, `"`, `\"`, `+`, `\+`, `-`, `\-`,
|
|
`&&`, `\&&`, `||`, `\||`, `!`, `\!`, `(`, `\(`, `)`, `\)`,
|
|
`{`, `\{`, `}`, `\}`, `[`, `\[`, `]`, `\]`, `^`, `\^`, `~`, `\~`, `*`, `\*`, `?`, `\?`,
|
|
)
|
|
return replacer.Replace(s)
|
|
}
|