Ned/reduce memory usage

.flake8

@@ -48,6 +48,8 @@ exclude =
     R.py
     # external packages added to this package to be independent
     utemplate
+    # result of pre-compiling templates
+    templates/*_tpl.py
 
 # Provide a comma-separated list of glob patterns to add to the list of excluded ones.
 # extend-exclude =

.gitignore

@@ -150,3 +150,9 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+# compiled templates
+templates/*_tpl.py
+
+# VS Code settings
+.vscode

changelog.md

@@ -20,6 +20,19 @@ r"^\#\# \[\d{1,}[.]\d{1,}[.]\d{1,}\] \- \d{4}\-\d{2}-\d{2}$"
 <!-- ## [Unreleased] -->
 
 ## Released
+## [1.13.0] - 2023-06-12
+### Added
+  - Support for frozen, pre-compiled templates
+  - Support for frozen static resources
+  - Garbage collect before every request
+  - Added aiorepl to run() (if you have aiorepl)
+### Changed
+  - Rendering network list using included template rather than string appending
+  - Simplified static file serving
+  - Changed spelling of Passwort to Password throughout
+  - Moved favicon.ico under static/ico to avoid special-case handling
+### Removed
+  - Removed two unused templates
 ## [1.12.0] - 2023-06-12
 ### Added
 - Instructions for using this package `boot.py` and `main.py` files

package.json

@@ -57,8 +57,8 @@
             "github:brainelectronics/Micropython-ESP-WiFi-Manager/static/css/bootstrap.min.css.gz"
         ],
         [
-            "static/favicon.ico",
-            "github:brainelectronics/Micropython-ESP-WiFi-Manager/static/favicon.ico"
+            "static/ico/favicon.ico",
+            "github:brainelectronics/Micropython-ESP-WiFi-Manager/static/ico/favicon.ico"
         ],
         [
             "static/js/toast.js",
@@ -79,10 +79,14 @@
         [
             "templates/select.tpl",
             "github:brainelectronics/Micropython-ESP-WiFi-Manager/templates/select.tpl"
+        ],
+        [
+            "templates/render_nets.tpl",
+            "github:brainelectronics/Micropython-ESP-WiFi-Manager/templates/render_nets.tpl"
         ]
     ],
     "deps": [
         ["github:brainelectronics/micropython-modules", "develop"]
     ],
     "version": "1.11.0"
-}
+}

simulation/templates/select.tpl.html

@@ -45,7 +45,7 @@ <h4>Select a WiFi network</h4>
         </div>
         <input type="text" class="w-100" name="ssid" id="ssid" placeholder="Custom Network Name">
         <br>
-        <input type="password" class="w-100" name="password" id="password" placeholder="Passwort" onkeydown="if(event.keyCode==13)document.getElementById('save').click()"/>
+        <input type="password" class="w-100" name="password" id="password" placeholder="Password" onkeydown="if(event.keyCode==13)document.getElementById('save').click()"/>
         <div class="list-group">
           <button type="submit" id="save" value="Save" class="btn btn-lg btn-primary list-group-item active">Submit</button>
           <form>
@@ -97,4 +97,4 @@ <h4>Select a WiFi network</h4>
     }
   </script>
 </body>
-</html>
+</html>

simulation/templates/wifi_select_loader.tpl.html

@@ -22,7 +22,7 @@ <h4>Select a WiFi network</h4>
           {% endfor %}
         </select>
         <input type="text" name="ssid" id="ssid" placeholder="Custom Network Name">
-        <input type="password" name="password" id="password" placeholder="Passwort" onkeydown="if(event.keyCode==13)document.getElementById('save').click()"/>
+        <input type="password" name="password" id="password" placeholder="Password" onkeydown="if(event.keyCode==13)document.getElementById('save').click()"/>
         <input type="submit" class="button" id="save" value="Save">
       </form>
       <form>

templates/render_nets.tpl

@@ -0,0 +1,17 @@
+{% args content %}
+        {% if len(content) %}
+          {% for net in content %}
+            <input class="list-group-item-check" type="radio" name="bssid" id="{{net['bssid']}}" value="{{net['bssid']}}" 
+              onclick="remember_selected_element(this)" {{net['state']}}>
+            <label class="list-group-item py-3" for="{{net['bssid']}}">
+              {{net['ssid']}}
+              <span class="d-block small opacity-50">
+                Signal quality {{net['quality']}}&#37;, BSSID {{net['bssid']}}
+              </span>
+            </label>
+          {% endfor %}
+        {% else %}
+          <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+          </div>
+        {% endif %}

templates/select.tpl

@@ -46,11 +46,11 @@
     <div class="list-group list-group-checkable">
       <form action="save_wifi_config" method="post" id="save_wifi_config_form">
         <div name="wifi_network" id="wifi_network">
-          {{ content }}
+        {% include "render_nets.tpl" content %}
         </div>
         <input type="text" class="w-100" name="ssid" id="ssid" placeholder="Custom Network Name">
         <br>
-        <input type="password" class="w-100" name="password" id="password" placeholder="Passwort" onkeydown="if(event.keyCode==13)document.getElementById('save').click()"/>
+        <input type="password" class="w-100" name="password" id="password" placeholder="Password" onkeydown="if(event.keyCode==13)document.getElementById('save').click()"/>
         <div class="list-group">
           <button type="submit" id="save" value="Save" class="btn btn-lg btn-primary list-group-item active">Submit</button>
           <form>
@@ -95,4 +95,4 @@
     }
   </script>
 </body>
-</html>
+</html>