olaf
fcc0dfbb0f
DB/model Add Conversion model + ConversionStatus enum (pending, processing, ready, failed) Alembic migrations: create conversions table, indexes, unique (source_event_media_id, target_format, file_hash), and NOT NULL on file_hash API Enqueue on upload (ppt|pptx|odp) in routes/eventmedia.py: compute sha256, upsert Conversion, enqueue job New routes: POST /api/conversions/<media_id>/pdf — ensure/enqueue conversion GET /api/conversions/<media_id>/status — latest status/details GET /api/files/converted/<path> — serve converted PDFs Register conversions blueprint in wsgi Worker server/worker.py: convert_event_media_to_pdf Calls Gotenberg /forms/libreoffice/convert, writes to server/media/converted/ Updates Conversion status, timestamps, error messages Fix media root resolution to /server/media Prefer function enqueue over string path; expose server.worker in package init for RQ string compatibility Queue/infra server/task_queue.py: RQ queue helper (REDIS_URL, default redis://redis:6379/0) docker-compose: Add redis and gotenberg services Add worker service (rq worker conversions) Pass REDIS_URL and GOTENBERG_URL to server/worker Mount shared media volume in prod for API/worker parity docker-compose.override: Add dev redis/gotenberg/worker services Ensure PYTHONPATH + working_dir allow importing server.worker Use rq CLI instead of python -m rq for worker Dashboard dev: run as appropriate user/root and pre-create/chown caches to avoid EACCES Dashboard dev UX Vite: set cacheDir .vite to avoid EACCES in node_modules Disable Node inspector by default to avoid port conflicts Docs Update copilot-instructions.md with conversion system: flow, services, env vars, endpoints, storage paths, and data model
69 lines
2.5 KiB
Python
69 lines
2.5 KiB
Python
from flask import Blueprint, jsonify, send_from_directory
|
|
from server.database import Session
|
|
from models.models import EventMedia
|
|
import os
|
|
|
|
# Blueprint for direct file downloads by media ID
|
|
files_bp = Blueprint("files", __name__, url_prefix="/api/files")
|
|
|
|
# Reuse the same media root convention as eventmedia.py
|
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
MEDIA_ROOT = os.path.join(BASE_DIR, "media")
|
|
|
|
|
|
@files_bp.route("/<int:media_id>/<path:filename>", methods=["GET"])
|
|
def download_media_file(media_id: int, filename: str):
|
|
"""
|
|
Download the stored media file for a given EventMedia ID.
|
|
|
|
URL format example:
|
|
/api/files/26/LPUV4I_Folien_Nowitzki_Bewertungskriterien.pptx
|
|
|
|
Behavior:
|
|
- Looks up EventMedia by ID
|
|
- Validates requested filename against stored metadata (best-effort)
|
|
- Serves the file from server/media using the stored relative file_path
|
|
"""
|
|
session = Session()
|
|
media = session.query(EventMedia).get(media_id)
|
|
if not media:
|
|
session.close()
|
|
return jsonify({"error": "Not found"}), 404
|
|
|
|
# Prefer the stored relative file_path; fall back to the URL/filename
|
|
rel_path = media.file_path or media.url
|
|
|
|
# Basic filename consistency check to avoid leaking other files
|
|
# Only enforce if media.url is present
|
|
if media.url and os.path.basename(filename) != os.path.basename(media.url):
|
|
session.close()
|
|
return jsonify({
|
|
"error": "Filename mismatch",
|
|
"expected": os.path.basename(media.url),
|
|
"got": os.path.basename(filename),
|
|
}), 400
|
|
|
|
abs_path = os.path.join(MEDIA_ROOT, rel_path)
|
|
|
|
# Ensure file exists
|
|
if not os.path.isfile(abs_path):
|
|
session.close()
|
|
return jsonify({"error": "File not found on server"}), 404
|
|
|
|
# Serve as attachment (download)
|
|
directory = os.path.dirname(abs_path)
|
|
served_name = os.path.basename(abs_path)
|
|
session.close()
|
|
return send_from_directory(directory, served_name, as_attachment=True)
|
|
|
|
|
|
@files_bp.route("/converted/<path:relpath>", methods=["GET"])
|
|
def download_converted(relpath: str):
|
|
"""Serve converted files (e.g., PDFs) relative to media/converted."""
|
|
abs_path = os.path.join(MEDIA_ROOT, relpath)
|
|
if not abs_path.startswith(MEDIA_ROOT):
|
|
return jsonify({"error": "Invalid path"}), 400
|
|
if not os.path.isfile(abs_path):
|
|
return jsonify({"error": "File not found"}), 404
|
|
return send_from_directory(os.path.dirname(abs_path), os.path.basename(abs_path), as_attachment=True)
|