From 841bb513d31989ab554ff1fb4392d764c4ed97de Mon Sep 17 00:00:00 2001
From: BBaoVanC <github@bbaovanc.com>
Date: Wed, 2 Sep 2020 17:14:28 -0500
Subject: [PATCH] Allow easy customization of filename generation

Added a new file called functions.py which contains user-customizable
functions, instead of requiring the user to edit imgupload.py.
---
 functions.py |  8 ++++++++
 imgupload.py | 16 ++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)
 create mode 100644 functions.py

diff --git a/functions.py b/functions.py
new file mode 100644
index 0000000..c13c25a
--- /dev/null
+++ b/functions.py
@@ -0,0 +1,8 @@
+import string
+import random
+
+
+def generate_name():
+    chars = string.ascii_letters + string.digits  # uppercase, lowercase, and numbers
+    name = ''.join((random.choice(chars) for i in range(8)))  # generate name
+    return name
diff --git a/imgupload.py b/imgupload.py
index 03fdd81..405550c 100644
--- a/imgupload.py
+++ b/imgupload.py
@@ -2,15 +2,12 @@ from flask import Flask, request, jsonify, abort, Response
 from cryptography.fernet import Fernet
 from flask_api import status
 from pathlib import Path
-import string
 import random
 import os
 import datetime
 
 import settings  # app settings (such as allowed extensions)
-
-
-ALPHANUMERIC = string.ascii_letters + string.digits  # uppercase, lowercase, and numbers
+import functions  # custom functions
 
 app = Flask(__name__)  # app is the app
 
@@ -22,15 +19,6 @@ def allowed_extension(testext):
         return False
 
 
-def generate_name(extension):
-    namefound = False
-    while not namefound:
-        fname = ''.join((random.choice(ALPHANUMERIC) for i in range(8))) + str(extension)
-        if not Path(fname).is_file():
-            namefound = True
-    return fname
-
-
 def log_savelog(key, ip, savedname):
     if settings.SAVELOG_KEYPREFIX > 0:
         with open(settings.SAVELOG, "a+") as slogf:
@@ -77,7 +65,7 @@ def upload():
                 fext = Path(f.filename).suffix  # get the uploaded extension
                 if allowed_extension(fext):  # if the extension is allowed
                     print("Generating file with extension {0}".format(fext))
-                    fname = generate_name(fext)  # generate file name
+                    fname = functions.generate_name() + fext  # generate file name
                     print("Generated name: {0}".format(fname))
 
                     if f:  # if the uploaded image exists