simple-image-hosting 0.1.2__tar.gz → 0.1.4__tar.gz

{simple_image_hosting-0.1.2/simple_image_hosting.egg-info → simple_image_hosting-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-image-hosting
-Version: 0.1.2
+Version: 0.1.4
 Summary: Simple image hosting
 Author: pkufool
 License: Apache 2.0
@@ -148,10 +148,6 @@ server {
     client_max_body_size 20m;
     proxy_read_timeout 300s;
     proxy_send_timeout 300s;
-
-    # HTML 与 API 响应不建议长期缓存
-    expires -1;
-    add_header Cache-Control "no-store";
   }
 }
 ```

{simple_image_hosting-0.1.2 → simple_image_hosting-0.1.4}/README.md

@@ -129,10 +129,6 @@ server {
     client_max_body_size 20m;
     proxy_read_timeout 300s;
     proxy_send_timeout 300s;
-
-    # HTML 与 API 响应不建议长期缓存
-    expires -1;
-    add_header Cache-Control "no-store";
   }
 }
 ```

{simple_image_hosting-0.1.2 → simple_image_hosting-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simple-image-hosting"
-version = "0.1.2"
+version = "0.1.4"
 description = "Simple image hosting"
 readme = "README.md"
 requires-python = ">=3.10"

{simple_image_hosting-0.1.2 → simple_image_hosting-0.1.4}/simple_image/cli.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 import uvicorn
 
-from .main import _bootstrap_admin, create_app, hash_password
+from .main import create_app, hash_password
 from .models import DEFAULT_COMPRESS_QUALITY, User, create_session_factory
 
 
@@ -100,7 +100,6 @@ def run_serve(args: argparse.Namespace) -> None:
         database_url=args.database_url,
         base_path=args.base_path,
     )
-    _bootstrap_admin(app)
     uvicorn.run(app, host=args.host, port=args.port, reload=args.reload)
 
 

{simple_image_hosting-0.1.2 → simple_image_hosting-0.1.4}/simple_image/main.py

@@ -1,5 +1,6 @@
 import hashlib
 import json
+import mimetypes
 import os
 import secrets
 from datetime import datetime
@@ -9,7 +10,7 @@ from typing import List, Optional
 from dotenv import load_dotenv
 from fastapi import Cookie, Depends, FastAPI, File, Form, Header, HTTPException, Query, Request, Response, UploadFile, status
 from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
-from fastapi.staticfiles import StaticFiles
+
 from pydantic import BaseModel, Field
 from sqlalchemy import and_
 from sqlalchemy.orm import Session
@@ -131,6 +132,19 @@ def image_disk_path(images_dir: Path, image_id: str, extension: str) -> Path:
     return images_dir / f"{generate_uuid_filename(image_id)}.{extension}"
 
 
+def find_image_file(images_dir: Path, image_id: str) -> Optional[Path]:
+    """Locate an image on disk by scanning the directory, skipping the database."""
+    base = images_dir / generate_uuid_filename(image_id)
+    parent = base.parent
+    if not parent.is_dir():
+        return None
+    stem = base.name
+    for entry in parent.iterdir():
+        if entry.is_file() and entry.stem == stem and entry.suffix.lstrip(".") in ALLOWED_EXTENSIONS:
+            return entry
+    return None
+
+
 def normalize_path_prefix(value: Optional[str]) -> str:
     if not value:
         return ""
@@ -286,10 +300,7 @@ def create_app(
         db_path=None if app.state.database_url else app.state.db_path,
     )
 
-    @app.on_event("startup")
-    def _startup_bootstrap_admin() -> None:
-        _bootstrap_admin(app)
-
+    _bootstrap_admin(app)
     _register_routes(app)
     if not resolved_base_path:
         return app
@@ -546,16 +557,21 @@ def _register_routes(app: FastAPI) -> None:
 
 
     @app.get("/image/{image_uuid}", response_class=FileResponse)
-    def get_image(image_uuid: str, db: Session = Depends(get_db)):
-        db_image = db.query(Image).filter(Image.id == image_uuid).first()
-        if not db_image:
+    def get_image(image_uuid: str):
+        image_path = find_image_file(app.state.images_dir, image_uuid)
+        if not image_path:
             raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image not found")
