Unified export result types

This commit is contained in:
Philipp Wolfer 2023-12-03 16:56:12 +01:00
parent a4a05ea047
commit ca3b8492b0
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
12 changed files with 35 additions and 37 deletions

View file

@ -119,17 +119,17 @@ func (b *ScrobblerLogBackend) ExportListens(oldestTimestamp time.Time, results c
listens := log.Listens.NewerThan(oldestTimestamp)
sort.Sort(listens)
progress <- models.Progress{Elapsed: int64(len(listens))}.Complete()
results <- models.ListensResult{Listens: listens}
results <- models.ListensResult{Items: listens}
}
func (b *ScrobblerLogBackend) ImportListens(export models.ListensResult, importResult models.ImportResult, progress chan models.Progress) (models.ImportResult, error) {
lastTimestamp, err := Write(b.file, export.Listens)
lastTimestamp, err := Write(b.file, export.Items)
if err != nil {
return importResult, err
}
importResult.UpdateTimestamp(lastTimestamp)
importResult.ImportCount += len(export.Listens)
importResult.ImportCount += len(export.Items)
progress <- models.Progress{}.FromImportResult(importResult)
return importResult, nil