From 08876a2d706a96d602739d2f6cc815055a2ee595 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 21 Nov 2023 19:05:06 +0100
Subject: [PATCH] Fixed import count updates

---
 backends/scrobblerlog/scrobblerlog.go | 2 +-
 backends/spotify/spotify.go           | 3 +--
 models/models.go                      | 2 +-
 models/models_test.go                 | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backends/scrobblerlog/scrobblerlog.go b/backends/scrobblerlog/scrobblerlog.go
index 47b445a..78e9785 100644
--- a/backends/scrobblerlog/scrobblerlog.go
+++ b/backends/scrobblerlog/scrobblerlog.go
@@ -134,7 +134,7 @@ func (b *ScrobblerLogBackend) ImportListens(export models.ListensResult, importR
 	}
 
 	importResult.UpdateTimestamp(lastTimestamp)
-	importResult.ImportCount = len(export.Listens)
+	importResult.ImportCount += len(export.Listens)
 	progress <- models.Progress{}.FromImportResult(importResult)
 
 	return importResult, nil
diff --git a/backends/spotify/spotify.go b/backends/spotify/spotify.go
index a1e1bbc..7c4a644 100644
--- a/backends/spotify/spotify.go
+++ b/backends/spotify/spotify.go
@@ -74,7 +74,6 @@ func (b *SpotifyApiBackend) ExportListens(oldestTimestamp time.Time, results cha
 
 	p := models.Progress{Total: int64(totalDuration.Seconds())}
 
-out:
 	for {
 		result, err := b.client.RecentlyPlayedAfter(minTime, MaxItemsPerGet)
 		if err != nil {
@@ -114,7 +113,7 @@ out:
 			} else {
 				// result contains listens older then oldestTimestamp,
 				// we can stop requesting more
-				break out
+				break
 			}
 		}
 
diff --git a/models/models.go b/models/models.go
index dbafbd9..32c5d1b 100644
--- a/models/models.go
+++ b/models/models.go
@@ -134,7 +134,7 @@ func (i *ImportResult) UpdateTimestamp(newTime time.Time) {
 
 func (i *ImportResult) Update(from ImportResult) {
 	i.TotalCount = from.TotalCount
-	i.ImportCount += from.ImportCount
+	i.ImportCount = from.ImportCount
 	i.UpdateTimestamp(from.LastTimestamp)
 }
 
diff --git a/models/models_test.go b/models/models_test.go
index d065553..b6dc0ca 100644
--- a/models/models_test.go
+++ b/models/models_test.go
@@ -90,7 +90,7 @@ func TestImportResultUpdate(t *testing.T) {
 	}
 	result.Update(newResult)
 	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)
 }