Scrape lyrics from Genius and lyrics refactor

spotdl/spotify_tools.py

@@ -1,6 +1,5 @@
 import spotipy
 import spotipy.oauth2 as oauth2
-import lyricwikia
 
 from slugify import slugify
 from titlecase import titlecase
@@ -12,6 +11,8 @@ import functools
 
 from spotdl import const
 from spotdl import internals
+from spotdl.lyrics.providers import LyricWikia
+from spotdl.lyrics.exceptions import LyricsNotFound
 
 spotify = None
 
@@ -74,12 +75,11 @@ def generate_metadata(raw_song):
     meta_tags[u"total_tracks"] = album["tracks"]["total"]
 
     log.debug("Fetching lyrics")
+    track = LyricWikia(meta_tags["artists"][0]["name"], meta_tags["name"])
 
     try:
-        meta_tags["lyrics"] = lyricwikia.get_lyrics(
-            meta_tags["artists"][0]["name"], meta_tags["name"]
-        )
-    except lyricwikia.LyricsNotFound:
+        meta_tags["lyrics"] = track.get_lyrics()
+    except LyricsNotFound:
         meta_tags["lyrics"] = None
 
     # Some sugar