marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-04-18 11:09:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed import count updates

Browse source
This commit is contained in:
Philipp Wolfer 2023-11-21 19:05:06 +01:00
parent 56eae67292
commit 08876a2d70
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backends/scrobblerlog/scrobblerlog.go
View file

@ -134,7 +134,7 @@ func (b *ScrobblerLogBackend) ImportListens(export models.ListensResult, importR
} }
importResult.UpdateTimestamp(lastTimestamp) importResult.UpdateTimestamp(lastTimestamp)
importResult.ImportCount = len(export.Listens) importResult.ImportCount += len(export.Listens)
progress <- models.Progress{}.FromImportResult(importResult) progress <- models.Progress{}.FromImportResult(importResult)
return importResult, nil return importResult, nil

3
backends/spotify/spotify.go
View file

@ -74,7 +74,6 @@ func (b *SpotifyApiBackend) ExportListens(oldestTimestamp time.Time, results cha
p := models.Progress{Total: int64(totalDuration.Seconds())} p := models.Progress{Total: int64(totalDuration.Seconds())}
out:
for { for {
result, err := b.client.RecentlyPlayedAfter(minTime, MaxItemsPerGet) result, err := b.client.RecentlyPlayedAfter(minTime, MaxItemsPerGet)
if err != nil { if err != nil {
@ -114,7 +113,7 @@ out:
} else { } else {
// result contains listens older then oldestTimestamp, // result contains listens older then oldestTimestamp,
// we can stop requesting more // we can stop requesting more
break out break
} }
} }

2
models/models.go
View file

@ -134,7 +134,7 @@ func (i *ImportResult) UpdateTimestamp(newTime time.Time) {
func (i *ImportResult) Update(from ImportResult) { func (i *ImportResult) Update(from ImportResult) {
i.TotalCount = from.TotalCount i.TotalCount = from.TotalCount
i.ImportCount += from.ImportCount i.ImportCount = from.ImportCount
i.UpdateTimestamp(from.LastTimestamp) i.UpdateTimestamp(from.LastTimestamp)
} }

2
models/models_test.go
View file

@ -90,7 +90,7 @@ func TestImportResultUpdate(t *testing.T) {
} }
result.Update(newResult) result.Update(newResult)
assert.Equal(t, 120, result.TotalCount) assert.Equal(t, 120, result.TotalCount)
assert.Equal(t, 70, result.ImportCount) assert.Equal(t, 50, result.ImportCount)
assert.Equal(t, newResult.LastTimestamp, result.LastTimestamp) assert.Equal(t, newResult.LastTimestamp, result.LastTimestamp)
} }