Add PHOTOS_DIR env, refactor a bit

1 files changed, 15 insertions, 13 deletions

diff --git a/taulubot.py b/taulubot.py
index 4910048..81da778 100644
--- a/taulubot.py
+++ b/taulubot.py
@@ -1,13 +1,15 @@
-import time
-import traceback
-import random
-import os
 import calendar
 import logging
+import os
+import random
+import time
+import traceback
+
+from dotenv import load_dotenv
+from PIL import Image
+
 from telepot import Bot
 from telepot.loop import MessageLoop
-from PIL import Image
-from dotenv import load_dotenv
 
 load_dotenv()
 
@@ -18,6 +20,8 @@ BOT_TOKEN = os.getenv("BOT_TOKEN", default=None)
 if not BOT_TOKEN:
     raise Exception("BOT_TOKEN not defined in env")
 
+PHOTOS_DIR = os.getenv("PHOTOS_DIR", default="photo")
+
 wooden_im = Image.open("wooden.png")
 golden_im = Image.open("golden.png")
 img_size = (640, 640)
@@ -57,13 +61,11 @@ def run(chat_id, user_id):
     pic = photos["photos"][0][-1]
     file_id = pic["file_id"]
 
-    if not os.path.exists("photo/"):
-        logging.warning("No 'photo' directory in working directory, creating one...")
-        os.makedirs("photo/")
+    os.makedirs(PHOTOS_DIR, exist_ok=True)
 
-    unedited_path = f"photo/{file_id}.jpg"
-    edited_path_wooden = f"photo/{file_id}_wooden.png"
-    edited_path_gold = f"photo/{file_id}_gold.png"
+    unedited_path = os.path.join(PHOTOS_DIR, f"{file_id}.jpg")
+    edited_path_wooden = os.path.join(PHOTOS_DIR, f"{file_id}_wooden.png")
+    edited_path_gold = os.path.join(PHOTOS_DIR, f"{file_id}_gold.png")
 
     if os.path.exists(unedited_path):
         logging.info("User profile pic already found. Skipping download...")
@@ -90,7 +92,7 @@ def run(chat_id, user_id):
     logging.warning(
         "Editing and sending photo {} to chat {}...".format(edited_path, chat_id)
     )
-    im = edit_image(unedited_path, edited_path, frame_im)
+    edit_image(unedited_path, edited_path, frame_im)
     with open(edited_path, "rb") as f:
         bot.sendPhoto(chat_id, f)