igna/catnote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the fix. We'll pretend that never happened.

Browse Source
This commit is contained in:
Ignacio Rivero 2025-06-26 21:30:54 -03:00
parent b6223caa80
commit 072f70c7aa
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app.py
View File

@ -52,31 +52,40 @@ def remove_alpha(img):
def bleh_image_from_url(url, dithering, mode): def bleh_image_from_url(url, dithering, mode):
resp = requests.get(url, stream=True) resp = requests.get(url, stream=True)
resp.raise_for_status() resp.raise_for_status()
img = Image.open(io.BytesIO(resp.content))
img = remove_alpha(img)
buf = io.BytesIO()
img.save(buf, format="PNG")
image_bytes_no_alpha = buf.getvalue()
bleh = subprocess.Popen( bleh = subprocess.Popen(
["./bleh", "-o", "-", "-mode", f"{mode}", "-d", f"{dithering}", "-"], ["./bleh", "-o", "-", "-mode", f"{mode}", "-d", f"{dithering}", "-"],
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = bleh.communicate(resp.content) out, err = bleh.communicate(image_bytes_no_alpha)
if bleh.returncode != 0: if bleh.returncode != 0:
raise RuntimeError(f"Driver failed: {err.decode()}") raise RuntimeError(f"Driver failed: {err.decode()}")
img = Image.open(io.BytesIO(out)) img = Image.open(io.BytesIO(out)).convert("L")
img = remove_alpha(img)
img = img.convert("L")
# Optionally check width, pad/resize if needed # Optionally check width, pad/resize if needed
if img.width != IMAGE_WIDTH: if img.width != IMAGE_WIDTH:
img = img.resize((IMAGE_WIDTH, img.height), Image.LANCZOS) img = img.resize((IMAGE_WIDTH, img.height), Image.LANCZOS)
return img return img
def bleh_image_from_bytes(image_bytes, dithering, mode): def bleh_image_from_bytes(image_bytes, dithering, mode):
# OPEN the uploaded image and remove alpha
img = Image.open(io.BytesIO(image_bytes))
img = remove_alpha(img)
buf = io.BytesIO()
img.save(buf, format="PNG")
image_bytes_no_alpha = buf.getvalue()
# pass that to bleh
bleh = subprocess.Popen( bleh = subprocess.Popen(
["./bleh", "-o", "-", "-mode", f"{mode}", "-d", f"{dithering}", "-"], ["./bleh", "-o", "-", "-mode", f"{mode}", "-d", f"{dithering}", "-"],
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE
) )
out, err = bleh.communicate(image_bytes) out, err = bleh.communicate(image_bytes_no_alpha)
if bleh.returncode != 0: if bleh.returncode != 0:
raise RuntimeError(f"Driver failed: {err.decode()}") raise RuntimeError(f"Driver failed: {err.decode()}")
img = Image.open(io.BytesIO(out)) img = Image.open(io.BytesIO(out)).convert("L")
img = remove_alpha(img)
img = img.convert("L")
if img.width != IMAGE_WIDTH: if img.width != IMAGE_WIDTH:
img = img.resize((IMAGE_WIDTH, img.height), Image.LANCZOS) img = img.resize((IMAGE_WIDTH, img.height), Image.LANCZOS)
return img return img