feat(download): fill in the tracks a nearly complete album is missing
A grab that delivers nine of twelve tracks clears the completeness floor and is imported, and the other three were never looked for. On Soulseek that is the commonest way an album ends up almost right: one peer's folder lacks a track, or one file fails. After a successful import the manager now compares the tracks the files were aligned to (ImportResult.Matched, new) with the expected tracklist. When one to three are missing, and fewer than half, it searches for each one on its own, as the track's artist and title with the album kept for ranking. It grabs the first auto-acceptable copy that is not from the source that already failed to supply it, and is not a delegate, which would place it in its own library. The candidate is trimmed to the one file aligned to the track. The import uses the album's own request with ImportOptions.Only, which skips the completeness check and imports only a file aligned to the missing track, so it is tagged and placed as part of the album, and anything else the folder brought is left out. One attempt per track, and nothing here fails the download: the album is already imported, so a track that cannot be found is logged on the job and left. slskd accepts one-file folders for a request that expects one track, which the per-track search needs. Closes #276 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017HJiuc3ZZhxsPXz3ozTirT
This commit is contained in:
@@ -79,6 +79,12 @@ type ImportOptions struct {
|
||||
// them. Off for delegate providers, which have already imported
|
||||
// and tagged the files themselves.
|
||||
WriteTags bool
|
||||
|
||||
// Only, when set, imports just the files that align to these
|
||||
// tracks of the download and skips the completeness check: it is a
|
||||
// fill-in for tracks an earlier grab of the same album did not
|
||||
// deliver (#276), tagged and placed as part of that album.
|
||||
Only []ExpectedTrack
|
||||
}
|
||||
|
||||
// DefaultPathTemplate is the layout used when none is configured.
|
||||
@@ -118,6 +124,10 @@ type ImportResult struct {
|
||||
// Skipped counts non-audio files left in staging (logs, cue sheets,
|
||||
// scene .nfo files) — deliberately not imported.
|
||||
Skipped int
|
||||
|
||||
// Matched are the expected tracks an imported file was aligned to,
|
||||
// which is how a caller learns what the grab did not deliver.
|
||||
Matched []ExpectedTrack
|
||||
}
|
||||
|
||||
// Import verifies, tags and moves a completed grab into the library.
|
||||
@@ -140,14 +150,25 @@ func (i *Importer) Import(
|
||||
return ImportResult{}, ErrNoAudio
|
||||
}
|
||||
|
||||
if err := checkCompleteness(len(audio), dl); err != nil {
|
||||
return ImportResult{}, err
|
||||
if len(opts.Only) == 0 {
|
||||
if err := checkCompleteness(len(audio), dl); err != nil {
|
||||
return ImportResult{}, err
|
||||
}
|
||||
}
|
||||
|
||||
// Align staged files to the expected tracklist so tags and
|
||||
// filenames reflect the release, not the uploader's naming.
|
||||
plan := i.planFiles(audio, dl)
|
||||
|
||||
if len(opts.Only) > 0 {
|
||||
plan = onlyTracks(plan, opts.Only)
|
||||
if len(plan) == 0 {
|
||||
return ImportResult{}, fmt.Errorf(
|
||||
"%w: no file matched the missing track", ErrTooIncomplete,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
out := ImportResult{
|
||||
Paths: make([]string, 0, len(plan)),
|
||||
Skipped: skipped,
|
||||
@@ -184,11 +205,49 @@ func (i *Importer) Import(
|
||||
}
|
||||
|
||||
out.Paths = append(out.Paths, dest)
|
||||
|
||||
if p.Matched {
|
||||
out.Matched = append(out.Matched, p.Track)
|
||||
}
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// trackKey identifies an expected track within a release.
|
||||
type trackKey struct{ disc, position int }
|
||||
|
||||
func keyOf(t ExpectedTrack) trackKey {
|
||||
return trackKey{disc: t.DiscNumber, position: t.Position}
|
||||
}
|
||||
|
||||
// onlyTracks keeps the planned files aligned to one of want. A fill-in
|
||||
// grab can bring more than the one file it was after — a folder where
|
||||
// the title also matched a live take — and anything else would land in
|
||||
// the album as a duplicate or a stranger.
|
||||
func onlyTracks(plan []plannedFile, want []ExpectedTrack) []plannedFile {
|
||||
keys := make(map[trackKey]bool, len(want))
|
||||
for _, t := range want {
|
||||
keys[keyOf(t)] = true
|
||||
}
|
||||
|
||||
out := make([]plannedFile, 0, len(want))
|
||||
seen := map[trackKey]bool{}
|
||||
|
||||
for _, p := range plan {
|
||||
k := keyOf(p.Track)
|
||||
if !p.Matched || !keys[k] || seen[k] {
|
||||
continue
|
||||
}
|
||||
|
||||
seen[k] = true
|
||||
|
||||
out = append(out, p)
|
||||
}
|
||||
|
||||
return out
|
||||
}
|
||||
|
||||
// plannedFile pairs a staged file with the expected track it matched.
|
||||
type plannedFile struct {
|
||||
Source string
|
||||
|
||||
Reference in New Issue
Block a user