Added 4bpp option
This commit is contained in:
parent
d21f5f662f
commit
638228a88d
157
app.py
157
app.py
@ -36,6 +36,8 @@ DITHERING_MODES = {
|
||||
|
||||
HTML_FORM = '''
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>CatNote</title>
|
||||
<link rel="manifest" href="/static/manifest.json">
|
||||
<style>
|
||||
@ -66,7 +68,6 @@ HTML_FORM = '''
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.markdown-ref {
|
||||
background: #22282c;
|
||||
border-radius: 1.2em;
|
||||
@ -140,12 +141,10 @@ HTML_FORM = '''
|
||||
filter: brightness(1.12);
|
||||
box-shadow: 0 4px 18px #2229;
|
||||
}
|
||||
|
||||
button[type=submit][name=print] {
|
||||
background: linear-gradient(90deg, #ffeb3b, #ff9100);
|
||||
color: #181c1f;
|
||||
}
|
||||
|
||||
.preview-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -183,16 +182,13 @@ HTML_FORM = '''
|
||||
border-left: 4px solid #ff6384;
|
||||
box-shadow: 0 0 8px #22000690;
|
||||
}
|
||||
|
||||
label {
|
||||
font-size: 1em;
|
||||
padding: 0 1em 0 1em;
|
||||
}
|
||||
|
||||
input[type=file] {
|
||||
margin: 0.5em 1em 1.5em 1em;
|
||||
}
|
||||
|
||||
input[type=file]::file-selector-button {
|
||||
background: linear-gradient(90deg, #8ee3c1, #35a7ff);
|
||||
color: #222;
|
||||
@ -205,12 +201,10 @@ HTML_FORM = '''
|
||||
transition: filter 0.2s, box-shadow 0.2s;
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
|
||||
input[type=file]::file-selector-button:hover {
|
||||
filter: brightness(1.12);
|
||||
box-shadow: 0 4px 18px #2229;
|
||||
}
|
||||
|
||||
.print-frame {
|
||||
position: relative;
|
||||
padding: 10px 0 10px 0;
|
||||
@ -218,7 +212,6 @@ HTML_FORM = '''
|
||||
overflow: hidden;
|
||||
max-width: 424px;
|
||||
}
|
||||
|
||||
.print-frame::before,
|
||||
.print-frame::after {
|
||||
content: "";
|
||||
@ -230,16 +223,13 @@ HTML_FORM = '''
|
||||
background-size: 10px 384px;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.print-frame::before {
|
||||
top: 1px;
|
||||
}
|
||||
|
||||
.print-frame::after {
|
||||
bottom: 1px;
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
.print-frame img {
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
@ -247,17 +237,15 @@ HTML_FORM = '''
|
||||
margin: 0 auto;
|
||||
box-shadow: none;
|
||||
position: relative;
|
||||
width: 100%
|
||||
width: 100%;
|
||||
max-width: 384px;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
textarea {
|
||||
font-size: 1.16em !important;
|
||||
padding: 1em;
|
||||
min-height: 12em;
|
||||
}
|
||||
|
||||
.options {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -265,7 +253,6 @@ HTML_FORM = '''
|
||||
justify-content: space-between;
|
||||
margin-bottom: 1.2em;
|
||||
}
|
||||
|
||||
select {
|
||||
background: #181c1f;
|
||||
text-align: center;
|
||||
@ -276,11 +263,9 @@ HTML_FORM = '''
|
||||
margin: 1em;
|
||||
padding: 0.5em 1em;
|
||||
}
|
||||
|
||||
select option {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
input[type=number] {
|
||||
background: #181c1f;
|
||||
text-align: center;
|
||||
@ -290,34 +275,69 @@ HTML_FORM = '''
|
||||
margin: 1em;
|
||||
padding: 0.5em 1em;
|
||||
}
|
||||
|
||||
input[type=number]::-webkit-inner-spin-button,
|
||||
input[type=number]::-webkit-outer-spin-button {
|
||||
-webkit-appearance: none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.options-dithering,
|
||||
.options-intensity {
|
||||
.options-intensity,
|
||||
.options-rotation,
|
||||
.options-printmode {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
#loading-box {
|
||||
display: none;
|
||||
flex-direction: column;
|
||||
text-align: center;
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
padding: 1em;
|
||||
}
|
||||
#printing-text {
|
||||
color: #eee;
|
||||
font-size: 1em;
|
||||
font-weight: bold;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
.progress-bar {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 18px;
|
||||
background: #181c1f;
|
||||
border: 1.5px solid #444;
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 2px 12px #1116;
|
||||
}
|
||||
.progress-bar-inner {
|
||||
width: 40%;
|
||||
height: 100%;
|
||||
background: linear-gradient(90deg, #8ee3c1, #35a7ff);
|
||||
border-radius: 12px;
|
||||
position: absolute;
|
||||
left: -40%;
|
||||
animation: indeterminate-bar 1.2s infinite
|
||||
}
|
||||
@keyframes indeterminate-bar {
|
||||
0% { left: 0%; }
|
||||
50% { left: calc(100% - 40%); }
|
||||
100% { left: 0%; }
|
||||
}
|
||||
@media (max-width: 1000px) {
|
||||
body {
|
||||
font-size: 1.28em !important; /* Big bump */
|
||||
font-size: 1.28em !important;
|
||||
}
|
||||
h2, h3, h4 {
|
||||
font-size: 2em !important;
|
||||
}
|
||||
|
||||
.centered-flex {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
height: auto;
|
||||
gap: 1.6em;
|
||||
}
|
||||
|
||||
.form-card,
|
||||
.preview-card,
|
||||
.markdown-ref {
|
||||
@ -327,7 +347,6 @@ HTML_FORM = '''
|
||||
width: 100%;
|
||||
margin: 0.8em 0;
|
||||
}
|
||||
|
||||
textarea {
|
||||
font-size: 1.16em !important;
|
||||
padding: 1em;
|
||||
@ -343,11 +362,11 @@ HTML_FORM = '''
|
||||
}
|
||||
input[type=file] {
|
||||
font-size: 1.16em !important;
|
||||
padding: inherit 2.2em
|
||||
padding: inherit 2.2em;
|
||||
}
|
||||
label {
|
||||
font-size: 1.16em !important;
|
||||
padding: inherit 2.2em
|
||||
padding: inherit 2.2em;
|
||||
}
|
||||
select {
|
||||
font-size: 1.16em !important;
|
||||
@ -358,15 +377,16 @@ HTML_FORM = '''
|
||||
padding: 0.6em 1.2em;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="centered-flex">
|
||||
<div class="form-card">
|
||||
<center>
|
||||
<h2 style="margin-top:0.2em;">😺 CatNote 🖨️</h2>
|
||||
</center>
|
||||
<form method=post enctype=multipart/form-data>
|
||||
<textarea name=md placeholder="Ingrese Markdown aquí...">{{ default_md }}</textarea><br>
|
||||
<form method="post" enctype="multipart/form-data">
|
||||
<textarea name="md" placeholder="Ingrese Markdown aquí...">{{ default_md }}</textarea><br>
|
||||
<label for="userimg" style="display: inline-block; margin-bottom: 0.5em;">Subir imagen (opcional):</label><br>
|
||||
<input type="file" name="userimg" accept="image/png, image/jpeg"><br>
|
||||
<div class="options">
|
||||
@ -382,10 +402,32 @@ HTML_FORM = '''
|
||||
<label for="intensity">Intensidad:</label>
|
||||
<input type="number" name="intensity" value="85" min="0" max="100" step="1">
|
||||
</div>
|
||||
<div class="options-rotation">
|
||||
<label for="rotation">Rotar imagen:</label>
|
||||
<select name="rotation">
|
||||
<option value="0" {% if 0 == current_rotation %}selected="selected"{% endif %}>0°</option>
|
||||
<option value="90" {% if 90 == current_rotation %}selected="selected"{% endif %}>90°</option>
|
||||
<option value="180" {% if 180 == current_rotation %}selected="selected"{% endif %}>180°</option>
|
||||
<option value="270" {% if 270 == current_rotation %}selected="selected"{% endif %}>270°</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="options-printmode">
|
||||
<label for="printmode">Modo de impresión:</label>
|
||||
<select name="printmode">
|
||||
<option value="1bpp" {% if "1bpp" == current_printmode %}selected="selected"{% endif %}>1-bit</option>
|
||||
<option value="4bpp" {% if "4bpp" == current_printmode %}selected="selected"{% endif %}>4-bit</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="loading-box">
|
||||
<div id="printing-text">Imprimiendo...</div>
|
||||
<div class="progress-bar">
|
||||
<div class="progress-bar-inner"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<button type=submit name="generate">📷 Generar</button>
|
||||
<button type=submit name="print">🖨️ Imprimir</button>
|
||||
<button type="submit" name="generate">📷 Generar</button>
|
||||
<button type="submit" name="print">🖨️ Imprimir</button>
|
||||
</div>
|
||||
</form>
|
||||
{% if printed %}
|
||||
@ -422,6 +464,15 @@ HTML_FORM = '''
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
document.querySelector('form').addEventListener('submit', function(e) {
|
||||
if (document.activeElement && document.activeElement.name === "print") {
|
||||
document.getElementById('loading-box').style.display = 'flex';
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
'''
|
||||
|
||||
def remove_uploaded_img():
|
||||
@ -432,11 +483,11 @@ def remove_uploaded_img():
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def bleh_image_from_url(url, dithering):
|
||||
def bleh_image_from_url(url, dithering, mode):
|
||||
resp = requests.get(url, stream=True)
|
||||
resp.raise_for_status()
|
||||
bleh = subprocess.Popen(
|
||||
["./bleh", "-o", "-", "-mode", "1bpp", "-d", f"{dithering}", "-"],
|
||||
["./bleh", "-o", "-", "-mode", f"{mode}", "-d", f"{dithering}", "-"],
|
||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
out, err = bleh.communicate(resp.content)
|
||||
if bleh.returncode != 0:
|
||||
@ -447,9 +498,9 @@ def bleh_image_from_url(url, dithering):
|
||||
img = img.resize((IMAGE_WIDTH, img.height), Image.LANCZOS)
|
||||
return img
|
||||
|
||||
def bleh_image_from_bytes(image_bytes, dithering):
|
||||
def bleh_image_from_bytes(image_bytes, dithering, mode):
|
||||
bleh = subprocess.Popen(
|
||||
["./bleh", "-o", "-", "-mode", "1bpp", "-d", f"{dithering}", "-"],
|
||||
["./bleh", "-o", "-", "-mode", f"{mode}", "-d", f"{dithering}", "-"],
|
||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE
|
||||
)
|
||||
out, err = bleh.communicate(image_bytes)
|
||||
@ -460,6 +511,15 @@ def bleh_image_from_bytes(image_bytes, dithering):
|
||||
img = img.resize((IMAGE_WIDTH, img.height), Image.LANCZOS)
|
||||
return img
|
||||
|
||||
def rotate_image_bytes(image_bytes, rotation):
|
||||
if rotation == 0:
|
||||
return image_bytes
|
||||
img = Image.open(io.BytesIO(image_bytes))
|
||||
img = img.rotate(-rotation, expand=True) # PIL rotates counterclockwise, negative for clockwise
|
||||
buf = io.BytesIO()
|
||||
img.save(buf, format="PNG")
|
||||
return buf.getvalue()
|
||||
|
||||
def parse_line(line):
|
||||
if re.match(r"!\(img\)", line) or re.match(r"!\[.*\]\(img\)", line):
|
||||
return ('userimage', None)
|
||||
@ -559,7 +619,7 @@ def wrap_segments(segments, font, font_bold, font_italic, font_bolditalic, max_w
|
||||
if line:
|
||||
yield line
|
||||
|
||||
def render(md, dithering, uploaded_img_bytes=None):
|
||||
def render(md, dithering, printmode, uploaded_img_bytes=None):
|
||||
font = ImageFont.truetype(FONT_PATH, FONT_SIZE)
|
||||
font_bold = ImageFont.truetype(FONT_PATH_BOLD, FONT_SIZE)
|
||||
font_italic = ImageFont.truetype(FONT_PATH_OBLIQUE, FONT_SIZE)
|
||||
@ -578,14 +638,14 @@ def render(md, dithering, uploaded_img_bytes=None):
|
||||
tag = parse_line(src_line)
|
||||
if tag[0] == 'image':
|
||||
try:
|
||||
image = bleh_image_from_url(tag[1], dithering)
|
||||
image = bleh_image_from_url(tag[1], dithering, printmode)
|
||||
lines_out.append(('image', image))
|
||||
except Exception as e:
|
||||
lines_out.append(('text', [('text', f"[Imagen inválida: {e}]")], font, FONT_SIZE))
|
||||
elif tag[0] == 'userimage':
|
||||
if uploaded_img_bytes:
|
||||
try:
|
||||
image = bleh_image_from_bytes(uploaded_img_bytes, dithering)
|
||||
image = bleh_image_from_bytes(uploaded_img_bytes, dithering, printmode)
|
||||
lines_out.append(('image', image))
|
||||
except Exception as e:
|
||||
lines_out.append(('text', [('text', f"[Error al procesar imagen]")], font, FONT_SIZE))
|
||||
@ -714,6 +774,7 @@ def index():
|
||||
if request.method == "POST":
|
||||
userimg = request.files.get("userimg")
|
||||
uploaded_img_bytes = None
|
||||
rotation = int(request.form.get("rotation", "0"))
|
||||
if userimg and userimg.filename:
|
||||
# Remove old temp file if present
|
||||
remove_uploaded_img()
|
||||
@ -734,10 +795,19 @@ def index():
|
||||
session.pop('uploaded_img_path', None)
|
||||
else:
|
||||
remove_uploaded_img()
|
||||
if uploaded_img_bytes and rotation in (90, 180, 270):
|
||||
try:
|
||||
uploaded_img_bytes = rotate_image_bytes(uploaded_img_bytes, rotation)
|
||||
except Exception as e:
|
||||
error = f"Error rotating image: {e}"
|
||||
uploaded_img_bytes = None
|
||||
md = request.form["md"]
|
||||
dithering = request.form.get("dithering", "floyd")
|
||||
image = render(md, dithering, uploaded_img_bytes)
|
||||
printmode = request.form.get("printmode", "1bpp")
|
||||
image = render(md, dithering, printmode, uploaded_img_bytes)
|
||||
session['dithering'] = dithering
|
||||
session['printmode'] = printmode
|
||||
session['rotation'] = rotation
|
||||
buf = io.BytesIO()
|
||||
image.save(buf, format="PNG")
|
||||
buf.seek(0)
|
||||
@ -750,7 +820,6 @@ def index():
|
||||
except ValueError:
|
||||
error = "Intensidad debe ser un número entre 0 y 100"
|
||||
intensity = 85
|
||||
# Store intensity in session for later use
|
||||
session['intensity'] = intensity
|
||||
# If print button pressed, send to driver
|
||||
if "print" in request.form:
|
||||
@ -761,7 +830,7 @@ def index():
|
||||
# Run the bleh command
|
||||
result = subprocess.run([
|
||||
"./bleh",
|
||||
"-mode", "1bpp",
|
||||
"-mode", f"{printmode}",
|
||||
"-intensity", f"{intensity}",
|
||||
tmpfile.name
|
||||
], capture_output=True, text=True, timeout=90)
|
||||
@ -772,7 +841,7 @@ def index():
|
||||
except Exception as e:
|
||||
error = f"Failed to print: {e}"
|
||||
return render_template_string(HTML_FORM, dithering_modes=DITHERING_MODES, img=img_data, default_md=md,
|
||||
printed=printed, error=error, current_dithering=session.get('dithering', 'floyd'))
|
||||
printed=printed, error=error, current_dithering=session.get('dithering', 'floyd'), current_rotation=session.get('rotation', 0), current_printmode=session.get('printmode', '1bpp'))
|
||||
|
||||
@app.route('/manifest.json')
|
||||
def manifest():
|
||||
|
||||
Loading…
Reference in New Issue
Block a user