From b1d8f5eec1f6765b7553029807e88fea213086bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= <tlovinator@gmail.com>
Date: Tue, 11 May 2021 23:54:35 +0200
Subject: [PATCH] Move video files to separate folder

---
 Dockerfile |  2 +-
 main.py    | 32 ++++++++++++--------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c2b6274..c2547e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ COPY --from=compile-image /opt/venv /opt/venv
 RUN useradd --create-home botuser
 
 # Create directories we need
-RUN mkdir -p /home/botuser/Uploads && mkdir -p /home/botuser/templates
+RUN mkdir -p /home/botuser/Uploads/a && mkdir -p /home/botuser/templates
 
 # Change ownership of directories
 RUN chown -R botuser:botuser /home/botuser && chmod -R 755 /home/botuser
diff --git a/main.py b/main.py
index 1914728..5bbcec4 100644
--- a/main.py
+++ b/main.py
@@ -3,15 +3,7 @@ import shlex
 import subprocess
 from datetime import datetime
 
-from flask import (
-    Flask,
-    flash,
-    redirect,
-    render_template,
-    request,
-    send_from_directory,
-    url_for,
-)
+from flask import Flask, flash, redirect, render_template, request, url_for
 from werkzeug.utils import secure_filename
 
 app = Flask(__name__)
@@ -79,18 +71,20 @@ def upload_file():
     if request.method == "POST":
         # check if the post request has the file part
         if "file" not in request.files:
-            flash("No file part")
+            flash("No file part", "error")
             return redirect(request.url)
         file = request.files["file"]
+
         # if user does not select file, browser also
         # submit an empty part without filename
         if file.filename == "":
-            flash("No selected file")
+            flash("No selected file", "error")
             return redirect(request.url)
+
         if file:
             filename = secure_filename(file.filename)
             print(f"{filename=}")
-            filepath = f"Uploads/{file.filename}"
+            filepath = f"Uploads/v/{filename}"
             print(f"{filepath=}")
             file.save(filepath)
 
@@ -98,10 +92,10 @@ def upload_file():
             print(f"{height=}")
             print(f"{width=}")
 
-            screenshot_url = get_first_frame(filepath, file.filename)
+            screenshot_url = get_first_frame(filepath, filename)
             print(f"{screenshot_url=}")
 
-            video_url = f"https://killyoy.lovinator.space/{file.filename}"
+            video_url = f"https://killyoy.lovinator.space/v/{filename}"
             print(f"{video_url=}")
 
             html_url = generate_html(
@@ -112,14 +106,12 @@ def upload_file():
                 filename,
             )
             print(f"{html_url=}")
-            return redirect(url_for("uploaded_file", filename=file.filename))
+
+            return {"html_url": f"{html_url}"}
+
+    # If GET
     return redirect(url_for("index"))
 
 
-@app.route("/<filename>")
-def uploaded_file(filename):
-    return send_from_directory(app.config["UPLOAD_FOLDER"], filename)
-
-
 if __name__ == "__main__":
     app.run(debug=True)