dmart 1.4.41.post42__py3-none-any.whl → 1.4.41.post44__py3-none-any.whl

dmart/main.py

@@ -87,7 +87,7 @@ class SPAStaticFiles(StaticFiles):
             
         content = content.replace("/cxb/", target_url)
         
-        cxb_name = settings.cxb_url.rstrip("/")
+        cxb_name = settings.cxb_url.strip("/")
         if cxb_name != "cxb":
              content = content.replace('"cxb"', f'"{cxb_name}"')
         
@@ -561,10 +561,7 @@ if os.path.isdir(cxb_path):
             "cxb_url": settings.cxb_url
         }
 
-    mount_path = settings.cxb_url
-    if not mount_path.endswith("/"):
-        mount_path += "/"
-    app.mount(mount_path, SPAStaticFiles(directory=cxb_path, html=True), name="cxb")
+    app.mount(settings.cxb_url, SPAStaticFiles(directory=cxb_path, html=True), name="cxb")
 
 @app.options("/{x:path}", include_in_schema=False)
 async def myoptions():
@@ -577,8 +574,8 @@ async def myoptions():
 @app.patch("/{x:path}", include_in_schema=False)
 @app.delete("/{x:path}", include_in_schema=False)
 async def catchall(x):
-    if x == settings.cxb_url.strip("/"):
-        return RedirectResponse(f"{settings.cxb_url.rstrip('/')}/")
+    if x.startswith(settings.cxb_url.strip("/")):
+        return RedirectResponse(f"{settings.cxb_url}/")
     raise api.Exception(
         status_code=status.HTTP_404_NOT_FOUND,
         error=api.Error(

{dmart-1.4.41.post42.dist-info → dmart-1.4.41.post44.dist-info}/METADATA

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

{dmart-1.4.41.post42.dist-info → dmart-1.4.41.post44.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=z7r4NtEyYvT0lgATczEKYD4MnNmFevZkU_UjPCMG53M,21502
+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.post42.dist-info/METADATA,sha256=rbhBIqaj-31REIZxH9Ak_-ErdfrnBDdc19C9Jvwy5zk,839
-dmart-1.4.41.post42.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.41.post42.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.41.post42.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.41.post42.dist-info/RECORD,,
+dmart-1.4.41.post44.dist-info/METADATA,sha256=N-2uCKX5lHc1rQrkmYzQfi719gH_aoMhGUqKFaGAi4E,839
+dmart-1.4.41.post44.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.41.post44.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.41.post44.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.41.post44.dist-info/RECORD,,