Add tests for encoders

and some refactoring

spotdl/lyrics/providers/genius.py

@@ -8,13 +8,13 @@ BASE_URL = "https://genius.com"
 
 
 class Genius(LyricBase):
-    def __init__(self, artist, song):
+    def __init__(self, artist, track):
         self.artist = artist
-        self.song = song
+        self.track = track
         self.base_url = BASE_URL
 
     def _guess_lyric_url(self):
-        query = "/{} {} lyrics".format(self.artist, self.song)
+        query = "/{} {} lyrics".format(self.artist, self.track)
         query = query.replace(" ", "-")
         encoded_query = urllib.request.quote(query)
         lyric_url = self.base_url + encoded_query
@@ -28,7 +28,7 @@ class Genius(LyricBase):
         except urllib.request.HTTPError:
             raise LyricsNotFoundError(
                 "Could not find lyrics for {} - {} at URL: {}".format(
-                    self.artist, self.song, url
+                    self.artist, self.track, url
                 )
             )
         else:

spotdl/lyrics/providers/lyricwikia_wrapper.py

@@ -5,13 +5,13 @@ from spotdl.lyrics.exceptions import LyricsNotFoundError
 
 
 class LyricWikia(LyricBase):
-    def __init__(self, artist, song):
+    def __init__(self, artist, track):
         self.artist = artist
-        self.song = song
+        self.track = track
 
     def get_lyrics(self, linesep="\n", timeout=None):
         try:
-            lyrics = lyricwikia.get_lyrics(self.artist, self.song, linesep, timeout)
+            lyrics = lyricwikia.get_lyrics(self.artist, self.track, linesep, timeout)
         except lyricwikia.LyricsNotFound as e:
             raise LyricsNotFoundError(e.args[0])
         else:

spotdl/lyrics/providers/tests/test_genius.py

@@ -12,7 +12,7 @@ class TestGenius:
 
     @pytest.fixture(scope="module")
     def track(self):
-        return Genius("artist", "song")
+        return Genius("artist", "track")
 
     def test_base_url(self, track):
         assert track.base_url == "https://genius.com"