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.
116 lines
3 KiB
Go
116 lines
3 KiB
Go
package providers
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestComicVineSearch(t *testing.T) {
|
|
var gotPath, gotAPIKey, gotUA string
|
|
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
gotPath = r.URL.Path
|
|
gotAPIKey = r.URL.Query().Get("api_key")
|
|
gotUA = r.Header.Get("User-Agent")
|
|
w.Header().Set("Content-Type", "application/json")
|
|
_, _ = w.Write([]byte(`{
|
|
"status_code": 1,
|
|
"results": [
|
|
{
|
|
"id": 796,
|
|
"name": "Saga",
|
|
"start_year": "2012",
|
|
"description": "<p>A space opera.</p>",
|
|
"publisher": {"name": "Image Comics"},
|
|
"image": {"medium_url": "https://example.test/saga.jpg", "small_url": ""}
|
|
}
|
|
]
|
|
}`))
|
|
}))
|
|
defer srv.Close()
|
|
|
|
p := NewComicVine("secret-key")
|
|
p.BaseURL = srv.URL
|
|
|
|
cands, err := p.Search(context.Background(), Query{Title: "Saga"})
|
|
if err != nil {
|
|
t.Fatalf("Search: %v", err)
|
|
}
|
|
if len(cands) != 1 {
|
|
t.Fatalf("got %d candidates, want 1", len(cands))
|
|
}
|
|
|
|
c := cands[0]
|
|
if c.Title != "Saga" {
|
|
t.Errorf("Title = %q", c.Title)
|
|
}
|
|
if c.ExternalID != "796" {
|
|
t.Errorf("ExternalID = %q", c.ExternalID)
|
|
}
|
|
if c.Year != 2012 {
|
|
t.Errorf("Year = %d, want 2012", c.Year)
|
|
}
|
|
if c.Publisher != "Image Comics" {
|
|
t.Errorf("Publisher = %q", c.Publisher)
|
|
}
|
|
if c.CoverURL != "https://example.test/saga.jpg" {
|
|
t.Errorf("CoverURL = %q", c.CoverURL)
|
|
}
|
|
if c.Description != "A space opera." {
|
|
t.Errorf("Description = %q (HTML should be stripped)", c.Description)
|
|
}
|
|
|
|
if gotPath != "/search/" {
|
|
t.Errorf("request path = %q, want /search/", gotPath)
|
|
}
|
|
if gotAPIKey != "secret-key" {
|
|
t.Errorf("api_key = %q, want secret-key", gotAPIKey)
|
|
}
|
|
if gotUA == "" {
|
|
t.Error("no User-Agent sent; ComicVine rejects those")
|
|
}
|
|
}
|
|
|
|
func TestComicVineRejectsBadAPIKey(t *testing.T) {
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
_, _ = w.Write([]byte(`{"status_code": 100, "error": "Invalid API Key", "results": []}`))
|
|
}))
|
|
defer srv.Close()
|
|
|
|
p := NewComicVine("wrong")
|
|
p.BaseURL = srv.URL
|
|
|
|
if _, err := p.Search(context.Background(), Query{Title: "Saga"}); err == nil {
|
|
t.Fatal("expected an error for status_code 100")
|
|
} else if !strings.Contains(err.Error(), "API key") {
|
|
t.Errorf("error %q should mention the API key", err)
|
|
}
|
|
}
|
|
|
|
func TestComicVineWithoutKeyDoesNothing(t *testing.T) {
|
|
p := NewComicVine("")
|
|
cands, err := p.Search(context.Background(), Query{Title: "Saga"})
|
|
if err != nil {
|
|
t.Fatalf("Search: %v", err)
|
|
}
|
|
if len(cands) != 0 {
|
|
t.Errorf("got %d candidates with no key, want 0", len(cands))
|
|
}
|
|
}
|
|
|
|
func TestStripHTML(t *testing.T) {
|
|
cases := map[string]string{
|
|
"<p>A space opera.</p>": "A space opera.",
|
|
"plain text": "plain text",
|
|
"<b>Bold</b> and <i>italic</i>.": "Bold and italic.",
|
|
"": "",
|
|
}
|
|
for in, want := range cases {
|
|
if got := stripHTML(in); got != want {
|
|
t.Errorf("stripHTML(%q) = %q, want %q", in, got, want)
|
|
}
|
|
}
|
|
}
|