diff --git a/README.md b/README.md index dc274e1..9d7286a 100644 --- a/README.md +++ b/README.md @@ -186,15 +186,6 @@ Example usage: **`--downloaded-posts D:\bdfr\ALL_POSTS.txt`** ## **`--downloaded-delay`** When specified, it delays every download for given seconds. - - -## **`--config`** -Specify a `config.json` file to use. This will disable reading from the default `Bulk downloader for reddit/config.json` file, as well as `--use-local-config` option. - -Example usage: **`--config /etc/bdfr/config.json`** -Example usage: **`-c ~/config.json`** -Example usage: **`--config c:\Users\Me\Downloads\config.json`** -Example usage: **`-c c:\config.json`** ## ❔ FAQ diff --git a/script.py b/script.py index 314f817..8e541cc 100644 --- a/script.py +++ b/script.py @@ -269,26 +269,14 @@ def printLogo(): ) def main(): - - sys.argv = sys.argv + GLOBAL.config["options"].split() - arguments = Arguments.parse() - GLOBAL.arguments = arguments - if arguments.config: - if arguments.use_local_config: - sys.exit() - if Path(arguments.config).exists(): - GLOBAL.configDirectory = Path(arguments.config) - else: - VanillaPrint("custom config",arguments.config,"not found. Exiting.") - sys.exit() + if not Path(GLOBAL.defaultConfigDirectory).is_dir(): + os.makedirs(GLOBAL.defaultConfigDirectory) + + if Path("config.json").exists(): + GLOBAL.configDirectory = Path("config.json") else: - if Path("config.json").exists(): - GLOBAL.configDirectory = Path("config.json") - else: - if not Path(GLOBAL.defaultConfigDirectory).is_dir(): - os.makedirs(GLOBAL.defaultConfigDirectory) - GLOBAL.configDirectory = GLOBAL.defaultConfigDirectory / "config.json" + GLOBAL.configDirectory = GLOBAL.defaultConfigDirectory / "config.json" try: GLOBAL.config = Config(GLOBAL.configDirectory).generate() except InvalidJSONFile as exception: @@ -296,6 +284,11 @@ def main(): VanillaPrint("Resolve it or remove it to proceed") sys.exit() + sys.argv = sys.argv + GLOBAL.config["options"].split() + + arguments = Arguments.parse() + GLOBAL.arguments = arguments + if arguments.set_filename: Config(GLOBAL.configDirectory).setCustomFileName() sys.exit() @@ -382,5 +375,5 @@ if __name__ == "__main__": exc_info=full_exc_info(sys.exc_info())) print(GLOBAL.log_stream.getvalue()) - if not GLOBAL.arguments.quit: - input("\nPress enter to quit\n") + if not GLOBAL.arguments.quit: input("\nPress enter to quit\n") + diff --git a/src/arguments.py b/src/arguments.py index e022446..8bdcf9d 100644 --- a/src/arguments.py +++ b/src/arguments.py @@ -170,12 +170,6 @@ class Arguments: type=int, help="Amount, in seconds, to delay before beginning the next item in the download queue") - parser.add_argument( - "--config","-c", - help="Specify exact config.json file to use. " \ - "Disables reading from 'Bulk downloader for " \ - "reddit/config.json' and --use-local-config " \ - "option.") if arguments == []: return parser.parse_args()