From 8a2ddb7772b32ea49658c650856b73cf42ef70bf Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 15 Jan 2024 08:00:17 +0100
Subject: [PATCH] Replaced ImportResult.ImportErrors with
 ImportResult.ImportLog

---
 internal/backends/lastfm/lastfm.go            |  4 +--
 .../backends/listenbrainz/listenbrainz.go     |  4 +--
 internal/cli/transfer.go                      |  8 +++---
 internal/models/models.go                     | 24 ++++++++++++++--
 internal/models/models_test.go                | 28 +++++++++++++++++--
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/internal/backends/lastfm/lastfm.go b/internal/backends/lastfm/lastfm.go
index c4c2ec3..d2df067 100644
--- a/internal/backends/lastfm/lastfm.go
+++ b/internal/backends/lastfm/lastfm.go
@@ -236,7 +236,7 @@ func (b *LastfmApiBackend) ImportListens(export models.ListensResult, importResu
 			for _, s := range result.Scrobbles {
 				ignoreMsg := s.IgnoredMessage.Body
 				if ignoreMsg != "" {
-					importResult.ImportErrors = append(importResult.ImportErrors, ignoreMsg)
+					importResult.Log(models.Warning, ignoreMsg)
 				}
 			}
 			err := fmt.Errorf("last.fm import ignored %v scrobbles", count-accepted)
@@ -335,7 +335,7 @@ func (b *LastfmApiBackend) ImportLoves(export models.LovesResult, importResult m
 		} else {
 			msg := fmt.Sprintf("Failed import of \"%s\" by %s: %v",
 				love.TrackName, love.ArtistName(), err.Error())
-			importResult.ImportErrors = append(importResult.ImportErrors, msg)
+			importResult.Log(models.Error, msg)
 		}
 
 		progress <- models.Progress{}.FromImportResult(importResult)
diff --git a/internal/backends/listenbrainz/listenbrainz.go b/internal/backends/listenbrainz/listenbrainz.go
index 2c76ecb..ebeb64c 100644
--- a/internal/backends/listenbrainz/listenbrainz.go
+++ b/internal/backends/listenbrainz/listenbrainz.go
@@ -148,7 +148,7 @@ func (b *ListenBrainzApiBackend) ImportListens(export models.ListensResult, impo
 					count -= 1
 					msg := i18n.Tr("Ignored duplicate listen %v: \"%v\" by %v (%v)",
 						l.ListenedAt, l.TrackName, l.ArtistName(), l.RecordingMbid)
-					importResult.ImportErrors = append(importResult.ImportErrors, msg)
+					importResult.Log(models.Info, msg)
 					continue
 				}
 			}
@@ -276,7 +276,7 @@ func (b *ListenBrainzApiBackend) ImportLoves(export models.LovesResult, importRe
 			} else {
 				msg := fmt.Sprintf("Failed import of \"%s\" by %s: %v",
 					love.TrackName, love.ArtistName(), errMsg)
-				importResult.ImportErrors = append(importResult.ImportErrors, msg)
+				importResult.Log(models.Error, msg)
 			}
 		}
 
diff --git a/internal/cli/transfer.go b/internal/cli/transfer.go
index 84bdb2b..e335f1b 100644
--- a/internal/cli/transfer.go
+++ b/internal/cli/transfer.go
@@ -143,11 +143,11 @@ func (c *TransferCmd[E, I, R]) Transfer(exp backends.ExportProcessor[R], imp bac
 	}
 
 	// Print errors
-	if len(result.ImportErrors) > 0 {
+	if len(result.ImportLog) > 0 {
 		fmt.Println()
-		fmt.Println(i18n.Tr("During the import the following errors occurred:"))
-		for _, err := range result.ImportErrors {
-			fmt.Println(i18n.Tr("Error: %v", err))
+		fmt.Println(i18n.Tr("Import log:"))
+		for _, entry := range result.ImportLog {
+			fmt.Println(i18n.Tr("%v: %v", entry.Type, entry.Message))
 		}
 	}
 
diff --git a/internal/models/models.go b/internal/models/models.go
index 46dff9f..a225344 100644
--- a/internal/models/models.go
+++ b/internal/models/models.go
@@ -164,11 +164,24 @@ type ListensResult ExportResult[ListensList]
 
 type LovesResult ExportResult[LovesList]
 
+type LogEntryType string
+
+const (
+	Info    LogEntryType = "Info"
+	Warning LogEntryType = "Warning"
+	Error   LogEntryType = "Error"
+)
+
+type LogEntry struct {
+	Type    LogEntryType
+	Message string
+}
+
 type ImportResult struct {
 	TotalCount    int
 	ImportCount   int
 	LastTimestamp time.Time
-	ImportErrors  []string
+	ImportLog     []LogEntry
 
 	// Error is only set if an unrecoverable import error occurred
 	Error error
@@ -185,7 +198,14 @@ func (i *ImportResult) Update(from ImportResult) {
 	i.TotalCount = from.TotalCount
 	i.ImportCount = from.ImportCount
 	i.UpdateTimestamp(from.LastTimestamp)
-	i.ImportErrors = append(i.ImportErrors, from.ImportErrors...)
+	i.ImportLog = append(i.ImportLog, from.ImportLog...)
+}
+
+func (i *ImportResult) Log(t LogEntryType, msg string) {
+	i.ImportLog = append(i.ImportLog, LogEntry{
+		Type:    t,
+		Message: msg,
+	})
 }
 
 type Progress struct {
diff --git a/internal/models/models_test.go b/internal/models/models_test.go
index 59cc4dd..cd1f207 100644
--- a/internal/models/models_test.go
+++ b/internal/models/models_test.go
@@ -117,23 +117,45 @@ func TestLovesListSort(t *testing.T) {
 }
 
 func TestImportResultUpdate(t *testing.T) {
+	logEntry1 := models.LogEntry{
+		Type:    models.Warning,
+		Message: "foo",
+	}
+	logEntry2 := models.LogEntry{
+		Type:    models.Error,
+		Message: "bar",
+	}
 	result := models.ImportResult{
 		TotalCount:    100,
 		ImportCount:   20,
 		LastTimestamp: time.Now(),
-		ImportErrors:  []string{"foo"},
+		ImportLog:     []models.LogEntry{logEntry1},
 	}
 	newResult := models.ImportResult{
 		TotalCount:    120,
 		ImportCount:   50,
 		LastTimestamp: time.Now().Add(1 * time.Hour),
-		ImportErrors:  []string{"bar"},
+		ImportLog:     []models.LogEntry{logEntry2},
 	}
 	result.Update(newResult)
 	assert.Equal(t, 120, result.TotalCount)
 	assert.Equal(t, 50, result.ImportCount)
 	assert.Equal(t, newResult.LastTimestamp, result.LastTimestamp)
-	assert.Equal(t, []string{"foo", "bar"}, result.ImportErrors)
+	assert.Equal(t, []models.LogEntry{logEntry1, logEntry2}, result.ImportLog)
+}
+
+func TestImportResultLog(t *testing.T) {
+	result := models.ImportResult{}
+	result.Log(models.Warning, "foo")
+	result.Log(models.Error, "bar")
+	expected := []models.LogEntry{{
+		Type:    models.Warning,
+		Message: "foo",
+	}, {
+		Type:    models.Error,
+		Message: "bar",
+	}}
+	assert.Equal(t, expected, result.ImportLog)
 }
 
 func TestImportResultUpdateTimestamp(t *testing.T) {