From 016a5e938fb8ad51d226e9f8cf150e49a3cbaafa Mon Sep 17 00:00:00 2001 From: Hellow Date: Tue, 4 Apr 2023 21:10:47 +0200 Subject: [PATCH] refactored logger --- src/music_kraken/objects/parents.py | 12 ++++-------- src/music_kraken/pages/download_center/search.py | 6 ++---- src/music_kraken/utils/shared.py | 14 +++++--------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/music_kraken/objects/parents.py b/src/music_kraken/objects/parents.py index a14921b..7066d34 100644 --- a/src/music_kraken/objects/parents.py +++ b/src/music_kraken/objects/parents.py @@ -1,15 +1,11 @@ -from collections import defaultdict -from typing import Optional, Dict, Type, Tuple, List, TYPE_CHECKING -import uuid import random +import uuid +from collections import defaultdict +from typing import Optional, Dict, Tuple, List -from ..utils.shared import ( - SONG_LOGGER as LOGGER -) from .metadata import Metadata from .option import Options -if TYPE_CHECKING: - from .collection import Collection +from ..utils.shared import OBJECT_LOGGER as LOGGER class DatabaseObject: diff --git a/src/music_kraken/pages/download_center/search.py b/src/music_kraken/pages/download_center/search.py index 4cd7a85..ba97137 100644 --- a/src/music_kraken/pages/download_center/search.py +++ b/src/music_kraken/pages/download_center/search.py @@ -1,13 +1,11 @@ -from collections import defaultdict -from typing import Tuple, List, Set, Dict, Type, Union, Optional +from typing import Tuple, List, Set, Type, Optional from . import page_attributes from .download import Download from .multiple_options import MultiPageOptions from ..abstract import Page -from ...objects import Options, DatabaseObject, Source -from ...utils.shared import DOWNLOAD_LOGGER as LOGGER from ..support_classes.download_result import DownloadResult +from ...objects import DatabaseObject, Source class Search(Download): diff --git a/src/music_kraken/utils/shared.py b/src/music_kraken/utils/shared.py index fa02e47..d33d2d6 100644 --- a/src/music_kraken/utils/shared.py +++ b/src/music_kraken/utils/shared.py @@ -44,21 +44,17 @@ logging.basicConfig( ] ) -SONG_LOGGER = logging.getLogger("song-obj") -SEARCH_LOGGER = logging.getLogger("mb-cli") -INIT_PATH_LOGGER = logging.getLogger("init_path") +OBJECT_LOGGER = logging.getLogger("objects") +TARGET_LOGGER = logging.getLogger("target") DATABASE_LOGGER = logging.getLogger("database") -METADATA_DOWNLOAD_LOGGER = logging.getLogger("metadata") -URL_DOWNLOAD_LOGGER = logging.getLogger("AudioSource") -TAGGING_LOGGER = logging.getLogger("tagging") + YOUTUBE_LOGGER = logging.getLogger("Youtube") MUSIFY_LOGGER = logging.getLogger("Musify") -PATH_LOGGER = logging.getLogger("create-paths") -DOWNLOAD_LOGGER = logging.getLogger("download") -LYRICS_LOGGER = logging.getLogger("lyrics") GENIUS_LOGGER = logging.getLogger("genius") ENCYCLOPAEDIA_METALLUM_LOGGER = logging.getLogger("ma") +DOWNLOAD_LOGGER = logging.getLogger("download") + NOT_A_GENRE = ".", "..", "misc_scripts", "Music", "script", ".git", ".idea" MUSIC_DIR = Path(os.path.expanduser("~"), "Music")