Handle pillow file errors and move intermediate file storage to ram

This commit is contained in:
TT-392 2024-09-26 21:19:11 +02:00
parent ae9ac584f3
commit 025c1ec9b0
2 changed files with 12 additions and 20 deletions

28
app.py
View file

@ -10,8 +10,8 @@ from file_handler import *
from colorama import Fore, Style from colorama import Fore, Style
import os import os
generated_image_filename = "generated.png" text_image_filename = "text_image.png"
uploaded_image_filename = "uploaded" #extention is depended on uploaded file format uploaded_image_filename = "uploaded_image.png"
app = Flask(__name__) app = Flask(__name__)
@ -90,20 +90,21 @@ def image():
return redirect(request.url) return redirect(request.url)
if file: if file:
extension = os.path.splitext(file.filename)[1] extension = os.path.splitext(file.filename)[1]
session["uploaded image path"] = uploaded_image_filename+extension
filepath = get_file_path(session, session["uploaded image path"]) try:
file.save(filepath) message, status, img = process_image(file.stream)
session["uploaded image path"] = uploaded_image_filename
img.save(get_file_path(session, session["uploaded image path"]))
except Exception as e:
message = f"{e}"
status = "Error"
message, status, img = process_image(filepath)
img.save(filepath)
if status == "Error": if status == "Error":
session["uploaded image path"] = None session["uploaded image path"] = None
return render_image_template("Error: " + message, "red") return render_image_template("Error: " + message, "red")
elif status == "Info": elif status == "Info":
session["text image path"] = None
return render_image_template("Info: " + message, "black") return render_image_template("Info: " + message, "black")
return render_image_template() return render_image_template()
@ -173,7 +174,7 @@ def text_form():
get_folder_path(session) get_folder_path(session)
session["text image path"] = generated_image_filename session["text image path"] = text_image_filename
img.save(get_file_path(session, session["text image path"])) img.save(get_file_path(session, session["text image path"]))
print() print()
print(session["text image path"]) print(session["text image path"])
@ -216,15 +217,6 @@ def user_data(filename):
return send_from_directory(get_folder_path(session), filename) return send_from_directory(get_folder_path(session), filename)
@app.route('/uploads/<filename>')
def uploaded_file(filename):
return redirect(url_for('static', filename='uploads/' + filename))
@app.route('/text/<filename>')
def generated_file(filename):
return redirect(url_for('static', filename='text/' + filename))
if __name__ == "__main__": if __name__ == "__main__":
app.run(debug=True) app.run(debug=True)

View file

@ -11,8 +11,8 @@ def format_image_to_label(path):
return new_image return new_image
def process_image(path): def process_image(image_filestream):
image = Image.open(path) image = Image.open(image_filestream)
message = None message = None
status = None status = None