From f768a7d61cb478e2d1b8e2e06abf2f1e0134ed6a Mon Sep 17 00:00:00 2001 From: Ali Parlakci Date: Sun, 16 May 2021 19:47:57 +0300 Subject: [PATCH] Rename --skip to --skip-format --- README.md | 2 +- bdfr/__main__.py | 2 +- bdfr/configuration.py | 2 +- bdfr/downloader.py | 2 +- tests/test_downloader.py | 2 +- tests/test_integration.py | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cf5269c..cd1c12b 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ The following options apply only to the `download` command. This command downloa - `--skip-domain` - This adds domains to the download filter i.e. submissions coming from these domains will not be downloaded - Can be specified multiple times -- `--skip` +- `--skip-format` - This adds file types to the download filter i.e. submissions with one of the supplied file extensions will not be downloaded - Can be specified multiple times - `--skip-subreddit` diff --git a/bdfr/__main__.py b/bdfr/__main__.py index 372c7c3..03a6e1d 100644 --- a/bdfr/__main__.py +++ b/bdfr/__main__.py @@ -53,7 +53,7 @@ def cli(): @click.option('--max-wait-time', type=int, default=None) @click.option('--no-dupes', is_flag=True, default=None) @click.option('--search-existing', is_flag=True, default=None) -@click.option('--skip', default=None, multiple=True) +@click.option('--skip-format', default=None, multiple=True) @click.option('--skip-domain', default=None, multiple=True) @click.option('--skip-subreddit', default=None, multiple=True) @_add_common_options diff --git a/bdfr/configuration.py b/bdfr/configuration.py index 9ab9d45..8ca94a0 100644 --- a/bdfr/configuration.py +++ b/bdfr/configuration.py @@ -26,7 +26,7 @@ class Configuration(Namespace): self.search_existing: bool = False self.file_scheme: str = '{REDDITOR}_{TITLE}_{POSTID}' self.folder_scheme: str = '{SUBREDDIT}' - self.skip: list[str] = [] + self.skip_format: list[str] = [] self.skip_domain: list[str] = [] self.skip_subreddit: list[str] = [] self.sort: str = 'hot' diff --git a/bdfr/downloader.py b/bdfr/downloader.py index 1625c8f..663a9b0 100644 --- a/bdfr/downloader.py +++ b/bdfr/downloader.py @@ -379,7 +379,7 @@ class RedditDownloader: return RedditTypes.SortType.HOT def _create_download_filter(self) -> DownloadFilter: - return DownloadFilter(self.args.skip, self.args.skip_domain) + return DownloadFilter(self.args.skip_format, self.args.skip_domain) def _create_authenticator(self) -> SiteAuthenticator: return SiteAuthenticator(self.cfg_parser) diff --git a/tests/test_downloader.py b/tests/test_downloader.py index f1a20fc..b6e8f32 100644 --- a/tests/test_downloader.py +++ b/tests/test_downloader.py @@ -56,7 +56,7 @@ def test_determine_directories(tmp_path: Path, downloader_mock: MagicMock): (['.test'], ['test.com'],), )) def test_create_download_filter(skip_extensions: list[str], skip_domains: list[str], downloader_mock: MagicMock): - downloader_mock.args.skip = skip_extensions + downloader_mock.args.skip_format = skip_extensions downloader_mock.args.skip_domain = skip_domains result = RedditDownloader._create_download_filter(downloader_mock) diff --git a/tests/test_integration.py b/tests/test_integration.py index 7aec0eb..d52a527 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -166,8 +166,8 @@ def test_cli_download_search_existing(test_args: list[str], tmp_path: Path): @pytest.mark.reddit @pytest.mark.skipif(not does_test_config_exist, reason='A test config file is required for integration tests') @pytest.mark.parametrize('test_args', ( - ['--subreddit', 'tumblr', '-L', '25', '--skip', 'png', '--skip', 'jpg'], - ['--subreddit', 'MaliciousCompliance', '-L', '25', '--skip', 'txt'], + ['--subreddit', 'tumblr', '-L', '25', '--skip-format', 'png', '--skip-format', 'jpg'], + ['--subreddit', 'MaliciousCompliance', '-L', '25', '--skip-format', 'txt'], )) def test_cli_download_download_filters(test_args: list[str], tmp_path: Path): runner = CliRunner()