webfiles now get packed and comments removed

Software/prepare_littlefs.py

@@ -6,9 +6,59 @@ import glob
 import shutil
 import gzip
 import os
+import subprocess
 Import("env")
 Import("projenv")
 
+# Setze die Pfade zu den Tools als Variablen
+html_minifier_path = os.path.join(os.getenv("APPDATA"), "npm", "html-minifier.cmd")
+uglifyjs_path = os.path.join(os.getenv("APPDATA"), "npm", "uglifyjs.cmd")
+terser_path = os.path.join(os.getenv("APPDATA"), "npm", "terser.cmd")
+cssnano_path = os.path.join(os.getenv("APPDATA"), "npm", "cssnano.cmd")
+
+
+def minify_html(input_path, output_path):
+    subprocess.run([html_minifier_path, '--collapse-whitespace', '--remove-comments', input_path, '-o', output_path])
+
+def minify_js(input_path, output_path):
+    subprocess.run([terser_path, input_path, '-o', output_path, '-c', '-m'])
+
+def minify_css(input_path, output_path):
+    subprocess.run([cssnano_path, input_path, output_path])
+
+def process_file(src_path, dest_path):
+    _, file_extension = os.path.splitext(src_path)
+
+    # Extrahiere den Ordnerpfad im Zielverzeichnis
+    dest_dir = os.path.dirname(dest_path)
+
+    # Erstelle den Ordner und alle dazugehörigen Unterordner, falls sie nicht existieren
+    os.makedirs(dest_dir, exist_ok=True)
+
+    if file_extension.lower() == '.js':
+        minify_js(src_path, dest_path)
+    elif file_extension.lower() == '.css':
+        minify_css(src_path, dest_path)
+    elif file_extension.lower() in ['.html', '.htm']:
+        minify_html(src_path, dest_path)
+    else:
+        # Kopiere nicht bearbeitbare Dateien direkt in den Zielordner
+        shutil.copy2(src_path, dest_path)
+
+def strip_files(src_dir, dest_dir):
+    # Erstelle den Zielordner und alle dazugehörigen Unterordner, falls sie nicht existieren
+    os.makedirs(dest_dir, exist_ok=True)
+
+    # Durchlaufe alle Dateien und Unterverzeichnisse im Quellordner
+    for root, _, files in os.walk(src_dir):
+        for filename in files:
+            src_path = os.path.join(root, filename)
+            dest_path = os.path.relpath(src_path, src_dir)
+            dest_path = os.path.join(dest_dir, dest_path)
+
+            # Verarbeite nur Dateien (keine Unterverzeichnisse)
+            process_file(src_path, dest_path)
+
 
 def gzip_file(src_path, dst_path):
 
@@ -47,14 +97,16 @@ def gzip_webfiles(source, target, env):
     filetypes_to_gzip = ['.css', '.png', '.js', '.ico', '.woff2', '.json']
     print('\nGZIP: Starting gzip-Process for LittleFS-Image...\n')
     data_src_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_src')
+    data_temp_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_stripped')
+    strip_files(data_src_dir_path, data_temp_dir_path)
     data_dir_path = env.get('PROJECT_DATA_DIR')
     # check if data and datasrc exist. If the first exists and not the second, it renames it
-    if(os.path.exists(data_dir_path) and not os.path.exists(data_src_dir_path)):
+    if(os.path.exists(data_dir_path) and not os.path.exists(data_temp_dir_path)):
         print('GZIP: Directory "'+data_dir_path +
-              '" exists, "'+data_src_dir_path+'" is not found.')
+              '" exists, "'+data_temp_dir_path+'" is not found.')
         print('GZIP: Renaming "' + data_dir_path +
-              '" to "' + data_src_dir_path + '"')
+              '" to "' + data_temp_dir_path + '"')
-        os.rename(data_dir_path, data_src_dir_path)
+        os.rename(data_dir_path, data_temp_dir_path)
     # Delete the 'data' directory
     if(os.path.exists(data_dir_path)):
         print('GZIP: Deleting the "data" directory ' + data_dir_path)
@@ -67,27 +119,27 @@ def gzip_webfiles(source, target, env):
     files_to_copy = []
     files_to_gzip = []
 
-    all_data_src = getListOfFiles(data_src_dir_path)
+    all_data_src = getListOfFiles(data_temp_dir_path)
     for file in all_data_src:
         file_name, file_extension = os.path.splitext(file)
         print(file_name + " has filetype " + file_extension)
         if file_extension in filetypes_to_gzip:
             files_to_gzip.append(file)
         else:
-            filename_subdir = remove_prefix(file, data_src_dir_path)
+            filename_subdir = remove_prefix(file, data_temp_dir_path)
             files_to_copy.append(filename_subdir)
 
     for file in files_to_copy:
-        print('GZIP: Copying file from: ' + data_src_dir_path + file + ' to: ' + data_dir_path + file)
+        print('GZIP: Copying file from: ' + data_temp_dir_path + file + ' to: ' + data_dir_path + file)
         os.makedirs(os.path.dirname(data_dir_path + file), exist_ok=True)
-        shutil.copy(data_src_dir_path + file, data_dir_path + file)
+        shutil.copy(data_temp_dir_path + file, data_dir_path + file)
     # Compress and move files
     
     was_error = False
     try:
         for source_file_path in files_to_gzip:
             print('GZIP: compressing... ' + source_file_path)
-            filename_subdir = remove_prefix(source_file_path, data_src_dir_path)
+            filename_subdir = remove_prefix(source_file_path, data_temp_dir_path)
             target_file_path = data_dir_path + filename_subdir
             os.makedirs(os.path.dirname(target_file_path), exist_ok=True)
             print('GZIP: Compressed... ' + target_file_path)
@@ -100,6 +152,7 @@ def gzip_webfiles(source, target, env):
         print('GZIP: Failure/Incomplete.\n')
     else:
         print('GZIP: Compressed correctly.\n')
+        shutil.rmtree(data_temp_dir_path)
 
     return