Merge branch 'master' of github.com:spotipy-dev/spotipy into v3_rebase_rebase

examples/artist_albums.py

@@ -20,7 +20,7 @@ def get_args():
 def get_artist(name):
     results = sp.search(q=f'artist:{name}', type='artist')
     items = results['artists']['items']
-    return items[0] if len(items) > 0 else None
+    return items[0] if items else None
 
 
 def show_artist_albums(artist):
@@ -35,7 +35,7 @@ def show_artist_albums(artist):
     for album in albums:
         name = album['name']
         if name not in seen:
-            logger.info('ALBUM: %s', name)
+            logger.info(f'ALBUM: {name}')
             seen.add(name)
 
 
@@ -45,7 +45,7 @@ def main():
     if artist:
         show_artist_albums(artist)
     else:
-        logger.error("Can't find artist: %s", artist)
+        logger.error(f"Can't find artist: {artist}")
 
 
 if __name__ == '__main__':

examples/artist_discography.py

@@ -20,7 +20,7 @@ def get_args():
 def get_artist(name):
     results = sp.search(q=f'artist:{name}', type='artist')
     items = results['artists']['items']
-    return items[0] if len(items) > 0 else None
+    return items[0] if items else None
 
 
 def show_album_tracks(album):
@@ -31,7 +31,7 @@ def show_album_tracks(album):
         results = sp.next(results)
         tracks.extend(results['items'])
     for i, track in enumerate(tracks):
-        logger.info('%s. %s', i + 1, track['name'])
+        logger.info(f'{i + 1}. {track["name"]}')
 
 
 def show_artist_albums(artist):
@@ -41,21 +41,21 @@ def show_artist_albums(artist):
     while results['next']:
         results = sp.next(results)
         albums.extend(results['items'])
-    logger.info('Total albums: %s', len(albums))
+    logger.info(f'Total albums: {len(albums)}')
     unique = set()  # skip duplicate albums
     for album in albums:
         name = album['name'].lower()
         if name not in unique:
-            logger.info('ALBUM: %s', name)
+            logger.info(f'ALBUM: {name}')
             unique.add(name)
             show_album_tracks(album)
 
 
 def show_artist(artist):
-    logger.info('====%s====', artist['name'])
-    logger.info('Popularity: %s', artist['popularity'])
+    logger.info(f'===={artist["name"]}====')
+    logger.info(f'Popularity: {artist["popularity"]}')
     if len(artist['genres']) > 0:
-        logger.info('Genres: %s', ','.join(artist['genres']))
+        logger.info(f"Genres: {', '.join(artist['genres'])}")
 
 
 def main():

examples/artist_recommendations.py

@@ -22,14 +22,13 @@ def get_args():
 def get_artist(name):
     results = sp.search(q=f'artist:{name}', type='artist')
     items = results['artists']['items']
-    return items[0] if len(items) > 0 else None
+    return items[0] if items else None
 
 
 def show_recommendations_for_artist(artist):
     results = sp.recommendations(seed_artists=[artist['id']])
     for track in results['tracks']:
-        logger.info('Recommendation: %s - %s', track['name'],
-                    track['artists'][0]['name'])
+        logger.info(f'Recommendation: {track["name"]} - {track["artists"][0]["name"]}')
 
 
 def main():

examples/follow_playlist.py

@@ -16,7 +16,9 @@ def get_args():
 
 def main():
     args = get_args()
-    sp.current_user_follow_playlist(args.playlist)
+    # Uses Lofi Girl playlist
+    playlist = args.playlist or '0vvXsWCC9xrXsKd4FyS8kM'
+    spotipy.Spotify(auth_manager=SpotifyOAuth()).current_user_follow_playlist(playlist)
 
 if __name__ == '__main__':
     main()

examples/my_playlists.py

@@ -8,4 +8,4 @@ sp = spotipy.Spotify(auth_manager=SpotifyOAuth(scope=scope))
 
 results = sp.current_user_playlists(limit=50)
 for i, item in enumerate(results['items']):
-    print("%d %s" % (i, item['name']))
+    print(f"{i} {item['name']}")

examples/show_my_saved_tracks.py

@@ -9,7 +9,7 @@ scope = 'user-library-read'
 def show_tracks(results):
     for item in results['items']:
         track = item['track']
-        print("%32.32s %s" % (track['artists'][0]['name'], track['name']))
+        print(f"{track['artists'][0]['name']:>32.32} {track['name']}")
 
 
 sp = spotipy.Spotify(auth_manager=SpotifyOAuth(scope=scope))

examples/track_recommendations.py

@@ -38,6 +38,5 @@ recommendations = sp.recommendations(
 
 # Display the recommendations
 for i, track in enumerate(recommendations['tracks']):
-    print(
-        f"{i+1}. {track['name']} by {', '.join([artist['name'] for artist in track['artists']])}"
-    )
+    print(f"{i+1}. {track['name']} by "
+          f"{', '.join([artist['name'] for artist in track['artists']])}")

examples/user_playlists_contents.py

@@ -7,9 +7,7 @@ from spotipy.oauth2 import SpotifyOAuth
 def show_tracks(results):
     for i, item in enumerate(results['items']):
         track = item['track']
-        print(
-            "   %d %32.32s %s" %
-            (i, track['artists'][0]['name'], track['name']))
+        print(f"   {i} {track['artists'][0]['name']:>32.32} {track['name']}")
 
 
 if __name__ == '__main__':

examples/user_public_playlists.py

@@ -14,11 +14,8 @@ playlists = sp.user_playlists(user)
 
 while playlists:
     for i, playlist in enumerate(playlists['items']):
-        print(
-            "%4d %s %s" %
-            (i +
-             1 +
-             playlists['offset'],
-             playlist['uri'],
-             playlist['name']))
-    playlists = sp.next(playlists) if playlists['next'] else None
+        print(f"{i + 1 + playlists['offset']:4d} {playlist['uri']} {playlist['name']}")
+    if playlists['next']:
+        playlists = sp.next(playlists)
+    else:
+        playlists = None