diff --git a/bdfr/__main__.py b/bdfr/__main__.py index 56ffb0f..451a7f0 100644 --- a/bdfr/__main__.py +++ b/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('--file-scheme', default=None, type=str), + click.option('--folder-scheme', default=None, type=str), click.option('--ignore-user', type=str, multiple=True, default=None), click.option('--include-id-file', multiple=True, default=None), click.option('--log', type=str, default=None), @@ -38,8 +40,6 @@ _common_options = [ ] _downloader_options = [ - click.option('--file-scheme', default=None, type=str), - click.option('--folder-scheme', default=None, type=str), click.option('--make-hard-links', is_flag=True, default=None), click.option('--max-wait-time', type=int, default=None), click.option('--no-dupes', is_flag=True, default=None), diff --git a/tests/integration_tests/test_archive_integration.py b/tests/integration_tests/test_archive_integration.py index 5ef04a6..2234c5a 100644 --- a/tests/integration_tests/test_archive_integration.py +++ b/tests/integration_tests/test_archive_integration.py @@ -121,3 +121,18 @@ def test_cli_archive_ignore_user(test_args: list[str], tmp_path: Path): assert result.exit_code == 0 assert 'being an ignored user' in result.output assert 'Attempting to archive submission' not in 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', ( + ['--file-scheme', '{TITLE}', '-l', 'suy011'], +)) +def test_cli_archive_file_format(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 'Attempting to archive submission' in result.output + assert re.search('format at /.+?/Judge says Trump and two adult', result.output)