Seperate fHDHR_web

fHDHR/__init__.py

@@ -21,7 +21,7 @@ class fHDHR_INT_OBJ():
 
 class fHDHR_OBJ():
 
-    def __init__(self, settings, logger, db, alternative_epg, origin):
+    def __init__(self, settings, logger, db, origin, alternative_epg):
         self.fhdhr = fHDHR_INT_OBJ(settings, logger, db)
 
         self.originwrapper = OriginServiceWrapper(self.fhdhr, origin)

fHDHR/cli/run.py

@@ -9,7 +9,6 @@ import platform
 from fHDHR import fHDHR_VERSION, fHDHR_OBJ
 import fHDHR.exceptions
 import fHDHR.config
-from fHDHR.http import fHDHR_HTTP_Server
 from fHDHR.db import fHDHRdb
 
 ERR_CODE = 1
@@ -38,10 +37,10 @@ def get_configuration(args, script_dir, origin):
     return fHDHR.config.Config(args.cfg, script_dir, origin)
 
 
-def run(settings, logger, db, alternative_epg, origin):
+def run(settings, logger, db, script_dir, fHDHR_web, origin, alternative_epg):
 
-    fhdhr = fHDHR_OBJ(settings, logger, db, alternative_epg, origin)
-    fhdhrweb = fHDHR_HTTP_Server(fhdhr)
+    fhdhr = fHDHR_OBJ(settings, logger, db, origin, alternative_epg)
+    fhdhrweb = fHDHR_web.fHDHR_HTTP_Server(fhdhr)
 
     try:
 
@@ -81,7 +80,7 @@ def run(settings, logger, db, alternative_epg, origin):
     return ERR_CODE
 
 
-def start(args, script_dir, alternative_epg, origin):
+def start(args, script_dir, fHDHR_web, origin, alternative_epg):
     """Get Configuration for fHDHR and start"""
 
     try:
@@ -94,18 +93,19 @@ def start(args, script_dir, alternative_epg, origin):
 
     db = fHDHRdb(settings)
 
-    return run(settings, logger, db, alternative_epg, origin)
+    return run(settings, logger, db, script_dir, fHDHR_web, origin, alternative_epg)
 
 
-def main(script_dir, alternative_epg, origin):
+def main(script_dir, fHDHR_web, origin, alternative_epg):
     """fHDHR run script entry point"""
 
     print("Loading fHDHR %s" % fHDHR_VERSION)
+    print("Loading fHDHR_web %s" % fHDHR_web.fHDHR_web_VERSION)
     print("Loading Origin Service: %s %s" % (origin.ORIGIN_NAME, origin.ORIGIN_VERSION))
 
     try:
         args = build_args_parser()
-        return start(args, script_dir, alternative_epg, origin)
+        return start(args, script_dir, fHDHR_web, origin, alternative_epg)
     except KeyboardInterrupt:
         print("\n\nInterrupted")
         return ERR_CODE

fHDHR_web/__init__.py

@@ -8,6 +8,9 @@ from .rmg import fHDHR_RMG
 from .api import fHDHR_API
 
 
+fHDHR_web_VERSION = "v0.4.0-beta"
+
+
 class fHDHR_HTTP_Server():
     app = None