From ea8d19a513c20b573ce03b1fd73ca829aa1e3150 Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Tue, 24 Sep 2019 21:04:46 +0100
Subject: [PATCH] Fixed: Correctly page through Spotify followed artists

---
 .../Spotify/SpotifyFollowedArtistsFixture.cs              | 6 +++---
 .../ImportLists/Spotify/SpotifyFollowedArtists.cs         | 3 ++-
 src/NzbDrone.Core/ImportLists/Spotify/SpotifyProxy.cs     | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/NzbDrone.Core.Test/ImportListTests/Spotify/SpotifyFollowedArtistsFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/Spotify/SpotifyFollowedArtistsFixture.cs
index 982df6e61..9c3627761 100644
--- a/src/NzbDrone.Core.Test/ImportListTests/Spotify/SpotifyFollowedArtistsFixture.cs
+++ b/src/NzbDrone.Core.Test/ImportListTests/Spotify/SpotifyFollowedArtistsFixture.cs
@@ -132,8 +132,8 @@ namespace NzbDrone.Core.Test.ImportListTests
             Mocker.GetMock<ISpotifyProxy>()
                 .Setup(x => x.GetNextPage(It.IsAny<SpotifyFollowedArtists>(),
                                           It.IsAny<SpotifyWebAPI>(),
-                                          It.IsAny<CursorPaging<FullArtist>>()))
-                .Returns(default(CursorPaging<FullArtist>));
+                                          It.IsAny<FollowedArtists>()))
+                .Returns(default(FollowedArtists));
 
             var result = Subject.Fetch(api);
 
@@ -142,7 +142,7 @@ namespace NzbDrone.Core.Test.ImportListTests
             Mocker.GetMock<ISpotifyProxy>()
                 .Verify(v => v.GetNextPage(It.IsAny<SpotifyFollowedArtists>(),
                                            It.IsAny<SpotifyWebAPI>(),
-                                           It.IsAny<CursorPaging<FullArtist>>()),
+                                           It.IsAny<FollowedArtists>()),
                         Times.Once());
         }
 
diff --git a/src/NzbDrone.Core/ImportLists/Spotify/SpotifyFollowedArtists.cs b/src/NzbDrone.Core/ImportLists/Spotify/SpotifyFollowedArtists.cs
index 6a9bdd92a..5897af015 100644
--- a/src/NzbDrone.Core/ImportLists/Spotify/SpotifyFollowedArtists.cs
+++ b/src/NzbDrone.Core/ImportLists/Spotify/SpotifyFollowedArtists.cs
@@ -54,7 +54,8 @@ namespace NzbDrone.Core.ImportLists.Spotify
                     break;
                 }
 
-                artists = _spotifyProxy.GetNextPage(this, api, artists);
+                followedArtists = _spotifyProxy.GetNextPage(this, api, followedArtists);
+                artists = followedArtists?.Artists;
             }
 
             return result;
diff --git a/src/NzbDrone.Core/ImportLists/Spotify/SpotifyProxy.cs b/src/NzbDrone.Core/ImportLists/Spotify/SpotifyProxy.cs
index bcaa5cca9..72e2464e9 100644
--- a/src/NzbDrone.Core/ImportLists/Spotify/SpotifyProxy.cs
+++ b/src/NzbDrone.Core/ImportLists/Spotify/SpotifyProxy.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.ImportLists.Spotify
             where TSettings : SpotifySettingsBase<TSettings>, new();
         Paging<T> GetNextPage<T, TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api, Paging<T> item)
             where TSettings : SpotifySettingsBase<TSettings>, new();
-        CursorPaging<T> GetNextPage<T, TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api, CursorPaging<T> item)
+        FollowedArtists GetNextPage<TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api, FollowedArtists item)
             where TSettings : SpotifySettingsBase<TSettings>, new();
     }
 
@@ -48,7 +48,7 @@ namespace NzbDrone.Core.ImportLists.Spotify
         public FollowedArtists GetFollowedArtists<TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api)
             where TSettings : SpotifySettingsBase<TSettings>, new()
         {
-            return Execute(list, api, x => x.GetFollowedArtists(FollowType.Artist));
+            return Execute(list, api, x => x.GetFollowedArtists(FollowType.Artist, 50));
         }
 
         public Paging<SavedAlbum> GetSavedAlbums<TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api)
@@ -69,10 +69,10 @@ namespace NzbDrone.Core.ImportLists.Spotify
             return Execute(list, api, (x) => x.GetNextPage(item));
         }
 
-        public CursorPaging<T> GetNextPage<T, TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api, CursorPaging<T> item)
+        public FollowedArtists GetNextPage<TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api, FollowedArtists item)
             where TSettings : SpotifySettingsBase<TSettings>, new()
         {
-            return Execute(list, api, (x) => x.GetNextPage(item));
+            return Execute(list, api, (x) => x.GetNextPage<FollowedArtists, FullArtist>(item.Artists));
         }
 
         public T Execute<T, TSettings>(SpotifyImportListBase<TSettings> list, SpotifyWebAPI api, Func<SpotifyWebAPI, T> method, bool allowReauth = true)