misc: fix warnings (#1400)

* misc: fix warnings * misc: fix spotipy warning
spotDL · Oct 22, 2021 · 209dfde · 209dfde
1 parent 2b5f9cf
commit 209dfde
Show file tree

Hide file tree

Showing 10 changed files with 24,811 additions and 24,827 deletions.
diff --git a/spotdl/parsers/query_parser.py b/spotdl/parsers/query_parser.py
@@ -144,9 +144,10 @@ def get_youtube_meta_track(
         return None
 
     # (try to) Get lyrics from musixmatch/genius
+    # use musixmatch as the default provider
     if lyrics_provider == "genius":
         lyrics = lyrics_providers.get_lyrics_genius(song_name, contributing_artist)
-    elif lyrics_provider == "musixmatch":
+    else:
         lyrics = lyrics_providers.get_lyrics_musixmatch(song_name, contributing_artist)
 
     return SongObject(

diff --git a/spotdl/providers/lyrics_providers.py b/spotdl/providers/lyrics_providers.py
@@ -103,7 +103,7 @@ def get_lyrics_musixmatch(
         lyrics = get_lyrics_musixmatch(song_name, song_artists, track_search=True)
         return lyrics
 
-    song_url = "https://www.musixmatch.com" + song_url_tag.get("href")
+    song_url = "https://www.musixmatch.com" + str(song_url_tag.get("href", ""))
     lyrics_resp = get(song_url, headers=user_agent)
     if not lyrics_resp.ok:
         return ""

diff --git a/spotdl/search/song_gatherer.py b/spotdl/search/song_gatherer.py
@@ -87,9 +87,10 @@ def from_spotify_url(
         print(f'Found YouTube URL for "{display_name}" : {youtube_link}')
 
     # (try to) Get lyrics from musixmatch/genius
+    # use musixmatch as the default provider
     if lyrics_provider == "genius":
         lyrics = lyrics_providers.get_lyrics_genius(song_name, contributing_artists)
-    elif lyrics_provider == "musixmatch":
+    else:
         lyrics = lyrics_providers.get_lyrics_musixmatch(song_name, contributing_artists)
 
     return SongObject(
@@ -270,7 +271,7 @@ def from_playlist(
     spotify_client = SpotifyClient()
     tracks = []
 
-    playlist_response = spotify_client.playlist_tracks(playlist_url)
+    playlist_response = spotify_client.playlist_items(playlist_url)
     if playlist_response is None:
         raise ValueError("Wrong playlist id")
 

diff --git a/tests/cassettes/test_download_a_playlist.yaml b/tests/cassettes/test_download_a_playlist.yaml
diff --git a/tests/cassettes/test_download_a_single_song.yaml b/tests/cassettes/test_download_a_single_song.yaml
diff --git a/tests/cassettes/test_download_an_album.yaml b/tests/cassettes/test_download_an_album.yaml
diff --git a/tests/cassettes/test_download_long_artists_song.yaml b/tests/cassettes/test_download_long_artists_song.yaml
diff --git a/tests/cassettes/test_download_single_song.yaml b/tests/cassettes/test_download_single_song.yaml
diff --git a/tests/cassettes/test_multiple_elements.yaml b/tests/cassettes/test_multiple_elements.yaml
diff --git a/tests/cassettes/test_search_and_download.yaml b/tests/cassettes/test_search_and_download.yaml
@@ -7,7 +7,7 @@ interactions:
       Accept-Encoding:
       - gzip, deflate
       Authorization:
-      - Bearer BQBGxr4bsEeZw-udeKLnYy-8FkJEL0FAO12t_kjp-3S1tZUDUBsNPJskuU4h8oZZx7cbs5NuVIz97PvwSNI
+      - Bearer BQAeY1_FgliDCv6ftZU-L8OnXPukGtSTkkOYEX_4HbUapDE7YErp-7eRaoR6jTvwKL4Fnl45ufR68_J4iHY
       Connection:
       - keep-alive
       Content-Type:
@@ -48,7 +48,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 21 Oct 2021 16:42:21 GMT
+      - Fri, 22 Oct 2021 08:52:15 GMT
       server:
       - envoy
       strict-transport-security: