moved from regulard expressions to <>

Author: mirkin

gurgleapps_webserver.py

@@ -79,16 +79,13 @@ async def serve_request(self, reader, writer):
                 url = match.group(1)
                 print(url)
             # check if the url is a function route and if so run the function
-            for route in self.function_routes:
-                route_pattern = re.compile(route["route"])
-                match = route_pattern.match(url)
-                if match:
-                    # Extract the parameters from the URL
-                    params = match.groups()
-                    # Pass the parameters to the corresponding function
-                    print("calling function: "+str(route["function"])+", params: "+str(params))
-                    await route["function"](writer, *params)
-                    return
+            path_components = self.get_path_components(url)
+            print("path_components: "+str(path_components))
+            route_function, params = self.match_route(path_components)
+            if route_function:
+                print("calling function: "+str(route_function)+" with params: "+str(params))
+                await route_function(writer, *params)
+                return
             # perhaps it is a file
             file = self.get_file(self.doc_root + url)
             print("file: "+str(file))
@@ -127,3 +124,30 @@ def get_file(self, filename):
             # print the error
             print(e)
             return False
+        
+    def get_path_components(self, path):
+        return tuple(filter(None, path.split('/')))
+    
+    def match_route(self, path_components):
+        for route in self.function_routes:
+            route_pattern = list(filter(None, route["route"].split("/")))
+            print("route_pattern: "+str(route_pattern))
+            if len(route_pattern) != len(path_components):
+                continue
+            match = True
+            params = []
+            for idx, pattern_component in enumerate(route_pattern):
+                print("pattern_component: "+pattern_component+" path_component: "+path_components[idx])
+                if pattern_component.startswith('<') and pattern_component.endswith('>'):
+                    param_value = path_components[idx]
+                    params.append(param_value)
+                else:
+                    if pattern_component != path_components[idx]:
+                        match = False
+                        break
+            if match:
+                return route["function"], params
+        return None, []
+
+
+

main.py

@@ -9,6 +9,17 @@
 status = True
 led = Pin("LED", Pin.OUT)
 
+async def example_func(writer, param1, param2):
+    print("example_func")
+    print("param1: " + param1)
+    print("param2: " + param2)
+    writer.write('HTTP/1.0 200 OK\r\nContent-type: application/json\r\n\r\n')
+    response = json.dumps({"param1": param1, "param2": param2})
+    writer.write(response)
+    await writer.drain()
+    await writer.wait_closed()
+    
+
 async def send_status(writer):
     writer.write('HTTP/1.0 200 OK\r\nContent-type: application/json\r\n\r\n')
     # send boolean status and number frequency
@@ -44,14 +55,22 @@ async def background_task():
             led.toggle()
         else:
             led.off()
+        
 
 async def run():
     await asyncio.gather(main(), background_task())
 
 server = GurgleAppsWebserver(config.WIFI_SSID, config.WIFI_PASSWORD)
-server.add_function_route("^/set-delay/(\d+(?:\.\d+)?)$", set_delay)
+server.add_function_route("/set-delay/<delay>", set_delay)
+server.add_function_route("/stop", stop_flashing)
+server.add_function_route("/start", start_flashing)
+server.add_function_route("/status", send_status)
+server.add_function_route("/example/func/<param1>/<param2>", example_func)
+
+""" server.add_function_route("^/set-delay/(\d+(?:\.\d+)?)$", set_delay) #23.78 2 23 float 
 server.add_function_route("^/stop$", stop_flashing)
 server.add_function_route("^/start$", start_flashing)
-server.add_function_route("^/status$", send_status)
+server.add_function_route("^/status$", send_status) """
+
 
 asyncio.run(run())