From 5282e1b0fd715d9f2fa56367bf113b528ddc4301 Mon Sep 17 00:00:00 2001
From: kobolol <familiehimmelberg@gmail.com>
Date: Thu, 29 Sep 2022 20:43:05 +0200
Subject: [PATCH] Add vercel

---
 .gitignore                    |   1 -
 app.py => main.py             |  16 ++++++++++------
 render/initer.py              |  14 ++++++++------
 render/utils/render_worker.py |  11 ++++++-----
 requirements.txt              | Bin 406 -> 0 bytes
 vercel.json                   |  15 ---------------
 6 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 .gitignore
 rename app.py => main.py (55%)
 delete mode 100644 requirements.txt
 delete mode 100644 vercel.json

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e985853..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.vercel
diff --git a/app.py b/main.py
similarity index 55%
rename from app.py
rename to main.py
index 8b4cb95..d8854d7 100644
--- a/app.py
+++ b/main.py
@@ -2,6 +2,9 @@ from flask import *
 from render.initer import load_themes, render_pic
 import os
 
+THIS_FOLDER = os.path.dirname(os.path.abspath(__file__))
+
+
 app = Flask(__name__)
 
 
@@ -10,7 +13,7 @@ def create_pic():
     name_query = str(request.args.get("name"))
     theme_query = str(request.args.get("t"))
 
-    filename = render_pic(themes, name_query, theme_query)
+    filename = render_pic(themes, name_query, theme_query, THIS_FOLDER)
 
     if filename == "error":
         return "<h1>error</h1><br><h3>check if theme exist or name & theme is given!</h3>"
@@ -18,8 +21,9 @@ def create_pic():
     return send_file(filename, mimetype='image/gif')
 
 
-dirs = 'render/outputs'
-for f in os.listdir(dirs):
-    os.remove(os.path.join(dirs, f))
-themes = load_themes()
-app.run()
+if __name__ == "__main__":
+    dirs = os.path.join(THIS_FOLDER, "render/outputs")
+    for f in os.listdir(dirs):
+        os.remove(os.path.join(dirs, f))
+    themes = load_themes(THIS_FOLDER)
+    app.run()
diff --git a/render/initer.py b/render/initer.py
index fd4c598..a45045a 100644
--- a/render/initer.py
+++ b/render/initer.py
@@ -4,22 +4,24 @@ from render.utils.render_worker import render_worker
 import os
 
 
-def render_pic(themes, name, theme):
+def render_pic(themes, name, theme, THIS_FOLDER):
+    file = os.path.join(THIS_FOLDER, f"render/outputs/{name}{theme}.png")
+
     if theme == "None" or name == "None" or len(themes)-1 < int(theme):
         return "error"
 
-    if not os.path.exists(f"render/outputs/{name}{theme}.png"):
+    if not os.path.exists(file):
         print("Anfrage noch nicht gerendert, Wird nun erstellt ...")
-        filename = render_worker(name, int(theme), themes)
+        filename = render_worker(name, int(theme), themes, THIS_FOLDER)
         return filename
 
     else:
         print("Anfrage wurde schon gerendert, wird nun übergeben ...")
-        return f"render/outputs/{name}{theme}.png"
+        return file
 
 
-def load_themes():
-    file = open("render/themelist.txt", "r")
+def load_themes(THIS_FOLDER):
+    file = open(os.path.join(THIS_FOLDER, "render/themelist.txt"))
     liste = readfile(file)
     file.close()
     return liste
diff --git a/render/utils/render_worker.py b/render/utils/render_worker.py
index c5fc8ff..1a58cdb 100644
--- a/render/utils/render_worker.py
+++ b/render/utils/render_worker.py
@@ -2,16 +2,17 @@ from PIL import Image
 from PIL import ImageFont
 from PIL import ImageDraw
 from render.utils.text_align import get_text_align
+import os
 
 
-def render_worker(name: str, theme: int, themes):
-    img = Image.open(f"render/themes/{themes[theme].getdataname()}")
-    font = ImageFont.truetype(f"render/fonts/{themes[theme].getfontname()}", int(themes[theme].getbold()))
+def render_worker(name: str, theme: int, themes, THIS_FOLDER:str):
+    img = Image.open(os.path.join(THIS_FOLDER, f"render/themes/{themes[theme].getdataname()}"))
+    font = ImageFont.truetype(os.path.join(THIS_FOLDER, f"render/fonts/{themes[theme].getfontname()}"), int(themes[theme].getbold()))
 
     draw = ImageDraw.Draw(img)
 
     msg = name
 
     draw.text(get_text_align(msg, font, (1024, 1024)), msg, (int(themes[theme].getcolor1()), int(themes[theme].getcolor2()), int(themes[theme].getcolor3())), font=font)
-    img.save(f"render/outputs/{name}{theme}.png")
-    return f"render/outputs/{name}{theme}.png"
+    img.save(os.path.join(THIS_FOLDER, f"render/outputs/{name}{theme}.png"))
+    return os.path.join(THIS_FOLDER, f"render/outputs/{name}{theme}.png")
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 5dfe1cae3e870cd39ff04a8a1b1f0747e857a188..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 406
zcmY+ANe=-*5QX1a;-?TZmT+)zaS#%TgE-nV#xfZu!jH#S)dcBOx>K*-QvG}^wO690
zQgu0PRTWWnl~tm90zE0$TnEY~YM>3O=@WhMxz2BPOh1&d6F8Z(FYd8Wh0a<R7%R$d
zQ#7^6c{SHeK+ZmK)Ry@ije?HNn!4qSeR6=uQ9E>EN9%v+h<;A8f)o?p8?=5kBG(wB
zvG*;nj&@wV%AU4ErW+1h&k%m7`Su9-7<{IlMjAT11sag4Cr@?fE>QS5fB)x>bH*{m
Jl83)H*B3HHIz#{f

diff --git a/vercel.json b/vercel.json
deleted file mode 100644
index 6a89c1f..0000000
--- a/vercel.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 2,
-  "builds": [
-      {
-          "src": "./app.py",
-          "use": "@vercel/python"
-      }
-  ],
-  "routes": [
-      {
-          "src": "/(.*)",
-          "dest": "/"
-      }
-  ]
-}
\ No newline at end of file