Refactor and added trailing / for directories

Author: michalpokusa

examples/httpserver_templates.py

@@ -25,33 +25,35 @@
     raise OSError("Please create a /static directory on the CIRCUITPY drive.") from e
 
 
+def is_file(path: str):
+    return (os.stat(path.rstrip("/"))[0] & 0b_11110000_00000000) == 0b_10000000_00000000
+
+
 @server.route("/")
 def directory_listing(request: Request):
     path = request.query_params.get("path", "").replace("%20", " ")
 
     # Preventing path traversal by removing all ../ from path
     path = re.sub(r"\/(\.\.)\/|\/(\.\.)|(\.\.)\/", "/", path).strip("/")
 
-    if path:
-        is_file = (
-            os.stat(f"/static/{path}")[0] & 0b_11110000_00000000
-        ) == 0b_10000000_00000000
-    else:
-        is_file = False
-
     # If path is a file, return it as a file response
-    if is_file:
+    if is_file(f"/static/{path}"):
         return FileResponse(request, path)
 
+    items = sorted(
+        [
+            item + ("" if is_file(f"/static/{path}/{item}") else "/")
+            for item in os.listdir(f"/static/{path}")
+        ],
+        key=lambda item: not item.endswith("/"),
+    )
+
     # Otherwise, return a directory listing
     return Response(
         request,
         render_template(
             "directory_listing.tpl.html",
-            context={
-                "path": path,
-                "items": os.listdir(f"/static/{path}"),
-            },
+            context={"path": path, "items": items},
         ),
         content_type="text/html",
     )