From da0fa2c8dcc88b5b7d48dec8a1dc426e228dae3d Mon Sep 17 00:00:00 2001 From: Hellow2 Date: Tue, 23 May 2023 10:55:44 +0200 Subject: [PATCH] refactor --- src/music_kraken/__init__.py | 6 +++--- src/music_kraken/download/__init__.py | 2 ++ .../{pages/download_center => download}/download.py | 0 .../{pages/download_center => download}/multiple_options.py | 0 .../{pages/download_center => download}/page_attributes.py | 0 .../{pages/download_center => download}/search.py | 0 src/music_kraken/pages/__init__.py | 5 ----- src/music_kraken/pages/download_center/__init__.py | 5 ----- 8 files changed, 5 insertions(+), 13 deletions(-) create mode 100644 src/music_kraken/download/__init__.py rename src/music_kraken/{pages/download_center => download}/download.py (100%) rename src/music_kraken/{pages/download_center => download}/multiple_options.py (100%) rename src/music_kraken/{pages/download_center => download}/page_attributes.py (100%) rename src/music_kraken/{pages/download_center => download}/search.py (100%) delete mode 100644 src/music_kraken/pages/download_center/__init__.py diff --git a/src/music_kraken/__init__.py b/src/music_kraken/__init__.py index b549f8c..f4debe2 100644 --- a/src/music_kraken/__init__.py +++ b/src/music_kraken/__init__.py @@ -6,7 +6,7 @@ from typing import List import gc import musicbrainzngs -from . import objects, pages +from . import objects, pages, download from .utils import exception, shared, path_manager from .utils.config import config, read, write, PATHS_SECTION from .utils.shared import MUSIC_DIR, MODIFY_GC, NOT_A_GENRE_REGEX, get_random_message @@ -176,7 +176,7 @@ def cli( if verification in agree_inputs: return new_genre - def next_search(_search: pages.Search, query: str) -> bool: + def next_search(_search: download.Search, query: str) -> bool: """ :param _search: :param query: @@ -234,7 +234,7 @@ def cli( print(f"Downloading to: \"{genre}\"") print() - search = pages.Search() + search = download.Search() # directly download url if direct_download_url is not None: diff --git a/src/music_kraken/download/__init__.py b/src/music_kraken/download/__init__.py new file mode 100644 index 0000000..e670c65 --- /dev/null +++ b/src/music_kraken/download/__init__.py @@ -0,0 +1,2 @@ +from .search import Search +from .download import Download diff --git a/src/music_kraken/pages/download_center/download.py b/src/music_kraken/download/download.py similarity index 100% rename from src/music_kraken/pages/download_center/download.py rename to src/music_kraken/download/download.py diff --git a/src/music_kraken/pages/download_center/multiple_options.py b/src/music_kraken/download/multiple_options.py similarity index 100% rename from src/music_kraken/pages/download_center/multiple_options.py rename to src/music_kraken/download/multiple_options.py diff --git a/src/music_kraken/pages/download_center/page_attributes.py b/src/music_kraken/download/page_attributes.py similarity index 100% rename from src/music_kraken/pages/download_center/page_attributes.py rename to src/music_kraken/download/page_attributes.py diff --git a/src/music_kraken/pages/download_center/search.py b/src/music_kraken/download/search.py similarity index 100% rename from src/music_kraken/pages/download_center/search.py rename to src/music_kraken/download/search.py diff --git a/src/music_kraken/pages/__init__.py b/src/music_kraken/pages/__init__.py index 3794526..0caea8f 100644 --- a/src/music_kraken/pages/__init__.py +++ b/src/music_kraken/pages/__init__.py @@ -3,8 +3,3 @@ from .musify import Musify EncyclopaediaMetallum = EncyclopaediaMetallum Musify = Musify - -from . import download_center - -Search = download_center.Search - diff --git a/src/music_kraken/pages/download_center/__init__.py b/src/music_kraken/pages/download_center/__init__.py deleted file mode 100644 index 5adfb95..0000000 --- a/src/music_kraken/pages/download_center/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from . import search -from . import download - -Download = download.Download -Search = search.Search