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

Update Versions

Browse Source
This commit is contained in:
deathbybandaid 2020-12-08 09:10:35 -05:00
parent 0afe2339a3
commit 835f98db43
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fHDHR/__init__.py
View File

@ -5,7 +5,7 @@ from .device import fHDHR_Device
import fHDHR.tools
fHDHR_VERSION = "v0.4.5-beta"
fHDHR_VERSION = "v0.4.6-beta"
class fHDHR_INT_OBJ():

9
fHDHR/cli/run.py
View File

@ -32,10 +32,10 @@ def build_args_parser():
return parser.parse_args()
def get_configuration(args, script_dir):
def get_configuration(args, script_dir, origin):
if not os.path.isfile(args.cfg):
raise fHDHR.exceptions.ConfigurationNotFound(filename=args.cfg)
return fHDHR.config.Config(args.cfg, script_dir)
return fHDHR.config.Config(args.cfg, script_dir, origin)
def run(settings, logger, db, alternative_epg, origin):
@ -85,7 +85,7 @@ def start(args, script_dir, alternative_epg, origin):
"""Get Configuration for fHDHR and start"""
try:
settings = get_configuration(args, script_dir)
settings = get_configuration(args, script_dir, origin)
except fHDHR.exceptions.ConfigurationError as e:
print(e)
return ERR_CODE_NO_RESTART
@ -100,7 +100,8 @@ def start(args, script_dir, alternative_epg, origin):
def main(script_dir, alternative_epg, origin):
"""fHDHR run script entry point"""
print("Loading fHDHR " + fHDHR_VERSION)
print("Loading fHDHR %s" % fHDHR_VERSION)
print("Loading Origin Service: %s %s" % (origin.ORIGIN_NAME, origin.ORIGIN_VERSION))
try:
args = build_args_parser()

6
fHDHR/config/__init__.py
View File

@ -15,7 +15,9 @@ from fHDHR.tools import isint, isfloat, is_arithmetic, is_docker
class Config():
def __init__(self, filename, script_dir):
def __init__(self, filename, script_dir, origin):
self.origin = origin
self.internal = {}
self.conf_default = {}
self.dict = {}
@ -64,6 +66,8 @@ class Config():
self.internal["versions"]["fHDHR"] = fHDHR_VERSION
self.internal["versions"][self.origin.ORIGIN_NAME] = self.origin.ORIGIN_VERSION
self.internal["versions"]["Python"] = sys.version
opersystem = platform.system()

3
origin/__init__.py
View File

@ -2,3 +2,6 @@
from .origin_service import *
from .origin_channels import *
from .origin_epg import *
ORIGIN_NAME = "fHDHR_NextPVR"
ORIGIN_VERSION = "v0.5.0-beta"