feat: admin gallery - lightbox with icons, filters by date/event/status; fix: event badges - only current slug shows En cours; fix: archive_all_open on new event; fix: mtime_index uses stem for event photo filter
This commit is contained in:
+17
-10
@@ -44,25 +44,32 @@ async def api_gallery_photos(
|
||||
|
||||
# Filtre par événement si demandé
|
||||
if event_slug:
|
||||
from pathlib import Path
|
||||
from datetime import datetime
|
||||
event_svc = getattr(request.app.state, "event_service", None)
|
||||
if event_svc:
|
||||
ev = await event_svc.get_event_by_slug(event_slug)
|
||||
if ev:
|
||||
started_at = ev["started_at"] or 0.0
|
||||
ended_at = ev["ended_at"] or datetime.now().timestamp()
|
||||
media_dir = Path(cfg.photobooth.media_dir)
|
||||
# Construire un index mtime par nom de fichier
|
||||
# Construire un index mtime par stem ET par nom complet
|
||||
mtime_index: dict[str, float] = {}
|
||||
if media_dir.exists():
|
||||
for f in media_dir.iterdir():
|
||||
mtime_index[f.name] = f.stat().st_mtime
|
||||
# Filtrer les photos par mtime
|
||||
for media_dir_candidate in [
|
||||
Path(cfg.photobooth.media_dir),
|
||||
Path("/home/pi/photobooth-data/media/processed_full"),
|
||||
Path("/home/pi/photobooth-data/media"),
|
||||
]:
|
||||
if media_dir_candidate.exists():
|
||||
for f in media_dir_candidate.iterdir():
|
||||
if f.is_file():
|
||||
mt = f.stat().st_mtime
|
||||
mtime_index[f.name] = mt # uuid.jpg
|
||||
mtime_index[f.stem] = mt # uuid
|
||||
break
|
||||
|
||||
def _in_event(p: dict) -> bool:
|
||||
pid = _get_id(p)
|
||||
mtime = mtime_index.get(pid, mtime_index.get(pid + ".jpg", 0.0))
|
||||
return started_at <= mtime <= ended_at
|
||||
stem = pid.rsplit(".", 1)[0] if "." in pid else pid
|
||||
mt = mtime_index.get(pid) or mtime_index.get(stem) or 0.0
|
||||
return mt > 0 and started_at <= mt <= ended_at
|
||||
photos = [p for p in photos if _in_event(p)]
|
||||
|
||||
total = len(photos)
|
||||
|
||||
Reference in New Issue
Block a user