add video preview, image left,right arrow

Author: 孙圣翔

MANIFEST.in

@@ -0,0 +1,6 @@
+recursive-include servefs/static *
+global-exclude *.pyc
+global-exclude *.pyo
+global-exclude *.pyd
+global-exclude __pycache__
+global-exclude .git*

Makefile

@@ -1,2 +1,9 @@
 dev:
 	npx nodemon -e "js html py" --exec "uvicorn servefs.main:app --port 7001"
+
+reload:
+	uvicorn servefs.main:app --port 7001 --reload
+
+
+format:
+	poetry run isort .

pyproject.toml

@@ -5,6 +5,7 @@ description = "A modern HTTP file server with web UI"
 authors = ["Your Name <your.email@example.com>"]
 readme = "README.md"
 packages = [{include = "servefs"}]
+include = ["servefs/static/**/*"]
 homepage = "https://github.com/codeskyblue/servefs"
 classifiers = [
     "Development Status :: 4 - Beta",

servefs/routes/page.py

@@ -1,15 +1,91 @@
 import mimetypes
+import os
 from pathlib import Path
+from typing import AsyncIterator, Union
 
+import aiofiles
 from fastapi import APIRouter, HTTPException, Request
-from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.responses import FileResponse, HTMLResponse, StreamingResponse
 from fastapi.staticfiles import StaticFiles
 
 # Get current module path
 PACKAGE_DIR = Path(__file__).parent.parent
 
 router = APIRouter(tags=["page"])
 
+async def stream_file_range(file_path: Path, start: int, end: int) -> AsyncIterator[bytes]:
+    """以块的方式流式读取文件"""
+    chunk_size = 4 * 1024 * 1024  # 4MB 块大小，提高传输速度
+    async with aiofiles.open(file_path, mode="rb") as f:
+        await f.seek(start)
+        bytes_remaining = end - start + 1
+        while bytes_remaining > 0:
+            chunk = await f.read(min(chunk_size, bytes_remaining))
+            if not chunk:
+                break
+            bytes_remaining -= len(chunk)
+            yield chunk
+
+async def handle_file_request(
+    file_path: Path,
+    range_header: str = None,
+    as_attachment: bool = False
+) -> Union[FileResponse, StreamingResponse]:
+    """处理文件请求的通用函数"""
+    try:
+        if not file_path.exists() or not file_path.is_file():
+            raise HTTPException(status_code=404, detail="File not found")
+            
+        file_size = os.path.getsize(file_path)
+        mime_type = mimetypes.guess_type(str(file_path))[0] or "application/octet-stream"
+        
+        # 如果是下载请求，强制使用 application/octet-stream
+        if as_attachment:
+            mime_type = "application/octet-stream"
+            
+        # 如果没有 Range 头，直接返回完整文件
+        if not range_header:
+            headers = {}
+            if as_attachment:
+                headers["Content-Disposition"] = f'attachment; filename="{file_path.name}"'
+            else:
+                headers["Content-Disposition"] = f'inline; filename="{file_path.name}"'
+                
+            return FileResponse(
+                path=file_path,
+                media_type=mime_type,
+                headers=headers
+            )
+            
+        try:
+            # 解析 Range 头
+            start, end = range_header.replace("bytes=", "").split("-")
+            start = int(start) if start else 0
+            end = min(int(end), file_size - 1) if end else file_size - 1
+            
+            if start >= file_size:
+                raise HTTPException(status_code=416, detail="Range not satisfiable")
+                
+            headers = {
+                "Content-Range": f"bytes {start}-{end}/{file_size}",
+                "Accept-Ranges": "bytes",
+                "Content-Length": str(end - start + 1),
+                "Content-Type": mime_type,
+                "Content-Disposition": "attachment" if as_attachment else "inline" + f'; filename="{file_path.name}"'
+            }
+            
+            return StreamingResponse(
+                stream_file_range(file_path, start, end),
+                status_code=206,
+                headers=headers
+            )
+            
+        except (ValueError, IndexError):
+            raise HTTPException(status_code=416, detail="Invalid range header")
+            
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
 # Mount static files for direct access to static assets
 def init_static_files(app):
     """Initialize static file serving"""
@@ -29,38 +105,30 @@ async def serve_blob_path(path: str):
 
 @router.get("/raw/{file_path:path}")
 async def get_raw_file(file_path: str, request: Request):
-    """Get raw file content"""
+    """Get raw file content with Range support"""
     try:
         file_path = request.app.state.ROOT_DIR / file_path
-        if not file_path.exists() or not file_path.is_file():
-            raise HTTPException(status_code=404, detail="File not found")
-        
-        # Get file MIME type
-        mime_type, _ = mimetypes.guess_type(str(file_path))
-        if mime_type is None:
-            mime_type = "application/octet-stream"
-            
-        return FileResponse(
-            path=file_path,
-            media_type=mime_type,
-            filename=file_path.name
+        return await handle_file_request(
+            file_path=file_path,
+            range_header=request.headers.get("range"),
+            as_attachment=False
         )
     except Exception as e:
+        if isinstance(e, HTTPException):
+            raise e
         raise HTTPException(status_code=500, detail=str(e))
 
-
 @router.get("/download/{file_path:path}")
 async def download_file(file_path: str, request: Request):
-    """Download file"""
+    """Download file with Range support"""
     try:
         file_path = request.app.state.ROOT_DIR / file_path
-        if not file_path.exists() or not file_path.is_file():
-            return {"error": "File not found"}
-        
-        return FileResponse(
-            file_path,
-            filename=file_path.name,
-            media_type="application/octet-stream"
+        return await handle_file_request(
+            file_path=file_path,
+            range_header=request.headers.get("range"),
+            as_attachment=True
         )
     except Exception as e:
-        return {"error": str(e)}
+        if isinstance(e, HTTPException):
+            raise e
+        raise HTTPException(status_code=500, detail=str(e))