More restructuring

lib/DomoticzMqttHandler/include/.gitignore

@@ -0,0 +1 @@
+json/*.h

lib/DomoticzMqttHandler/scripts/generate_includes.py

@@ -0,0 +1,76 @@
+import os
+import re
+import shutil
+import subprocess
+
+try:
+    from css_html_js_minify import js_minify
+except:
+    from SCons.Script import (
+        ARGUMENTS,
+        COMMAND_LINE_TARGETS,
+        DefaultEnvironment,
+    )
+    env = DefaultEnvironment()
+
+    env.Execute(
+        env.VerboseAction(
+            '$PYTHONEXE -m pip install "css_html_js_minify" ',
+            "Installing Python dependencies",
+        )
+    )
+    try:
+        from css_html_js_minify import js_minify
+    except:
+        print("WARN: Unable to load minifier")
+
+
+webroot = "lib/DomoticzMqttHandler/json"
+srcroot = "lib/DomoticzMqttHandler/include/json"
+
+version = os.environ.get('GITHUB_TAG')
+if version == None:
+    try:
+      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
+      if result.returncode == 0:
+        version = result.stdout.decode('utf-8').strip()
+      else:
+        version = "SNAPSHOT"
+    except:
+      version = "SNAPSHOT"
+
+if os.path.exists(srcroot):
+    shutil.rmtree(srcroot)
+    os.mkdir(srcroot)
+else:
+    os.mkdir(srcroot)
+
+for filename in os.listdir(webroot):
+    basename = re.sub("[^0-9a-zA-Z]+", "_", filename)
+
+    srcfile = webroot + "/" + filename
+    dstfile = srcroot + "/" + basename + ".h"
+
+    varname = basename.upper()
+
+    with open(srcfile, encoding="utf-8") as f:
+        content = f.read().replace("${version}", version)
+
+    try:    
+        if (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
+            content = js_minify(content)
+    except:
+        print("WARN: Unable to minify")
+
+    with open(dstfile, "w") as dst:
+        dst.write("static const char ")
+        dst.write(varname)
+        dst.write("[] PROGMEM = R\"==\"==(")
+        dst.write(content)
+        dst.write(")==\"==\";\n")
+        dst.write("const int ");
+        dst.write(varname)
+        dst.write("_LEN PROGMEM = ");
+        dst.write(str(len(content)))
+        dst.write(";");
+        

lib/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp

@@ -1,5 +1,5 @@
 #include "DomoticzMqttHandler.h"
-#include "root/domoticz_json.h"
+#include "json/domoticz_json.h"
 
 bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
     bool ret = false;

lib/HomeAssistantMqttHandler/include/.gitignore

@@ -0,0 +1 @@
+json/*.h

lib/HomeAssistantMqttHandler/scripts/generate_includes.py

@@ -0,0 +1,76 @@
+import os
+import re
+import shutil
+import subprocess
+
+try:
+    from css_html_js_minify import js_minify
+except:
+    from SCons.Script import (
+        ARGUMENTS,
+        COMMAND_LINE_TARGETS,
+        DefaultEnvironment,
+    )
+    env = DefaultEnvironment()
+
+    env.Execute(
+        env.VerboseAction(
+            '$PYTHONEXE -m pip install "css_html_js_minify" ',
+            "Installing Python dependencies",
+        )
+    )
+    try:
+        from css_html_js_minify import js_minify
+    except:
+        print("WARN: Unable to load minifier")
+
+
+webroot = "lib/HomeAssistantMqttHandler/json"
+srcroot = "lib/HomeAssistantMqttHandler/include/json"
+
+version = os.environ.get('GITHUB_TAG')
+if version == None:
+    try:
+      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
+      if result.returncode == 0:
+        version = result.stdout.decode('utf-8').strip()
+      else:
+        version = "SNAPSHOT"
+    except:
+      version = "SNAPSHOT"
+
+if os.path.exists(srcroot):
+    shutil.rmtree(srcroot)
+    os.mkdir(srcroot)
+else:
+    os.mkdir(srcroot)
+
+for filename in os.listdir(webroot):
+    basename = re.sub("[^0-9a-zA-Z]+", "_", filename)
+
+    srcfile = webroot + "/" + filename
+    dstfile = srcroot + "/" + basename + ".h"
+
+    varname = basename.upper()
+
+    with open(srcfile, encoding="utf-8") as f:
+        content = f.read().replace("${version}", version)
+
+    try:    
+        if (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
+            content = js_minify(content)
+    except:
+        print("WARN: Unable to minify")
+
+    with open(dstfile, "w") as dst:
+        dst.write("static const char ")
+        dst.write(varname)
+        dst.write("[] PROGMEM = R\"==\"==(")
+        dst.write(content)
+        dst.write(")==\"==\";\n")
+        dst.write("const int ");
+        dst.write(varname)
+        dst.write("_LEN PROGMEM = ");
+        dst.write(str(len(content)))
+        dst.write(";");
+        

lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp

@@ -3,12 +3,12 @@
 #include "hexutils.h"
 #include "Uptime.h"
 #include "version.h"
-#include "root/ha1_json.h"
-#include "root/ha2_json.h"
-#include "root/ha3_json.h"
-#include "root/jsonsys_json.h"
-#include "root/jsonprices_json.h"
-#include "root/hadiscover_json.h"
+#include "json/ha1_json.h"
+#include "json/ha2_json.h"
+#include "json/ha3_json.h"
+#include "json/jsonsys_json.h"
+#include "json/jsonprices_json.h"
+#include "json/hadiscover_json.h"
 
 bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected())

lib/JsonMqttHandler/include/.gitignore

@@ -0,0 +1 @@
+json/*.h

lib/JsonMqttHandler/scripts/generate_includes.py

@@ -0,0 +1,76 @@
+import os
+import re
+import shutil
+import subprocess
+
+try:
+    from css_html_js_minify import js_minify
+except:
+    from SCons.Script import (
+        ARGUMENTS,
+        COMMAND_LINE_TARGETS,
+        DefaultEnvironment,
+    )
+    env = DefaultEnvironment()
+
+    env.Execute(
+        env.VerboseAction(
+            '$PYTHONEXE -m pip install "css_html_js_minify" ',
+            "Installing Python dependencies",
+        )
+    )
+    try:
+        from css_html_js_minify import js_minify
+    except:
+        print("WARN: Unable to load minifier")
+
+
+webroot = "lib/JsonMqttHandler/json"
+srcroot = "lib/JsonMqttHandler/include/json"
+
+version = os.environ.get('GITHUB_TAG')
+if version == None:
+    try:
+      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
+      if result.returncode == 0:
+        version = result.stdout.decode('utf-8').strip()
+      else:
+        version = "SNAPSHOT"
+    except:
+      version = "SNAPSHOT"
+
+if os.path.exists(srcroot):
+    shutil.rmtree(srcroot)
+    os.mkdir(srcroot)
+else:
+    os.mkdir(srcroot)
+
+for filename in os.listdir(webroot):
+    basename = re.sub("[^0-9a-zA-Z]+", "_", filename)
+
+    srcfile = webroot + "/" + filename
+    dstfile = srcroot + "/" + basename + ".h"
+
+    varname = basename.upper()
+
+    with open(srcfile, encoding="utf-8") as f:
+        content = f.read().replace("${version}", version)
+
+    try:    
+        if (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
+            content = js_minify(content)
+    except:
+        print("WARN: Unable to minify")
+
+    with open(dstfile, "w") as dst:
+        dst.write("static const char ")
+        dst.write(varname)
+        dst.write("[] PROGMEM = R\"==\"==(")
+        dst.write(content)
+        dst.write(")==\"==\";\n")
+        dst.write("const int ");
+        dst.write(varname)
+        dst.write("_LEN PROGMEM = ");
+        dst.write(str(len(content)))
+        dst.write(";");
+        

lib/JsonMqttHandler/src/JsonMqttHandler.cpp

@@ -2,12 +2,12 @@
 #include "version.h"
 #include "hexutils.h"
 #include "Uptime.h"
-#include "root/json1_json.h"
-#include "root/json2_json.h"
-#include "root/json3_json.h"
-#include "root/json4_json.h"
-#include "root/jsonsys_json.h"
-#include "root/jsonprices_json.h"
+#include "json/json1_json.h"
+#include "json/json2_json.h"
+#include "json/json3_json.h"
+#include "json/json4_json.h"
+#include "json/jsonsys_json.h"
+#include "json/jsonprices_json.h"
 
 bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected())

platformio.ini

@@ -2,10 +2,13 @@
 extra_configs = platformio-user.ini
 
 [common]
-lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.0, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, EntsoePriceApi, EnergyAccounting, ClassicUi
+lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.0, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, EntsoePriceApi, EnergyAccounting, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, ClassicUi
 lib_ignore = OneWire
 extra_scripts =
     pre:scripts/addversion.py
+    lib/JsonMqttHandler/scripts/generate_includes.py
+    lib/DomoticzMqttHandler/scripts/generate_includes.py
+    lib/HomeAssistantMqttHandler/scripts/generate_includes.py
     lib/ClassicUi/scripts/generate_includes.py
 
 [esp32]

src/AmsToMqttBridge.ino

@@ -54,11 +54,11 @@ ADC_MODE(ADC_VCC);
 #include "AmsWebServer.h"
 #include "AmsConfiguration.h"
 
-#include "mqtt/AmsMqttHandler.h"
-#include "mqtt/JsonMqttHandler.h"
-#include "mqtt/RawMqttHandler.h"
-#include "mqtt/DomoticzMqttHandler.h"
-#include "mqtt/HomeAssistantMqttHandler.h"
+#include "AmsMqttHandler.h"
+#include "JsonMqttHandler.h"
+#include "RawMqttHandler.h"
+#include "DomoticzMqttHandler.h"
+#include "HomeAssistantMqttHandler.h"
 
 #include "Uptime.h"