Move files to modules

domoticz.py → modules/domoticz.py

@@ -5,9 +5,9 @@
 import json
 import os
 import re
-import config
+import modules.config as config
 
-from helpers import logger, get_settings
+from modules.helpers import logger, get_settings
 
 aogDevs = {}
 

helpers.py → modules/helpers.py

@@ -8,7 +8,7 @@
 
 import random
 import string
-import config
+import modules.config as config
 
 # Enable log in config.py if need #
 # if hasattr(config, 'LOG_FILE'):

reportstate.py → modules/reportstate.py

@@ -1,4 +1,3 @@
-import config
 import os
 import io
 import json
@@ -7,8 +6,9 @@
 import requests
 import google.auth.crypt
 import google.auth.jwt
+import module.config as config
 
-from helpers import logger, get_settings
+from modules.helpers import logger, get_settings
 
 class ReportState:
     """Google Report State implementation."""
@@ -108,4 +108,4 @@ def call_homegraph_api(self, rt, payload):
         r.raise_for_status()
 
         logger.debug("Device state reported %s" % (json.dumps(payload, indent=2, sort_keys=True)))
-        return r.status_code == requests.codes.ok
+        return r.status_code == requests.codes.ok

trait.py → modules/trait.py

@@ -2,9 +2,9 @@
 import hashlib
 import base64
 import json
-import config
-from helpers import get_settings, _tempConvert
-from domoticz import getDomoticzState, queryDomoticz
+import modules.config as config
+from modules.helpers import get_settings, _tempConvert
+from modules.domoticz import getDomoticzState, queryDomoticz
 
 attempts = 1
 blocked = {}

smarthome.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 
 import flask_login
-import config
 import importlib
 import urllib
 import os
 import sys
 import json
 import hashlib
+import modules.config as config
 
 from time import time, sleep
 from werkzeug.utils import secure_filename
 from werkzeug.middleware.proxy_fix import ProxyFix
-from domoticz import getDomoticzDevices, queryDomoticz, saveJson
-from helpers import logger, get_settings, save_settings, remove_user, check_token, get_token, random_string, get_device, get_devices, generateToken, generateCsrfToken, csrfProtect
-from reportstate import ReportState
+from modules.domoticz import getDomoticzDevices, queryDomoticz, saveJson
+from modules.helpers import logger, get_settings, save_settings, remove_user, check_token, get_token, random_string, get_device, get_devices, generateToken, generateCsrfToken, csrfProtect
+from modules.reportstate import ReportState
 from flask import Flask, redirect, request, url_for, render_template, send_from_directory, jsonify, session, flash, Response
 from secrets import compare_digest