From 679745cffa4270ae8e943c6a32f326e093984461 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 10 Dec 2020 12:01:34 -0500 Subject: [PATCH] Move Web Conf --- fHDHR/config/__init__.py | 6 ++++++ .../web_ui.json => fHDHR_web/web_ui_conf.json | 0 2 files changed, 6 insertions(+) rename data/internal_config/web_ui.json => fHDHR_web/web_ui_conf.json (100%) diff --git a/fHDHR/config/__init__.py b/fHDHR/config/__init__.py index 38e52c0..62b3c3a 100644 --- a/fHDHR/config/__init__.py +++ b/fHDHR/config/__init__.py @@ -42,6 +42,7 @@ class Config(): "origin_web": pathlib.Path(origin_dir).joinpath('origin_web'), "cache_dir": pathlib.Path(data_dir).joinpath('cache'), "internal_config": pathlib.Path(data_dir).joinpath('internal_config'), + "fHDHR_web_dir": fHDHR_web_dir, "www_dir": www_dir, "www_templates_dir": pathlib.Path(fHDHR_web_dir).joinpath('templates'), "font": pathlib.Path(data_dir).joinpath('garamond.ttf'), @@ -52,6 +53,11 @@ class Config(): if str(conffilepath).endswith(".json"): self.read_json_config(conffilepath) + for file_item in os.listdir(self.internal["paths"]["fHDHR_web_dir"]): + file_item_path = pathlib.Path(self.internal["paths"]["fHDHR_web_dir"]).joinpath(file_item) + if str(file_item_path).endswith("_conf.json"): + self.read_json_config(file_item_path) + for dir_type in ["alternative_epg", "origin"]: for file_item in os.listdir(self.internal["paths"][dir_type]): diff --git a/data/internal_config/web_ui.json b/fHDHR_web/web_ui_conf.json similarity index 100% rename from data/internal_config/web_ui.json rename to fHDHR_web/web_ui_conf.json