From e042d985b5475b41229f72f70cead507e5cf1328 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Sun, 14 Mar 2021 20:38:03 +1000 Subject: [PATCH] Load default config from package directory --- .../default_config.cfg | 0 bulkredditdownloader/downloader.py | 2 ++ bulkredditdownloader/tests/test_integration.py | 7 +++++++ 3 files changed, 9 insertions(+) rename default_config.cfg => bulkredditdownloader/default_config.cfg (100%) diff --git a/default_config.cfg b/bulkredditdownloader/default_config.cfg similarity index 100% rename from default_config.cfg rename to bulkredditdownloader/default_config.cfg diff --git a/bulkredditdownloader/downloader.py b/bulkredditdownloader/downloader.py index d4b47f2..3cf1f78 100644 --- a/bulkredditdownloader/downloader.py +++ b/bulkredditdownloader/downloader.py @@ -3,6 +3,7 @@ import configparser import hashlib +import importlib.resources import logging import os import re @@ -140,6 +141,7 @@ class RedditDownloader: Path('./default_config.cfg'), Path(self.config_directory, 'config.cfg'), Path(self.config_directory, 'default_config.cfg'), + list(importlib.resources.path('bulkredditdownloader', 'default_config.cfg').gen)[0], ] self.config_location = None for path in possible_paths: diff --git a/bulkredditdownloader/tests/test_integration.py b/bulkredditdownloader/tests/test_integration.py index d025828..dab80c8 100644 --- a/bulkredditdownloader/tests/test_integration.py +++ b/bulkredditdownloader/tests/test_integration.py @@ -230,3 +230,10 @@ def test_cli_download_hard_fail(test_args: list[str], tmp_path: Path): test_args = ['download', str(tmp_path), '-v', '--config', 'test_config.cfg'] + test_args result = runner.invoke(cli, test_args) assert result.exit_code != 0 + + +def test_cli_download_use_default_config(tmp_path: Path): + runner = CliRunner() + test_args = ['download', '-vv', str(tmp_path)] + result = runner.invoke(cli, test_args) + assert result.exit_code == 0