From e5a6723cd004696413fd889f96daf8803e87ba7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A8=D1=83=D1=80=D1=83=D0=BF=D0=BE=D0=B2=20=D0=98=D0=BB?= =?UTF-8?q?=D1=8C=D1=8F=20=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B8=D1=87?= Date: Wed, 4 Feb 2026 21:21:19 +0300 Subject: [PATCH] stable --- Flow.py | 8 ++++---- main.py | 2 +- src/{ => backends}/itunes/ParseItunesToJson.py | 0 src/{ => backends}/local/LocalLibraryIndexer.py | 0 src/{ => backends}/local/LocalPLaylistGenerator.py | 0 src/{ => backends}/local/ParseLocal.py | 0 src/{ => backends}/spotify/ParseSpotify.py | 0 src/{ => backends}/spotify/SpotifyAuthenticator.py | 0 src/{ => backends}/spotify/SpotifyWebAPI.py | 2 +- src/lyrics/lyrics.py | 6 ++++-- src/mappers/SpotifySearchMapping.py | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) rename src/{ => backends}/itunes/ParseItunesToJson.py (100%) rename src/{ => backends}/local/LocalLibraryIndexer.py (100%) rename src/{ => backends}/local/LocalPLaylistGenerator.py (100%) rename src/{ => backends}/local/ParseLocal.py (100%) rename src/{ => backends}/spotify/ParseSpotify.py (100%) rename src/{ => backends}/spotify/SpotifyAuthenticator.py (100%) rename src/{ => backends}/spotify/SpotifyWebAPI.py (98%) diff --git a/Flow.py b/Flow.py index 4731f1c..e1ac33d 100644 --- a/Flow.py +++ b/Flow.py @@ -8,11 +8,11 @@ from Env import work_dir from src.Library import * from src.LibrarySerializer import LibrarySaver, LibraryLoader -from src.spotify.SpotifyWebAPI import fetch_all -from src.spotify.ParseSpotify import Parser +from src.backends.spotify.SpotifyWebAPI import fetch_all +from src.backends.spotify.ParseSpotify import Parser -from src.local.LocalLibraryIndexer import update_local_library -from src.local.ParseLocal import LocalParser +from src.backends.local.LocalLibraryIndexer import update_local_library +from src.backends.local.ParseLocal import LocalParser from src.mappers.RemoteLibraryResolver import resolve_remote_tracks from src.StatGenerator import log_stats diff --git a/main.py b/main.py index 8499c07..af9ed31 100644 --- a/main.py +++ b/main.py @@ -5,7 +5,7 @@ import Flow def test1(): flow = Flow.Flow() - # flow.fetch_local() + flow.fetch_local() flow.parse_local_library() flow.load_libraries() diff --git a/src/itunes/ParseItunesToJson.py b/src/backends/itunes/ParseItunesToJson.py similarity index 100% rename from src/itunes/ParseItunesToJson.py rename to src/backends/itunes/ParseItunesToJson.py diff --git a/src/local/LocalLibraryIndexer.py b/src/backends/local/LocalLibraryIndexer.py similarity index 100% rename from src/local/LocalLibraryIndexer.py rename to src/backends/local/LocalLibraryIndexer.py diff --git a/src/local/LocalPLaylistGenerator.py b/src/backends/local/LocalPLaylistGenerator.py similarity index 100% rename from src/local/LocalPLaylistGenerator.py rename to src/backends/local/LocalPLaylistGenerator.py diff --git a/src/local/ParseLocal.py b/src/backends/local/ParseLocal.py similarity index 100% rename from src/local/ParseLocal.py rename to src/backends/local/ParseLocal.py diff --git a/src/spotify/ParseSpotify.py b/src/backends/spotify/ParseSpotify.py similarity index 100% rename from src/spotify/ParseSpotify.py rename to src/backends/spotify/ParseSpotify.py diff --git a/src/spotify/SpotifyAuthenticator.py b/src/backends/spotify/SpotifyAuthenticator.py similarity index 100% rename from src/spotify/SpotifyAuthenticator.py rename to src/backends/spotify/SpotifyAuthenticator.py diff --git a/src/spotify/SpotifyWebAPI.py b/src/backends/spotify/SpotifyWebAPI.py similarity index 98% rename from src/spotify/SpotifyWebAPI.py rename to src/backends/spotify/SpotifyWebAPI.py index 5ddc12f..8f4807f 100644 --- a/src/spotify/SpotifyWebAPI.py +++ b/src/backends/spotify/SpotifyWebAPI.py @@ -2,7 +2,7 @@ import requests from PIL import Image from io import BytesIO -from src.spotify.SpotifyAuthenticator import authenticate +from src.backends.spotify.SpotifyAuthenticator import authenticate from src.helpers import * diff --git a/src/lyrics/lyrics.py b/src/lyrics/lyrics.py index fb427de..ae6ed6d 100644 --- a/src/lyrics/lyrics.py +++ b/src/lyrics/lyrics.py @@ -7,11 +7,13 @@ def fetch_lyrics(artist: str, album: str, track: str, duration: int = 0) -> str: skip_artists = [ "shurupis", - "unknown" + "unknown", + "Unknown" ] skip_album = [ - "unknown" + "unknown", + "Unknown" ] if artist in skip_artists or album in skip_album: diff --git a/src/mappers/SpotifySearchMapping.py b/src/mappers/SpotifySearchMapping.py index 41c5bbb..e8878e9 100644 --- a/src/mappers/SpotifySearchMapping.py +++ b/src/mappers/SpotifySearchMapping.py @@ -3,7 +3,7 @@ from tqdm import tqdm from src.Library import * from src.helpers import * -from src.spotify.SpotifyWebAPI import find_song, update_access_token +from src.backends.spotify.SpotifyWebAPI import find_song, update_access_token def generate_map(client_id, client_secret, local_lib : Library, spotify_lib : Library, output_dir):