diff --git a/app.py b/app.py index c4fe7c1..231f5cf 100644 --- a/app.py +++ b/app.py @@ -47,6 +47,9 @@ def on_new_user(session): session["fonts"] = fonts() +image_presets = { + "Abandoned": "resources/abandoned.jpg" +} @app.route('/image', methods=['GET', 'POST']) def image(): @@ -56,15 +59,27 @@ def image(): if 'image' not in request.files: return render_image_template() - file = request.files['image'] + + + if "dropdown" in request.form and request.form["dropdown"] != "file": + path = image_presets[request.form["dropdown"]] + class file: + filename = os.path.basename(path) + stream = open(path, "rb") + else: + file = request.files['image'] + + print(file.stream) + if file.filename == '': return render_image_template() - if file: + else: extension = os.path.splitext(file.filename)[1] try: message, status, img = process_image(file.stream) + file.stream.close() session["uploaded image path"] = uploaded_image_filename img.save(get_file_path(session, session["uploaded image path"])) except Exception as e: diff --git a/config.py b/config.py index eca4c42..00571fa 100644 --- a/config.py +++ b/config.py @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later -label_width = 213 +#label_width = 213 +label_width = 450 printer_width = 512 max_label_length = 2000 diff --git a/resources/abandoned.jpg b/resources/abandoned.jpg new file mode 100644 index 0000000..fe608f9 Binary files /dev/null and b/resources/abandoned.jpg differ diff --git a/templates/image.html b/templates/image.html index 9438026..aa913d7 100644 --- a/templates/image.html +++ b/templates/image.html @@ -8,7 +8,19 @@ {% block content %}

Upload Image

- + {% if label_width == 450 %} + +
+ {%endif%} + +
+
+

Recommended image height = {{label_width}}, other sizes will be scaled
@@ -18,7 +30,7 @@ {% endif %} {% if filename %} - Uploaded image + Uploaded image
{% if cut %} @@ -30,5 +42,29 @@ {% endif %} + + {% endblock %}