dmart 1.4.41.post38__py3-none-any.whl → 1.4.41.post39__py3-none-any.whl

dmart/main.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env -S BACKEND_ENV=config.env python3
 """ Main module """
 import socket
+import mimetypes
 from starlette.datastructures import UploadFile
 from contextlib import asynccontextmanager
 import asyncio
@@ -47,33 +48,50 @@ from pathlib import Path
 class SPAStaticFiles(StaticFiles):
     async def get_response(self, path: str, scope) -> Response:
         if path == "" or path == "index.html":
-            return await self.serve_index()
+            return await self.serve_file("index.html", "text/html")
+            
+        ext = os.path.splitext(path)[1]
+        if ext in [".js", ".css", ".html"]:
+             try:
+                 return await self.serve_file(path)
+             except StarletteHTTPException:
+                 pass
 
         try:
             return await super().get_response(path, scope)
         except StarletteHTTPException as ex:
             if ex.status_code == 404 and path != "index.html" and not os.path.splitext(path)[1]:
                 try:
-                    return await self.serve_index()
+                    return await self.serve_file("index.html", "text/html")
                 except Exception:
                     pass
             raise ex
 
-    async def serve_index(self):
-        index_path = os.path.join(self.directory, "index.html")
-        if not os.path.exists(index_path):
+    async def serve_file(self, path, media_type=None):
+        full_path = os.path.join(self.directory, path)
+        if not os.path.exists(full_path):
              raise StarletteHTTPException(status_code=404)
         
-        with open(index_path, "r") as f:
-            content = f.read()
-            
+        if media_type is None:
+            media_type, _ = mimetypes.guess_type(full_path)
+        
+        try:
+            with open(full_path, "r", encoding="utf-8") as f:
+                content = f.read()
+        except UnicodeDecodeError:
+             return FileResponse(full_path, media_type=media_type)
+
         target_url = settings.cxb_url
         if not target_url.endswith("/"):
             target_url += "/"
             
         content = content.replace("/cxb/", target_url)
         
-        return Response(content, media_type="text/html")
+        cxb_name = settings.cxb_url.strip("/")
+        if cxb_name != "cxb":
+             content = content.replace('"cxb"', f'"{cxb_name}"')
+        
+        return Response(content, media_type=media_type)
 
 
 @asynccontextmanager

{dmart-1.4.41.post38.dist-info → dmart-1.4.41.post39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.41.post38
+Version: 1.4.41.post39
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic

{dmart-1.4.41.post38.dist-info → dmart-1.4.41.post39.dist-info}/RECORD

@@ -14,7 +14,7 @@ dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,5
 dmart/info.json,sha256=1VYb3TIoWeUp8-9IPkNkfqHIb3znxlrd8qa7oBl3_No,123
 dmart/login_creds.sh,sha256=Aht1LwL11uzR13sa8p3BdeUCprIa9tq0vzOoplJjH5U,235
 dmart/login_creds.sh.sample,sha256=Sb43HNNn1g11rrJrtDsPgAxcXu3_wJvdNn--8S62dTE,227
-dmart/main.py,sha256=JyU2UEEoo4H_ag81m1zMJi1elAlzNZLLKDEvtmPcPHc,20719
+dmart/main.py,sha256=nvpxQ8Ht0FCl5opAxDVGpYD7atmfSD-NopeefQKrtrs,21407
 dmart/manifest.sh,sha256=K3mY5MsUlrTyHa5cARslkShegvXh-UeqJcE2UZobdrE,544
 dmart/migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 dmart/password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
@@ -483,8 +483,8 @@ dmart/utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGV
 dmart/utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 dmart/utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 dmart/utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-1.4.41.post38.dist-info/METADATA,sha256=yeMaKBEPAL2egk8-U7R4GgIxQLl4sTt7KQh6MgtWbNA,839
-dmart-1.4.41.post38.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.41.post38.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.41.post38.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.41.post38.dist-info/RECORD,,
+dmart-1.4.41.post39.dist-info/METADATA,sha256=AIuQR0p6jubbZBtSkC-SMphgUZ55uipsvrkzsivFqyM,839
+dmart-1.4.41.post39.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.41.post39.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.41.post39.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.41.post39.dist-info/RECORD,,