fixed image upload to add file extension

clemenstyp · Mar 22, 2024 · ccc19e7 · ccc19e7
1 parent fbbe503
commit ccc19e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/Snackbar/Frontpage/Titlepage.py b/Snackbar/Frontpage/Titlepage.py
@@ -61,10 +61,11 @@ def change_image():
         if 'image' in request.files:
             file = request.files['image']
             if file.filename != "":
-                imagename = file.filename
+                imagename_extension = file.filename.rsplit('.',1)[-1]
+                imagename = file.filename.rsplit('.', 1)[0]
                 userid = request.form["userid"]
                 imagename = str(userid) + "_" + imagename + "_ " + ''.join(
-                    random.choice(string.ascii_uppercase + string.digits) for _ in range(6))
+                    random.choice(string.ascii_uppercase + string.digits) for _ in range(6)) + '.' + imagename_extension
                 if imagename != '':  # and allowed_file(imagename):
                     userid = request.form["userid"]
                     filename = secure_filename(imagename)

diff --git a/Snackbar/Frontpage/Userpage.py b/Snackbar/Frontpage/Userpage.py
@@ -88,12 +88,16 @@ def adduser():
                 filename = ''
                 if 'image' in request.files:
                     file = request.files['image']
-                    imagename = first_name + "_" + file.filename + "_ " + ''.join(
-                        random.choice(string.ascii_uppercase + string.digits) for _ in range(6))
-                    if imagename != '':  # and allowed_file(imagename):
-                        filename = secure_filename(imagename)
-                        full_path = os.path.join(app.config['IMAGE_FOLDER'], filename)
-                        file.save(full_path)
+                    if file.filename != "":
+                        imagename_extension = file.filename.rsplit('.', 1)[-1]
+                        imagename = file.filename.rsplit('.',1)[0]
+                        imagename = first_name + "_" + imagename + "_ " + ''.join(
+                            random.choice(string.ascii_uppercase + string.digits) for _ in
+                            range(6)) + '.' + imagename_extension
+                        if imagename != '':  # and allowed_file(imagename):
+                            filename = secure_filename(imagename)
+                            full_path = os.path.join(app.config['IMAGE_FOLDER'], filename)
+                            file.save(full_path)
 
                 new_user = User(firstname=first_name, lastname=last_name, email=email, imagename=filename)