diff --git a/script.py b/script.py index 7b59350..6fea859 100644 --- a/script.py +++ b/script.py @@ -674,8 +674,11 @@ def main(): if not Path(GLOBAL.configDirectory).is_dir(): os.makedirs(GLOBAL.configDirectory) - GLOBAL.config = getConfig("config.json") if Path("config.json").exists() \ - else getConfig(GLOBAL.configDirectory / "config.json") + + GLOBAL.configDirectory = Path("config.json") if Path("config.json").exists() \ + else GLOBAL.defaultConfigDirectory / "config.json" + + GLOBAL.config = getConfig(GLOBAL.configDirectory) if GLOBAL.arguments.log is not None: logDir = Path(GLOBAL.arguments.log) diff --git a/src/searcher.py b/src/searcher.py index 31ba755..5fa4626 100644 --- a/src/searcher.py +++ b/src/searcher.py @@ -95,7 +95,7 @@ def beginPraw(config,user_agent = str(socket.gethostname())): authorizedInstance = GetAuth(reddit,port).getRefreshToken(*scopes) reddit = authorizedInstance[0] refresh_token = authorizedInstance[1] - jsonFile(GLOBAL.configDirectory / "config.json").add({ + jsonFile(GLOBAL.configDirectory).add({ "reddit_username":str(reddit.user.me()), "reddit_refresh_token":refresh_token }) @@ -105,7 +105,7 @@ def beginPraw(config,user_agent = str(socket.gethostname())): authorizedInstance = GetAuth(reddit,port).getRefreshToken(*scopes) reddit = authorizedInstance[0] refresh_token = authorizedInstance[1] - jsonFile(GLOBAL.configDirectory / "config.json").add({ + jsonFile(GLOBAL.configDirectory).add({ "reddit_username":str(reddit.user.me()), "reddit_refresh_token":refresh_token }) diff --git a/src/tools.py b/src/tools.py index 88d6d89..7299f0f 100644 --- a/src/tools.py +++ b/src/tools.py @@ -14,7 +14,8 @@ class GLOBAL: config = None arguments = None directory = None - configDirectory = Path.home() / "Bulk Downloader for Reddit" + defaultConfigDirectory = Path.home() / "Bulk Downloader for Reddit" + configDirectory = "" reddit_client_id = "BSyphDdxYZAgVQ" reddit_client_secret = "bfqNJaRh8NMh-9eAr-t4TRz-Blk" printVanilla = print