From d7090b836a2c58669d9f39a6158966515800a02a Mon Sep 17 00:00:00 2001 From: stev Date: Sat, 9 Sep 2023 14:06:35 +0200 Subject: [PATCH] change constants --- config.json | 16 ++++++++-------- src/gmirator/__init__.py | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/config.json b/config.json index d5a01bb..28bd070 100644 --- a/config.json +++ b/config.json @@ -1,11 +1,11 @@ { - "workdir" : "where/your/sources/live", - "dir_assets" : "assets", - "dir_source" : "content", - "dir_helper" : "html-parts", - "dir_o_html" : "html-output", - "rem_gmi" : "your/remote/gemini/path", - "rem_html" : "your/remote/html/path", - "port" : "1312" + "dir_assets" : "path/to/assets", + "dir_gmi_content" : "path/to/content", + "dir_gmi_helper" : "path/to/gmi-helper", + "dir_html_helper" : "path/to/html-helper", + "dir_html_out" : "path/to/web", + "rem_gmi" : "remote_server:path/to/gmi", + "rem_html" : "remote_server:path/to/gmi", + "port" : "1312" } diff --git a/src/gmirator/__init__.py b/src/gmirator/__init__.py index 7a67d4a..d466b4a 100644 --- a/src/gmirator/__init__.py +++ b/src/gmirator/__init__.py @@ -7,13 +7,14 @@ cfg_file = xdg_path if xdg_path.exists() else "config.json" with open(cfg_file) as f: config = json.load(f) -WORKDIR = Path(config["workdir"]) -DIR_ASSETS = WORKDIR / config["dir_assets"] -DIR_SOURCE = WORKDIR / config["dir_source"] -DIR_HELPER = WORKDIR / config["dir_helper"] -DIR_O_HTML = WORKDIR / config["dir_o_html"] -GMI_FOOTER = WORKDIR / "footer.gmi" +DIR_ASSETS = Path(config["dir_assets"]) +DIR_SOURCE = Path(config["dir_gmi_content"]) +DIR_GMI_HELPER = Path(config["dir_gmi_helper"]) +DIR_HELPER = Path(config["dir_html_helper"]) +DIR_O_HTML = Path(config["dir_html_out"]) -REM_HTML = config["rem_html"] -REM_GMI = config["rem_gmi"] -RPORT = config["port"] +GMI_FOOTER = DIR_GMI_HELPER / "footer.gmi" + +REM_HTML = config["rem_html"] +REM_GMI = config["rem_gmi"] +RPORT = config["port"]