Fix multi-shot: countdown entre chaque photo + vider apercu precedent

- Preview relancee avant chaque countdown (l'utilisateur se voit)
- Countdown 3-2-1 entre chaque photo de la serie
- Apercu precedent vide au debut d'une nouvelle session
- Surveillance DSLR pausee pendant les captures

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-04-07 20:06:52 +02:00
parent c2b6b01f4f
commit 8975b0392f
2 changed files with 24 additions and 16 deletions

View File

@@ -33,23 +33,20 @@ log = logging.getLogger("photobooth")
clients_ws: list[WebSocket] = []
capture_en_cours = False
async def surveiller_dslr():
"""Verifie periodiquement si un DSLR est branche et bascule dessus."""
while True:
await asyncio.sleep(5)
await asyncio.sleep(10)
if capture_en_cours:
continue
try:
if camera.mode != "gphoto2" and GPHOTO2_DISPONIBLE:
dslrs = gp.Camera.autodetect()
if len(dslrs) > 0:
log.info(f"DSLR detecte : {dslrs[0][0]}, bascule automatique")
camera.connecter(source="gphoto2")
elif camera.mode == "gphoto2":
# Verifier que le DSLR repond encore
try:
camera.camera.get_summary()
except Exception:
log.warning("DSLR deconnecte, reconnexion...")
camera.connecter()
except Exception:
pass
@@ -100,12 +97,17 @@ async def api_config_update(modifications: dict):
@app.post("/api/capturer")
async def api_capturer():
global capture_en_cours
# Verifier le compteur
etat = compteur_restant()
if etat["actif"] and etat["restantes"] <= 0:
return JSONResponse({"erreur": "Limite de photos atteinte"}, status_code=403)
chemin = camera.capturer()
capture_en_cours = True
try:
chemin = camera.capturer()
finally:
capture_en_cours = False
if chemin is None:
return JSONResponse({"erreur": "Echec capture"}, status_code=500)
nom = chemin.name