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.
119 lines
3 KiB
Go
119 lines
3 KiB
Go
package providers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// OpenLibrary matches books by title and author. No API key, no registration.
|
|
type OpenLibrary struct {
|
|
// BaseURL is overridable so tests can point at a local server.
|
|
BaseURL string
|
|
Client *http.Client
|
|
}
|
|
|
|
// NewOpenLibrary builds the provider with a bounded HTTP client.
|
|
func NewOpenLibrary() *OpenLibrary {
|
|
return &OpenLibrary{
|
|
BaseURL: "https://openlibrary.org",
|
|
Client: &http.Client{Timeout: 10 * time.Second},
|
|
}
|
|
}
|
|
|
|
func (p *OpenLibrary) Name() string { return "openlibrary" }
|
|
|
|
func (p *OpenLibrary) Kinds() []string { return []string{"ebooks", "audiobooks"} }
|
|
|
|
// olSearchResponse is the subset of the search API this provider reads.
|
|
type olSearchResponse struct {
|
|
Docs []struct {
|
|
Key string `json:"key"`
|
|
Title string `json:"title"`
|
|
AuthorName []string `json:"author_name"`
|
|
FirstPublish int `json:"first_publish_year"`
|
|
Publisher []string `json:"publisher"`
|
|
Language []string `json:"language"`
|
|
CoverID int `json:"cover_i"`
|
|
ISBN []string `json:"isbn"`
|
|
} `json:"docs"`
|
|
}
|
|
|
|
func (p *OpenLibrary) Search(ctx context.Context, q Query) ([]Candidate, error) {
|
|
params := url.Values{}
|
|
params.Set("limit", "5")
|
|
params.Set("fields", "key,title,author_name,first_publish_year,publisher,language,cover_i,isbn")
|
|
if q.ISBN != "" {
|
|
params.Set("isbn", q.ISBN)
|
|
} else {
|
|
if q.Title != "" {
|
|
params.Set("title", q.Title)
|
|
}
|
|
if q.Author != "" {
|
|
params.Set("author", q.Author)
|
|
}
|
|
}
|
|
if params.Get("isbn") == "" && params.Get("title") == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
endpoint := strings.TrimRight(p.BaseURL, "/") + "/search.json?" + params.Encode()
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Open Library asks callers to identify themselves.
|
|
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("openlibrary: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, fmt.Errorf("openlibrary: status %d", resp.StatusCode)
|
|
}
|
|
|
|
var parsed olSearchResponse
|
|
if err := json.NewDecoder(resp.Body).Decode(&parsed); err != nil {
|
|
return nil, fmt.Errorf("openlibrary: decode: %w", err)
|
|
}
|
|
|
|
out := make([]Candidate, 0, len(parsed.Docs))
|
|
for _, d := range parsed.Docs {
|
|
if d.Title == "" {
|
|
continue
|
|
}
|
|
c := Candidate{
|
|
Provider: p.Name(),
|
|
ExternalID: d.Key,
|
|
Title: d.Title,
|
|
Authors: d.AuthorName,
|
|
Year: d.FirstPublish,
|
|
Language: first(d.Language),
|
|
}
|
|
if len(d.Publisher) > 0 {
|
|
c.Publisher = d.Publisher[0]
|
|
}
|
|
if len(d.ISBN) > 0 {
|
|
c.ISBN = d.ISBN[0]
|
|
}
|
|
if d.CoverID > 0 {
|
|
c.CoverURL = "https://covers.openlibrary.org/b/id/" + strconv.Itoa(d.CoverID) + "-L.jpg"
|
|
}
|
|
out = append(out, c)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func first(s []string) string {
|
|
if len(s) == 0 {
|
|
return ""
|
|
}
|
|
return strings.TrimSpace(s[0])
|
|
}
|