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.
130 lines
3.2 KiB
Go
130 lines
3.2 KiB
Go
package providers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// GoogleBooks is a fallback catalogue for books. No API key for low volume.
|
|
type GoogleBooks struct {
|
|
Client *http.Client
|
|
}
|
|
|
|
// NewGoogleBooks builds the provider with a bounded HTTP client.
|
|
func NewGoogleBooks() *GoogleBooks {
|
|
return &GoogleBooks{Client: &http.Client{Timeout: 10 * time.Second}}
|
|
}
|
|
|
|
func (p *GoogleBooks) Name() string { return "googlebooks" }
|
|
|
|
func (p *GoogleBooks) Kinds() []string { return []string{"ebooks"} }
|
|
|
|
type gbResponse struct {
|
|
Items []struct {
|
|
ID string `json:"id"`
|
|
VolumeInfo struct {
|
|
Title string `json:"title"`
|
|
Authors []string `json:"authors"`
|
|
Publisher string `json:"publisher"`
|
|
Language string `json:"language"`
|
|
Description string `json:"description"`
|
|
PublishedDate string `json:"publishedDate"`
|
|
ImageLinks struct {
|
|
Thumbnail string `json:"thumbnail"`
|
|
} `json:"imageLinks"`
|
|
IndustryIdentifiers []struct {
|
|
Type string `json:"type"`
|
|
Identifier string `json:"identifier"`
|
|
} `json:"industryIdentifiers"`
|
|
} `json:"volumeInfo"`
|
|
} `json:"items"`
|
|
}
|
|
|
|
func (p *GoogleBooks) Search(ctx context.Context, q Query) ([]Candidate, error) {
|
|
var terms []string
|
|
if q.ISBN != "" {
|
|
terms = append(terms, "isbn:"+q.ISBN)
|
|
} else {
|
|
if q.Title != "" {
|
|
terms = append(terms, "intitle:"+q.Title)
|
|
}
|
|
if q.Author != "" {
|
|
terms = append(terms, "inauthor:"+q.Author)
|
|
}
|
|
}
|
|
if len(terms) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
params := url.Values{}
|
|
params.Set("q", strings.Join(terms, "+"))
|
|
params.Set("maxResults", "5")
|
|
params.Set("printType", "books")
|
|
|
|
endpoint := "https://www.googleapis.com/books/v1/volumes?" + params.Encode()
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
resp, err := p.Client.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("googlebooks: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusOK {
|
|
return nil, fmt.Errorf("googlebooks: status %d", resp.StatusCode)
|
|
}
|
|
|
|
var parsed gbResponse
|
|
if err := json.NewDecoder(resp.Body).Decode(&parsed); err != nil {
|
|
return nil, fmt.Errorf("googlebooks: decode: %w", err)
|
|
}
|
|
|
|
out := make([]Candidate, 0, len(parsed.Items))
|
|
for _, item := range parsed.Items {
|
|
v := item.VolumeInfo
|
|
if v.Title == "" {
|
|
continue
|
|
}
|
|
c := Candidate{
|
|
Provider: p.Name(),
|
|
ExternalID: item.ID,
|
|
Title: v.Title,
|
|
Authors: v.Authors,
|
|
Publisher: v.Publisher,
|
|
Language: v.Language,
|
|
Description: v.Description,
|
|
Year: parseYear(v.PublishedDate),
|
|
}
|
|
// Google returns http:// thumbnail URLs; https avoids mixed content.
|
|
if v.ImageLinks.Thumbnail != "" {
|
|
c.CoverURL = strings.Replace(v.ImageLinks.Thumbnail, "http://", "https://", 1)
|
|
}
|
|
for _, id := range v.IndustryIdentifiers {
|
|
if id.Type == "ISBN_13" || c.ISBN == "" {
|
|
c.ISBN = id.Identifier
|
|
}
|
|
}
|
|
out = append(out, c)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// parseYear extracts a leading 4-digit year from dates like "2021-05-04".
|
|
func parseYear(date string) int {
|
|
if len(date) < 4 {
|
|
return 0
|
|
}
|
|
n, err := strconv.Atoi(date[:4])
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
return n
|
|
}
|