diff --git a/app/database.py b/app/database.py index dc51e88..7e989f3 100644 --- a/app/database.py +++ b/app/database.py @@ -23,6 +23,13 @@ def init_db(): processed_at INTEGER ) """) + conn.execute(""" + CREATE TABLE IF NOT EXISTS whitelist ( + plate TEXT PRIMARY KEY, + label TEXT, + added_at INTEGER + ) + """) # Migrate existing DBs that lack clip_path try: conn.execute("ALTER TABLE events ADD COLUMN clip_path TEXT") @@ -126,3 +133,57 @@ def get_cameras(): rows = conn.execute("SELECT DISTINCT camera FROM events ORDER BY camera").fetchall() conn.close() return [r[0] for r in rows] + + +# ── Whitelist ───────────────────────────────────────────────────────────────── + +def get_whitelist() -> list[dict]: + conn = get_db() + rows = conn.execute("SELECT plate, label, added_at FROM whitelist ORDER BY added_at DESC").fetchall() + conn.close() + return [dict(r) for r in rows] + + +def is_whitelisted(plate: str) -> bool: + if not plate: + return False + conn = get_db() + row = conn.execute("SELECT plate FROM whitelist WHERE plate = ?", (plate.upper().strip(),)).fetchone() + conn.close() + return row is not None + + +def add_to_whitelist(plate: str, label: str = ""): + import time + conn = get_db() + conn.execute( + "INSERT OR REPLACE INTO whitelist (plate, label, added_at) VALUES (?, ?, ?)", + (plate.upper().strip(), label.strip(), int(time.time())), + ) + conn.commit() + conn.close() + + +def remove_from_whitelist(plate: str): + conn = get_db() + conn.execute("DELETE FROM whitelist WHERE plate = ?", (plate.upper().strip(),)) + conn.commit() + conn.close() + + +# ── Stats ───────────────────────────────────────────────────────────────────── + +def get_plate_stats() -> list[dict]: + conn = get_db() + rows = conn.execute(""" + SELECT plate, + COUNT(*) AS count, + MIN(start_time) AS first_seen, + MAX(start_time) AS last_seen + FROM events + WHERE plate IS NOT NULL AND plate != '' + GROUP BY plate + ORDER BY count DESC + """).fetchall() + conn.close() + return [dict(r) for r in rows] diff --git a/app/main.py b/app/main.py index 27a4c74..e2b1e5c 100644 --- a/app/main.py +++ b/app/main.py @@ -109,6 +109,7 @@ async def event_detail(request: Request, event_id: str): plate_ocr_abs = os.path.join(event_dir, "plate_ocr.jpg") plate_ocr = f"events/{event_id}/plate_ocr.jpg" if os.path.exists(plate_ocr_abs) else None + is_wl = database.is_whitelisted(ev.get("plate") or "") return templates.TemplateResponse("event_detail.html", { "request": request, "ev": ev, @@ -120,6 +121,7 @@ async def event_detail(request: Request, event_id: str): "capture_duration": CAPTURE_DURATION, "capture_fps": CAPTURE_FPS, "capture_total": CAPTURE_DURATION * CAPTURE_FPS, + "is_whitelisted": is_wl, }) @@ -186,6 +188,39 @@ async def upload_clip(file: UploadFile = File(...)): return RedirectResponse(f"/event/{event_id}", status_code=303) +@app.get("/stats", response_class=HTMLResponse) +async def stats_page(request: Request): + rows = database.get_plate_stats() + whitelist_plates = {w["plate"] for w in database.get_whitelist()} + for r in rows: + r["first_str"] = ts_to_str(r["first_seen"]) + r["last_str"] = ts_to_str(r["last_seen"]) + r["whitelisted"] = r["plate"] in whitelist_plates + return templates.TemplateResponse("stats.html", {"request": request, "stats": rows}) + + +@app.get("/whitelist", response_class=HTMLResponse) +async def whitelist_page(request: Request): + entries = database.get_whitelist() + for e in entries: + e["added_str"] = ts_to_str(e["added_at"]) + return templates.TemplateResponse("whitelist.html", {"request": request, "entries": entries}) + + +@app.post("/whitelist/add") +async def whitelist_add(plate: str = Form(""), label: str = Form(""), back: str = Form("")): + plate = plate.strip().upper() + if plate: + database.add_to_whitelist(plate, label) + return RedirectResponse(back or "/whitelist", status_code=303) + + +@app.post("/whitelist/remove/{plate}") +async def whitelist_remove(plate: str, back: str = Form("")): + database.remove_from_whitelist(plate) + return RedirectResponse(back or "/whitelist", status_code=303) + + @app.get("/health") async def health(): return {"status": "ok"} diff --git a/app/templates/event_detail.html b/app/templates/event_detail.html index e44b3af..4ccd593 100644 --- a/app/templates/event_detail.html +++ b/app/templates/event_detail.html @@ -35,6 +35,20 @@ ← Retour 🚗 {{ ev.time_str }} + {% if ev.plate %} + {% if is_whitelisted %} +
+ + +
+ {% else %} +
+ + + +
+ {% endif %} + {% endif %}
diff --git a/app/templates/index.html b/app/templates/index.html index a270bf0..eeddaf6 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -33,6 +33,8 @@
{{ total }} passage{{ 's' if total != 1 else '' }} + 📊 Stats + 🛡 Whitelist
diff --git a/app/templates/stats.html b/app/templates/stats.html new file mode 100644 index 0000000..33c350a --- /dev/null +++ b/app/templates/stats.html @@ -0,0 +1,89 @@ + + + + + + CamWatch — Statistiques + + + + + +
+ ← Retour + 📊 + Statistiques de passages + 🛡 Liste blanche +
+ +
+ + {% if not stats %} +
+
📊
+

Aucune plaque enregistrée pour le moment.

+
+ {% else %} +
+ + + + + + + + + + + + + {% for row in stats %} + + + + + + + + + {% endfor %} + +
#PlaquePassages
{{ loop.index }} +
+ {{ row.plate }} + {% if row.whitelisted %} + ✓ connu + {% endif %} +
+ 		+ {{ row.count }} + fois + + {% if row.whitelisted %} + + + + + {% else %} +
+ + + +
+ {% endif %} +
+
+ {% endif %} + +
+ + diff --git a/app/templates/whitelist.html b/app/templates/whitelist.html new file mode 100644 index 0000000..028cf35 --- /dev/null +++ b/app/templates/whitelist.html @@ -0,0 +1,82 @@ + + + + + + CamWatch — Liste blanche + + + + + +
+ ← Retour + 🛡 + Liste blanche + 📊 Stats +
+ +
+ + +
+

Les plaques listées ici sont ignorées automatiquement — aucun événement ni fichier ne sera créé lors de leur passage.

+
+ + + + +
+
+ + + {% if not entries %} +
+
🛡
+

Aucune plaque en liste blanche.

+
+ {% else %} +
+ + + + + + + + + + + {% for e in entries %} + + + + + + + {% endfor %} + +
PlaqueLibellé
+ {{ e.plate }} + {{ e.label or '—' }} +
+ + +
+
+
+ {% endif %} + +
+ + diff --git a/app/watcher.py b/app/watcher.py index dc2a830..fc99bdb 100644 --- a/app/watcher.py +++ b/app/watcher.py @@ -255,6 +255,12 @@ def _process_clip(event_id: str, event_dir: str, clip_path: str, camera_name: st snapshot_path = os.path.join(SNAPSHOTS_DIR, snapshot_file) cv2.imwrite(snapshot_path, best_frame, [cv2.IMWRITE_JPEG_QUALITY, 90]) + from database import is_whitelisted + if plate and is_whitelisted(plate): + log.info(f"Skipped (whitelist): {plate} — event {event_id[:8]}") + shutil.rmtree(event_dir, ignore_errors=True) + return None + hex_color, color_name = _vehicle_color(best_frame, plate_bbox) insert_event( event_id, camera_name, int(time.time()),