Version 3.0 is finally here!

Author: OpenSourceSimon

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -45,7 +45,7 @@ body:
 
         Python version : [e.g. Python 3.6]
 
-        App version / Branch [e.g. latest, V2.0, master, develop]
+        App version / Branch : [e.g. latest, V2.0, master, develop]
     validations:
       required: true
   - type: checkboxes

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Ask a question
     about: Join our discord server to ask questions and discuss with maintainers and contributors.

.gitignore

@@ -232,6 +232,7 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 
 assets/
+/.vscode
 out
 .DS_Store
 .setup-done-before
@@ -243,3 +244,4 @@ video_creation/data/videos.json
 video_creation/data/envvars.txt
 
 config.toml
+video_creation/data/videos.json

CONTRIBUTING.md

@@ -28,7 +28,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
 
 ## I Have a Question
 
-> If you want to ask a question, we assume that you have read the available [Documentation](https://luka-hietala.gitbook.io/documentation-for-the-reddit-bot/).
+> If you want to ask a question, we assume that you have read the available [Documentation](https://reddit-video-maker-bot.netlify.app/).
 
 Before you ask a question, it is best to search for existing [Issues](https://github.com/elebumm/RedditVideoMakerBot/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
 
@@ -144,4 +144,4 @@ When making your PR, follow these guidelines:
 
 ### Improving The Documentation
 
-All updates to the documentation should be made in a pull request to [this repo](https://github.com/LukaHietala/reddit-bot-docs)
+All updates to the documentation should be made in a pull request to [this repo](https://github.com/LukaHietala/RedditVideoMakerBot-website)

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright
+FROM python:3.10.9-slim
 
 RUN apt update
 RUN apt install python3-pip -y

GUI.py

@@ -1,32 +1,118 @@
-# Import the server module
-import http.server
 import webbrowser
+from pathlib import Path
+
+# Used "tomlkit" instead of "toml" because it doesn't change formatting on "dump"
+import tomlkit
+from flask import (
+    Flask,
+    redirect,
+    render_template,
+    request,
+    send_from_directory,
+    url_for,
+)
+
+import utils.gui_utils as gui
 
 # Set the hostname
 HOST = "localhost"
 # Set the port number
 PORT = 4000
 
-# Define class to display the index page of the web server
-class PythonServer(http.server.SimpleHTTPRequestHandler):
-    def do_GET(self):
-        if self.path == "/GUI":
-            self.path = "index.html"
-        return http.server.SimpleHTTPRequestHandler.do_GET(self)
-
-
-# Declare object of the class
-webServer = http.server.HTTPServer((HOST, PORT), PythonServer)
-# Print the URL of the webserver, new =2 opens in a new tab
-print(f"Server started at http://{HOST}:{PORT}/GUI/")
-webbrowser.open(f"http://{HOST}:{PORT}/GUI/", new=2)
-print("Website opened in new tab")
-print("Press Ctrl+C to quit")
-try:
-    # Run the web server
-    webServer.serve_forever()
-except KeyboardInterrupt:
-    # Stop the web server
-    webServer.server_close()
-    print("The server is stopped.")
-    exit()
+# Configure application
+app = Flask(__name__, template_folder="GUI")
+
+# Configure secret key only to use 'flash'
+app.secret_key = b'_5#y2L"F4Q8z\n\xec]/'
+
+
+# Ensure responses aren't cached
+@app.after_request
+def after_request(response):
+    response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"
+    response.headers["Expires"] = 0
+    response.headers["Pragma"] = "no-cache"
+    return response
+
+
+# Display index.html
+@app.route("/")
+def index():
+    return render_template("index.html", file="videos.json")
+
+
+@app.route("/backgrounds", methods=["GET"])
+def backgrounds():
+    return render_template("backgrounds.html", file="backgrounds.json")
+
+
+@app.route("/background/add", methods=["POST"])
+def background_add():
+    # Get form values
+    youtube_uri = request.form.get("youtube_uri").strip()
+    filename = request.form.get("filename").strip()
+    citation = request.form.get("citation").strip()
+    position = request.form.get("position").strip()
+
+    gui.add_background(youtube_uri, filename, citation, position)
+
+    return redirect(url_for("backgrounds"))
+
+
+@app.route("/background/delete", methods=["POST"])
+def background_delete():
+    key = request.form.get("background-key")
+    gui.delete_background(key)
+
+    return redirect(url_for("backgrounds"))
+
+
+@app.route("/settings", methods=["GET", "POST"])
+def settings():
+    config_load = tomlkit.loads(Path("config.toml").read_text())
+    config = gui.get_config(config_load)
+
+    # Get checks for all values
+    checks = gui.get_checks()
+
+    if request.method == "POST":
+        # Get data from form as dict
+        data = request.form.to_dict()
+
+        # Change settings
+        config = gui.modify_settings(data, config_load, checks)
+
+    return render_template(
+        "settings.html", file="config.toml", data=config, checks=checks
+    )
+
+
+# Make videos.json accessible
+@app.route("/videos.json")
+def videos_json():
+    return send_from_directory("video_creation/data", "videos.json")
+
+
+# Make backgrounds.json accessible
+@app.route("/backgrounds.json")
+def backgrounds_json():
+    return send_from_directory("utils", "backgrounds.json")
+
+
+# Make videos in results folder accessible
+@app.route("/results/<path:name>")
+def results(name):
+    return send_from_directory("results", name, as_attachment=True)
+
+
+# Make voices samples in voices folder accessible
+@app.route("/voices/<path:name>")
+def voices(name):
+    return send_from_directory("GUI/voices", name, as_attachment=True)
+
+
+# Run browser and start the app
+if __name__ == "__main__":
+    webbrowser.open(f"http://{HOST}:{PORT}", new=2)
+    print("Website opened in new tab. Refresh if it didn't load.")
+    app.run(port=PORT)