Duplicated helpers
cmd/rip had its own copies of six helpers that already existed in
internal/jsonutil: asString (StringFromAny), searchInt (IntFromAny),
nestedSearchInt and nestedSearchString (NestedAny/NestedString),
firstNonEmpty (FirstNonEmpty) and firstPositiveInt. firstPositiveInt was
duplicated a third and fourth time in provider/yandex and provider/beatport,
so it moves into jsonutil alongside the rest. jsonutil is back to 100%
coverage.
searchBool is deliberately left alone, with a comment saying why: it accepts
only a real bool, and switching it to jsonutil.BoolFromAny would start
coercing strings and numbers, changing how search results get labelled.
config auto-upgrade is no longer destructive
UpgradeOutdated re-serializes the whole config from the parsed struct, so any
key this version does not know about is dropped, and it runs automatically
from run() without prompting. It now copies the original to
<path>.bak-<unixtime> (0600, since it holds the same credentials) and
validates the result before writing. It returns the backup path so the CLI
can tell the user where it went. The comment states plainly that this is a
version stamp rather than a migration framework.
cmd/rip tests
The command bodies are testable now that they are functions returning exit
codes rather than arms of a switch that called os.Exit. Covers the usage
errors for every command, the quality floor on `rip id`, config path output,
the --version flag, and that applyQualityOverride reaches all six sources and
clamps only the two with a floor. cmd/rip coverage 17% -> 26%.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Completes the restructuring started when main() became run() int. main.go goes
from 1217 lines to 130: global option handling, config loading, signal setup,
and a dispatch switch that delegates to one function per command.
The command bodies move to cmd_rip.go (url, file, id), cmd_search.go (search,
lastfm), cmd_config.go (config, database) and cmd_smoke.go (the developer smoke
commands), each taking (ctx, cfg, gopts, args) and returning an exit code.
They also stop reading the process global. Previously run() did
os.Args = append([]string{os.Args[0], gopts.command}, gopts.commandArgs...)
and the arms then indexed back into os.Args[2:], os.Args[5:] and so on, so the
already-parsed options were round-tripped through os.Args. The arms now take
the parsed gopts.commandArgs directly, which is a uniform index shift of two
(os.Args[5:] -> args[3:], len(os.Args) < 5 -> len(args) < 3).
No behaviour change. Verified by running each command's argument validation and
help path against the built binary, plus the existing suite.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
JorenandClaude Opus 5