fix playlist fetch bug for paginated playlists (SathyaBhat#126)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,5 +21,6 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
+ - OS: [e.g. Windows 10, Linux (which distro)]
  - Python version
+

spotify_dl/constants.py

@@ -1,4 +1,4 @@
 __all__ = ['VERSION']
 
-VERSION = '7.1.0'
+VERSION = '7.2.0'
 SAVE_PATH = '~/.spotifydl'

spotify_dl/spotify.py

@@ -14,29 +14,32 @@ def fetch_tracks(sp, item_type, url):
     offset = 0
 
     if item_type == 'playlist':
-        items = sp.playlist_items(playlist_id=url, fields='items.track.name,items.track.artists(name),items.track.album(name),total,next,offset', additional_types=['track'])
         while True:
+            items = sp.playlist_items(playlist_id=url, fields='items.track.name,items.track.artists(name),items.track.album(name),total,next,offset', additional_types=['track'], offset=offset)
+            total_songs = items.get('total')
             for item in items['items']:
                 track_name = item['track']['name']
-                log.debug("Artist: {}".format(item['track']['artists']))
                 track_artist = ", ".join([artist['name'] for artist in item['track']['artists']])
                 songs_dict.update({track_name: track_artist})
                 offset += 1
-
-            if items.get('next') is None:
+
+            log.info(f"Fetched {offset}/{total_songs} songs in the playlist")                
+            if total_songs == offset:
                 log.info('All pages fetched, time to leave. Added %s songs in total', offset)
                 break
 
     elif item_type == 'album':
-        items = sp.album_tracks(album_id=url)
         while True:
+            items = sp.album_tracks(album_id=url)
+            total_songs = items.get('total')
             for item in items['items']:
                 track_name = item['name']
                 track_artist = " ".join([artist['name'] for artist in item['artists']])
                 songs_dict.update({track_name: track_artist})
                 offset += 1
 
-            if items.get('next') is None:
+            log.info(f"Fetched {offset}/{total_songs} songs in the album")                
+            if total_songs == offset:
                 log.info('All pages fetched, time to leave. Added %s songs in total', offset)
                 break
 

spotify_dl/youtube.py

@@ -35,7 +35,7 @@ def download_songs(songs, download_directory, format_string, skip_mp3):
 
         with youtube_dl.YoutubeDL(ydl_opts) as ydl:
             try:
-                log.debug(ydl.download([query]))
+                ydl.download([query])
             except Exception as e:
                 log.debug(e)
                 print('Failed to download: {}, please ensure YouTubeDL is up-to-date. '.format(query))