fix #125

xaoyaoo · Aug 21, 2024 · d379e4e · d379e4e
1 parent cf92003
commit d379e4e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/pywxdump/__init__.py b/pywxdump/__init__.py
@@ -5,7 +5,7 @@
 # Author:       xaoyaoo
 # Date:         2023/10/14
 # -------------------------------------------------------------------------------
-__version__ = "3.1.27"
+__version__ = "3.1.28"
 
 import os, json
 

diff --git a/pywxdump/api/__init__.py b/pywxdump/api/__init__.py
@@ -10,12 +10,13 @@
 import sys
 import time
 import uvicorn
+import mimetypes
 
 from fastapi import FastAPI, Request, Path, Query
 from fastapi.staticfiles import StaticFiles
 from fastapi.exceptions import RequestValidationError
 from starlette.middleware.cors import CORSMiddleware
-from starlette.responses import RedirectResponse
+from starlette.responses import RedirectResponse, FileResponse
 
 from .utils import gc, is_port_in_use, server_loger
 from .rjson import ReJson
@@ -32,6 +33,8 @@ def gen_fastapi_app():
                   license_info={"name": "MIT License",
                                 "url": "https://github.com/xaoyaoo/PyWxDump/blob/master/LICENSE"})
 
+    web_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "ui", "web")  # web文件夹路径
+
     # 跨域
     origins = [
         "http://localhost:5000",
@@ -48,11 +51,13 @@ def gen_fastapi_app():
         allow_headers=["*"],  # 允许所有头
     )
 
+    # 错误处理
     @app.exception_handler(RequestValidationError)
     async def request_validation_exception_handler(request: Request, exc: RequestValidationError):
         # print(request.body)
         return ReJson(1002, {"detail": exc.errors()})
 
+    # 首页
     @app.get("/")
     @app.get("/index.html")
     async def index():
@@ -63,10 +68,29 @@ async def index():
     app.include_router(rs_api, prefix='/api/rs', tags=['远程api'])
     app.include_router(ls_api, prefix='/api/ls', tags=['本地api'])
 
+    # 根据文件类型，设置mime_type，返回文件
+    @app.get("/s/{filename:path}")
+    async def serve_file(filename: str):
+        # 构建完整的文件路径
+        file_path = os.path.join(web_path, filename)
+
+        # 检查文件是否存在
+        if os.path.isfile(file_path):
+            # 获取文件 MIME 类型
+            mime_type, _ = mimetypes.guess_type(file_path)
+            # 如果 MIME 类型为空，则默认为 application/octet-stream
+            if mime_type is None:
+                mime_type = "application/octet-stream"
+
+            # 返回文件
+            return FileResponse(file_path, media_type=mime_type)
+
+        # 如果文件不存在，返回 404
+        return {"detail": "Not Found"}, 404
+
     # 静态文件挂载
-    web_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "ui", "web")
-    if os.path.exists(os.path.join(web_path, "index.html")):
-        app.mount("/s", StaticFiles(directory=web_path), name="static")
+    # if os.path.exists(os.path.join(web_path, "index.html")):
+    #     app.mount("/s", StaticFiles(directory=web_path), name="static")
 
     return app