fHDHR/fHDHR_NextPVR
1
0
Fork 0
mirror of https://github.com/fHDHR/fHDHR_NextPVR.git synced 2025-12-06 16:56:57 -05:00
Code Issues Releases Wiki Activity

Add Web Version

Browse Source
This commit is contained in:
deathbybandaid 2020-12-08 13:19:50 -05:00
parent 0304bdb5e5
commit f8429883a6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fHDHR/cli/run.py
View File

@ -31,10 +31,10 @@ def build_args_parser():
return parser.parse_args() 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): if not os.path.isfile(args.cfg):
raise fHDHR.exceptions.ConfigurationNotFound(filename=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): 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""" """Get Configuration for fHDHR and start"""
try: try:
settings = get_configuration(args, script_dir, origin) settings = get_configuration(args, script_dir, origin, fHDHR_web)
except fHDHR.exceptions.ConfigurationError as e: except fHDHR.exceptions.ConfigurationError as e:
print(e) print(e)
return ERR_CODE_NO_RESTART return ERR_CODE_NO_RESTART

5
fHDHR/config/__init__.py
View File

@ -15,8 +15,9 @@ from fHDHR.tools import isint, isfloat, is_arithmetic, is_docker
class Config(): class Config():
def __init__(self, filename, script_dir, origin): def __init__(self, filename, script_dir, origin, fHDHR_web):
self.origin = origin self.origin = origin
self.fHDHR_web = fHDHR_web
self.internal = {} self.internal = {}
self.conf_default = {} self.conf_default = {}
@ -67,6 +68,8 @@ class Config():
self.internal["versions"]["fHDHR"] = fHDHR_VERSION 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"][self.origin.ORIGIN_NAME] = self.origin.ORIGIN_VERSION
self.internal["versions"]["Python"] = sys.version self.internal["versions"]["Python"] = sys.version