Update artist image download message and lyrics plugin URL

This commit is contained in:
mungai-njoroge
2024-02-24 21:15:18 +03:00
parent 67f28b8a9b
commit 10a60c9ca2
5 changed files with 11 additions and 17 deletions
+2 -2
View File
@@ -102,10 +102,10 @@ class Populate:
CheckArtistImages(instance_key)
except (RequestConnectionError, ReadTimeout) as e:
log.error(
"Internet connection lost. Downloading artist images stopped."
"Internet connection lost. Downloading artist images suspended."
)
else:
log.warning(f"No internet connection. Downloading artist images stopped!")
log.warning(f"No internet connection. Downloading artist images suspended!")
# Re-process the new artist images.
if tried_to_download_new_images:
+2 -9
View File
@@ -46,15 +46,14 @@ class LyricsProvider(LRCProvider):
Musixmatch provider class
"""
ROOT_URL = Keys.PLUGIN_LYRICS_ROOT_URL
get_token_trials = 0
ROOT_URL = "https://apic-desktop.musixmatch.com/ws/1.1/"
def __init__(self) -> None:
super().__init__()
self.token = None
self.session.headers.update(
{
"authority": Keys.PLUGIN_LYRICS_AUTHORITY,
"authority": "apic-desktop.musixmatch.com",
"cookie": "AWSELBCORS=0; AWSELB=0",
}
)
@@ -86,10 +85,6 @@ class LyricsProvider(LRCProvider):
return None
def _get_token(self):
if self.get_token_trials > 3:
self.get_token_trials = 0
return
# Check if token is cached and not expired
plugin_path = Paths.get_lyrics_plugins_path()
token_path = os.path.join(plugin_path, "token.json")
@@ -116,12 +111,10 @@ class LyricsProvider(LRCProvider):
res = res.json()
if res["message"]["header"]["status_code"] == 401:
time.sleep(13)
self.get_token_trials += 1
return self._get_token()
new_token = res["message"]["body"]["user_token"]
expiration_time = current_time + 600 # 10 minutes expiration
self.get_token_trials = 0
# Cache the new token
self.token = new_token
-3
View File
@@ -234,9 +234,6 @@ class TCOLOR:
class Keys:
# get last fm api key from os environment
PLUGIN_LYRICS_AUTHORITY = os.environ.get("apic-desktop.musixmatch.com")
PLUGIN_LYRICS_ROOT_URL = os.environ.get("https://apic-desktop.musixmatch.com/ws/1.1/")
SWINGMUSIC_APP_VERSION = os.environ.get("SWINGMUSIC_APP_VERSION")
@classmethod
+3 -3
View File
@@ -25,9 +25,9 @@ class ArtistStore:
ARTIST_LOAD_KEY = instance_key
print("Loading artists... ", end="")
cls.artists.extend(
get_all_artists(TrackStore.tracks, AlbumStore.albums)
)
cls.artists.clear()
cls.artists.extend(get_all_artists(TrackStore.tracks, AlbumStore.albums))
print("Done!")
for artist in ardb.get_all_artists():
if instance_key != ARTIST_LOAD_KEY:
+4
View File
@@ -7,8 +7,12 @@ class CustomList(list):
def __getitem__(self, index):
# Do some shared memory stuff here
# print the length of the list
# print(f"__getitem__ Length of the list: {len(self)}")
return super().__getitem__(index)
def __iter__(self) -> Iterator:
# Do some shared memory stuff here
# print the length of the list
# print(f"__iter__ Length of the list: {len(self)}")
return super().__iter__()