From fc2414dc6898b1450d1a6db747afe44388713819 Mon Sep 17 00:00:00 2001 From: Lars Noack Date: Tue, 9 Apr 2024 10:32:17 +0200 Subject: [PATCH] feat: build --- .../music_kraken => music_kraken}/__init__.py | 2 +- .../music_kraken => music_kraken}/__main__.py | 0 .../audio/__init__.py | 0 .../audio/codec.py | 0 .../audio/metadata.py | 0 .../cli/__init__.py | 0 .../cli/informations/__init__.py | 0 .../cli/informations/paths.py | 0 .../cli/main_downloader.py | 0 .../cli/options/__init__.py | 0 .../cli/options/cache.py | 0 .../cli/options/first_config.py | 0 .../cli/options/frontend.py | 0 .../cli/options/settings.py | 0 .../cli/utils.py | 0 .../connection/__init__.py | 0 .../connection/cache.py | 0 .../connection/connection.py | 2 +- .../connection/rotating.py | 0 .../database/__init__.py | 0 .../database/data_models.py | 0 .../database/database.py | 0 .../download/__init__.py | 0 .../download/page_attributes.py | 0 .../download/results.py | 0 .../objects/__init__.py | 0 .../objects/cache.py | 0 .../objects/collection.py | 0 .../objects/contact.py | 0 .../objects/country.py | 0 .../objects/formatted_text.py | 0 .../objects/lint_default_factories.py | 0 .../objects/lyrics.py | 0 .../objects/metadata.py | 0 .../objects/new_collection.py | 0 .../objects/old_collection.py | 0 .../objects/option.py | 0 .../objects/parents.py | 0 .../objects/song.py | 0 .../objects/source.py | 0 .../objects/target.py | 0 .../pages/__init__.py | 0 .../pages/abstract.py | 0 .../pages/bandcamp.py | 0 .../pages/encyclopaedia_metallum.py | 0 .../pages/musify.py | 0 .../pages/preset.py | 0 .../pages/youtube.py | 0 .../pages/youtube_music/__init__.py | 0 .../pages/youtube_music/_list_render.py | 0 .../youtube_music/_music_object_render.py | 0 .../pages/youtube_music/super_youtube.py | 0 .../pages/youtube_music/youtube_music.py | 0 .../utils/__init__.py | 0 .../utils/config/__init__.py | 0 .../utils/config/attributes/__init__.py | 0 .../utils/config/attributes/attribute.py | 0 .../config/attributes/special_attributes.py | 0 .../utils/config/config.py | 0 .../utils/config/config_files/__init__.py | 0 .../config/config_files/logging_config.py | 0 .../utils/config/config_files/main_config.py | 0 .../config/config_files/youtube_config.py | 0 .../utils/config/utils.py | 0 .../utils/debug_utils.py | 0 .../utils/enums/__init__.py | 0 .../utils/enums/album.py | 0 .../utils/enums/colors.py | 0 .../utils/enums/contact.py | 0 .../utils/enums/source.py | 0 .../utils/exception/__init__.py | 0 .../utils/exception/config.py | 0 .../utils/exception/download.py | 0 .../utils/exception/objects.py | 0 .../utils/functions.py | 0 .../utils/hacking.py | 0 .../utils/object_handeling.py | 0 .../utils/path_manager/__init__.py | 0 .../utils/path_manager/config_directory.py | 0 .../utils/path_manager/locations.py | 0 .../utils/path_manager/music_directory.py | 0 .../utils/phonetic_compares.py | 0 .../utils/regex.py | 0 .../utils/shared.py | 0 .../utils/string_processing.py | 0 .../utils/support_classes/__init__.py | 0 .../utils/support_classes/download_result.py | 0 .../utils/support_classes/hacking.py | 0 .../utils/support_classes/query.py | 0 .../utils/support_classes/thread_classes.py | 0 pyproject.toml | 61 ++++++++++++------- requirements.txt | 1 - setup.py | 2 +- 93 files changed, 42 insertions(+), 26 deletions(-) rename {src/music_kraken => music_kraken}/__init__.py (97%) rename {src/music_kraken => music_kraken}/__main__.py (100%) rename {src/music_kraken => music_kraken}/audio/__init__.py (100%) rename {src/music_kraken => music_kraken}/audio/codec.py (100%) rename {src/music_kraken => music_kraken}/audio/metadata.py (100%) rename {src/music_kraken => music_kraken}/cli/__init__.py (100%) rename {src/music_kraken => music_kraken}/cli/informations/__init__.py (100%) rename {src/music_kraken => music_kraken}/cli/informations/paths.py (100%) rename {src/music_kraken => music_kraken}/cli/main_downloader.py (100%) rename {src/music_kraken => music_kraken}/cli/options/__init__.py (100%) rename {src/music_kraken => music_kraken}/cli/options/cache.py (100%) rename {src/music_kraken => music_kraken}/cli/options/first_config.py (100%) rename {src/music_kraken => music_kraken}/cli/options/frontend.py (100%) rename {src/music_kraken => music_kraken}/cli/options/settings.py (100%) rename {src/music_kraken => music_kraken}/cli/utils.py (100%) rename {src/music_kraken => music_kraken}/connection/__init__.py (100%) rename {src/music_kraken => music_kraken}/connection/cache.py (100%) rename {src/music_kraken => music_kraken}/connection/connection.py (98%) rename {src/music_kraken => music_kraken}/connection/rotating.py (100%) rename {src/music_kraken => music_kraken}/database/__init__.py (100%) rename {src/music_kraken => music_kraken}/database/data_models.py (100%) rename {src/music_kraken => music_kraken}/database/database.py (100%) rename {src/music_kraken => music_kraken}/download/__init__.py (100%) rename {src/music_kraken => music_kraken}/download/page_attributes.py (100%) rename {src/music_kraken => music_kraken}/download/results.py (100%) rename {src/music_kraken => music_kraken}/objects/__init__.py (100%) rename {src/music_kraken => music_kraken}/objects/cache.py (100%) rename {src/music_kraken => music_kraken}/objects/collection.py (100%) rename {src/music_kraken => music_kraken}/objects/contact.py (100%) rename {src/music_kraken => music_kraken}/objects/country.py (100%) rename {src/music_kraken => music_kraken}/objects/formatted_text.py (100%) rename {src/music_kraken => music_kraken}/objects/lint_default_factories.py (100%) rename {src/music_kraken => music_kraken}/objects/lyrics.py (100%) rename {src/music_kraken => music_kraken}/objects/metadata.py (100%) rename {src/music_kraken => music_kraken}/objects/new_collection.py (100%) rename {src/music_kraken => music_kraken}/objects/old_collection.py (100%) rename {src/music_kraken => music_kraken}/objects/option.py (100%) rename {src/music_kraken => music_kraken}/objects/parents.py (100%) rename {src/music_kraken => music_kraken}/objects/song.py (100%) rename {src/music_kraken => music_kraken}/objects/source.py (100%) rename {src/music_kraken => music_kraken}/objects/target.py (100%) rename {src/music_kraken => music_kraken}/pages/__init__.py (100%) rename {src/music_kraken => music_kraken}/pages/abstract.py (100%) rename {src/music_kraken => music_kraken}/pages/bandcamp.py (100%) rename {src/music_kraken => music_kraken}/pages/encyclopaedia_metallum.py (100%) rename {src/music_kraken => music_kraken}/pages/musify.py (100%) rename {src/music_kraken => music_kraken}/pages/preset.py (100%) rename {src/music_kraken => music_kraken}/pages/youtube.py (100%) rename {src/music_kraken => music_kraken}/pages/youtube_music/__init__.py (100%) rename {src/music_kraken => music_kraken}/pages/youtube_music/_list_render.py (100%) rename {src/music_kraken => music_kraken}/pages/youtube_music/_music_object_render.py (100%) rename {src/music_kraken => music_kraken}/pages/youtube_music/super_youtube.py (100%) rename {src/music_kraken => music_kraken}/pages/youtube_music/youtube_music.py (100%) rename {src/music_kraken => music_kraken}/utils/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/config/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/config/attributes/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/config/attributes/attribute.py (100%) rename {src/music_kraken => music_kraken}/utils/config/attributes/special_attributes.py (100%) rename {src/music_kraken => music_kraken}/utils/config/config.py (100%) rename {src/music_kraken => music_kraken}/utils/config/config_files/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/config/config_files/logging_config.py (100%) rename {src/music_kraken => music_kraken}/utils/config/config_files/main_config.py (100%) rename {src/music_kraken => music_kraken}/utils/config/config_files/youtube_config.py (100%) rename {src/music_kraken => music_kraken}/utils/config/utils.py (100%) rename {src/music_kraken => music_kraken}/utils/debug_utils.py (100%) rename {src/music_kraken => music_kraken}/utils/enums/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/enums/album.py (100%) rename {src/music_kraken => music_kraken}/utils/enums/colors.py (100%) rename {src/music_kraken => music_kraken}/utils/enums/contact.py (100%) rename {src/music_kraken => music_kraken}/utils/enums/source.py (100%) rename {src/music_kraken => music_kraken}/utils/exception/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/exception/config.py (100%) rename {src/music_kraken => music_kraken}/utils/exception/download.py (100%) rename {src/music_kraken => music_kraken}/utils/exception/objects.py (100%) rename {src/music_kraken => music_kraken}/utils/functions.py (100%) rename {src/music_kraken => music_kraken}/utils/hacking.py (100%) rename {src/music_kraken => music_kraken}/utils/object_handeling.py (100%) rename {src/music_kraken => music_kraken}/utils/path_manager/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/path_manager/config_directory.py (100%) rename {src/music_kraken => music_kraken}/utils/path_manager/locations.py (100%) rename {src/music_kraken => music_kraken}/utils/path_manager/music_directory.py (100%) rename {src/music_kraken => music_kraken}/utils/phonetic_compares.py (100%) rename {src/music_kraken => music_kraken}/utils/regex.py (100%) rename {src/music_kraken => music_kraken}/utils/shared.py (100%) rename {src/music_kraken => music_kraken}/utils/string_processing.py (100%) rename {src/music_kraken => music_kraken}/utils/support_classes/__init__.py (100%) rename {src/music_kraken => music_kraken}/utils/support_classes/download_result.py (100%) rename {src/music_kraken => music_kraken}/utils/support_classes/hacking.py (100%) rename {src/music_kraken => music_kraken}/utils/support_classes/query.py (100%) rename {src/music_kraken => music_kraken}/utils/support_classes/thread_classes.py (100%) diff --git a/src/music_kraken/__init__.py b/music_kraken/__init__.py similarity index 97% rename from src/music_kraken/__init__.py rename to music_kraken/__init__.py index 85cd867..a787571 100644 --- a/src/music_kraken/__init__.py +++ b/music_kraken/__init__.py @@ -11,7 +11,7 @@ from .utils.config import logging_settings, main_settings, read_config read_config() -console: Console = Console(width=220) +console: Console = Console() def init_logging(): log_file = main_settings['log_file'] diff --git a/src/music_kraken/__main__.py b/music_kraken/__main__.py similarity index 100% rename from src/music_kraken/__main__.py rename to music_kraken/__main__.py diff --git a/src/music_kraken/audio/__init__.py b/music_kraken/audio/__init__.py similarity index 100% rename from src/music_kraken/audio/__init__.py rename to music_kraken/audio/__init__.py diff --git a/src/music_kraken/audio/codec.py b/music_kraken/audio/codec.py similarity index 100% rename from src/music_kraken/audio/codec.py rename to music_kraken/audio/codec.py diff --git a/src/music_kraken/audio/metadata.py b/music_kraken/audio/metadata.py similarity index 100% rename from src/music_kraken/audio/metadata.py rename to music_kraken/audio/metadata.py diff --git a/src/music_kraken/cli/__init__.py b/music_kraken/cli/__init__.py similarity index 100% rename from src/music_kraken/cli/__init__.py rename to music_kraken/cli/__init__.py diff --git a/src/music_kraken/cli/informations/__init__.py b/music_kraken/cli/informations/__init__.py similarity index 100% rename from src/music_kraken/cli/informations/__init__.py rename to music_kraken/cli/informations/__init__.py diff --git a/src/music_kraken/cli/informations/paths.py b/music_kraken/cli/informations/paths.py similarity index 100% rename from src/music_kraken/cli/informations/paths.py rename to music_kraken/cli/informations/paths.py diff --git a/src/music_kraken/cli/main_downloader.py b/music_kraken/cli/main_downloader.py similarity index 100% rename from src/music_kraken/cli/main_downloader.py rename to music_kraken/cli/main_downloader.py diff --git a/src/music_kraken/cli/options/__init__.py b/music_kraken/cli/options/__init__.py similarity index 100% rename from src/music_kraken/cli/options/__init__.py rename to music_kraken/cli/options/__init__.py diff --git a/src/music_kraken/cli/options/cache.py b/music_kraken/cli/options/cache.py similarity index 100% rename from src/music_kraken/cli/options/cache.py rename to music_kraken/cli/options/cache.py diff --git a/src/music_kraken/cli/options/first_config.py b/music_kraken/cli/options/first_config.py similarity index 100% rename from src/music_kraken/cli/options/first_config.py rename to music_kraken/cli/options/first_config.py diff --git a/src/music_kraken/cli/options/frontend.py b/music_kraken/cli/options/frontend.py similarity index 100% rename from src/music_kraken/cli/options/frontend.py rename to music_kraken/cli/options/frontend.py diff --git a/src/music_kraken/cli/options/settings.py b/music_kraken/cli/options/settings.py similarity index 100% rename from src/music_kraken/cli/options/settings.py rename to music_kraken/cli/options/settings.py diff --git a/src/music_kraken/cli/utils.py b/music_kraken/cli/utils.py similarity index 100% rename from src/music_kraken/cli/utils.py rename to music_kraken/cli/utils.py diff --git a/src/music_kraken/connection/__init__.py b/music_kraken/connection/__init__.py similarity index 100% rename from src/music_kraken/connection/__init__.py rename to music_kraken/connection/__init__.py diff --git a/src/music_kraken/connection/cache.py b/music_kraken/connection/cache.py similarity index 100% rename from src/music_kraken/connection/cache.py rename to music_kraken/connection/cache.py diff --git a/src/music_kraken/connection/connection.py b/music_kraken/connection/connection.py similarity index 98% rename from src/music_kraken/connection/connection.py rename to music_kraken/connection/connection.py index c3d3e02..991c712 100644 --- a/src/music_kraken/connection/connection.py +++ b/music_kraken/connection/connection.py @@ -314,7 +314,7 @@ class Connection: > The internationally recommended unit symbol for the kilobyte is kB. """ - with tqdm(total=total_size - target.size, unit='B', unit_scale=True, unit_divisor=1024, desc=name) as t: + with tqdm(total=total_size, initial=target.size, unit='B', unit_scale=True, unit_divisor=1024, desc=name) as t: try: for chunk in r.iter_content(chunk_size=chunk_size): size = f.write(chunk) diff --git a/src/music_kraken/connection/rotating.py b/music_kraken/connection/rotating.py similarity index 100% rename from src/music_kraken/connection/rotating.py rename to music_kraken/connection/rotating.py diff --git a/src/music_kraken/database/__init__.py b/music_kraken/database/__init__.py similarity index 100% rename from src/music_kraken/database/__init__.py rename to music_kraken/database/__init__.py diff --git a/src/music_kraken/database/data_models.py b/music_kraken/database/data_models.py similarity index 100% rename from src/music_kraken/database/data_models.py rename to music_kraken/database/data_models.py diff --git a/src/music_kraken/database/database.py b/music_kraken/database/database.py similarity index 100% rename from src/music_kraken/database/database.py rename to music_kraken/database/database.py diff --git a/src/music_kraken/download/__init__.py b/music_kraken/download/__init__.py similarity index 100% rename from src/music_kraken/download/__init__.py rename to music_kraken/download/__init__.py diff --git a/src/music_kraken/download/page_attributes.py b/music_kraken/download/page_attributes.py similarity index 100% rename from src/music_kraken/download/page_attributes.py rename to music_kraken/download/page_attributes.py diff --git a/src/music_kraken/download/results.py b/music_kraken/download/results.py similarity index 100% rename from src/music_kraken/download/results.py rename to music_kraken/download/results.py diff --git a/src/music_kraken/objects/__init__.py b/music_kraken/objects/__init__.py similarity index 100% rename from src/music_kraken/objects/__init__.py rename to music_kraken/objects/__init__.py diff --git a/src/music_kraken/objects/cache.py b/music_kraken/objects/cache.py similarity index 100% rename from src/music_kraken/objects/cache.py rename to music_kraken/objects/cache.py diff --git a/src/music_kraken/objects/collection.py b/music_kraken/objects/collection.py similarity index 100% rename from src/music_kraken/objects/collection.py rename to music_kraken/objects/collection.py diff --git a/src/music_kraken/objects/contact.py b/music_kraken/objects/contact.py similarity index 100% rename from src/music_kraken/objects/contact.py rename to music_kraken/objects/contact.py diff --git a/src/music_kraken/objects/country.py b/music_kraken/objects/country.py similarity index 100% rename from src/music_kraken/objects/country.py rename to music_kraken/objects/country.py diff --git a/src/music_kraken/objects/formatted_text.py b/music_kraken/objects/formatted_text.py similarity index 100% rename from src/music_kraken/objects/formatted_text.py rename to music_kraken/objects/formatted_text.py diff --git a/src/music_kraken/objects/lint_default_factories.py b/music_kraken/objects/lint_default_factories.py similarity index 100% rename from src/music_kraken/objects/lint_default_factories.py rename to music_kraken/objects/lint_default_factories.py diff --git a/src/music_kraken/objects/lyrics.py b/music_kraken/objects/lyrics.py similarity index 100% rename from src/music_kraken/objects/lyrics.py rename to music_kraken/objects/lyrics.py diff --git a/src/music_kraken/objects/metadata.py b/music_kraken/objects/metadata.py similarity index 100% rename from src/music_kraken/objects/metadata.py rename to music_kraken/objects/metadata.py diff --git a/src/music_kraken/objects/new_collection.py b/music_kraken/objects/new_collection.py similarity index 100% rename from src/music_kraken/objects/new_collection.py rename to music_kraken/objects/new_collection.py diff --git a/src/music_kraken/objects/old_collection.py b/music_kraken/objects/old_collection.py similarity index 100% rename from src/music_kraken/objects/old_collection.py rename to music_kraken/objects/old_collection.py diff --git a/src/music_kraken/objects/option.py b/music_kraken/objects/option.py similarity index 100% rename from src/music_kraken/objects/option.py rename to music_kraken/objects/option.py diff --git a/src/music_kraken/objects/parents.py b/music_kraken/objects/parents.py similarity index 100% rename from src/music_kraken/objects/parents.py rename to music_kraken/objects/parents.py diff --git a/src/music_kraken/objects/song.py b/music_kraken/objects/song.py similarity index 100% rename from src/music_kraken/objects/song.py rename to music_kraken/objects/song.py diff --git a/src/music_kraken/objects/source.py b/music_kraken/objects/source.py similarity index 100% rename from src/music_kraken/objects/source.py rename to music_kraken/objects/source.py diff --git a/src/music_kraken/objects/target.py b/music_kraken/objects/target.py similarity index 100% rename from src/music_kraken/objects/target.py rename to music_kraken/objects/target.py diff --git a/src/music_kraken/pages/__init__.py b/music_kraken/pages/__init__.py similarity index 100% rename from src/music_kraken/pages/__init__.py rename to music_kraken/pages/__init__.py diff --git a/src/music_kraken/pages/abstract.py b/music_kraken/pages/abstract.py similarity index 100% rename from src/music_kraken/pages/abstract.py rename to music_kraken/pages/abstract.py diff --git a/src/music_kraken/pages/bandcamp.py b/music_kraken/pages/bandcamp.py similarity index 100% rename from src/music_kraken/pages/bandcamp.py rename to music_kraken/pages/bandcamp.py diff --git a/src/music_kraken/pages/encyclopaedia_metallum.py b/music_kraken/pages/encyclopaedia_metallum.py similarity index 100% rename from src/music_kraken/pages/encyclopaedia_metallum.py rename to music_kraken/pages/encyclopaedia_metallum.py diff --git a/src/music_kraken/pages/musify.py b/music_kraken/pages/musify.py similarity index 100% rename from src/music_kraken/pages/musify.py rename to music_kraken/pages/musify.py diff --git a/src/music_kraken/pages/preset.py b/music_kraken/pages/preset.py similarity index 100% rename from src/music_kraken/pages/preset.py rename to music_kraken/pages/preset.py diff --git a/src/music_kraken/pages/youtube.py b/music_kraken/pages/youtube.py similarity index 100% rename from src/music_kraken/pages/youtube.py rename to music_kraken/pages/youtube.py diff --git a/src/music_kraken/pages/youtube_music/__init__.py b/music_kraken/pages/youtube_music/__init__.py similarity index 100% rename from src/music_kraken/pages/youtube_music/__init__.py rename to music_kraken/pages/youtube_music/__init__.py diff --git a/src/music_kraken/pages/youtube_music/_list_render.py b/music_kraken/pages/youtube_music/_list_render.py similarity index 100% rename from src/music_kraken/pages/youtube_music/_list_render.py rename to music_kraken/pages/youtube_music/_list_render.py diff --git a/src/music_kraken/pages/youtube_music/_music_object_render.py b/music_kraken/pages/youtube_music/_music_object_render.py similarity index 100% rename from src/music_kraken/pages/youtube_music/_music_object_render.py rename to music_kraken/pages/youtube_music/_music_object_render.py diff --git a/src/music_kraken/pages/youtube_music/super_youtube.py b/music_kraken/pages/youtube_music/super_youtube.py similarity index 100% rename from src/music_kraken/pages/youtube_music/super_youtube.py rename to music_kraken/pages/youtube_music/super_youtube.py diff --git a/src/music_kraken/pages/youtube_music/youtube_music.py b/music_kraken/pages/youtube_music/youtube_music.py similarity index 100% rename from src/music_kraken/pages/youtube_music/youtube_music.py rename to music_kraken/pages/youtube_music/youtube_music.py diff --git a/src/music_kraken/utils/__init__.py b/music_kraken/utils/__init__.py similarity index 100% rename from src/music_kraken/utils/__init__.py rename to music_kraken/utils/__init__.py diff --git a/src/music_kraken/utils/config/__init__.py b/music_kraken/utils/config/__init__.py similarity index 100% rename from src/music_kraken/utils/config/__init__.py rename to music_kraken/utils/config/__init__.py diff --git a/src/music_kraken/utils/config/attributes/__init__.py b/music_kraken/utils/config/attributes/__init__.py similarity index 100% rename from src/music_kraken/utils/config/attributes/__init__.py rename to music_kraken/utils/config/attributes/__init__.py diff --git a/src/music_kraken/utils/config/attributes/attribute.py b/music_kraken/utils/config/attributes/attribute.py similarity index 100% rename from src/music_kraken/utils/config/attributes/attribute.py rename to music_kraken/utils/config/attributes/attribute.py diff --git a/src/music_kraken/utils/config/attributes/special_attributes.py b/music_kraken/utils/config/attributes/special_attributes.py similarity index 100% rename from src/music_kraken/utils/config/attributes/special_attributes.py rename to music_kraken/utils/config/attributes/special_attributes.py diff --git a/src/music_kraken/utils/config/config.py b/music_kraken/utils/config/config.py similarity index 100% rename from src/music_kraken/utils/config/config.py rename to music_kraken/utils/config/config.py diff --git a/src/music_kraken/utils/config/config_files/__init__.py b/music_kraken/utils/config/config_files/__init__.py similarity index 100% rename from src/music_kraken/utils/config/config_files/__init__.py rename to music_kraken/utils/config/config_files/__init__.py diff --git a/src/music_kraken/utils/config/config_files/logging_config.py b/music_kraken/utils/config/config_files/logging_config.py similarity index 100% rename from src/music_kraken/utils/config/config_files/logging_config.py rename to music_kraken/utils/config/config_files/logging_config.py diff --git a/src/music_kraken/utils/config/config_files/main_config.py b/music_kraken/utils/config/config_files/main_config.py similarity index 100% rename from src/music_kraken/utils/config/config_files/main_config.py rename to music_kraken/utils/config/config_files/main_config.py diff --git a/src/music_kraken/utils/config/config_files/youtube_config.py b/music_kraken/utils/config/config_files/youtube_config.py similarity index 100% rename from src/music_kraken/utils/config/config_files/youtube_config.py rename to music_kraken/utils/config/config_files/youtube_config.py diff --git a/src/music_kraken/utils/config/utils.py b/music_kraken/utils/config/utils.py similarity index 100% rename from src/music_kraken/utils/config/utils.py rename to music_kraken/utils/config/utils.py diff --git a/src/music_kraken/utils/debug_utils.py b/music_kraken/utils/debug_utils.py similarity index 100% rename from src/music_kraken/utils/debug_utils.py rename to music_kraken/utils/debug_utils.py diff --git a/src/music_kraken/utils/enums/__init__.py b/music_kraken/utils/enums/__init__.py similarity index 100% rename from src/music_kraken/utils/enums/__init__.py rename to music_kraken/utils/enums/__init__.py diff --git a/src/music_kraken/utils/enums/album.py b/music_kraken/utils/enums/album.py similarity index 100% rename from src/music_kraken/utils/enums/album.py rename to music_kraken/utils/enums/album.py diff --git a/src/music_kraken/utils/enums/colors.py b/music_kraken/utils/enums/colors.py similarity index 100% rename from src/music_kraken/utils/enums/colors.py rename to music_kraken/utils/enums/colors.py diff --git a/src/music_kraken/utils/enums/contact.py b/music_kraken/utils/enums/contact.py similarity index 100% rename from src/music_kraken/utils/enums/contact.py rename to music_kraken/utils/enums/contact.py diff --git a/src/music_kraken/utils/enums/source.py b/music_kraken/utils/enums/source.py similarity index 100% rename from src/music_kraken/utils/enums/source.py rename to music_kraken/utils/enums/source.py diff --git a/src/music_kraken/utils/exception/__init__.py b/music_kraken/utils/exception/__init__.py similarity index 100% rename from src/music_kraken/utils/exception/__init__.py rename to music_kraken/utils/exception/__init__.py diff --git a/src/music_kraken/utils/exception/config.py b/music_kraken/utils/exception/config.py similarity index 100% rename from src/music_kraken/utils/exception/config.py rename to music_kraken/utils/exception/config.py diff --git a/src/music_kraken/utils/exception/download.py b/music_kraken/utils/exception/download.py similarity index 100% rename from src/music_kraken/utils/exception/download.py rename to music_kraken/utils/exception/download.py diff --git a/src/music_kraken/utils/exception/objects.py b/music_kraken/utils/exception/objects.py similarity index 100% rename from src/music_kraken/utils/exception/objects.py rename to music_kraken/utils/exception/objects.py diff --git a/src/music_kraken/utils/functions.py b/music_kraken/utils/functions.py similarity index 100% rename from src/music_kraken/utils/functions.py rename to music_kraken/utils/functions.py diff --git a/src/music_kraken/utils/hacking.py b/music_kraken/utils/hacking.py similarity index 100% rename from src/music_kraken/utils/hacking.py rename to music_kraken/utils/hacking.py diff --git a/src/music_kraken/utils/object_handeling.py b/music_kraken/utils/object_handeling.py similarity index 100% rename from src/music_kraken/utils/object_handeling.py rename to music_kraken/utils/object_handeling.py diff --git a/src/music_kraken/utils/path_manager/__init__.py b/music_kraken/utils/path_manager/__init__.py similarity index 100% rename from src/music_kraken/utils/path_manager/__init__.py rename to music_kraken/utils/path_manager/__init__.py diff --git a/src/music_kraken/utils/path_manager/config_directory.py b/music_kraken/utils/path_manager/config_directory.py similarity index 100% rename from src/music_kraken/utils/path_manager/config_directory.py rename to music_kraken/utils/path_manager/config_directory.py diff --git a/src/music_kraken/utils/path_manager/locations.py b/music_kraken/utils/path_manager/locations.py similarity index 100% rename from src/music_kraken/utils/path_manager/locations.py rename to music_kraken/utils/path_manager/locations.py diff --git a/src/music_kraken/utils/path_manager/music_directory.py b/music_kraken/utils/path_manager/music_directory.py similarity index 100% rename from src/music_kraken/utils/path_manager/music_directory.py rename to music_kraken/utils/path_manager/music_directory.py diff --git a/src/music_kraken/utils/phonetic_compares.py b/music_kraken/utils/phonetic_compares.py similarity index 100% rename from src/music_kraken/utils/phonetic_compares.py rename to music_kraken/utils/phonetic_compares.py diff --git a/src/music_kraken/utils/regex.py b/music_kraken/utils/regex.py similarity index 100% rename from src/music_kraken/utils/regex.py rename to music_kraken/utils/regex.py diff --git a/src/music_kraken/utils/shared.py b/music_kraken/utils/shared.py similarity index 100% rename from src/music_kraken/utils/shared.py rename to music_kraken/utils/shared.py diff --git a/src/music_kraken/utils/string_processing.py b/music_kraken/utils/string_processing.py similarity index 100% rename from src/music_kraken/utils/string_processing.py rename to music_kraken/utils/string_processing.py diff --git a/src/music_kraken/utils/support_classes/__init__.py b/music_kraken/utils/support_classes/__init__.py similarity index 100% rename from src/music_kraken/utils/support_classes/__init__.py rename to music_kraken/utils/support_classes/__init__.py diff --git a/src/music_kraken/utils/support_classes/download_result.py b/music_kraken/utils/support_classes/download_result.py similarity index 100% rename from src/music_kraken/utils/support_classes/download_result.py rename to music_kraken/utils/support_classes/download_result.py diff --git a/src/music_kraken/utils/support_classes/hacking.py b/music_kraken/utils/support_classes/hacking.py similarity index 100% rename from src/music_kraken/utils/support_classes/hacking.py rename to music_kraken/utils/support_classes/hacking.py diff --git a/src/music_kraken/utils/support_classes/query.py b/music_kraken/utils/support_classes/query.py similarity index 100% rename from src/music_kraken/utils/support_classes/query.py rename to music_kraken/utils/support_classes/query.py diff --git a/src/music_kraken/utils/support_classes/thread_classes.py b/music_kraken/utils/support_classes/thread_classes.py similarity index 100% rename from src/music_kraken/utils/support_classes/thread_classes.py rename to music_kraken/utils/support_classes/thread_classes.py diff --git a/pyproject.toml b/pyproject.toml index e107dcc..2304274 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,24 @@ [build-system] -requires = ["setuptools>=58.0.4", "wheel>=0.37.0"] -build-backend = "setuptools.build_meta" +requires = ["hatchling", "hatch-requirements-txt" ] +build-backend = "hatchling.build" + +[tool.hatch.build] +directory = "dist" + +[tool.hatch.build.targets.sdist] +include = ["music_kraken/*.py" ] + +[tool.hatch.build.targets.wheel] +packages = ["music_kraken"] + +[project.scripts] +music-kraken = "music_kraken.__main__:cli" [project] name = "music-kraken" version = "1.2.1" description = "An extensive music downloader crawling the internet. It gets its metadata from a couple of metadata providers, and it scrapes the audiofiles." -authors = [{ name = "Hellow2", email = "Hellow2@outlook.de" }] +authors = [{ name = "Hellow2", email = "hazel_is_cute@proton.me" }] license = "AGPL-3.0-or-later" readme = "README.md" repository = "https://github.com/HeIIow2/music-downloader" @@ -22,26 +34,31 @@ classifiers = [ "Topic :: Multimedia :: Sound/Audio", "Topic :: Utilities", ] -[project.dependencies] -requests = "~=2.28.1" -mutagen = "~=1.46.0" -musicbrainzngs = "~=0.7.1" -jellyfish = "~=0.9.0" -pydub = "~=0.25.1" -youtube_dl = "*" -beautifulsoup4 = "~=4.11.1" -pycountry = "~=22.3.5" + +dependencies = [ + "requests~=2.31.0", + "responses~=0.24.1", + "beautifulsoup4~=4.11.1", + + "ffmpeg-python~=0.2.0", + "ffmpeg-progress-yield~=0.7.8", + "mutagen~=1.46.0", + "pandoc~=2.3", + + "jellyfish~=0.9.0", + "transliterate~=1.10.2", + "pycountry~=24.0.1", + + "tqdm~=4.65.0", + "platformdirs~=4.2.0", + "pathvalidate~=2.5.2", + "toml~=0.10.2", + "typing_extensions~=4.7.1", + + "sponsorblock~=0.1.3", + "youtube_dl", +] [tool.setuptools.entry_points] music-kraken = "music_kraken:cli" - -[tool.setuptools] -packages = ['music_kraken', 'music_kraken.lyrics', 'music_kraken.not_used_anymore', 'music_kraken.target', 'music_kraken.tagging', 'music_kraken.utils', 'music_kraken.not_used_anymore.sources', 'music_kraken.database', 'music_kraken.static_files'] -include_package_data = true -package_dir = {''= 'src', 'music_kraken'= 'src/music_kraken'} -package_data = {'music_kraken'= ['*.sql']} -data_files = ["", ["requirements.txt", "README.md", "version"]] - -[tool.setuptools.command.test] -# ... diff --git a/requirements.txt b/requirements.txt index 27b2af8..7ba18a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,6 @@ pyffmpeg~=2.4.2.18 ffmpeg-progress-yield~=0.7.8 pathvalidate~=2.5.2 guppy3~=3.1.3 - toml~=0.10.2 typing_extensions~=4.7.1 responses~=0.24.1 diff --git a/setup.py b/setup.py index 1eebc18..772a81f 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ setup( packages=packages, package_dir={'': 'src', 'music_kraken': 'src/music_kraken'}, install_requires=install_requires, - entry_points={'console_scripts': ['music-kraken = music_kraken:cli']}, + entry_points={'_scripts': ['music-kraken = music_kraken:cli']}, include_package_data=True, package_data={'music_kraken': ['*.sql']}, data_files=[