improvements

- reset current line after the lyrics update
- some refactoring

Author: goktug97

setup.py

@@ -8,7 +8,7 @@
     long_description = f.read()
 
 setup(name='yet-another-spotify-lyrics',
-      version='2.1.0',
+      version='2.1.1',
       description='Command Line Spotify Lyrics with Album Cover',
       author='Göktuğ Karakaşlı',
       author_email='[email protected]',
@@ -17,7 +17,7 @@
       long_description_content_type='text/markdown',
       url='https://github.com/goktug97/yet-another-spotify-lyrics',
       download_url=(
-          'https://github.com/goktug97/yet-another-spotify-lyrics/archive/v2.1.0.tar.gz'),
+          'https://github.com/goktug97/yet-another-spotify-lyrics/archive/v2.1.1.tar.gz'),
       py_modules=[os.path.splitext(os.path.basename(path))[0]
                   for path in ['spotify_lyrics',
                                'utils',

spotify_lyrics.py

@@ -26,6 +26,7 @@ class Lyrics(object):
     def __init__(self):
         self.spotify = utils.Spotify()
         self.home = str(Path.home())
+        self.current_line = 0
 
     def update_directories(self):
         self.lyrics_directory = os.path.join(self.home, '.cache', 'spotify-lyrics')
@@ -52,6 +53,8 @@ def update_directories(self):
             pass
 
     def print_metadata(self):
+        os.system('clear')
+        utils.move_cursor(0, 0)
         print(f'\033[95mArtist: {self.artist}\033[0m')
         print(f'\033[95mAlbum: {self.album}\033[0m')
         print(f'\033[95mSong: {self.song}\033[0m')
@@ -71,6 +74,7 @@ def update_lyrics(self):
             self.save_lyrics()
         else:
             self.lyrics = self.read_lyrics()
+        self.current_line = 0
 
     @ueberzug.Canvas()
     def main(self, canvas):
@@ -90,11 +94,8 @@ def main(self, canvas):
 
         utils.hide_cursor()
 
-        os.system('clear')
-        utils.move_cursor(0, 0)
         self.print_metadata()
 
-        current_line = 0
         start_row = 5
 
         with utils.KeyPoller() as key_poller:
@@ -107,25 +108,18 @@ def main(self, canvas):
                     self.art_url = art_url
                     self.update_directories()
                     self.update_lyrics()
-
                     album_cover.path = self.image_file
-
-                    os.system('clear')
-                    utils.move_cursor(0, 0)
                     self.print_metadata()
 
                 rows, columns = utils.terminal_size()
                 if self.rows != rows or self.columns != columns:
                     difference = rows - self.rows
                     self.rows, self.columns = rows, columns
                     if difference > 0:
-                        current_line -= difference
-                        current_line = max(0, current_line)
-                        current_line = min(current_line, len(wrapped_lines)-1)
+                        self.current_line -= difference
+                        self.current_line = max(0, self.current_line)
+                        self.current_line = min(self.current_line, len(wrapped_lines)-1)
                     album_cover.x = self.columns//2
-
-                    os.system('clear')
-                    utils.move_cursor(0, 0)
                     self.print_metadata()
 
                 lines = self.lyrics.split('\n')
@@ -135,9 +129,9 @@ def main(self, canvas):
                         textwrap.fill(line, columns//2-2).split('\n'))
 
                 utils.move_cursor(0, start_row)
-                n_entries = min(rows+current_line-start_row,
-                                len(wrapped_lines)) - current_line
-                for i in range(current_line, current_line + n_entries):
+                n_entries = min(rows+self.current_line-start_row,
+                                len(wrapped_lines)) - self.current_line
+                for i in range(self.current_line, self.current_line + n_entries):
                     utils.delete_line()
                     print(utils.boldify(wrapped_lines[i]))
                 utils.move_cursor(0, n_entries+start_row)
@@ -149,24 +143,23 @@ def main(self, canvas):
                     break
                 elif key == 'j':
                     if rows - start_row == n_entries:
-                        current_line += 1
-                        current_line = min(current_line, len(wrapped_lines)-1)
+                        self.current_line += 1
+                        self.current_line = min(self.current_line, len(wrapped_lines)-1)
                 elif key == 'k':
-                    current_line += -1
-                    current_line = max(current_line, 0)
+                    self.current_line += -1
+                    self.current_line = max(self.current_line, 0)
                 elif key == 'e':
                     try:
                         EDITOR = os.environ.get('EDITOR')
                         call([EDITOR, self.lyrics_file])
                         self.update_lyrics()
+                        self.print_metadata()
                         utils.hide_cursor()
                     except TypeError:
                         os.system('clear')
                         print('$EDITOR is not set')
                         time.sleep(1)
                 elif key == 'r':
-                    os.system('clear')
-                    utils.move_cursor(0, 0)
                     self.print_metadata()
                 elif key == 'd':
                     os.remove(self.lyrics_file)