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.
178 lines
4.6 KiB
Go
178 lines
4.6 KiB
Go
package providers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// IGDB matches games. It uses Twitch's client-credentials flow: the app
|
|
// exchanges its client id and secret for a bearer token that lasts about two
|
|
// months, so the token is cached rather than re-fetched per search.
|
|
type IGDB struct {
|
|
ClientID string
|
|
ClientSecret string
|
|
|
|
// BaseURL and TokenURL are overridable so tests can point at a local server.
|
|
BaseURL string
|
|
TokenURL string
|
|
|
|
Client *http.Client
|
|
|
|
mu sync.Mutex
|
|
token string
|
|
tokenExpiry time.Time
|
|
}
|
|
|
|
// NewIGDB builds the provider.
|
|
func NewIGDB(clientID, clientSecret string) *IGDB {
|
|
return &IGDB{
|
|
ClientID: clientID,
|
|
ClientSecret: clientSecret,
|
|
BaseURL: "https://api.igdb.com/v4",
|
|
TokenURL: "https://id.twitch.tv/oauth2/token",
|
|
Client: &http.Client{Timeout: 15 * time.Second},
|
|
}
|
|
}
|
|
|
|
func (p *IGDB) Name() string { return "igdb" }
|
|
|
|
func (p *IGDB) Kinds() []string { return []string{"games"} }
|
|
|
|
type igdbGame struct {
|
|
ID int `json:"id"`
|
|
Name string `json:"name"`
|
|
Summary string `json:"summary"`
|
|
FirstReleaseDate int64 `json:"first_release_date"`
|
|
Cover struct {
|
|
URL string `json:"url"`
|
|
} `json:"cover"`
|
|
}
|
|
|
|
func (p *IGDB) Search(ctx context.Context, q Query) ([]Candidate, error) {
|
|
if p.ClientID == "" || p.ClientSecret == "" || strings.TrimSpace(q.Title) == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
token, err := p.accessToken(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// IGDB uses its own query language (Apicalypse) sent as the request body.
|
|
body := fmt.Sprintf(
|
|
`search %q; fields name,summary,first_release_date,cover.url; limit 5;`,
|
|
q.Title)
|
|
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
|
strings.TrimRight(p.BaseURL, "/")+"/games", strings.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
req.Header.Set("Client-ID", p.ClientID)
|
|
req.Header.Set("Authorization", "Bearer "+token)
|
|
req.Header.Set("Accept", "application/json")
|
|
|
|
resp, err := p.Client.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("igdb: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode == http.StatusUnauthorized {
|
|
// The cached token was rejected; drop it so the next call re-auths.
|
|
p.mu.Lock()
|
|
p.token, p.tokenExpiry = "", time.Time{}
|
|
p.mu.Unlock()
|
|
return nil, fmt.Errorf("igdb: unauthorized (token rejected)")
|
|
}
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, fmt.Errorf("igdb: status %d", resp.StatusCode)
|
|
}
|
|
|
|
var games []igdbGame
|
|
if err := json.NewDecoder(resp.Body).Decode(&games); err != nil {
|
|
return nil, fmt.Errorf("igdb: decode: %w", err)
|
|
}
|
|
|
|
out := make([]Candidate, 0, len(games))
|
|
for _, g := range games {
|
|
if g.Name == "" {
|
|
continue
|
|
}
|
|
c := Candidate{
|
|
Provider: p.Name(),
|
|
ExternalID: strconv.Itoa(g.ID),
|
|
Title: g.Name,
|
|
Description: g.Summary,
|
|
}
|
|
if g.FirstReleaseDate > 0 {
|
|
c.Year = time.Unix(g.FirstReleaseDate, 0).UTC().Year()
|
|
}
|
|
if g.Cover.URL != "" {
|
|
c.CoverURL = igdbCover(g.Cover.URL)
|
|
}
|
|
out = append(out, c)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// accessToken returns a cached bearer token, fetching a new one when absent or
|
|
// near expiry.
|
|
func (p *IGDB) accessToken(ctx context.Context) (string, error) {
|
|
p.mu.Lock()
|
|
defer p.mu.Unlock()
|
|
|
|
// Refresh a minute early to avoid racing the expiry.
|
|
if p.token != "" && time.Now().Before(p.tokenExpiry.Add(-time.Minute)) {
|
|
return p.token, nil
|
|
}
|
|
|
|
params := url.Values{}
|
|
params.Set("client_id", p.ClientID)
|
|
params.Set("client_secret", p.ClientSecret)
|
|
params.Set("grant_type", "client_credentials")
|
|
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
|
p.TokenURL+"?"+params.Encode(), nil)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
resp, err := p.Client.Do(req)
|
|
if err != nil {
|
|
return "", fmt.Errorf("igdb: token request: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusOK {
|
|
return "", fmt.Errorf("igdb: token status %d", resp.StatusCode)
|
|
}
|
|
|
|
var parsed struct {
|
|
AccessToken string `json:"access_token"`
|
|
ExpiresIn int `json:"expires_in"`
|
|
}
|
|
if err := json.NewDecoder(resp.Body).Decode(&parsed); err != nil {
|
|
return "", fmt.Errorf("igdb: token decode: %w", err)
|
|
}
|
|
if parsed.AccessToken == "" {
|
|
return "", fmt.Errorf("igdb: empty access token")
|
|
}
|
|
p.token = parsed.AccessToken
|
|
p.tokenExpiry = time.Now().Add(time.Duration(parsed.ExpiresIn) * time.Second)
|
|
return p.token, nil
|
|
}
|
|
|
|
// igdbCover normalises an IGDB image URL: protocol-relative to https, and the
|
|
// thumbnail size swapped for a larger one.
|
|
func igdbCover(u string) string {
|
|
u = strings.Replace(u, "t_thumb", "t_cover_big", 1)
|
|
if strings.HasPrefix(u, "//") {
|
|
u = "https:" + u
|
|
}
|
|
return u
|
|
}
|