dtoro
cf7c72d437
Two related fixes:
1. Prevention — scanner now normalizes paths before lookup/insert
in get_or_create_source_root and get_or_create_folder. Trailing
slashes, redundant separators, and `.` segments all collapse to
the same row. _normalize_path uses os.path.normpath; symlinks
are intentionally NOT resolved so mount paths stay intact for
cross-machine portability.
2. Cleanup — new app/services/cleanup.py runs on backend startup
(idempotent) and merges any pre-existing duplicates left over
from older scanner versions:
- Groups source_roots by normalized path. Picks the canonical
row (preferring one with a non-empty name and the earliest
added_at), re-points child Folder rows via UPDATE, and
deletes the duplicates.
- Same for folders, with photo_count as the tiebreaker. Photos
get re-pointed to the canonical folder via UPDATE.
- Recomputes folder.photo_count from the actual non-discarded
photo membership so the sidebar count matches reality.
Wired into main.py's lifespan handler. On the dev DB this merged
the empty-name "/host/Pictures/MulitaTest/" duplicate that was
showing up alongside the canonical MulitaTest source root.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
90 lines
2.7 KiB
Python
90 lines
2.7 KiB
Python
"""
|
|
Mulita - Photo Management Application
|
|
Main FastAPI application entry point
|
|
"""
|
|
from contextlib import asynccontextmanager
|
|
from fastapi import FastAPI
|
|
from fastapi.middleware.cors import CORSMiddleware
|
|
from fastapi.staticfiles import StaticFiles
|
|
import logging
|
|
import os
|
|
|
|
from app.config import settings
|
|
from app.database import init_db
|
|
from app.routers import photos, folders, heaps, tags, discard, library
|
|
from app.services.scanner import start_initial_scan
|
|
from app.services.cleanup import cleanup_data_integrity
|
|
|
|
# Configure logging
|
|
logging.basicConfig(
|
|
level=logging.INFO,
|
|
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
|
|
)
|
|
logger = logging.getLogger(__name__)
|
|
|
|
@asynccontextmanager
|
|
async def lifespan(app: FastAPI):
|
|
"""Manage application lifecycle"""
|
|
logger.info("Starting Mulita application...")
|
|
|
|
# Initialize database
|
|
await init_db()
|
|
|
|
# One-shot cleanup of duplicate source_roots / folders left over from
|
|
# earlier scanner versions that didn't normalize paths. Idempotent.
|
|
try:
|
|
await cleanup_data_integrity()
|
|
except Exception as e:
|
|
logger.error(f"Startup cleanup failed (continuing): {e}")
|
|
|
|
# Start initial scan if configured
|
|
if settings.scanner.initial_scan_on_start:
|
|
logger.info("Starting initial library scan...")
|
|
await start_initial_scan()
|
|
|
|
yield
|
|
|
|
logger.info("Shutting down Mulita application...")
|
|
|
|
# Create FastAPI app
|
|
app = FastAPI(
|
|
title="Mulita Photo Management API",
|
|
description="Self-hosted photo management application inspired by Lightroom",
|
|
version="1.0.0",
|
|
lifespan=lifespan
|
|
)
|
|
|
|
# Configure CORS
|
|
app.add_middleware(
|
|
CORSMiddleware,
|
|
allow_origins=["http://localhost:3000", "http://localhost:5173"], # Frontend URLs
|
|
allow_credentials=True,
|
|
allow_methods=["*"],
|
|
allow_headers=["*"],
|
|
)
|
|
|
|
# Mount static files for serving thumbnails (with X-Accel-Redirect support)
|
|
if os.path.exists("/data/thumbs"):
|
|
app.mount("/thumbs", StaticFiles(directory="/data/thumbs"), name="thumbs")
|
|
|
|
# Include routers
|
|
app.include_router(photos.router, prefix="/api/v1/photos", tags=["photos"])
|
|
app.include_router(folders.router, prefix="/api/v1/folders", tags=["folders"])
|
|
app.include_router(heaps.router, prefix="/api/v1/heaps", tags=["heaps"])
|
|
app.include_router(tags.router, prefix="/api/v1/tags", tags=["tags"])
|
|
app.include_router(discard.router, prefix="/api/v1/discard", tags=["discard"])
|
|
app.include_router(library.router, prefix="/api/v1/library", tags=["library"])
|
|
|
|
@app.get("/")
|
|
async def root():
|
|
"""Root endpoint"""
|
|
return {
|
|
"name": "Mulita Photo Management API",
|
|
"version": "1.0.0",
|
|
"status": "running"
|
|
}
|
|
|
|
@app.get("/health")
|
|
async def health_check():
|
|
"""Health check endpoint for Docker"""
|
|
return {"status": "healthy"} |