broke currently

This commit is contained in:
2025-06-22 16:11:29 -05:00
parent e7a0f5b1be
commit 2bb7a29141
77 changed files with 1748 additions and 2298 deletions

View File

@ -3,17 +3,12 @@
import os
from uuid import uuid4
from datetime import datetime
from PIL import Image
from PIL import Image, ExifTags
from flask import (
Blueprint,
redirect,
url_for,
request,
flash,
send_from_directory,
current_app,
jsonify
Blueprint, request, redirect, url_for,
flash, send_from_directory, current_app,
jsonify, abort
)
from flask_login import login_required, current_user
@ -21,54 +16,195 @@ from app import db
from .models import Media, ImageHeart, FeaturedImage
from plugins.plant.models import Plant
bp = Blueprint("media", __name__, url_prefix="/media", template_folder="templates")
bp = Blueprint(
"media",
__name__,
url_prefix="/media",
template_folder="templates"
)
# -----------------------------------------------------------------------------
# Make generate_image_url available in all templates
# -----------------------------------------------------------------------------
# ─── Context Processor ─────────────────────────────────────────────────────────
@bp.app_context_processor
def utility_processor():
def generate_image_url(path):
if path:
return url_for("media.media_file", filename=path)
w, h = current_app.config.get("STANDARD_IMG_SIZE", (300, 200))
return f"https://placehold.co/{w}x{h}"
return dict(generate_image_url=generate_image_url)
# -----------------------------------------------------------------------------
# Helpers & config
# -----------------------------------------------------------------------------
# ─── Helpers & Config ─────────────────────────────────────────────────────────
def allowed_file(filename):
ext = filename.rsplit(".", 1)[-1].lower() if "." in filename else ""
return ext in current_app.config.get("ALLOWED_EXTENSIONS", {"png","jpg","jpeg","gif"})
return ext in current_app.config.get(
"ALLOWED_EXTENSIONS",
{"png", "jpg", "jpeg", "gif", "webp"}
)
def get_upload_path():
base = current_app.config.get("UPLOAD_FOLDER", "static/uploads")
def get_upload_path(plugin: str, related_id: int):
"""
Build and return (absolute_dir, subdir) where uploads are stored:
{UPLOAD_FOLDER}/{plugin}s/{related_id}/YYYY/MM/DD/
"""
now = datetime.utcnow()
subdir = os.path.join(str(now.year), f"{now.month:02}", f"{now.day:02}")
full = os.path.join(base, subdir)
os.makedirs(full, exist_ok=True)
return full, subdir
date_path = f"{now.year}/{now.month:02}/{now.day:02}"
subdir = f"{plugin}s/{related_id}/{date_path}"
base = current_app.config["UPLOAD_FOLDER"]
abs_dir = os.path.join(base, subdir)
os.makedirs(abs_dir, exist_ok=True)
return abs_dir, subdir
# -----------------------------------------------------------------------------
# Routes
# -----------------------------------------------------------------------------
def _strip_exif(image: Image.Image) -> Image.Image:
try:
exif = image._getexif()
orient_key = next(
(k for k, v in ExifTags.TAGS.items() if v == "Orientation"),
None
)
if exif and orient_key in exif:
o = exif[orient_key]
if o == 3:
image = image.rotate(180, expand=True)
elif o == 6:
image = image.rotate(270, expand=True)
elif o == 8:
image = image.rotate(90, expand=True)
except Exception:
pass
return image
def _process_upload_file(
file,
uploader_id: int,
plugin: str,
related_id: int
):
"""
Save the uploaded image (strip EXIF), write Media row with
file_url, and return the Media instance.
"""
ext = os.path.splitext(file.filename)[1].lower()
if ext not in {".jpg", ".jpeg", ".png", ".gif", ".webp"}:
raise ValueError("Unsupported file type.")
# generate a stable filename
filename = f"{uuid4().hex}{ext}"
# determine disk path
abs_dir, subdir = get_upload_path(plugin, related_id)
full_path = os.path.join(abs_dir, filename)
# strip EXIF and save
img = Image.open(file)
img = _strip_exif(img)
img.save(full_path)
# create the DB record
now = datetime.utcnow()
media = Media(
uploader_id=uploader_id,
file_url=f"{subdir}/{filename}",
uploaded_at=now
)
# legacy relationships
if plugin == "plant":
media.plant_id = related_id
elif plugin == "growlog":
media.growlog_id = related_id
db.session.add(media)
db.session.commit()
return media
# ─── Exposed Utilities ─────────────────────────────────────────────────────────
def save_media_file(file, user_id, **ctx):
return _process_upload_file(file, user_id, **ctx)
def delete_media_file(media: Media):
"""
Remove file from disk and delete DB record.
"""
base = current_app.config["UPLOAD_FOLDER"]
path = os.path.join(base, media.file_url)
if os.path.exists(path):
os.remove(path)
db.session.delete(media)
db.session.commit()
def rotate_media_file(media: Media):
"""
Rotate the image on disk by -90° and save.
"""
base = current_app.config["UPLOAD_FOLDER"]
path = os.path.join(base, media.file_url)
with Image.open(path) as img:
img.rotate(-90, expand=True).save(path)
db.session.commit()
def generate_image_url(media: Media):
"""
Given a Media instance (or None), return its public URL
or a placeholder if no media.
"""
if media and media.file_url:
return url_for("media.media_file", filename=media.file_url)
w, h = current_app.config.get("STANDARD_IMG_SIZE", (300, 200))
return f"https://placehold.co/{w}x{h}"
# ─── Routes ────────────────────────────────────────────────────────────────────
@bp.route("/", methods=["GET"])
def media_index():
return redirect(url_for("core_ui.home"))
@bp.route("/files/<path:filename>", methods=["GET"])
@bp.route("/<plugin>/<filename>")
def serve(plugin, filename):
"""
Stream uploaded media by plugin & filename, enforcing Media lookup.
"""
m = Media.query.filter_by(file_url=f"{plugin}s/%/{filename}").first_or_404()
# reconstruct disk path
date_path = m.uploaded_at.strftime("%Y/%m/%d")
disk_dir = os.path.join(
current_app.config["UPLOAD_FOLDER"],
f"{plugin}s",
str(m.plant_id or m.growlog_id),
date_path
)
return send_from_directory(disk_dir, filename)
@bp.route("/files/<path:filename>")
def media_file(filename):
# Strip leading "uploads/" if present
if filename.startswith("uploads/"):
filename = filename[len("uploads/"):]
folder = current_app.config.get("UPLOAD_FOLDER", "static/uploads")
return send_from_directory(folder, filename)
base = current_app.config["UPLOAD_FOLDER"]
full = os.path.normpath(os.path.join(base, filename))
if not full.startswith(os.path.abspath(base)):
abort(404)
return send_from_directory(base, filename)
@bp.route("/<filename>")
def media_public(filename):
base = current_app.config["UPLOAD_FOLDER"]
m = Media.query.filter(Media.file_url.endswith(filename)).first_or_404()
full = os.path.normpath(os.path.join(base, m.file_url))
if not full.startswith(os.path.abspath(base)):
abort(404)
return send_from_directory(base, m.file_url)
@bp.route("/heart/<int:media_id>", methods=["POST"])
@login_required
def toggle_heart(media_id):
existing = ImageHeart.query.filter_by(user_id=current_user.id, media_id=media_id).first()
existing = ImageHeart.query.filter_by(
user_id=current_user.id, media_id=media_id
).first()
if existing:
db.session.delete(existing)
db.session.commit()
@ -78,6 +214,7 @@ def toggle_heart(media_id):
db.session.commit()
return jsonify({"status": "hearted"})
@bp.route("/add/<string:plant_uuid>", methods=["POST"])
@login_required
def add_media(plant_uuid):
@ -87,65 +224,84 @@ def add_media(plant_uuid):
flash("Invalid or missing file.", "danger")
return redirect(request.referrer or url_for("plant.edit", uuid_val=plant_uuid))
ext = file.filename.rsplit(".", 1)[-1].lower()
filename = f"{uuid4()}.{ext}"
full_path, subdir = get_upload_path()
file.save(os.path.join(full_path, filename))
media = Media(
file_url=os.path.join(subdir, filename).replace("\\", "/"),
_process_upload_file(
file=file,
uploader_id=current_user.id,
plant_id=plant.id
plugin="plant",
related_id=plant.id
)
db.session.add(media)
db.session.commit()
flash("Media uploaded successfully.", "success")
return redirect(request.referrer or url_for("plant.edit", uuid_val=plant_uuid))
@bp.route("/feature/<int:media_id>", methods=["POST"])
@login_required
def set_featured_image(media_id):
media = Media.query.get_or_404(media_id)
if current_user.id != media.uploader_id and current_user.role != "admin":
flash("Not authorized to set featured image.", "danger")
return redirect(request.referrer or url_for("core_ui.home"))
FeaturedImage.query.filter_by(media_id=media_id).delete()
featured = FeaturedImage(media_id=media_id, is_featured=True)
db.session.add(featured)
@bp.route("/feature/<string:context>/<int:context_id>/<int:media_id>", methods=["POST"])
@login_required
def set_featured_image(context, context_id, media_id):
media = Media.query.get_or_404(media_id)
if media.uploader_id != current_user.id and current_user.role != "admin":
return jsonify({"error": "Not authorized"}), 403
FeaturedImage.query.filter_by(
context=context,
context_id=context_id
).delete()
feat = FeaturedImage(
media_id=media.id,
context=context,
context_id=context_id,
is_featured=True
)
db.session.add(feat)
if context == "plant":
plant = Plant.query.get_or_404(context_id)
plant.featured_media_id = media.id
db.session.commit()
flash("Image set as featured.", "success")
return redirect(request.referrer or url_for("plant.edit", uuid_val=media.plant.uuid))
return jsonify({"status": "success", "media_id": media.id})
@bp.route("/delete/<int:media_id>", methods=["POST"])
@login_required
def delete_media(media_id):
media = Media.query.get_or_404(media_id)
if current_user.id != media.uploader_id and current_user.role != "admin":
if media.uploader_id != current_user.id and current_user.role != "admin":
flash("Not authorized to delete this media.", "danger")
return redirect(request.referrer or url_for("core_ui.home"))
full_path = os.path.join(current_app.config.get("UPLOAD_FOLDER", "static/uploads"), media.file_url)
if os.path.exists(full_path):
os.remove(full_path)
db.session.delete(media)
db.session.commit()
delete_media_file(media)
flash("Media deleted.", "success")
return redirect(request.referrer or url_for("plant.edit", uuid_val=media.plant.uuid))
@bp.route("/bulk_delete/<string:plant_uuid>", methods=["POST"])
@login_required
def bulk_delete_media(plant_uuid):
plant = Plant.query.filter_by(uuid=plant_uuid).first_or_404()
media_ids = request.form.getlist("delete_ids")
deleted = 0
for mid in media_ids:
m = Media.query.filter_by(id=mid, plant_id=plant.id).first()
if m and (m.uploader_id == current_user.id or current_user.role == "admin"):
delete_media_file(m)
deleted += 1
flash(f"{deleted} image(s) deleted.", "success")
return redirect(request.referrer or url_for("plant.edit", uuid_val=plant_uuid))
@bp.route("/rotate/<int:media_id>", methods=["POST"])
@login_required
def rotate_media(media_id):
media = Media.query.get_or_404(media_id)
if current_user.id != media.uploader_id and current_user.role != "admin":
if media.uploader_id != current_user.id and current_user.role != "admin":
flash("Not authorized to rotate this media.", "danger")
return redirect(request.referrer or url_for("core_ui.home"))
full_path = os.path.join(current_app.config.get("UPLOAD_FOLDER", "static/uploads"), media.file_url)
try:
with Image.open(full_path) as img:
img.rotate(-90, expand=True).save(full_path)
rotate_media_file(media)
flash("Image rotated successfully.", "success")
except Exception as e:
flash(f"Failed to rotate image: {e}", "danger")