- Refactoring

- Action Button with Parameter
- Actor Action with Parameter
- Sensor Action with Parameter

modules/recipe_import/beerxml.py

@@ -2,7 +2,7 @@ from flask import json, request
 from flask_classy import FlaskView, route
 from git import Repo, Git
 import sqlite3
-from modules.core.core import cbpi
+from modules import cbpi
 from werkzeug.utils import secure_filename
 import pprint
 import time
@@ -60,7 +60,7 @@ class BeerXMLImport(FlaskView):
                     return ('', 204)
                 return ('', 404)
         except Exception as e:
-            print e
+            self.api.logger.error(e)
             self.api.notify(headline="Upload Failed", message="Failed to upload Beer xml", type="danger")
             return ('', 500)
 
@@ -143,4 +143,4 @@ class BeerXMLImport(FlaskView):
 def init(cbpi):
 
     BeerXMLImport.api = cbpi
-    BeerXMLImport.register(cbpi._app, route_base='/api/beerxml')
+    BeerXMLImport.register(cbpi.web, route_base='/api/beerxml')

modules/recipe_import/kbh.py

@@ -2,7 +2,7 @@ from flask import json, request
 from flask_classy import FlaskView, route
 from git import Repo, Git
 import sqlite3
-from modules.core.core import cbpi
+from modules import cbpi
 from werkzeug.utils import secure_filename
 import pprint
 import time
@@ -39,7 +39,7 @@ class KBH(FlaskView):
                 result.append({"id": row[0], "name": row[1], "brewed": row[2]})
             return json.dumps(result)
         except Exception as e:
-            print e
+            self.api.logger.error(e)
             self.api.notify(headline="Failed to load KHB database", message="ERROR", type="danger")
             return ('', 500)
         finally:
@@ -143,4 +143,4 @@ class KBH(FlaskView):
 def init(cbpi):
 
     KBH.api = cbpi
-    KBH.register(cbpi._app, route_base='/api/kbh')
+    KBH.register(cbpi.web, route_base='/api/kbh')

modules/recipe_import/restapi.py

@@ -2,7 +2,7 @@ from flask import json, request
 from flask_classy import FlaskView, route
 from git import Repo, Git
 import sqlite3
-from modules.core.core import cbpi
+from modules import cbpi
 from werkzeug.utils import secure_filename
 import pprint
 import time
@@ -59,4 +59,4 @@ class RESTImport(FlaskView):
 @cbpi.addon.core.initializer()
 def init(cbpi):
     RESTImport.api = cbpi
-    RESTImport.register(cbpi._app, route_base='/api/recipe/import/v1')
+    RESTImport.register(cbpi.web, route_base='/api/recipe/import/v1')