yrtria/theme-song-booth
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix email logo: resize/compress to small JPEG, make path configurable in settings, add Pillow

Browse source
This commit is contained in:
Troll (Hermes Agent) 2026-08-01 23:32:14 +00:00
parent 48db5c5461
commit 918eaa682c
6 changed files with 80206 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app.py
View file

@ -300,21 +300,45 @@ def send_email(to, subject, body, attachments=None, inline_images=None):
def build_signature_images():
"""Return inline image tuple list for the Dionysis Media logo if present."""
logo_path = Path('/mnt/Storage/DM-Logo.png')
if logo_path.exists():
return [(str(logo_path), 'dm-logo')]
return []
"""
Return inline image tuple list for the Dionysis Media logo if present.
The logo path is configurable via /admin/settings. A downscaled, compressed
email-sized JPEG copy is generated in the upload folder so attachments stay small.
:return: list of (path, cid) tuples. Empty if no logo is configured or not found.
"""
cfg = load_booth_settings()
logo_path = cfg.get('logo_path') or '/mnt/Storage/DM-Logo.png'
logo_file = Path(logo_path)
if not logo_file.exists():
return []
# Cache a small email-friendly JPEG inside the upload folder.
cache_dir = Path(current_app.config['UPLOAD_FOLDER'])
cache_dir.mkdir(parents=True, exist_ok=True)
email_logo = cache_dir / 'dm-logo.email.jpg'
try:
from PIL import Image
with Image.open(logo_file) as im:
im.thumbnail((600, 600))
if im.mode in ('RGBA', 'LA', 'P'):
# Composite transparent images onto a white background for JPEG.
background = Image.new('RGB', im.size, (255, 255, 255))
if im.mode == 'P':
im = im.convert('RGBA')
background.paste(im, mask=im.split()[-1] if im.mode == 'RGBA' else None)
im = background
else:
im = im.convert('RGB')
im.save(email_logo, format='JPEG', optimize=True, quality=85)
except Exception:
# If resize fails, fall back to the original file.
return [(str(logo_file), 'dm-logo')]
return [(str(email_logo), 'dm-logo')]
# ---------------------------------------------------------------------------
# Public customer routes
# ---------------------------------------------------------------------------
@app.route('/')
def index():
"""Root route: redirect customers straight to the request form."""
return redirect(url_for('request_form'))
@app.route('/request', methods=['GET', 'POST'])
@limiter.limit("5 per minute")
@ -688,6 +712,7 @@ def admin_settings():
'smtp_user': runtime_settings.get('smtp_user', current_app.config['SMTP_USER']),
'smtp_from': runtime_settings.get('smtp_from', current_app.config['SMTP_FROM']),
'smtp_pass_set': bool(runtime_settings.get('smtp_pass', '')),
'logo_path': runtime_settings.get('logo_path', '/mnt/Storage/DM-Logo.png'),
}
# Compute upload folder stats.
@ -798,6 +823,7 @@ def admin_settings():
cfg['smtp_port'] = request.form.get('smtp_port', '').strip() or None
cfg['smtp_user'] = request.form.get('smtp_user', '').strip() or None
cfg['smtp_from'] = request.form.get('smtp_from', '').strip() or None
cfg['logo_path'] = request.form.get('logo_path', '').strip() or None
new_pass = request.form.get('smtp_pass', '').strip()
# Only overwrite the stored password if a new value was provided.
if new_pass: