Show provider for lyrics

Author: raffaem

src/mediaplayer

@@ -4,6 +4,7 @@
 # Inspired by: https://github.com/Alexays/Waybar/blob/
 #              master/resources/custom_modules/mediaplayer.py
 import argparse
+import io
 import json
 import logging
 import math
@@ -13,6 +14,7 @@ import subprocess
 import sys
 import time
 import urllib
+from collections import namedtuple
 from functools import partial
 from pathlib import Path
 
@@ -286,23 +288,36 @@ def update_metadata(player, metadata, manager):
     logger.debug("Returning")
 
 
-def get_new_lyrics(artist, title):
-    def finalize():
-        global lyrics
-        lyrics["max_len"] = max([len(x) for x in lyrics["text"]])
-    global lyrics
-    lyrics = {"secs": [0], "text": ["[INTRO]"], "last_ix": -1}
+def download_lyrics(artist, title):
+    syncedlyrics.logger.setLevel(logging.INFO)
+    stream = io.StringIO()
+    syncedlyrics.logger.addHandler(logging.StreamHandler(stream))
     lt = syncedlyrics.search(
         f"{artist} {title}",
         allow_plain_format=False,
         providers=config["lyrics_providers"],
     )
-    if lt is None:
+    lt = lt.split("\n")
+    provider = stream.getvalue().split("on ")[1].strip()
+    stream.close()
+    SyncedLyrics = namedtuple("SyncedLyrics", ["lt", "provider"])
+    return SyncedLyrics(lt, provider)
+
+
+def get_new_lyrics(artist, title):
+    global lyrics
+    lyrics = {
+        "secs": [0],
+        "text": ["[INTRO]"],
+        "last_ix": -1,
+        "max_len": 7,
+        "provider": None,
+    }
+    lyr = download_lyrics(artist, title)
+    if lyr.lt is None:
         logger.debug("No lyrics, returning")
-        finalize()
         return
-    lt = lt.split("\n")
-    for i, line in enumerate(lt):
+    for i, line in enumerate(lyr.lt):
         m = re.match(r"\[(.*)\](.*)", line)
         timing = m.group(1)
         timing2 = timing.split(":")
@@ -317,7 +332,8 @@ def get_new_lyrics(artist, title):
         logger.debug(i, line, "->", "[" + str(secs) + "] ", text)
     lyrics["text"].append("[OUTRO]")
     lyrics["secs"].append(lyrics["secs"][-1] + 1)
-    finalize()
+    lyrics["max_len"] = max([len(x) for x in lyrics["text"]])
+    lyrics["provider"] = lyr.provider
 
 
 def left_text(s):
@@ -421,22 +437,26 @@ def update_progressbar(manager, player):
         and metadata["length"] == last_metadata["length"]
         and lyrics_same
     )
-    if same_song and not pbar_needs_update and not rot_needs_update:
+    # CHeck if we need to update
+    if same_song and \
+        not pbar_needs_update and \
+        not rot_needs_update:
         logger.debug(
             "Song is the same and neither the text "
             "nor the progressbar nor the lyrics needs an update. Returning"
         )
         return False
     # Write output
-    # Widget text
+    # - Widget text
     widget_text = gen_widget_text(player)
-    # Tooltip text
+    # - Tooltip text
     s = [metadata["title"], metadata["artist"], metadata["album"]]
-    # lyrics
+    # -- Lyrics
     curr_line = None
     if lyrics:
         ll = lyrics.get("max_len", 3)
         s.append("-" * ll)
+        s.append("["+lyrics.get("provider", "")+"]")
 
         # DEBUG
         # print(f"lyrics['secs']={lyrics['secs']}")
@@ -459,7 +479,7 @@ def update_progressbar(manager, player):
             s.append(lyrics["text"][t])
             if t == lyrics_ix:
                 curr_line = len(s) - 1
-    # tooltip
+    # -- Tooltip
     center_text(s, lyrics.get("max_len", None))
     if curr_line:
         s[curr_line] = "<b>" + s[curr_line] + "</b>"