Upload 2 files

app.py

@@ -6,6 +6,8 @@ from datetime import datetime
 from pathlib import Path
 from PIL import Image
 import json
+from fastapi import FastAPI, Response
+from fastapi.responses import FileResponse, JSONResponse
 
 # 环境变量
 ACCESS_PASSWORD = os.environ.get("ACCESS_PASSWORD", "changeme")
@@ -66,13 +68,14 @@ def generate_filename(original_filename):
         ext = ".png"
     return f"{timestamp}_{hash_suffix}{ext}"
 
-def generate_full_url(file_path):
-    """生成完整的图片URL"""
-    relative_path = f"/file={file_path}"
+def generate_full_url(image_id):
+    """生成完整的图片URL（使用专用API端点）"""
+    api_path = f"/api/img/{image_id}"
     if HF_USERNAME and HF_SPACE_NAME:
-        return f"https://{HF_USERNAME}-{HF_SPACE_NAME}.hf.space{relative_path}"
+        return f"https://{HF_USERNAME}-{HF_SPACE_NAME}.hf.space{api_path}"
     else:
-        return relative_path
+        # 返回相对路径，用户访问时会自动补全域名
+        return api_path
 
 def upload_images(images, description, password):
     """批量上传图片"""
@@ -126,7 +129,7 @@ def upload_images(images, description, password):
                 conn.close()
                 
                 # 生成访问 URL
-                full_url = generate_full_url(file_path)
+                full_url = generate_full_url(image_id)
                 
                 results.append({
                     'id': image_id,
@@ -216,7 +219,7 @@ def get_image_list_html(password):
         
         for row in rows:
             upload_time_str = datetime.fromisoformat(row['upload_time']).strftime('%Y-%m-%d %H:%M:%S')
-            full_url = generate_full_url(row['file_path'])
+            full_url = generate_full_url(row['id'])
             
             html += f"""
                 <tr>
@@ -269,7 +272,7 @@ def view_image_by_id(image_id, password):
             return "❌ 图片文件已损坏或丢失！", None, ""
         
         # 生成访问 URL
-        full_url = generate_full_url(file_path)
+        full_url = generate_full_url(row['id'])
         
         info_text = f"""## 📷 图片信息
 
@@ -390,7 +393,7 @@ def export_data(password):
         # 转换为 JSON
         data = []
         for row in rows:
-            full_url = generate_full_url(row['file_path'])
+            full_url = generate_full_url(row['id'])
             data.append({
                 'id': row['id'],
                 'filename': row['filename'],
@@ -414,6 +417,90 @@ def export_data(password):
 # 初始化数据库
 init_success = init_db()
 
+# 创建FastAPI app
+fastapi_app = FastAPI()
+
+# 添加图片访问API端点
+@fastapi_app.get("/api/img/{image_id}")
+async def get_image(image_id: int):
+    """通过ID获取图片"""
+    try:
+        conn = get_db_connection()
+        cursor = conn.cursor()
+        cursor.execute("SELECT * FROM images WHERE id = ?", (image_id,))
+        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"}
+            )
+        
+        # 返回图片文件
+        return FileResponse(
+            file_path,
+            media_type=row['mime_type'],
+            headers={
+                "Cache-Control": "public, max-age=31536000",
+                "Content-Disposition": f'inline; filename="{row["original_filename"]}"'
+            }
+        )
+    
+    except Exception as e:
+        return JSONResponse(
+            status_code=500,
+            content={"error": str(e)}
+        )
+
+# 添加图片信息API端点（可选，用于获取元数据）
+@fastapi_app.get("/api/img/{image_id}/info")
+async def get_image_info(image_id: int, 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 id = ?", (image_id,))
+        row = cursor.fetchone()
+        conn.close()
+        
+        if not row:
+            return JSONResponse(
+                status_code=404,
+                content={"error": "Image not found"}
+            )
+        
+        return JSONResponse(content={
+            "id": row['id'],
+            "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['id'])
+        })
+    
+    except Exception as e:
+        return JSONResponse(
+            status_code=500,
+            content={"error": str(e)}
+        )
+
 # 自定义CSS
 custom_css = """
 .compact-gallery .gallery {
@@ -426,7 +513,7 @@ custom_css = """
 """
 
 # 创建 Gradio 界面
-with gr.Blocks(title="私人图床服务", theme=gr.themes.Soft(), css=custom_css) as app:
+with gr.Blocks(title="私人图床服务", theme=gr.themes.Soft(), css=custom_css) as gradio_app:
     gr.Markdown("# 🖼️ 私人图床服务")
     gr.Markdown("⚠️ 请输入密码以使用此服务 | 支持批量上传 | 图片存储在服务器本地")
     
@@ -619,4 +706,9 @@ with gr.Blocks(title="私人图床服务", theme=gr.themes.Soft(), css=custom_cs
     """)
 
 if __name__ == "__main__":
-    app.launch()
+    # 将Gradio app挂载到FastAPI
+    app = gr.mount_gradio_app(fastapi_app, gradio_app, path="/")
+    
+    # 启动服务
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=7860)

requirements.txt

@@ -1,3 +1,5 @@
 gradio==4.44.0
 Pillow==10.4.0
+uvicorn[standard]>=0.24.0
+fastapi>=0.104.0