diff --git a/fHDHR/cli/run.py b/fHDHR/cli/run.py index 6a90246..49c5697 100644 --- a/fHDHR/cli/run.py +++ b/fHDHR/cli/run.py @@ -31,10 +31,10 @@ def build_args_parser(): return parser.parse_args() -def get_configuration(args, script_dir, origin): +def get_configuration(args, script_dir, origin, fHDHR_web): if not os.path.isfile(args.cfg): raise fHDHR.exceptions.ConfigurationNotFound(filename=args.cfg) - return fHDHR.config.Config(args.cfg, script_dir, origin) + return fHDHR.config.Config(args.cfg, script_dir, origin, fHDHR_web) def run(settings, logger, db, script_dir, fHDHR_web, origin, alternative_epg): @@ -84,7 +84,7 @@ def start(args, script_dir, fHDHR_web, origin, alternative_epg): """Get Configuration for fHDHR and start""" try: - settings = get_configuration(args, script_dir, origin) + settings = get_configuration(args, script_dir, origin, fHDHR_web) except fHDHR.exceptions.ConfigurationError as e: print(e) return ERR_CODE_NO_RESTART diff --git a/fHDHR/config/__init__.py b/fHDHR/config/__init__.py index e0784f9..02483ca 100644 --- a/fHDHR/config/__init__.py +++ b/fHDHR/config/__init__.py @@ -15,8 +15,9 @@ from fHDHR.tools import isint, isfloat, is_arithmetic, is_docker class Config(): - def __init__(self, filename, script_dir, origin): + def __init__(self, filename, script_dir, origin, fHDHR_web): self.origin = origin + self.fHDHR_web = fHDHR_web self.internal = {} self.conf_default = {} @@ -67,6 +68,8 @@ class Config(): self.internal["versions"]["fHDHR"] = fHDHR_VERSION + self.internal["versions"]["fHDHR_web"] = self.fHDHR_web.fHDHR_web_VERSION + self.internal["versions"][self.origin.ORIGIN_NAME] = self.origin.ORIGIN_VERSION self.internal["versions"]["Python"] = sys.version