Some cleanup

core/spotify_tools.py

@@ -18,6 +18,8 @@ def generate_token():
     token = credentials.get_access_token()
     return token
 
+# token is mandatory when using Spotify's API
+# https://developer.spotify.com/news-stories/2017/01/27/removing-unauthenticated-calls-to-the-web-api/
 token = generate_token()
 spotify = spotipy.Spotify(auth=token)
 

spotdl.py

@@ -192,11 +192,6 @@ def grab_single(raw_song, number=None):
             log.error('No audio streams available')
 
 
-# token is mandatory when using Spotify's API
-# https://developer.spotify.com/news-stories/2017/01/27/removing-unauthenticated-calls-to-the-web-api/
-token = spotify_tools.generate_token()
-spotify = spotipy.Spotify(auth=token)
-
 if __name__ == '__main__':
     const.args = handle.get_arguments()
     internals.filter_path(const.args.folder)

test/test_username.py

@@ -4,25 +4,26 @@ import spotdl
 
 username = 'alex'
 
+spotify = spotdl.spotify_tools.spotify
 
 def test_user():
     expect_playlists = 7
-    playlists = spotdl.spotify.user_playlists(username)
+    playlists = spotify.user_playlists(username)
     playlists = len(playlists['items'])
     assert playlists == expect_playlists
 
 
 def test_playlist():
     expect_tracks = 14
-    playlist = spotdl.spotify.user_playlists(username)['items'][0]
+    playlist = spotify.user_playlists(username)['items'][0]
     tracks = playlist['tracks']['total']
     assert tracks == expect_tracks
 
 
 def test_tracks():
-    playlist = spotdl.spotify.user_playlists(username)['items'][0]
+    playlist = spotify.user_playlists(username)['items'][0]
     expect_lines = playlist['tracks']['total']
-    result = spotdl.spotify.user_playlist(
+    result = spotify.user_playlist(
         playlist['owner']['id'], playlist['id'], fields='tracks,next')
     tracks = result['tracks']