diff --git a/config.json b/config.json index c36c0c1..9d3cef5 100644 --- a/config.json +++ b/config.json @@ -13,7 +13,8 @@ } }, "file":{ - "repos":["data_test/files", "E:/local_booru/img"], - "dw":"data_test/files" + "repos":["data/files"], + "dw":"data/files", + "thumb":"data/thumb" } } \ No newline at end of file diff --git a/run.py b/run.py index cdb2a57..45c2dc0 100644 --- a/run.py +++ b/run.py @@ -6,17 +6,21 @@ from pathlib import Path import traceback import os -CONFIG_ROOT = json.load(open("config.json", "r", encoding="utf-8")) -CONFIG_ROOT_S = json.load(open("config_gb.json", "r", encoding="utf-8")) +if Path("config_gb.json").exists(): + CONFIG_FILE = "config_gb.json" +else: + CONFIG_FILE = "config.json" + +CONFIG_ROOT = json.load(open(CONFIG_FILE, "r", encoding="utf-8")) CONFIG_HOST = CONFIG_ROOT["server"]["host"] CONFIG_PORT = CONFIG_ROOT["server"]["port"] PAGINATION_COUNT = CONFIG_ROOT["server"]["count_page"] -GB_ID = CONFIG_ROOT_S["gb"]["id"] -GB_HASH = CONFIG_ROOT_S["gb"]["hash"] +GB_ID = CONFIG_ROOT["gb"]["id"] +GB_HASH = CONFIG_ROOT["gb"]["hash"] GB_HEADERS = CONFIG_ROOT["gb"]["headers"] FILE_FOLDERS = CONFIG_ROOT["file"]["repos"] FILE_DW_FOLDERS = CONFIG_ROOT["file"]["dw"] -THUMB_FOLDER = "data_test/thumb" +THUMB_FOLDER = CONFIG_ROOT["file"]["thumb"] gb = gelbooru.GB(GB_ID, GB_HASH, GB_HEADERS, FILE_DW_FOLDERS) log = logger.Logger()