modify script for new way of serving gz files

further improvments, [this] in lambda fcn callback, compressed gz webfiles via streamFile()
2021-06-26 09:33:37 +02:00 · 2021-06-26 09:21:34 +02:00
8 changed files with 98 additions and 55 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 .pio
 .vscode
 compress
 data_gz
 platformio.ini
 include/wifi_credentials.h
 include/*.gz.h
--- a/create_gz_c_arr.py
+++ b/create_gz_c_arr.py
@ -0,0 +1,38 @@
 #!/usr/bin/python3
 import os, gzip
 # https://www.mischianti.org/2020/10/26/web-server-with-esp8266-and-esp32-byte-array-gzipped-pages-and-spiffs-2/
 def convert_to_gzip(src, out, f):
    input_file = f'{src}{f}'
    output_file = f'{out}{f}.gz.h'
    output_charp = f'{f.replace(".", "_")}_gz'
    top = ''
    with open(input_file, 'rb') as f_in:
        gz = gzip.compress(f_in.read())
        gzlen = len(gz)
        top += f'// filename: {f}.gz.h\n'
        top += f'#define {output_charp}_len {gzlen}\n'
        top += f'const char {output_charp}[] = '
        top += '{'
        with open(output_file, 'wb') as f_out:
            for i, b in enumerate(gz):
                if not i%10:
                    top += '\n '
                top += f'0x{b:02X}, '
            top = top[:-2]
            top += '};'
            f_out.write(top.encode(encoding='utf-8'))
 src='data/'
 out='compress/'
 if not 'compress' in os.listdir():
    os.mkdir('compress')
 for f in os.listdir(src):
    convert_to_gzip(src, out, f)
--- a/create_gz_files.py
+++ b/create_gz_files.py
@ -1,38 +1,15 @@
 #!/usr/bin/python3
 import os, gzip
-# https://www.mischianti.org/2020/10/26/web-server-with-esp8266-and-esp32-byte-array-gzipped-pages-and-spiffs-2/
+# https://stackoverflow.com/questions/8156707/gzip-a-file-in-python
-def convert_to_gzip(src, out, f):
+src_dir='data'
-    input_file = f'{src}{f}'
+out_dir='data_gz'
    output_file = f'{out}{f}.gz.h'
    output_charp = f'{f.replace(".", "_")}_gz'
-    top = ''
+if not 'data_gz' in os.listdir():
-    with open(input_file, 'rb') as f_in:
+    os.mkdir('data_gz')
        gz = gzip.compress(f_in.read())
        gzlen = len(gz)
-        top += f'// filename: {f}.gz.h\n'
+for f in os.listdir(src_dir):
-        top += f'#define {output_charp}_len {gzlen}\n'
+    with open(f'{src_dir}/{f}', 'rb') as f_in:
-        top += f'const char {output_charp}[] = '
+        with gzip.open(f'{out_dir}/{f}.gz', 'wb') as f_out:
-        top += '{'
+            f_out.writelines(f_in)
        with open(output_file, 'wb') as f_out:
            for i, b in enumerate(gz):
                if not i%10:
                    top += '\n '
                top += f'0x{b:02X}, '
            top = top[:-2]
            top += '};'
            f_out.write(top.encode(encoding='utf-8'))
 src='data/'
 out='compress/'
 if not 'compress' in os.listdir():
    os.mkdir('compress')
 for f in os.listdir(src):
    convert_to_gzip(src, out, f)
--- a/data/compress.html
+++ b/data/compress.html
@ -0,0 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
  <title>Ich bin ein komrpimierter Test</title>
  I bims der Head
 </head>
 <body>
  I bims der Body
 </body>
 </html>
--- a/data/compress.html.gz
+++ b/data/compress.html.gz
--- a/doku.md
+++ b/doku.md
@ -68,10 +68,15 @@ TODO:
 - maybe compress files ?
-LED Flickering issue
+### LED Flickering issue
 https://github.com/NachtRaveVL/PCA9685-Arduino/issues/15
-
+PlatformIO Library veraltet !!
 PlatformIO Library veraltet
 ### TIMER in OTA unterbrechen !!!!!
 ### further improvments
 with streamFile gzip encoded Files can be sent
 this reduces space on fs !
 new easier script needed to just convert to .gz
 maybe measure timings on ESP
--- a/lib/httpserver/httpserver.h
+++ b/lib/httpserver/httpserver.h
@ -46,6 +46,34 @@ public:
                streamFile(f, cont);
            }
        });
        on("/comp.html", [this]() {
            File f = open("/comp.html.gz");
            if (!f) {
                Serial.println("Failed to open file for reading");
            }
            else
            {
                Serial.println("Streaming /comp.html.gz to client");
                const String cont = "text/html";
                streamFile(f, cont);
            }
        });
        onNotFound([this]() {
            String message = "File Not Found\n\n";
            message += "URI: ";
            message += uri();
            message += "\nMethod: ";
            message += (method() == HTTP_GET) ? "GET" : "POST";
            message += "\nArguments: ";
            message += args();
            message += "\n";
            for (uint8_t i = 0; i < args(); i++) {
                message += " " + argName(i) + ": " + arg(i) + "\n";
            }
            send(404, "text/plain", message);
        });
        if( this->addRootFileHandler() ){
            this->begin();
--- a/src/main.cpp
+++ b/src/main.cpp
@ -34,8 +34,7 @@ void timerCallback(void *pArg)
  stairs.task();
 }
-// HTTP
+// port 80, root directory of server '/'
 void handleNotFound();
 HTTPServer httpServer(80, "/");
 uint32_t _t=0;
@ -44,22 +43,6 @@ uint32_t _t=0;
 // ===============================================
 void handleNotFound() {
  String message = "File Not Found\n\n";
  message += "URI: ";
  message += httpServer.uri();
  message += "\nMethod: ";
  message += (httpServer.method() == HTTP_GET) ? "GET" : "POST";
  message += "\nArguments: ";
  message += httpServer.args();
  message += "\n";
  for (uint8_t i = 0; i < httpServer.args(); i++) {
    message += " " + httpServer.argName(i) + ": " + httpServer.arg(i) + "\n";
  }
  httpServer.send(404, "text/plain", message);
 }
 void setup() {
 #ifdef WITH_DEBUGGING_ON
@ -95,7 +78,6 @@ void setup() {
  ota_setup();
  httpServer.start();
  httpServer.onNotFound(handleNotFound);
  Serial.println("HTTP server started !");
  stairs.setup();
Author	SHA1	Message	Date
Simon Schmidt	4e6445fea8	modify script for new way of serving gz files	2021-06-26 09:33:37 +02:00
Simon Schmidt	10b57ca516	further improvments, [this] in lambda fcn callback, compressed gz webfiles via streamFile()	2021-06-26 09:21:34 +02:00