From d6616573e21f5c6021a06d0d3c96377b423fa884 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Sun, 12 Sep 2021 01:41:54 +0200
Subject: [PATCH] update(bandcamp): avoid duplications (close #5)

---
 server.go | 33 +++++++++++++++------------------
 struct.go | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/server.go b/server.go
index 8a61a9a..777338e 100644
--- a/server.go
+++ b/server.go
@@ -125,34 +125,31 @@ func getListPlaylist(id, token, tokentype string) {
     playlist := getAllTracksPlaylist(token, tokentype, id, 0)
 
     var find bool
-    var tmp string
+    var tmp, artist, album, urlSpotify string
     var MyResp = &RespBandcamp{}
     MyResp.Todo = len(playlist.Items)
     MyResp.Done = 0
     Queue[token] = MyResp
 
     for i := 0; i < len(playlist.Items); i++ {
-        find, tmp = searchAlbumBandcamp(playlist.Items[i].Track.Album.Name,
-            playlist.Items[i].Track.Album.Artists[0].Name)
+        album = playlist.Items[i].Track.Album.Name
+        artist = playlist.Items[i].Track.Album.Artists[0].Name
+        urlSpotify = playlist.Items[i].Track.Album.ExternalUrls.Spotify
+
+        if (MyResp.ContainsAlbum(album, artist)) {
+            MyResp.Todo--
+            continue
+        }
+
+        find, tmp = searchAlbumBandcamp(album, artist)
         if find {
-            MyResp.AddAlbum(newUrlBandcamp(
-                playlist.Items[i].Track.Album.Artists[0].Name,
-                playlist.Items[i].Track.Album.Name,
-                playlist.Items[i].Track.Album.ExternalUrls.Spotify,
-                tmp))
+            MyResp.AddAlbum(newUrlBandcamp(artist, album, urlSpotify, tmp))
         } else {
-            find, tmp = searchArtistBandcamp(playlist.Items[i].Track.Album.Artists[0].Name)
+            find, tmp = searchArtistBandcamp(artist)
             if find {
-                MyResp.AddArtist(newUrlBandcamp(
-                    playlist.Items[i].Track.Album.Artists[0].Name,
-                    playlist.Items[i].Track.Album.Name,
-                    playlist.Items[i].Track.Album.ExternalUrls.Spotify,
-                    tmp))
+                MyResp.AddArtist(newUrlBandcamp(artist, album, urlSpotify, tmp))
             } else {
-                MyResp.AddNotfound(newUrlWoBandcamp(
-                    playlist.Items[i].Track.Album.Artists[0].Name,
-                    playlist.Items[i].Track.Album.Name,
-                    playlist.Items[i].Track.Album.ExternalUrls.Spotify))
+                MyResp.AddNotfound(newUrlWoBandcamp(artist, album, urlSpotify))
             }
         }
 
diff --git a/struct.go b/struct.go
index f35f4f8..454c799 100644
--- a/struct.go
+++ b/struct.go
@@ -33,7 +33,50 @@ type RespBandcamp struct {
     Albums []UrlBandcamp  `json:"albums"`
     Artists []UrlBandcamp `json:"artists"`
     Notfound []UrlBandcamp `json:"notfound"`
+}
 
+func (rp *RespBandcamp) ContainsAlbum(album, artist string) bool {
+    ret := false
+
+    for _, elem := range rp.Albums {
+        if elem.Album == album && elem.Artiste == artist {
+            ret = true
+            break
+        }
+    }
+
+    if !ret {
+        for _, elem := range rp.Artists {
+            if elem.Album == album && elem.Artiste == artist {
+                ret = true
+                break
+            }
+        }
+    }
+
+    if !ret {
+        for _, elem := range rp.Notfound {
+            if elem.Album == album && elem.Artiste == artist {
+                ret = true
+                break
+            }
+        }
+    }
+
+    return ret
+}
+
+func (rp *RespBandcamp) ContainsArtist(artist string) bool {
+    ret := false
+
+    for _, elem := range rp.Artists {
+        if elem.Artiste == artist {
+            ret = true
+            break
+        }
+    }
+
+    return ret
 }
 
 func (rp *RespBandcamp) AddAlbum(tmp UrlBandcamp) []UrlBandcamp {