Upload 2 files

app.py

@@ -10,8 +10,7 @@ import uuid
 import threading
 import time
 import random
-from fastapi.responses import FileResponse, JSONResponse
-from starlette.responses import RedirectResponse
+import shutil
 
 # 环境变量
 ACCESS_PASSWORD = os.environ.get("ACCESS_PASSWORD", "changeme")
@@ -20,10 +19,12 @@ HF_SPACE_NAME = os.environ.get("HF_SPACE_NAME", "")
 
 # 文件存储路径
 IMAGE_DIR = Path("uploaded_images")
+PUBLIC_DIR = Path("public")  # 公共访问目录，使用hash作为文件名
 DB_PATH = "image_database.db"
 
 # 创建图片存储目录
 IMAGE_DIR.mkdir(exist_ok=True)
+PUBLIC_DIR.mkdir(exist_ok=True)
 
 def init_db():
     """初始化数据库"""
@@ -83,12 +84,29 @@ def generate_image_hash():
     return uuid.uuid4().hex[:12]
 
 def generate_full_url(image_hash):
-    """生成完整的图片URL（使用API端点，会重定向到实际文件）"""
-    api_path = f"/api/img/{image_hash}"
-    if HF_USERNAME and HF_SPACE_NAME:
-        return f"https://{HF_USERNAME}-{HF_SPACE_NAME}.hf.space{api_path}"
-    else:
-        return api_path
+    """生成完整的图片URL（直接访问public目录）"""
+    # 查找对应的文件扩展名
+    try:
+        conn = get_db_connection()
+        cursor = conn.cursor()
+        cursor.execute("SELECT file_path FROM images WHERE hash = ?", (image_hash,))
+        row = cursor.fetchone()
+        conn.close()
+        
+        if row:
+            ext = Path(row['file_path']).suffix
+            public_path = PUBLIC_DIR / f"{image_hash}{ext}"
+            file_path = f"/file={public_path}"
+            
+            if HF_USERNAME and HF_SPACE_NAME:
+                return f"https://{HF_USERNAME}-{HF_SPACE_NAME}.hf.space{file_path}"
+            else:
+                return file_path
+    except:
+        pass
+    
+    # 默认返回
+    return f"/file=public/{image_hash}"
 
 def keep_alive():
     """防止系统休眠的后台线程"""
@@ -131,6 +149,11 @@ def upload_images(images, description, password):
                 # 保存图片
                 img.save(file_path, quality=95, optimize=True)
                 
+                # 在public目录创建副本，文件名为hash
+                ext = file_path.suffix
+                public_file = PUBLIC_DIR / f"{image_hash}{ext}"
+                shutil.copy2(file_path, public_file)
+                
                 # 获取文件信息
                 file_size = file_path.stat().st_size
                 mime_type = f"image/{file_path.suffix[1:]}"
@@ -338,12 +361,18 @@ def delete_image_by_hash(image_hash, password):
         file_path = Path(row['file_path'])
         original_filename = row['original_filename']
         
+        # 删除public目录的副本
+        ext = file_path.suffix
+        public_file = PUBLIC_DIR / f"{image_hash}{ext}"
+        if public_file.exists():
+            public_file.unlink()
+        
         # 删除数据库记录
         cursor.execute("DELETE FROM images WHERE hash = ?", (image_hash,))
         conn.commit()
         conn.close()
         
-        # 删除文件
+        # 删除原始文件
         if file_path.exists():
             file_path.unlink()
         
@@ -540,79 +569,6 @@ with gr.Blocks(title="My图床", theme=gr.themes.Soft(), css=custom_css) as grad
                     outputs=[export_output, export_file_output]
                 )
 
-# 在Gradio的底层FastAPI上添加自定义API路由
-@gradio_app.app.get("/api/img/{image_hash}")
-async def get_image(image_hash: str):
-    """通过hash重定向到图片文件"""
-    try:
-        conn = get_db_connection()
-        cursor = conn.cursor()
-        cursor.execute("SELECT file_path FROM images WHERE hash = ?", (image_hash,))
-        row = cursor.fetchone()
-        conn.close()
-        
-        if not row:
-            return JSONResponse(
-                status_code=404,
-                content={"error": "Image not found"}
-            )
-        
-        file_path = Path(row['file_path'])
-        
-        if not file_path.exists():
-            return JSONResponse(
-                status_code=404,
-                content={"error": "Image file not found"}
-            )
-        
-        # 重定向到Gradio的文件服务路径
-        return RedirectResponse(url=f"/file={file_path}", status_code=302)
-    
-    except Exception as e:
-        return JSONResponse(
-            status_code=500,
-            content={"error": str(e)}
-        )
-
-@gradio_app.app.get("/api/img/{image_hash}/info")
-async def get_image_info(image_hash: str, password: str = None):
-    """获取图片信息（需要密码）"""
-    if not password or not check_password(password):
-        return JSONResponse(
-            status_code=401,
-            content={"error": "Unauthorized"}
-        )
-    
-    try:
-        conn = get_db_connection()
-        cursor = conn.cursor()
-        cursor.execute("SELECT * FROM images WHERE hash = ?", (image_hash,))
-        row = cursor.fetchone()
-        conn.close()
-        
-        if not row:
-            return JSONResponse(
-                status_code=404,
-                content={"error": "Image not found"}
-            )
-        
-        return JSONResponse(content={
-            "hash": row['hash'],
-            "filename": row['filename'],
-            "original_filename": row['original_filename'],
-            "file_size": row['file_size'],
-            "mime_type": row['mime_type'],
-            "upload_time": row['upload_time'],
-            "description": row['description'],
-            "url": generate_full_url(row['hash'])
-        })
-    
-    except Exception as e:
-        return JSONResponse(
-            status_code=500,
-            content={"error": str(e)}
-        )
-
 if __name__ == "__main__":
     # 直接启动Gradio，它会使用自己的FastAPI实例
     gradio_app.launch(server_name="0.0.0.0", server_port=7860)