-
-        image_path = image_disk_path(app.state.images_dir, db_image.id, db_image.file_extension)
-        if not image_path.exists():
-            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image file not found")
-        media_type = IMAGE_MEDIA_TYPES.get(normalize_image_extension(db_image.file_extension), "application/octet-stream")
-        return FileResponse(path=image_path, media_type=media_type)
+        ext = normalize_image_extension(image_path.suffix.lstrip("."))
+        media_type = IMAGE_MEDIA_TYPES.get(ext, "application/octet-stream")
+        return FileResponse(path=image_path, media_type=media_type, headers={"Cache-Control": "public, max-age=2592000"})
+        # db_image = db.query(Image).filter(Image.id == image_uuid).first()
+        # if not db_image:
+        #     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image not found")
+        # image_path = image_disk_path(app.state.images_dir, db_image.id, db_image.file_extension)
+        # if not image_path.exists():
+        #     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image file not found")
+        # media_type = IMAGE_MEDIA_TYPES.get(normalize_image_extension(db_image.file_extension), "application/octet-stream")
+        # return FileResponse(path=image_path, media_type=media_type)
 
 
     @app.get("/download/{image_uuid}")
@@ -583,16 +599,11 @@ def _register_routes(app: FastAPI) -> None:
         image_uuid: str,
         size: int = Query(default=160, ge=48, le=512),
         quality: int = Query(default=75, ge=40, le=95),
-        db: Session = Depends(get_db),
     ):
-        db_image = db.query(Image).filter(Image.id == image_uuid).first()
-        if not db_image:
+        image_path = find_image_file(app.state.images_dir, image_uuid)
+        if not image_path:
             raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image not found")
 
-        image_path = image_disk_path(app.state.images_dir, db_image.id, db_image.file_extension)
-        if not image_path.exists():
-            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image file not found")
-
         try:
             with open(image_path, "rb") as source_file:
                 image_data = source_file.read()
@@ -603,8 +614,14 @@ def _register_routes(app: FastAPI) -> None:
         return Response(
             content=thumbnail_data,
             media_type="image/jpeg",
-            headers={"Cache-Control": "public, max-age=86400"},
+            headers={"Cache-Control": "public, max-age=2592000"},
         )
+        # db_image = db.query(Image).filter(Image.id == image_uuid).first()
+        # if not db_image:
+        #     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image not found")
+        # image_path = image_disk_path(app.state.images_dir, db_image.id, db_image.file_extension)
+        # if not image_path.exists():
+        #     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Image file not found")
 
 
     def list_user_images(
@@ -828,7 +845,18 @@ def _register_routes(app: FastAPI) -> None:
     if WEB_DIR.exists():
         static_dir = WEB_DIR / "static"
         if static_dir.exists():
-            app.mount("/static", StaticFiles(directory=str(static_dir)), name="static")
+
+            @app.get("/static/{file_path:path}", include_in_schema=False)
+            def static_file(file_path: str):
+                full_path = static_dir / file_path
+                if not full_path.exists() or not full_path.is_file():
+                    raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
+                media_type = mimetypes.guess_type(str(full_path))[0]
+                return FileResponse(
+                    path=full_path,
+                    media_type=media_type,
+                    headers={"Cache-Control": "public, max-age=604800"},
+                )
 
 
     @app.get("/", include_in_schema=False)

{simple_image_hosting-0.1.2 → simple_image_hosting-0.1.4}/simple_image/web/index.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="simple-image-base-path" content="__SIMPLE_IMAGE_BASE_PATH__" />
   <title>Simple Image</title>
-  <link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/element-plus/2.13.6/index.min.css" />
+  <link rel="stylesheet" href="static/vendor/element-plus.css" />
   <link rel="stylesheet" href="static/styles.css" />
 </head>
 
@@ -403,11 +403,11 @@
     </el-dialog>
   </div>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/vue/3.5.31/vue.global.prod.min.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/element-plus/2.13.6/index.full.min.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/axios/1.14.0/axios.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/heic2any@0.0.4/dist/heic2any.min.js"></script>
-  <script src="https://cdn.bootcdn.net/ajax/libs/blueimp-load-image/2.31.0/load-image.all.min.js"></script>
+  <script src="static/vendor/vue.global.prod.js"></script>
+  <script src="static/vendor/element-plus.full.min.js"></script>
+  <script src="static/vendor/axios.min.js"></script>
+  <script src="static/vendor/heic2any.min.js"></script>
+  <script src="static/vendor/load-image.all.min.js"></script>
   <script src="static/app.js"></script>
 </body>
 

{simple_image_hosting-0.1.2 → simple_image_hosting-0.1.4/simple_image_hosting.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-image-hosting
-Version: 0.1.2
+Version: 0.1.4
 Summary: Simple image hosting
 Author: pkufool
 License: Apache 2.0
@@ -148,10 +148,6 @@ server {
     client_max_body_size 20m;
     proxy_read_timeout 300s;
     proxy_send_timeout 300s;
-
-    # HTML 与 API 响应不建议长期缓存
-    expires -1;
-    add_header Cache-Control "no-store";
   }
 }
 ```