add missing dep, fix copy

孙圣翔 · 孙圣翔 · commit 28a719f1d117 · 2025-02-11T21:48:46.000+08:00
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 dev:
 	npx nodemon -e "js html py" --exec "uvicorn servefs.main:app --port 7001"
 
-watch:
-	npx nodemon -e "js html py" --exec "poetry run servefs -d ./files --port 7001"
+auth:
+	npx nodemon -e "js html py" --exec "poetry run servefs -b foo:123 -d ./files --port 7001"
 
 reload:
 	uvicorn servefs.main:app --port 7001 --reload
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,6 +32,7 @@ uvicorn = "^0.24.0"
 python-multipart = "^0.0.6"
 typer = "^0.9.0"
 rich = "^13.7.0"
+aiofiles = "^24.1.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"
diff --git a/servefs/__main__.py b/servefs/__main__.py
@@ -0,0 +1,4 @@
+from .cli import app
+
+if __name__ == "__main__":
+    app()
diff --git a/servefs/main.py b/servefs/main.py
@@ -1,15 +1,13 @@
 import os
-import base64
 from pathlib import Path
 
-from fastapi import FastAPI, Request, HTTPException
+from fastapi import FastAPI, HTTPException
 from fastapi.responses import JSONResponse
-from starlette.middleware.base import BaseHTTPMiddleware
 
+from .middleware.auth import AuthManager, AuthMiddleware
 from .routes.api import router as api_router
 from .routes.page import init_static_files
 from .routes.page import router as page_router
-from .middleware.auth import AuthManager, AuthMiddleware
 
 # Get debug mode from environment variable
 DEBUG = os.getenv("SERVEFS_DEBUG", "false").lower() == "true"
diff --git a/servefs/middleware/auth.py b/servefs/middleware/auth.py
@@ -1,10 +1,10 @@
 import base64
-from typing import Optional
+from typing import Optional, Tuple
 
 from fastapi import Request
 from starlette.middleware.base import (BaseHTTPMiddleware,
                                        RequestResponseEndpoint)
-from starlette.responses import Response, JSONResponse
+from starlette.responses import JSONResponse, Response
 
 
 class Permission:
@@ -29,7 +29,7 @@ def configure(self, basic_auth: Optional[str] = None):
         else:
             self.auth_enabled = False
 
-    def check_auth(self, auth_header: Optional[str]) -> tuple[bool, str]:
+    def check_auth(self, auth_header: Optional[str]) -> Tuple[bool, str]:
         """检查认证信息
         返回: (是否认证成功, 权限级别)
         """
diff --git a/servefs/routes/api.py b/servefs/routes/api.py
@@ -1,8 +1,10 @@
 import mimetypes
 import shutil
+from typing import List
 
 from fastapi import APIRouter, File, Form, HTTPException, Request, UploadFile
 from fastapi.responses import JSONResponse
+
 from ..middleware.auth import Permission
 
 router = APIRouter(prefix="/api", tags=["api"])
@@ -171,7 +173,7 @@ async def rename_file(file_path: str, request: Request):
         return {"error": str(e)}
 
 @router.post("/upload/{path:path}")
-async def upload_files(path: str, files: list[UploadFile] = File(...), paths: list[str] = Form(...), request: Request = None):
+async def upload_files(path: str, files: List[UploadFile] = File(...), paths: List[str] = Form(...), request: Request = None):
     """Upload files to the specified path"""
     try:
         target_path = request.app.state.ROOT_DIR / path
diff --git a/servefs/static/index.html b/servefs/static/index.html
@@ -12,6 +12,7 @@
     <script src="https://unpkg.com/element-plus"></script>
     <!-- Import Element Plus Icons -->
     <script src="https://unpkg.com/@element-plus/icons-vue"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.11/clipboard.min.js"></script>
     <link rel="stylesheet" href="/static/css/style.css">
 </head>
 <body>
diff --git a/servefs/static/js/main.js b/servefs/static/js/main.js
@@ -215,13 +215,34 @@ const app = createApp({
 
         // 复制文件链接的方法
         const copyFileLink = async (item) => {
-            try {
-                const fullUrl = new URL(item.download_url, window.location.origin).href;
-                await navigator.clipboard.writeText(fullUrl);
-                // 更新 tooltip 文本
+            const fullUrl = new URL(item.download_url, window.location.origin).href;
+            // 创建一个临时按钮用于复制
+            const button = document.createElement('button');
+            button.setAttribute('data-clipboard-text', fullUrl);
+            document.body.appendChild(button);
+            
+            // 初始化 clipboard.js
+            const clipboard = new ClipboardJS(button);
+            
+            clipboard.on('success', () => {
                 item.tooltipText = 'Copied';
-            } catch (error) {
+                ElMessage.success('Link copied to clipboard');
+                cleanup();
+            });
+            
+            clipboard.on('error', () => {
                 item.tooltipText = 'Failed to copy';
+                ElMessage.error('Failed to copy to clipboard');
+                cleanup();
+            });
+            
+            // 触发复制
+            button.click();
+            
+            // 清理函数
+            function cleanup() {
+                clipboard.destroy();
+                document.body.removeChild(button);
             }
         };
 
@@ -404,6 +425,12 @@ const app = createApp({
             }
         });
 
+        // 处理对话框关闭
+        const handleClose = (done) => {
+            previewDialog.value.visible = false;
+            done();
+        };
+
         // 图片导航相关
         const imageList = ref([]);
         const hasPrevImage = computed(() => previewDialog.value.isImage && previewDialog.value.currentImageIndex > 0);
@@ -518,40 +545,41 @@ const app = createApp({
         };
 
         return {
-            fileList,
+            confirmDelete,
+            copyFileLink,
             currentPath,
-            pathSegments,
-            previewDialog,
             deleteDialog,
-            isDragOver,
-            uploadProgress,
+            downloadFile,
             fileInput,
+            fileList,
             folderInput,
-            handleItemClick,
-            navigateTo,
-            getPathUpTo,
-            saveFile,
-            saveAndClose,
-            showDeleteDialog,
-            confirmDelete,
-            isImageFile,
-            isVideoFile,
             formatFileSize,
-            handleFileSelect,
+            getPathUpTo,
+            handleClose,
             handleFileDrop,
-            downloadFile,
-            previewText,
+            handleImageKeydown,
+            handleItemClick,
+            handleFileSelect,
             hasPrevImage,
             hasNextImage,
-            showPrevImage,
-            showNextImage,
-            handleImageKeydown,
+            hasWritePermission,
             imagePreview,
-            renameFile,
-            copyFileLink,
+            isDragOver,
+            isImageFile,
+            isVideoFile,
+            login,
+            navigateTo,
             onTooltipHide,
-            hasWritePermission,
-            login,  // 暴露登录方法
+            pathSegments,
+            previewDialog,
+            previewText,
+            renameFile,
+            saveAndClose,
+            saveFile,
+            showDeleteDialog,
+            showNextImage,
+            showPrevImage,
+            uploadProgress,
         };
     }
 });

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +from .cli import app
++
 +if __name__ == "__main__":
 +    app()