From cd57c976fcc3a9f0380eb303570dea7d365c3c4c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Dec 2025 03:36:36 +0100 Subject: [PATCH] Prepare V0.2 --- zotify/config.py | 6 ------ zotify/track.py | 5 +---- zotify/zotify.py | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/zotify/config.py b/zotify/config.py index b5521eb..b3baabd 100644 --- a/zotify/config.py +++ b/zotify/config.py @@ -41,7 +41,6 @@ LYRICS_FILENAME = 'LYRICS_FILENAME' ALWAYS_CHECK_LYRICS = 'ALWAYS_CHECK_LYRICS' LYRICS_MD_HEADER = 'LYRICS_MD_HEADER' MD_SAVE_LYRICS = 'MD_SAVE_LYRICS' -UNIQUE_LYRICS_FILE = 'UNIQUE_LYRICS_FILE' LOCALE = 'LOCALE' CONFIG_VALUES = { @@ -58,7 +57,6 @@ CONFIG_VALUES = { ALWAYS_CHECK_LYRICS: { 'default': 'False', 'type': bool, 'arg': '--always-check-lyrics' }, LYRICS_MD_HEADER: { 'default': 'False', 'type': bool, 'arg': '--lyrics-md-header' }, MD_SAVE_LYRICS: { 'default': 'True', 'type': bool, 'arg': '--md-save-lyrics' }, - UNIQUE_LYRICS_FILE: { 'default': 'False', 'type': bool, 'arg': '--unique-file' }, MD_SAVE_GENRES: { 'default': 'False', 'type': bool, 'arg': '--md-save-genres' }, MD_ALLGENRES: { 'default': 'False', 'type': bool, 'arg': '--md-allgenres' }, MD_GENREDELIMITER: { 'default': ',', 'type': str, 'arg': '--md-genredelimiter' }, @@ -239,10 +237,6 @@ class Config: def get_save_lyrics_tags(cls) -> bool: return cls.get(MD_SAVE_LYRICS) - @classmethod - def get_unique_lyrics_file(cls) -> bool: - return cls.get(UNIQUE_LYRICS_FILE) - @classmethod def get_bulk_wait_time(cls) -> int: return cls.get(BULK_WAIT_TIME) diff --git a/zotify/track.py b/zotify/track.py index 98e8d65..6c57c7f 100644 --- a/zotify/track.py +++ b/zotify/track.py @@ -338,10 +338,7 @@ def download_track(mode: str, track_id: str, extra_keys=None, disable_progressba lyr_name = lyr_name.replace('{artist}', fix_filename(artists[0])) lyr_name = lyr_name.replace('{song_name}', fix_filename(name)) lyr_name = lyr_name.replace('{album}', fix_filename(album_name)) - if Zotify.CONFIG.get_unique_lyrics_file(): - lrc_path = PurePath(lyr_dir).joinpath("lyrics.lrc") - else: - lrc_path = PurePath(lyr_dir).joinpath(f"{lyr_name}.lrc") + lrc_path = PurePath(lyr_dir).joinpath(f"{lyr_name}.lrc") get_song_lyrics(track_id, lrc_path, title=name, artists=artists, album=album_name, duration_ms=duration_ms) except ValueError: Printer.print(PrintChannel.SKIPS, f"### LYRICS_UNAVAILABLE: Lyrics for {song_name} not available or API returned empty/errored response ###") diff --git a/zotify/zotify.py b/zotify/zotify.py index 9d8af17..09a0c3d 100644 --- a/zotify/zotify.py +++ b/zotify/zotify.py @@ -125,7 +125,7 @@ class Zotify: time.sleep(5) return cls.invoke_url(url, tryCount + 1) - Printer.print(PrintChannel.API_ERRORS, f"Spotify API Error ({responsejson['error']['status']}): {responsejson['error']['message']}") + # Printer.print(PrintChannel.API_ERRORS, f"Spotify API Error ({responsejson['error']['status']}): {responsejson['error']['message']}") return responsetext, responsejson