Media-Previews: _preview.jpg bei Upload, alle Listenansichten — SW by-v437, APP_VER 416
- media_utils: generate_preview() (Pillow, max 800px, JPEG q72) + preview_url_from() - diary.py: Preview beim Bild-Upload, preview_url in media_items + cover_preview_url in Kalender-, Karten- und Listenabfragen - forum.py: Preview in _save_upload(), foto_preview_url in Thread-Listen - Frontend diary.js: cover_preview_url in Listenansicht, Mediengalerie, Kalender, Karten-Marker + Popup; onerror-Fallback auf Original - Frontend forum.js: foto_preview_url in Thread-Karten-Thumbnails - Admin: 'Previews generieren (Bestand)' Button → POST /admin/media/generate-previews
This commit is contained in:
parent
faf433f4cf
commit
5bd07d9598
9 changed files with 145 additions and 17 deletions
|
|
@ -801,3 +801,47 @@ async def admin_delete_zuchter(zuchter_id: int, user=Depends(require_mod)):
|
|||
raise HTTPException(404, "Züchter nicht gefunden.")
|
||||
conn.execute("DELETE FROM wiki_zuchter WHERE id=?", (zuchter_id,))
|
||||
_audit(conn, user, "wiki_zuchter_delete", f"zuchter:{zuchter_id}")
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# POST /api/admin/media/generate-previews — Previews für Bestandsmedien
|
||||
# ------------------------------------------------------------------
|
||||
@router.post("/media/generate-previews")
|
||||
async def generate_media_previews(user=Depends(require_admin)):
|
||||
"""Generiert fehlende _preview.jpg für alle Bilder in /data/media."""
|
||||
import io as _io
|
||||
from media_utils import generate_preview, _PREVIEW_EXTS
|
||||
MEDIA_DIR = os.getenv("MEDIA_DIR", "/data/media")
|
||||
|
||||
generated = 0
|
||||
skipped = 0
|
||||
errors = 0
|
||||
|
||||
for subdir in ("diary", "forum"):
|
||||
folder = os.path.join(MEDIA_DIR, subdir)
|
||||
if not os.path.isdir(folder):
|
||||
continue
|
||||
for fname in os.listdir(folder):
|
||||
# Nur Original-Bilder (keine _preview, _thumb, Videos, PDFs)
|
||||
low = fname.lower()
|
||||
if "_preview" in low or "_thumb" in low:
|
||||
continue
|
||||
base, ext = os.path.splitext(fname)
|
||||
if ext.lower() not in _PREVIEW_EXTS:
|
||||
continue
|
||||
preview_path = os.path.join(folder, base + "_preview.jpg")
|
||||
if os.path.exists(preview_path):
|
||||
skipped += 1
|
||||
continue
|
||||
try:
|
||||
data = open(os.path.join(folder, fname), "rb").read()
|
||||
preview = generate_preview(data, ext)
|
||||
if preview:
|
||||
open(preview_path, "wb").write(preview)
|
||||
generated += 1
|
||||
else:
|
||||
skipped += 1
|
||||
except Exception as exc:
|
||||
errors += 1
|
||||
|
||||
return {"generated": generated, "skipped": skipped, "errors": errors}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ from auth import get_current_user, require_admin
|
|||
import ki as KI
|
||||
import httpx
|
||||
import weather as weather_mod
|
||||
from media_utils import convert_media, extract_video_thumb, safe_media_path, validate_upload, extract_gps_from_exif
|
||||
from media_utils import convert_media, extract_video_thumb, safe_media_path, validate_upload, extract_gps_from_exif, generate_preview, preview_url_from
|
||||
from timeutils import safe_client_time
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
|
@ -127,8 +127,10 @@ def _fetch_media_items(conn, entry_ids: list[int]) -> dict:
|
|||
).fetchall()
|
||||
result = {}
|
||||
for r in rows:
|
||||
url = r["url"]
|
||||
result.setdefault(r["diary_id"], []).append({
|
||||
"id": r["id"], "url": r["url"],
|
||||
"id": r["id"], "url": url,
|
||||
"preview_url": preview_url_from(url),
|
||||
"media_type": r["media_type"], "sort_order": r["sort_order"],
|
||||
"is_cover": r["is_cover"],
|
||||
})
|
||||
|
|
@ -143,7 +145,8 @@ def _entry_dict(row, dog_ids_map: dict, media_map: dict = None) -> dict:
|
|||
e["media_items"] = items
|
||||
# cover_url: Item mit is_cover=1, Fallback auf erstes Item
|
||||
cover = next((m for m in items if m.get("is_cover")), items[0] if items else None)
|
||||
e["cover_url"] = cover["url"] if cover else None
|
||||
e["cover_url"] = cover["url"] if cover else None
|
||||
e["cover_preview_url"] = preview_url_from(e["cover_url"])
|
||||
return e
|
||||
|
||||
|
||||
|
|
@ -185,7 +188,12 @@ async def diary_calendar(dog_id: int, user=Depends(get_current_user)):
|
|||
ORDER BY d.datum DESC""",
|
||||
(dog_id, dog_id)
|
||||
).fetchall()
|
||||
return [dict(r) for r in rows]
|
||||
result = []
|
||||
for r in rows:
|
||||
d = dict(r)
|
||||
d["cover_preview_url"] = preview_url_from(d.get("cover_url"))
|
||||
result.append(d)
|
||||
return result
|
||||
|
||||
|
||||
@router.get("/{dog_id}/diary/locations")
|
||||
|
|
@ -207,7 +215,12 @@ async def diary_locations(dog_id: int, user=Depends(get_current_user)):
|
|||
ORDER BY d.datum DESC""",
|
||||
(dog_id, dog_id)
|
||||
).fetchall()
|
||||
return [dict(r) for r in rows]
|
||||
result = []
|
||||
for r in rows:
|
||||
d = dict(r)
|
||||
d["cover_preview_url"] = preview_url_from(d.get("cover_url"))
|
||||
result.append(d)
|
||||
return result
|
||||
|
||||
|
||||
@router.get("/{dog_id}/diary")
|
||||
|
|
@ -670,6 +683,12 @@ async def upload_media(dog_id: int, entry_id: int,
|
|||
|
||||
if media_type == "video":
|
||||
extract_video_thumb(path)
|
||||
elif media_type == "image":
|
||||
preview_bytes = generate_preview(raw_data, ext)
|
||||
if preview_bytes:
|
||||
preview_path = os.path.splitext(path)[0] + "_preview.jpg"
|
||||
with open(preview_path, "wb") as f:
|
||||
f.write(preview_bytes)
|
||||
|
||||
media_url = f"/media/diary/{filename}"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from database import db
|
|||
from auth import get_current_user, get_current_user_optional
|
||||
from timeutils import safe_client_time
|
||||
from routes.push import send_push_to_user
|
||||
from media_utils import convert_media, extract_video_thumb
|
||||
from media_utils import convert_media, extract_video_thumb, generate_preview, preview_url_from
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -87,6 +87,11 @@ def _save_upload(file: UploadFile, data: bytes) -> str:
|
|||
f.write(data)
|
||||
if ext in {".mp4", ".webm"}:
|
||||
extract_video_thumb(path)
|
||||
else:
|
||||
preview_bytes = generate_preview(data, ext)
|
||||
if preview_bytes:
|
||||
with open(os.path.splitext(path)[0] + "_preview.jpg", "wb") as f:
|
||||
f.write(preview_bytes)
|
||||
return f"/media/forum/{filename}"
|
||||
|
||||
def _parse_foto_urls(raw) -> list:
|
||||
|
|
@ -146,7 +151,9 @@ async def list_threads(
|
|||
for r in rows:
|
||||
t = dict(r)
|
||||
foto_list = _parse_foto_urls(t.get('foto_urls'))
|
||||
t['foto_preview'] = foto_list[0] if foto_list else None
|
||||
first = foto_list[0] if foto_list else None
|
||||
t['foto_preview'] = first
|
||||
t['foto_preview_url'] = preview_url_from(first)
|
||||
t['foto_urls'] = foto_list
|
||||
t['user_liked'] = _user_liked(conn, uid, 'thread', t['id']) if uid else False
|
||||
result.append(t)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue