From 2db2c884416ed676e510c2d186f5d9370468e2ec Mon Sep 17 00:00:00 2001 From: jbannon Date: Tue, 26 Apr 2022 07:19:53 +0000 Subject: [PATCH] setup cfg --- ytdl_subscribe/__init__.py => Dockerfile | 0 requirements.txt | 7 ---- requirements_dev.txt | 8 ----- setup.cfg | 36 +++++++++++++++++++ setup.py | 7 ---- .../cli => src/ytdl_sub}/__init__.py | 0 .../config => src/ytdl_sub/cli}/__init__.py | 0 .../ytdl_sub}/cli/download_args_parser.py | 0 .../ytdl_sub}/cli/main_args_parser.py | 0 .../ytdl_sub/config}/__init__.py | 0 .../ytdl_sub}/config/config_file.py | 6 ++-- .../ytdl_sub}/config/preset.py | 30 ++++++++-------- .../ytdl_sub}/config/preset_class_mappings.py | 20 +++++------ .../ytdl_sub}/config/preset_options.py | 16 ++++----- .../ytdl_sub}/config/subscription.py | 16 ++++----- .../ytdl_sub/downloaders}/__init__.py | 0 .../ytdl_sub}/downloaders/downloader.py | 6 ++-- .../downloaders/soundcloud_downloader.py | 12 +++---- .../downloaders/youtube_downloader.py | 14 ++++---- .../ytdl_sub/entries}/__init__.py | 0 .../ytdl_sub}/entries/base_entry.py | 0 .../ytdl_sub}/entries/entry.py | 4 +-- .../ytdl_sub}/entries/soundcloud.py | 6 ++-- .../ytdl_sub/entries/variables}/__init__.py | 0 .../entries/variables/entry_variables.py | 2 +- .../entries/variables/soundcloud_variables.py | 2 +- .../entries/variables/youtube_variables.py | 4 +-- .../ytdl_sub}/entries/youtube.py | 4 +-- {ytdl_subscribe => src/ytdl_sub}/main.py | 14 ++++---- .../ytdl_sub/plugins}/__init__.py | 0 .../ytdl_sub}/plugins/convert_thumbnail.py | 8 ++--- .../ytdl_sub}/plugins/music_tags.py | 10 +++--- .../ytdl_sub}/plugins/nfo_tags.py | 10 +++--- .../plugins/output_directory_nfo_tags.py | 8 ++--- .../ytdl_sub}/plugins/plugin.py | 8 ++--- .../ytdl_sub/subscriptions}/__init__.py | 0 .../ytdl_sub}/subscriptions/subscription.py | 22 ++++++------ .../ytdl_sub/utils}/__init__.py | 0 .../ytdl_sub}/utils/exceptions.py | 0 .../ytdl_sub/validators}/__init__.py | 0 .../validators/date_range_validator.py | 4 +-- .../validators/strict_dict_validator.py | 2 +- .../ytdl_sub}/validators/string_datetime.py | 2 +- .../validators/string_formatter_validators.py | 8 ++--- .../validators/string_select_validator.py | 2 +- .../ytdl_sub}/validators/validators.py | 2 +- src/ytdl_sub/version.py | 1 + src/ytdl_sub/ytdl_additions/__init__.py | 0 .../enhanced_download_archive.py | 2 +- tests/unit/entries/conftest.py | 4 +-- tests/unit/entries/test_soundcloud_entries.py | 2 +- tests/unit/validators/test_bool_validator.py | 4 +-- tests/unit/validators/test_dict_validator.py | 10 +++--- .../test_string_formatter_validator.py | 12 +++---- .../unit/validators/test_string_validator.py | 4 +-- 55 files changed, 177 insertions(+), 162 deletions(-) rename ytdl_subscribe/__init__.py => Dockerfile (100%) delete mode 100644 requirements.txt delete mode 100644 requirements_dev.txt create mode 100644 setup.cfg delete mode 100644 setup.py rename {ytdl_subscribe/cli => src/ytdl_sub}/__init__.py (100%) rename {ytdl_subscribe/config => src/ytdl_sub/cli}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/cli/download_args_parser.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/cli/main_args_parser.py (100%) rename {ytdl_subscribe/downloaders => src/ytdl_sub/config}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/config/config_file.py (84%) rename {ytdl_subscribe => src/ytdl_sub}/config/preset.py (86%) rename {ytdl_subscribe => src/ytdl_sub}/config/preset_class_mappings.py (80%) rename {ytdl_subscribe => src/ytdl_sub}/config/preset_options.py (82%) rename {ytdl_subscribe => src/ytdl_sub}/config/subscription.py (84%) rename {ytdl_subscribe/entries => src/ytdl_sub/downloaders}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/downloaders/downloader.py (95%) rename {ytdl_subscribe => src/ytdl_sub}/downloaders/soundcloud_downloader.py (91%) rename {ytdl_subscribe => src/ytdl_sub}/downloaders/youtube_downloader.py (94%) rename {ytdl_subscribe/entries/variables => src/ytdl_sub/entries}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/entries/base_entry.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/entries/entry.py (85%) rename {ytdl_subscribe => src/ytdl_sub}/entries/soundcloud.py (95%) rename {ytdl_subscribe/plugins => src/ytdl_sub/entries/variables}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/entries/variables/entry_variables.py (98%) rename {ytdl_subscribe => src/ytdl_sub}/entries/variables/soundcloud_variables.py (94%) rename {ytdl_subscribe => src/ytdl_sub}/entries/variables/youtube_variables.py (80%) rename {ytdl_subscribe => src/ytdl_sub}/entries/youtube.py (89%) rename {ytdl_subscribe => src/ytdl_sub}/main.py (88%) rename {ytdl_subscribe/subscriptions => src/ytdl_sub/plugins}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/plugins/convert_thumbnail.py (84%) rename {ytdl_subscribe => src/ytdl_sub}/plugins/music_tags.py (75%) rename {ytdl_subscribe => src/ytdl_sub}/plugins/nfo_tags.py (85%) rename {ytdl_subscribe => src/ytdl_sub}/plugins/output_directory_nfo_tags.py (86%) rename {ytdl_subscribe => src/ytdl_sub}/plugins/plugin.py (86%) rename {ytdl_subscribe/utils => src/ytdl_sub/subscriptions}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/subscriptions/subscription.py (90%) rename {ytdl_subscribe/validators => src/ytdl_sub/utils}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/utils/exceptions.py (100%) rename {ytdl_subscribe/ytdl_additions => src/ytdl_sub/validators}/__init__.py (100%) rename {ytdl_subscribe => src/ytdl_sub}/validators/date_range_validator.py (81%) rename {ytdl_subscribe => src/ytdl_sub}/validators/strict_dict_validator.py (96%) rename {ytdl_subscribe => src/ytdl_sub}/validators/string_datetime.py (90%) rename {ytdl_subscribe => src/ytdl_sub}/validators/string_formatter_validators.py (95%) rename {ytdl_subscribe => src/ytdl_sub}/validators/string_select_validator.py (88%) rename {ytdl_subscribe => src/ytdl_sub}/validators/validators.py (98%) create mode 100644 src/ytdl_sub/version.py create mode 100644 src/ytdl_sub/ytdl_additions/__init__.py rename {ytdl_subscribe => src/ytdl_sub}/ytdl_additions/enhanced_download_archive.py (99%) diff --git a/ytdl_subscribe/__init__.py b/Dockerfile similarity index 100% rename from ytdl_subscribe/__init__.py rename to Dockerfile diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 3ebb8852..00000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -argparse==1.4.0 -dicttoxml==1.7.4 -mergedeep==1.3.4 -music-tag==0.4.3 -Pillow==9.1.0 -PyYAML==6.0 -yt-dlp==2022.4.8 \ No newline at end of file diff --git a/requirements_dev.txt b/requirements_dev.txt deleted file mode 100644 index c3991e3b..00000000 --- a/requirements_dev.txt +++ /dev/null @@ -1,8 +0,0 @@ --r requirements.txt -black==22.3.0 -coverage==6.3.2 -isort==5.10.1 -pylint==2.13.5 -pytest==7.1.1 -sphinx==4.5.0 -sphinx-rtd-theme==1.0.0 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..24b42871 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,36 @@ +[metadata] +name = ytdl-sub +version = attr:ytdl_sub.version.__version__ +author = Jesse Bannon +description = ytdl automated with metadata creation +author_email = use_github_issues@nope.com +url = https://github.com/jmbannon/ytdl-sub +license = GNUv3 +platforms = Unix +classifiers = + Topic :: Multimedia :: Sound/Audio + Topic :: Multimedia :: Video + License :: Public Domain + Environment :: Console + Programming Language :: Python :: 3.10 + +[options.entry_points] +console_scripts = + ytdl-sub = ytdl_sub.main:main + +[options] +package_dir = + = src +install_requires = + argparse==1.4.0 + dicttoxml==1.7.4 + mergedeep==1.3.4 + music-tag==0.4.3 + Pillow==9.1.0 + PyYAML==6.0 + yt-dlp==2022.4.8 + +[options.extras_require] +test = coverage==6.3.2; pytest==7.1.1 +lint = black==22.3.0; isort==5.10.1; pylint==2.13.5 +docs = sphinx==4.5.0; sphinx-rtd-theme==1.0.0 diff --git a/setup.py b/setup.py deleted file mode 100644 index 39fea648..00000000 --- a/setup.py +++ /dev/null @@ -1,7 +0,0 @@ -from setuptools import find_packages -from setuptools import setup - -setup( - name="ytdl_subscribe", - packages=find_packages(), -) diff --git a/ytdl_subscribe/cli/__init__.py b/src/ytdl_sub/__init__.py similarity index 100% rename from ytdl_subscribe/cli/__init__.py rename to src/ytdl_sub/__init__.py diff --git a/ytdl_subscribe/config/__init__.py b/src/ytdl_sub/cli/__init__.py similarity index 100% rename from ytdl_subscribe/config/__init__.py rename to src/ytdl_sub/cli/__init__.py diff --git a/ytdl_subscribe/cli/download_args_parser.py b/src/ytdl_sub/cli/download_args_parser.py similarity index 100% rename from ytdl_subscribe/cli/download_args_parser.py rename to src/ytdl_sub/cli/download_args_parser.py diff --git a/ytdl_subscribe/cli/main_args_parser.py b/src/ytdl_sub/cli/main_args_parser.py similarity index 100% rename from ytdl_subscribe/cli/main_args_parser.py rename to src/ytdl_sub/cli/main_args_parser.py diff --git a/ytdl_subscribe/downloaders/__init__.py b/src/ytdl_sub/config/__init__.py similarity index 100% rename from ytdl_subscribe/downloaders/__init__.py rename to src/ytdl_sub/config/__init__.py diff --git a/ytdl_subscribe/config/config_file.py b/src/ytdl_sub/config/config_file.py similarity index 84% rename from ytdl_subscribe/config/config_file.py rename to src/ytdl_sub/config/config_file.py index 4a84c3d2..52c83a61 100644 --- a/ytdl_subscribe/config/config_file.py +++ b/src/ytdl_sub/config/config_file.py @@ -2,9 +2,9 @@ from typing import Any import yaml -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator -from ytdl_subscribe.validators.validators import LiteralDictValidator -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.validators.validators import LiteralDictValidator +from ytdl_sub.validators.validators import StringValidator class ConfigOptions(StrictDictValidator): diff --git a/ytdl_subscribe/config/preset.py b/src/ytdl_sub/config/preset.py similarity index 86% rename from ytdl_subscribe/config/preset.py rename to src/ytdl_sub/config/preset.py index 6bdf34b4..363d30e1 100644 --- a/ytdl_subscribe/config/preset.py +++ b/src/ytdl_sub/config/preset.py @@ -5,21 +5,21 @@ from typing import Optional from typing import Tuple from typing import Type -from ytdl_subscribe.config.preset_class_mappings import DownloadStrategyMapping -from ytdl_subscribe.config.preset_class_mappings import PluginMapping -from ytdl_subscribe.config.preset_options import OutputOptions -from ytdl_subscribe.config.preset_options import Overrides -from ytdl_subscribe.config.preset_options import YTDLOptions -from ytdl_subscribe.downloaders.downloader import Downloader -from ytdl_subscribe.downloaders.downloader import DownloaderValidator -from ytdl_subscribe.plugins.plugin import Plugin -from ytdl_subscribe.plugins.plugin import PluginOptions -from ytdl_subscribe.utils.exceptions import StringFormattingVariableNotFoundException -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator -from ytdl_subscribe.validators.string_formatter_validators import OverridesStringFormatterValidator -from ytdl_subscribe.validators.validators import DictValidator -from ytdl_subscribe.validators.validators import StringValidator -from ytdl_subscribe.validators.validators import Validator +from ytdl_sub.config.preset_class_mappings import DownloadStrategyMapping +from ytdl_sub.config.preset_class_mappings import PluginMapping +from ytdl_sub.config.preset_options import OutputOptions +from ytdl_sub.config.preset_options import Overrides +from ytdl_sub.config.preset_options import YTDLOptions +from ytdl_sub.downloaders.downloader import Downloader +from ytdl_sub.downloaders.downloader import DownloaderValidator +from ytdl_sub.plugins.plugin import Plugin +from ytdl_sub.plugins.plugin import PluginOptions +from ytdl_sub.utils.exceptions import StringFormattingVariableNotFoundException +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.validators.string_formatter_validators import OverridesStringFormatterValidator +from ytdl_sub.validators.validators import DictValidator +from ytdl_sub.validators.validators import StringValidator +from ytdl_sub.validators.validators import Validator PRESET_REQUIRED_KEYS = {"output_options"} PRESET_OPTIONAL_KEYS = { diff --git a/ytdl_subscribe/config/preset_class_mappings.py b/src/ytdl_sub/config/preset_class_mappings.py similarity index 80% rename from ytdl_subscribe/config/preset_class_mappings.py rename to src/ytdl_sub/config/preset_class_mappings.py index 5fec82e7..aa715bcb 100644 --- a/ytdl_subscribe/config/preset_class_mappings.py +++ b/src/ytdl_sub/config/preset_class_mappings.py @@ -2,16 +2,16 @@ from typing import Dict from typing import List from typing import Type -from ytdl_subscribe.downloaders.downloader import Downloader -from ytdl_subscribe.downloaders.soundcloud_downloader import SoundcloudAlbumsAndSinglesDownloader -from ytdl_subscribe.downloaders.youtube_downloader import YoutubeChannelDownloader -from ytdl_subscribe.downloaders.youtube_downloader import YoutubePlaylistDownloader -from ytdl_subscribe.downloaders.youtube_downloader import YoutubeVideoDownloader -from ytdl_subscribe.plugins.convert_thumbnail import ConvertThumbnailPlugin -from ytdl_subscribe.plugins.music_tags import MusicTagsPlugin -from ytdl_subscribe.plugins.nfo_tags import NfoTagsPlugin -from ytdl_subscribe.plugins.output_directory_nfo_tags import OutputDirectoryNfoTagsPlugin -from ytdl_subscribe.plugins.plugin import Plugin +from ytdl_sub.downloaders.downloader import Downloader +from ytdl_sub.downloaders.soundcloud_downloader import SoundcloudAlbumsAndSinglesDownloader +from ytdl_sub.downloaders.youtube_downloader import YoutubeChannelDownloader +from ytdl_sub.downloaders.youtube_downloader import YoutubePlaylistDownloader +from ytdl_sub.downloaders.youtube_downloader import YoutubeVideoDownloader +from ytdl_sub.plugins.convert_thumbnail import ConvertThumbnailPlugin +from ytdl_sub.plugins.music_tags import MusicTagsPlugin +from ytdl_sub.plugins.nfo_tags import NfoTagsPlugin +from ytdl_sub.plugins.output_directory_nfo_tags import OutputDirectoryNfoTagsPlugin +from ytdl_sub.plugins.plugin import Plugin class DownloadStrategyMapping: diff --git a/ytdl_subscribe/config/preset_options.py b/src/ytdl_sub/config/preset_options.py similarity index 82% rename from ytdl_subscribe/config/preset_options.py rename to src/ytdl_sub/config/preset_options.py index 4b656768..7e60d9bf 100644 --- a/ytdl_subscribe/config/preset_options.py +++ b/src/ytdl_sub/config/preset_options.py @@ -2,14 +2,14 @@ from typing import Optional from yt_dlp.utils import sanitize_filename -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.validators.date_range_validator import DateRangeValidator -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator -from ytdl_subscribe.validators.string_formatter_validators import DictFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import OverridesStringFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import StringFormatterValidator -from ytdl_subscribe.validators.validators import BoolValidator -from ytdl_subscribe.validators.validators import LiteralDictValidator +from ytdl_sub.entries.entry import Entry +from ytdl_sub.validators.date_range_validator import DateRangeValidator +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator +from ytdl_sub.validators.string_formatter_validators import OverridesStringFormatterValidator +from ytdl_sub.validators.string_formatter_validators import StringFormatterValidator +from ytdl_sub.validators.validators import BoolValidator +from ytdl_sub.validators.validators import LiteralDictValidator class YTDLOptions(LiteralDictValidator): diff --git a/ytdl_subscribe/config/subscription.py b/src/ytdl_sub/config/subscription.py similarity index 84% rename from ytdl_subscribe/config/subscription.py rename to src/ytdl_sub/config/subscription.py index 0a5f4add..f3b83ff5 100644 --- a/ytdl_subscribe/config/subscription.py +++ b/src/ytdl_sub/config/subscription.py @@ -6,14 +6,14 @@ from typing import List import yaml from mergedeep import mergedeep -from ytdl_subscribe.config.config_file import ConfigFile -from ytdl_subscribe.config.preset import PRESET_OPTIONAL_KEYS -from ytdl_subscribe.config.preset import PRESET_REQUIRED_KEYS -from ytdl_subscribe.config.preset import Preset -from ytdl_subscribe.config.preset_options import Overrides -from ytdl_subscribe.subscriptions.subscription import Subscription -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.config.config_file import ConfigFile +from ytdl_sub.config.preset import PRESET_OPTIONAL_KEYS +from ytdl_sub.config.preset import PRESET_REQUIRED_KEYS +from ytdl_sub.config.preset import Preset +from ytdl_sub.config.preset_options import Overrides +from ytdl_sub.subscriptions.subscription import Subscription +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.validators.validators import StringValidator class SubscriptionValidator(StrictDictValidator): diff --git a/ytdl_subscribe/entries/__init__.py b/src/ytdl_sub/downloaders/__init__.py similarity index 100% rename from ytdl_subscribe/entries/__init__.py rename to src/ytdl_sub/downloaders/__init__.py diff --git a/ytdl_subscribe/downloaders/downloader.py b/src/ytdl_sub/downloaders/downloader.py similarity index 95% rename from ytdl_subscribe/downloaders/downloader.py rename to src/ytdl_sub/downloaders/downloader.py index d5f0c8f6..afbbc624 100644 --- a/ytdl_subscribe/downloaders/downloader.py +++ b/src/ytdl_sub/downloaders/downloader.py @@ -11,9 +11,9 @@ from typing import TypeVar import yt_dlp as ytdl -from ytdl_subscribe.config.preset_options import Overrides -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.config.preset_options import Overrides +from ytdl_sub.entries.entry import Entry +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator class DownloaderValidator(StrictDictValidator, ABC): diff --git a/ytdl_subscribe/downloaders/soundcloud_downloader.py b/src/ytdl_sub/downloaders/soundcloud_downloader.py similarity index 91% rename from ytdl_subscribe/downloaders/soundcloud_downloader.py rename to src/ytdl_sub/downloaders/soundcloud_downloader.py index 41a1265f..7cc3a48f 100644 --- a/ytdl_subscribe/downloaders/soundcloud_downloader.py +++ b/src/ytdl_sub/downloaders/soundcloud_downloader.py @@ -4,12 +4,12 @@ from typing import Generic from typing import List from typing import TypeVar -from ytdl_subscribe.downloaders.downloader import Downloader -from ytdl_subscribe.downloaders.downloader import DownloaderValidator -from ytdl_subscribe.entries.soundcloud import SoundcloudAlbum -from ytdl_subscribe.entries.soundcloud import SoundcloudTrack -from ytdl_subscribe.validators.validators import BoolValidator -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.downloaders.downloader import Downloader +from ytdl_sub.downloaders.downloader import DownloaderValidator +from ytdl_sub.entries.soundcloud import SoundcloudAlbum +from ytdl_sub.entries.soundcloud import SoundcloudTrack +from ytdl_sub.validators.validators import BoolValidator +from ytdl_sub.validators.validators import StringValidator ############################################################################### # Abstract Soundcloud downloader + options diff --git a/ytdl_subscribe/downloaders/youtube_downloader.py b/src/ytdl_sub/downloaders/youtube_downloader.py similarity index 94% rename from ytdl_subscribe/downloaders/youtube_downloader.py rename to src/ytdl_sub/downloaders/youtube_downloader.py index 9124707b..a6e6c96a 100644 --- a/ytdl_subscribe/downloaders/youtube_downloader.py +++ b/src/ytdl_sub/downloaders/youtube_downloader.py @@ -13,13 +13,13 @@ from PIL.Image import Image from PIL.Image import open as pil_open from yt_dlp.utils import RejectedVideoReached -from ytdl_subscribe.config.preset_options import Overrides -from ytdl_subscribe.downloaders.downloader import Downloader -from ytdl_subscribe.downloaders.downloader import DownloaderValidator -from ytdl_subscribe.entries.youtube import YoutubeVideo -from ytdl_subscribe.validators.date_range_validator import DateRangeValidator -from ytdl_subscribe.validators.string_formatter_validators import OverridesStringFormatterValidator -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.config.preset_options import Overrides +from ytdl_sub.downloaders.downloader import Downloader +from ytdl_sub.downloaders.downloader import DownloaderValidator +from ytdl_sub.entries.youtube import YoutubeVideo +from ytdl_sub.validators.date_range_validator import DateRangeValidator +from ytdl_sub.validators.string_formatter_validators import OverridesStringFormatterValidator +from ytdl_sub.validators.validators import StringValidator ############################################################################### # Abstract Youtube downloader + options diff --git a/ytdl_subscribe/entries/variables/__init__.py b/src/ytdl_sub/entries/__init__.py similarity index 100% rename from ytdl_subscribe/entries/variables/__init__.py rename to src/ytdl_sub/entries/__init__.py diff --git a/ytdl_subscribe/entries/base_entry.py b/src/ytdl_sub/entries/base_entry.py similarity index 100% rename from ytdl_subscribe/entries/base_entry.py rename to src/ytdl_sub/entries/base_entry.py diff --git a/ytdl_subscribe/entries/entry.py b/src/ytdl_sub/entries/entry.py similarity index 85% rename from ytdl_subscribe/entries/entry.py rename to src/ytdl_sub/entries/entry.py index 4b47977f..7735e0ac 100644 --- a/ytdl_subscribe/entries/entry.py +++ b/src/ytdl_sub/entries/entry.py @@ -2,8 +2,8 @@ from pathlib import Path from typing import Dict from typing import final -from ytdl_subscribe.entries.base_entry import BaseEntry -from ytdl_subscribe.entries.variables.entry_variables import EntryVariables +from ytdl_sub.entries.base_entry import BaseEntry +from ytdl_sub.entries.variables.entry_variables import EntryVariables class Entry(EntryVariables, BaseEntry): diff --git a/ytdl_subscribe/entries/soundcloud.py b/src/ytdl_sub/entries/soundcloud.py similarity index 95% rename from ytdl_subscribe/entries/soundcloud.py rename to src/ytdl_sub/entries/soundcloud.py index 324a05cb..5d5fdcb8 100644 --- a/ytdl_subscribe/entries/soundcloud.py +++ b/src/ytdl_sub/entries/soundcloud.py @@ -1,9 +1,9 @@ from typing import Dict from typing import List -from ytdl_subscribe.entries.base_entry import PlaylistMetadata -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.entries.variables.soundcloud_variables import SoundcloudVariables +from ytdl_sub.entries.base_entry import PlaylistMetadata +from ytdl_sub.entries.entry import Entry +from ytdl_sub.entries.variables.soundcloud_variables import SoundcloudVariables class SoundcloudTrack(SoundcloudVariables, Entry): diff --git a/ytdl_subscribe/plugins/__init__.py b/src/ytdl_sub/entries/variables/__init__.py similarity index 100% rename from ytdl_subscribe/plugins/__init__.py rename to src/ytdl_sub/entries/variables/__init__.py diff --git a/ytdl_subscribe/entries/variables/entry_variables.py b/src/ytdl_sub/entries/variables/entry_variables.py similarity index 98% rename from ytdl_subscribe/entries/variables/entry_variables.py rename to src/ytdl_sub/entries/variables/entry_variables.py index 5323a141..6ddc7a75 100644 --- a/ytdl_subscribe/entries/variables/entry_variables.py +++ b/src/ytdl_sub/entries/variables/entry_variables.py @@ -3,7 +3,7 @@ from typing import final from yt_dlp.utils import sanitize_filename -from ytdl_subscribe.entries.base_entry import BaseEntry +from ytdl_sub.entries.base_entry import BaseEntry # This file contains mixins to a BaseEntry subclass. Ignore pylint's "no kwargs member" suggestion # pylint: disable=no-member diff --git a/ytdl_subscribe/entries/variables/soundcloud_variables.py b/src/ytdl_sub/entries/variables/soundcloud_variables.py similarity index 94% rename from ytdl_subscribe/entries/variables/soundcloud_variables.py rename to src/ytdl_sub/entries/variables/soundcloud_variables.py index 915297db..3fcbdcab 100644 --- a/ytdl_subscribe/entries/variables/soundcloud_variables.py +++ b/src/ytdl_sub/entries/variables/soundcloud_variables.py @@ -1,6 +1,6 @@ from yt_dlp.utils import sanitize_filename -from ytdl_subscribe.entries.variables.entry_variables import EntryVariables +from ytdl_sub.entries.variables.entry_variables import EntryVariables # This file contains mixins to a BaseEntry subclass. Ignore pylint's "no kwargs member" suggestion # pylint: disable=no-member diff --git a/ytdl_subscribe/entries/variables/youtube_variables.py b/src/ytdl_sub/entries/variables/youtube_variables.py similarity index 80% rename from ytdl_subscribe/entries/variables/youtube_variables.py rename to src/ytdl_sub/entries/variables/youtube_variables.py index fd5fcfb7..49247ce7 100644 --- a/ytdl_subscribe/entries/variables/youtube_variables.py +++ b/src/ytdl_sub/entries/variables/youtube_variables.py @@ -1,5 +1,5 @@ -from ytdl_subscribe.entries.base_entry import BaseEntry -from ytdl_subscribe.entries.variables.entry_variables import EntryVariables +from ytdl_sub.entries.base_entry import BaseEntry +from ytdl_sub.entries.variables.entry_variables import EntryVariables # This file contains mixins to a BaseEntry subclass. Ignore pylint's "no kwargs member" suggestion # pylint: disable=no-member diff --git a/ytdl_subscribe/entries/youtube.py b/src/ytdl_sub/entries/youtube.py similarity index 89% rename from ytdl_subscribe/entries/youtube.py rename to src/ytdl_sub/entries/youtube.py index 9275304e..da5b39e7 100644 --- a/ytdl_subscribe/entries/youtube.py +++ b/src/ytdl_sub/entries/youtube.py @@ -1,8 +1,8 @@ import os.path from pathlib import Path -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.entries.variables.youtube_variables import YoutubeVideoVariables +from ytdl_sub.entries.entry import Entry +from ytdl_sub.entries.variables.youtube_variables import YoutubeVideoVariables class YoutubeVideo(YoutubeVideoVariables, Entry): diff --git a/ytdl_subscribe/main.py b/src/ytdl_sub/main.py similarity index 88% rename from ytdl_subscribe/main.py rename to src/ytdl_sub/main.py index ced0fe2c..84a22574 100644 --- a/ytdl_subscribe/main.py +++ b/src/ytdl_sub/main.py @@ -3,11 +3,11 @@ import sys import traceback from typing import List -from ytdl_subscribe.cli.download_args_parser import DownloadArgsParser -from ytdl_subscribe.cli.main_args_parser import parser -from ytdl_subscribe.config.config_file import ConfigFile -from ytdl_subscribe.config.subscription import SubscriptionValidator -from ytdl_subscribe.utils.exceptions import ValidationException +from ytdl_sub.cli.download_args_parser import DownloadArgsParser +from ytdl_sub.cli.main_args_parser import parser +from ytdl_sub.config.config_file import ConfigFile +from ytdl_sub.config.subscription import SubscriptionValidator +from ytdl_sub.utils.exceptions import ValidationException DEBUGGER_MODE = True @@ -49,7 +49,7 @@ def _download_subscription_from_cli(config: ConfigFile, extra_args: List[str]) - ).to_subscription().download() -def _main(): +def main(): """Entrypoint for ytdl-subscribe""" args, extra_args = parser.parse_known_args() @@ -66,7 +66,7 @@ def _main(): if __name__ == "__main__": try: - _main() + main() except ValidationException as validation_exception: if DEBUGGER_MODE: raise diff --git a/ytdl_subscribe/subscriptions/__init__.py b/src/ytdl_sub/plugins/__init__.py similarity index 100% rename from ytdl_subscribe/subscriptions/__init__.py rename to src/ytdl_sub/plugins/__init__.py diff --git a/ytdl_subscribe/plugins/convert_thumbnail.py b/src/ytdl_sub/plugins/convert_thumbnail.py similarity index 84% rename from ytdl_subscribe/plugins/convert_thumbnail.py rename to src/ytdl_sub/plugins/convert_thumbnail.py index f7aea6e2..288902ee 100644 --- a/ytdl_subscribe/plugins/convert_thumbnail.py +++ b/src/ytdl_sub/plugins/convert_thumbnail.py @@ -3,10 +3,10 @@ import os from PIL.Image import Image from PIL.Image import open as pil_open -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.plugins.plugin import Plugin -from ytdl_subscribe.plugins.plugin import PluginOptions -from ytdl_subscribe.validators.string_select_validator import StringSelectValidator +from ytdl_sub.entries.entry import Entry +from ytdl_sub.plugins.plugin import Plugin +from ytdl_sub.plugins.plugin import PluginOptions +from ytdl_sub.validators.string_select_validator import StringSelectValidator class ThumbnailTypes(StringSelectValidator): diff --git a/ytdl_subscribe/plugins/music_tags.py b/src/ytdl_sub/plugins/music_tags.py similarity index 75% rename from ytdl_subscribe/plugins/music_tags.py rename to src/ytdl_sub/plugins/music_tags.py index 7321579d..de9a4066 100644 --- a/ytdl_subscribe/plugins/music_tags.py +++ b/src/ytdl_sub/plugins/music_tags.py @@ -1,10 +1,10 @@ import music_tag -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.plugins.plugin import Plugin -from ytdl_subscribe.plugins.plugin import PluginOptions -from ytdl_subscribe.validators.string_formatter_validators import DictFormatterValidator -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.entries.entry import Entry +from ytdl_sub.plugins.plugin import Plugin +from ytdl_sub.plugins.plugin import PluginOptions +from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator +from ytdl_sub.validators.validators import StringValidator class MusicTagsOptions(PluginOptions): diff --git a/ytdl_subscribe/plugins/nfo_tags.py b/src/ytdl_sub/plugins/nfo_tags.py similarity index 85% rename from ytdl_subscribe/plugins/nfo_tags.py rename to src/ytdl_sub/plugins/nfo_tags.py index 4f39ecf8..f28fa336 100644 --- a/ytdl_subscribe/plugins/nfo_tags.py +++ b/src/ytdl_sub/plugins/nfo_tags.py @@ -3,11 +3,11 @@ from pathlib import Path import dicttoxml -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.plugins.plugin import Plugin -from ytdl_subscribe.plugins.plugin import PluginOptions -from ytdl_subscribe.validators.string_formatter_validators import DictFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import StringFormatterValidator +from ytdl_sub.entries.entry import Entry +from ytdl_sub.plugins.plugin import Plugin +from ytdl_sub.plugins.plugin import PluginOptions +from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator +from ytdl_sub.validators.string_formatter_validators import StringFormatterValidator class NfoTagsOptions(PluginOptions): diff --git a/ytdl_subscribe/plugins/output_directory_nfo_tags.py b/src/ytdl_sub/plugins/output_directory_nfo_tags.py similarity index 86% rename from ytdl_subscribe/plugins/output_directory_nfo_tags.py rename to src/ytdl_sub/plugins/output_directory_nfo_tags.py index ee300f96..8dd21d7c 100644 --- a/ytdl_subscribe/plugins/output_directory_nfo_tags.py +++ b/src/ytdl_sub/plugins/output_directory_nfo_tags.py @@ -3,10 +3,10 @@ from pathlib import Path import dicttoxml -from ytdl_subscribe.plugins.plugin import Plugin -from ytdl_subscribe.plugins.plugin import PluginOptions -from ytdl_subscribe.validators.string_formatter_validators import OverridesDictFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import OverridesStringFormatterValidator +from ytdl_sub.plugins.plugin import Plugin +from ytdl_sub.plugins.plugin import PluginOptions +from ytdl_sub.validators.string_formatter_validators import OverridesDictFormatterValidator +from ytdl_sub.validators.string_formatter_validators import OverridesStringFormatterValidator class OutputDirectoryNfoTagsOptions(PluginOptions): diff --git a/ytdl_subscribe/plugins/plugin.py b/src/ytdl_sub/plugins/plugin.py similarity index 86% rename from ytdl_subscribe/plugins/plugin.py rename to src/ytdl_sub/plugins/plugin.py index 8caebdd5..ba102e50 100644 --- a/ytdl_subscribe/plugins/plugin.py +++ b/src/ytdl_sub/plugins/plugin.py @@ -4,10 +4,10 @@ from typing import Type from typing import TypeVar from typing import final -from ytdl_subscribe.config.preset_options import Overrides -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator -from ytdl_subscribe.ytdl_additions.enhanced_download_archive import EnhancedDownloadArchive +from ytdl_sub.config.preset_options import Overrides +from ytdl_sub.entries.entry import Entry +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.ytdl_additions.enhanced_download_archive import EnhancedDownloadArchive class PluginOptions(StrictDictValidator): diff --git a/ytdl_subscribe/utils/__init__.py b/src/ytdl_sub/subscriptions/__init__.py similarity index 100% rename from ytdl_subscribe/utils/__init__.py rename to src/ytdl_sub/subscriptions/__init__.py diff --git a/ytdl_subscribe/subscriptions/subscription.py b/src/ytdl_sub/subscriptions/subscription.py similarity index 90% rename from ytdl_subscribe/subscriptions/subscription.py rename to src/ytdl_sub/subscriptions/subscription.py index a112132b..5221dcda 100644 --- a/ytdl_subscribe/subscriptions/subscription.py +++ b/src/ytdl_sub/subscriptions/subscription.py @@ -7,17 +7,17 @@ from typing import List from typing import Tuple from typing import Type -from ytdl_subscribe.config.config_file import ConfigOptions -from ytdl_subscribe.config.preset import Preset -from ytdl_subscribe.config.preset_options import OutputOptions -from ytdl_subscribe.config.preset_options import Overrides -from ytdl_subscribe.config.preset_options import YTDLOptions -from ytdl_subscribe.downloaders.downloader import Downloader -from ytdl_subscribe.downloaders.downloader import DownloaderValidator -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.plugins.plugin import Plugin -from ytdl_subscribe.plugins.plugin import PluginOptions -from ytdl_subscribe.ytdl_additions.enhanced_download_archive import EnhancedDownloadArchive +from ytdl_sub.config.config_file import ConfigOptions +from ytdl_sub.config.preset import Preset +from ytdl_sub.config.preset_options import OutputOptions +from ytdl_sub.config.preset_options import Overrides +from ytdl_sub.config.preset_options import YTDLOptions +from ytdl_sub.downloaders.downloader import Downloader +from ytdl_sub.downloaders.downloader import DownloaderValidator +from ytdl_sub.entries.entry import Entry +from ytdl_sub.plugins.plugin import Plugin +from ytdl_sub.plugins.plugin import PluginOptions +from ytdl_sub.ytdl_additions.enhanced_download_archive import EnhancedDownloadArchive class Subscription: diff --git a/ytdl_subscribe/validators/__init__.py b/src/ytdl_sub/utils/__init__.py similarity index 100% rename from ytdl_subscribe/validators/__init__.py rename to src/ytdl_sub/utils/__init__.py diff --git a/ytdl_subscribe/utils/exceptions.py b/src/ytdl_sub/utils/exceptions.py similarity index 100% rename from ytdl_subscribe/utils/exceptions.py rename to src/ytdl_sub/utils/exceptions.py diff --git a/ytdl_subscribe/ytdl_additions/__init__.py b/src/ytdl_sub/validators/__init__.py similarity index 100% rename from ytdl_subscribe/ytdl_additions/__init__.py rename to src/ytdl_sub/validators/__init__.py diff --git a/ytdl_subscribe/validators/date_range_validator.py b/src/ytdl_sub/validators/date_range_validator.py similarity index 81% rename from ytdl_subscribe/validators/date_range_validator.py rename to src/ytdl_sub/validators/date_range_validator.py index d727acb6..87324bfe 100644 --- a/ytdl_subscribe/validators/date_range_validator.py +++ b/src/ytdl_sub/validators/date_range_validator.py @@ -2,8 +2,8 @@ from typing import Optional from yt_dlp import DateRange -from ytdl_subscribe.validators.strict_dict_validator import StrictDictValidator -from ytdl_subscribe.validators.string_datetime import StringDatetimeValidator +from ytdl_sub.validators.strict_dict_validator import StrictDictValidator +from ytdl_sub.validators.string_datetime import StringDatetimeValidator class DateRangeValidator(StrictDictValidator): diff --git a/ytdl_subscribe/validators/strict_dict_validator.py b/src/ytdl_sub/validators/strict_dict_validator.py similarity index 96% rename from ytdl_subscribe/validators/strict_dict_validator.py rename to src/ytdl_sub/validators/strict_dict_validator.py index 2c1406a5..f03107c7 100644 --- a/ytdl_subscribe/validators/strict_dict_validator.py +++ b/src/ytdl_sub/validators/strict_dict_validator.py @@ -1,7 +1,7 @@ from typing import List from typing import Set -from ytdl_subscribe.validators.validators import DictValidator +from ytdl_sub.validators.validators import DictValidator class StrictDictValidator(DictValidator): diff --git a/ytdl_subscribe/validators/string_datetime.py b/src/ytdl_sub/validators/string_datetime.py similarity index 90% rename from ytdl_subscribe/validators/string_datetime.py rename to src/ytdl_sub/validators/string_datetime.py index 272a1b3a..391e0ae6 100644 --- a/ytdl_subscribe/validators/string_datetime.py +++ b/src/ytdl_sub/validators/string_datetime.py @@ -1,6 +1,6 @@ from yt_dlp.utils import datetime_from_str -from ytdl_subscribe.validators.validators import Validator +from ytdl_sub.validators.validators import Validator class StringDatetimeValidator(Validator): diff --git a/ytdl_subscribe/validators/string_formatter_validators.py b/src/ytdl_sub/validators/string_formatter_validators.py similarity index 95% rename from ytdl_subscribe/validators/string_formatter_validators.py rename to src/ytdl_sub/validators/string_formatter_validators.py index 7d752301..80d24839 100644 --- a/ytdl_subscribe/validators/string_formatter_validators.py +++ b/src/ytdl_sub/validators/string_formatter_validators.py @@ -5,10 +5,10 @@ from typing import Dict from typing import List from typing import final -from ytdl_subscribe.utils.exceptions import StringFormattingException -from ytdl_subscribe.utils.exceptions import StringFormattingVariableNotFoundException -from ytdl_subscribe.validators.validators import LiteralDictValidator -from ytdl_subscribe.validators.validators import Validator +from ytdl_sub.utils.exceptions import StringFormattingException +from ytdl_sub.utils.exceptions import StringFormattingVariableNotFoundException +from ytdl_sub.validators.validators import LiteralDictValidator +from ytdl_sub.validators.validators import Validator class StringFormatterValidator(Validator): diff --git a/ytdl_subscribe/validators/string_select_validator.py b/src/ytdl_sub/validators/string_select_validator.py similarity index 88% rename from ytdl_subscribe/validators/string_select_validator.py rename to src/ytdl_sub/validators/string_select_validator.py index fd06b6cd..24fe767d 100644 --- a/ytdl_subscribe/validators/string_select_validator.py +++ b/src/ytdl_sub/validators/string_select_validator.py @@ -1,6 +1,6 @@ from typing import Set -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.validators.validators import StringValidator class StringSelectValidator(StringValidator): diff --git a/ytdl_subscribe/validators/validators.py b/src/ytdl_sub/validators/validators.py similarity index 98% rename from ytdl_subscribe/validators/validators.py rename to src/ytdl_sub/validators/validators.py index 63e1a49e..3b9c2fc2 100644 --- a/ytdl_subscribe/validators/validators.py +++ b/src/ytdl_sub/validators/validators.py @@ -8,7 +8,7 @@ from typing import Type from typing import TypeVar from typing import final -from ytdl_subscribe.utils.exceptions import ValidationException +from ytdl_sub.utils.exceptions import ValidationException V = TypeVar("V", bound=ValidationException) diff --git a/src/ytdl_sub/version.py b/src/ytdl_sub/version.py new file mode 100644 index 00000000..f102a9ca --- /dev/null +++ b/src/ytdl_sub/version.py @@ -0,0 +1 @@ +__version__ = "0.0.1" diff --git a/src/ytdl_sub/ytdl_additions/__init__.py b/src/ytdl_sub/ytdl_additions/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ytdl_subscribe/ytdl_additions/enhanced_download_archive.py b/src/ytdl_sub/ytdl_additions/enhanced_download_archive.py similarity index 99% rename from ytdl_subscribe/ytdl_additions/enhanced_download_archive.py rename to src/ytdl_sub/ytdl_additions/enhanced_download_archive.py index 43f9f8f1..be4471aa 100644 --- a/ytdl_subscribe/ytdl_additions/enhanced_download_archive.py +++ b/src/ytdl_sub/ytdl_additions/enhanced_download_archive.py @@ -12,7 +12,7 @@ from typing import Set from yt_dlp import DateRange -from ytdl_subscribe.entries.entry import Entry +from ytdl_sub.entries.entry import Entry @dataclass diff --git a/tests/unit/entries/conftest.py b/tests/unit/entries/conftest.py index e29c3868..ce0b83a9 100644 --- a/tests/unit/entries/conftest.py +++ b/tests/unit/entries/conftest.py @@ -1,7 +1,7 @@ import pytest -from ytdl_subscribe.entries.entry import Entry -from ytdl_subscribe.validators.string_formatter_validators import StringFormatterValidator +from ytdl_sub.entries.entry import Entry +from ytdl_sub.validators.string_formatter_validators import StringFormatterValidator def _pad(num): diff --git a/tests/unit/entries/test_soundcloud_entries.py b/tests/unit/entries/test_soundcloud_entries.py index 32460f81..d6c42b44 100644 --- a/tests/unit/entries/test_soundcloud_entries.py +++ b/tests/unit/entries/test_soundcloud_entries.py @@ -1,6 +1,6 @@ import pytest -from ytdl_subscribe.entries.soundcloud import SoundcloudTrack +from ytdl_sub.entries.soundcloud import SoundcloudTrack @pytest.fixture diff --git a/tests/unit/validators/test_bool_validator.py b/tests/unit/validators/test_bool_validator.py index bc51f28e..4e754106 100644 --- a/tests/unit/validators/test_bool_validator.py +++ b/tests/unit/validators/test_bool_validator.py @@ -1,7 +1,7 @@ import pytest -from ytdl_subscribe.utils.exceptions import ValidationException -from ytdl_subscribe.validators.validators import BoolValidator +from ytdl_sub.utils.exceptions import ValidationException +from ytdl_sub.validators.validators import BoolValidator @pytest.mark.parametrize("value", [True, False]) diff --git a/tests/unit/validators/test_dict_validator.py b/tests/unit/validators/test_dict_validator.py index 5ba5eda8..5ae9b0d5 100644 --- a/tests/unit/validators/test_dict_validator.py +++ b/tests/unit/validators/test_dict_validator.py @@ -1,10 +1,10 @@ import pytest -from ytdl_subscribe.utils.exceptions import ValidationException -from ytdl_subscribe.validators.validators import BoolValidator -from ytdl_subscribe.validators.validators import DictValidator -from ytdl_subscribe.validators.validators import LiteralDictValidator -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.utils.exceptions import ValidationException +from ytdl_sub.validators.validators import BoolValidator +from ytdl_sub.validators.validators import DictValidator +from ytdl_sub.validators.validators import LiteralDictValidator +from ytdl_sub.validators.validators import StringValidator class TestDictValidator: diff --git a/tests/unit/validators/test_string_formatter_validator.py b/tests/unit/validators/test_string_formatter_validator.py index 9439da04..5a94c1fc 100644 --- a/tests/unit/validators/test_string_formatter_validator.py +++ b/tests/unit/validators/test_string_formatter_validator.py @@ -1,11 +1,11 @@ import pytest -from ytdl_subscribe.utils.exceptions import StringFormattingException -from ytdl_subscribe.utils.exceptions import ValidationException -from ytdl_subscribe.validators.string_formatter_validators import DictFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import OverridesDictFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import OverridesStringFormatterValidator -from ytdl_subscribe.validators.string_formatter_validators import StringFormatterValidator +from ytdl_sub.utils.exceptions import StringFormattingException +from ytdl_sub.utils.exceptions import ValidationException +from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator +from ytdl_sub.validators.string_formatter_validators import OverridesDictFormatterValidator +from ytdl_sub.validators.string_formatter_validators import OverridesStringFormatterValidator +from ytdl_sub.validators.string_formatter_validators import StringFormatterValidator @pytest.fixture diff --git a/tests/unit/validators/test_string_validator.py b/tests/unit/validators/test_string_validator.py index 5755c716..b495bdef 100644 --- a/tests/unit/validators/test_string_validator.py +++ b/tests/unit/validators/test_string_validator.py @@ -1,7 +1,7 @@ import pytest -from ytdl_subscribe.utils.exceptions import ValidationException -from ytdl_subscribe.validators.validators import StringValidator +from ytdl_sub.utils.exceptions import ValidationException +from ytdl_sub.validators.validators import StringValidator @pytest.mark.parametrize("value", ["a", "unicode 💩", ""])