Merge pull request #642 from Serene-Arc/bug_fix_618

bdfr/__main__.py

@@ -17,6 +17,8 @@ _common_options = [
     click.option('--authenticate', is_flag=True, default=None),
     click.option('--config', type=str, default=None),
     click.option('--disable-module', multiple=True, default=None, type=str),
+    click.option('--exclude-id', default=None, multiple=True),
+    click.option('--exclude-id-file', default=None, multiple=True),
     click.option('--file-scheme', default=None, type=str),
     click.option('--folder-scheme', default=None, type=str),
     click.option('--ignore-user', type=str, multiple=True, default=None),
@@ -44,8 +46,6 @@ _downloader_options = [
     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('--exclude-id', default=None, multiple=True),
-    click.option('--exclude-id-file', default=None, multiple=True),
     click.option('--skip', default=None, multiple=True),
     click.option('--skip-domain', default=None, multiple=True),
     click.option('--skip-subreddit', default=None, multiple=True),

bdfr/archiver.py

@@ -34,6 +34,9 @@ class Archiver(RedditConnector):
                         f'Submission {submission.id} in {submission.subreddit.display_name} skipped'
                         f' due to {submission.author.name if submission.author else "DELETED"} being an ignored user')
                     continue
+                if submission.id in self.excluded_submission_ids:
+                    logger.debug(f'Object {submission.id} in exclusion list, skipping')
+                    continue
                 logger.debug(f'Attempting to archive submission {submission.id}')
                 self.write_entry(submission)
 

bdfr/configuration.py

@@ -35,7 +35,7 @@ class Configuration(Namespace):
         self.skip_subreddit: list[str] = []
         self.sort: str = 'hot'
         self.submitted: bool = False
-        self.subscribed: bool = True
+        self.subscribed: bool = False
         self.subreddit: list[str] = []
         self.time: str = 'all'
         self.time_format = None

tests/integration_tests/test_archive_integration.py

@@ -136,3 +136,18 @@ def test_cli_archive_file_format(test_args: list[str], tmp_path: Path):
     assert result.exit_code == 0
     assert 'Attempting to archive submission' in result.output
     assert re.search('format at /.+?/Judge says Trump and two adult', result.output)
+
+
+@pytest.mark.online
+@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', (
+    ['-l', 'm2601g', '--exclude-id', 'm2601g'],
+))
+def test_cli_archive_links_exclusion(test_args: list[str], tmp_path: Path):
+    runner = CliRunner()
+    test_args = create_basic_args_for_archive_runner(test_args, tmp_path)
+    result = runner.invoke(cli, test_args)
+    assert result.exit_code == 0
+    assert 'in exclusion list' in result.output
+    assert 'Attempting to archive' not in result.output

tests/integration_tests/test_download_integration.py

@@ -97,7 +97,6 @@ def test_cli_download_user_specific_subreddits(test_args: list[str], tmp_path: P
     ['-l', 'm2601g'],
     ['-l', 'https://www.reddit.com/r/TrollXChromosomes/comments/m2601g/its_a_step_in_the_right_direction/'],
     ['-l', 'm3hxzd'],  # Really long title used to overflow filename limit
-    ['-l', 'm3kua3'],  # Has a deleted user
     ['-l', 'm5bqkf'],  # Resource leading to a 404
 ))
 def test_cli_download_links(test_args: list[str], tmp_path: Path):
@@ -313,9 +312,8 @@ def test_cli_download_file_scheme_warning(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', (
-    ['-l', 'm2601g', '--disable-module', 'Direct'],
-    ['-l', 'nnb9vs', '--disable-module', 'YoutubeDlFallback'],
-    ['-l', 'nnb9vs', '--disable-module', 'youtubedlfallback'],
+    ['-l', 'm2601g', '--disable-module', 'SelfPost'],
+    ['-l', 'nnb9vs', '--disable-module', 'YtdlpFallback'],
 ))
 def test_cli_download_disable_modules(test_args: list[str], tmp_path: Path):
     runner = CliRunner()

tests/site_downloaders/fallback_downloaders/test_ytdlp_fallback.py

@@ -15,6 +15,7 @@ from bdfr.site_downloaders.fallback_downloaders.ytdlp_fallback import YtdlpFallb
     ('https://www.youtube.com/watch?v=P19nvJOmqCc', True),
     ('https://www.example.com/test', False),
     ('https://milesmatrix.bandcamp.com/album/la-boum/', False),
+    ('https://v.redd.it/54i8fvzev3u81', True),
 ))
 def test_can_handle_link(test_url: str, expected: bool):
     result = YtdlpFallback.can_handle_link(test_url)