aey/placeany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve image rendering (#1)

Browse source 
* Re-randomize image if dimensions do not satisfy

* Try a maximum of 10 times to generate an image

* Decrease image generation cache to 1s

* Increase image quality
This commit is contained in:
Anders Englöf Ytterström 2024-09-09 09:12:44 +02:00 • committed by GitHub
parent e124ce6501
commit ee699df9e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
wsgi.py
View file

@ -2,7 +2,7 @@ import os
import random import random
from io import BytesIO from io import BytesIO
from flask import Flask, render_template, request, send_file from flask import Flask, Response, render_template, request, send_file
from flask_caching import Cache from flask_caching import Cache
from PIL import Image, ImageOps from PIL import Image, ImageOps
@ -17,23 +17,28 @@ app = Flask(__name__)
cache.init_app(app) cache.init_app(app)
def get_cropped_image(x, y, grey=False): def get_cropped_image(x, y, grey=False, retries=0):
"""crops a random image from collection""" """crops a random image from collection"""
if retries > 10:
return None
im_src = random.choice(os.listdir("./images")) im_src = random.choice(os.listdir("./images"))
im = Image.open(f"images/{im_src}") im = Image.open(f"images/{im_src}")
out = BytesIO() out = BytesIO()
max_x, max_y = im.size max_x, max_y = im.size
if x < max_x or y < max_y: if x > max_x and y > max_y:
return get_cropped_image(x, y, grey, retries + 1)
im = ImageOps.fit(im, (x, y)) im = ImageOps.fit(im, (x, y))
if grey: if grey:
im = ImageOps.grayscale(im) im = ImageOps.grayscale(im)
im.save(out, "WEBP", quality=50) im.save(out, "WEBP", quality=80)
out.seek(0) out.seek(0)
return out return out
def make_response(x, y, color_mode=COLOR): def make_response(x, y, color_mode=COLOR):
im = get_cropped_image(x, y, color_mode == GREY) im = get_cropped_image(x, y, color_mode == GREY)
if not im:
return Response(status=401)
return send_file(im, mimetype="image/webp") return send_file(im, mimetype="image/webp")
@ -50,13 +55,13 @@ def bookmarklet():
@app.route("/<int:x>/<int:y>") @app.route("/<int:x>/<int:y>")
@cache.cached(10) @cache.cached(1)
def generate(x, y): def generate(x, y):
return make_response(x, y, COLOR) return make_response(x, y, COLOR)
@app.route("/g/<int:x>/<int:y>") @app.route("/g/<int:x>/<int:y>")
@cache.cached(10) @cache.cached(1)
def generate_grey(x, y): def generate_grey(x, y):
return make_response(x, y, GREY) return make_response(x, y, GREY)