Merge pull request #43 from Jugran/feature/lyrics-provider

Feature/lyrics provider

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/lyrics/lyrics_in_terminal.py",
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}/lyrics:${PYTHONPATH}"
+            },
+            "justMyCode": true
+        },
+    ]
+}

lyrics/__init__.py

@@ -2,9 +2,9 @@
 
 CACHE_PATH = Path.home().joinpath('.cache', 'lyrics')
 
-CONFIG_PATH = Path.home().joinpath('.config', 'lyrics-in-terminal','lyrics.cfg')
+CONFIG_PATH = Path.home().joinpath('.config', 'lyrics-in-terminal', 'lyrics.cfg')
 
-__version__ = '1.6.0'
+__version__ = '1.7.0-dev'
 
 if not CONFIG_PATH.exists():
     from shutil import copy

lyrics/lyrics.cfg

@@ -21,14 +21,12 @@ step-up=arrow_left
 step-down=arrow_right
 step-size=5
 
-google=R
-azLyrics=r
-
 left=j
 center=k
 right=l
 
 autoswitchtoggle=a
+cycle-source=s
 
 delete=d
 edit=e

lyrics/lyrics_in_terminal.py

@@ -25,7 +25,7 @@ def wrapper(*args, **kwargs):
 
 
 @ErrorHandler
-def init_pager(stdscr):
+def init_pager(stdscr=None):
     defaults = Config('OPTIONS')
 
     if len(sys.argv) >= 2:

lyrics/player.py

@@ -185,12 +185,9 @@ def update(self):
 
         return False
 
-    def refresh(self, source=None, cache=True):
+    def refresh(self, cycle_source=False, source=None, cache=True):
         ''' Re-fetches lyrics from procided source
             source -> source name ('google' or 'azlyrics')
             cache -> bool | wether to store cache file
         '''
-
-        if source is None:
-            source = self.default_source
-        self.track.get_lyrics(source, cache=cache)
+        self.track.get_lyrics(source, cycle_source, cache)

lyrics/track.py

@@ -5,8 +5,8 @@
 
 class Track:
     def __init__(self,
-                 artist=None,
-                 title=None,
+                 artist='',
+                 title='',
                  align=1,
                  width=0):
 
@@ -15,9 +15,11 @@ def __init__(self,
         self.alignment = align
         self.width = width
         self.length = 0
-        self.lyrics = None
+        self.lyrics = []
+        self.source = None
         self.album = None
         self.trackid = None
+        self.sources = ['google', 'azlyrics', 'genius']
 
     def __str__(self):
         ''' trackname in format "{artist} - {title}"
@@ -57,10 +59,21 @@ def update(self, artist, title, album, trackid):
         # self.art_url = art_url
         # self.get_lyrics()
 
-    def get_lyrics(self, source, cache=True):
+    def get_lyrics(self, source, cycle_source=False, cache=True):
         ''' fetch lyrics off the internet
         '''
-        self.lyrics = util.get_lyrics(self.track_name, source, cache=cache)
+        if self.source is None or self.source == 'cache':
+            self.source = source or self.sources[0]
+
+        if cycle_source:
+            curr_source = self.sources.index(self.source)
+            next_source = (curr_source + 1) % len(self.sources)
+            source = self.sources[next_source]
+            cache = False
+        else:
+            source = 'any'
+
+        self.lyrics, self.source = util.get_lyrics(self.track_name, source, cache=cache)
         self.width = len(max(self.lyrics, key=len))
         self.length = len(self.lyrics)