Merge branch 'develop' into master

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

README.md

@@ -32,7 +32,7 @@ The only original thing being done is the editing and gathering of all materials
 
 ## Requirements
 
-- Python 3.9+
+- Python 3.10
 - Playwright (this should install automatically in installation)
 
 ## Installation 👩‍💻
@@ -70,6 +70,7 @@ In its current state, this bot does exactly what it needs to do. However, improv
 I have tried to simplify the code so anyone can read it and start contributing at any skill level. Don't be shy :) contribute!
 
 - [ ] Creating better documentation and adding a command line interface.
+- [ ] Allowing the user to choose background music for their videos.
 - [x] Allowing users to choose a reddit thread instead of being randomized.
 - [x] Allowing users to choose a background that is picked instead of the Minecraft one.
 - [x] Allowing users to choose between any subreddit.
@@ -86,9 +87,11 @@ Elebumm (Lewis#6305) - https://github.com/elebumm (Founder)
 
 Jason (JasonLovesDoggo#1904) - https://github.com/JasonLovesDoggo (Maintainer)
 
+Simon (OpenSourceSimon) - https://github.com/OpenSourceSimon
+
 CallumIO (c.#6837) - https://github.com/CallumIO
 
-Verq (Verq#2338) - https://github.com/CordlessCoder 
+Verq (Verq#2338) - https://github.com/CordlessCoder
 
 LukaHietala (Pix.#0001) - https://github.com/LukaHietala
 

main.py

@@ -65,13 +65,13 @@ def run_many(times):
 
 
 def shutdown():
-    print_markdown("## Clearing temp files")
     try:
         redditid
     except NameError:
         print("Exiting...")
         exit()
     else:
+        print_markdown("## Clearing temp files")
         cleanup(redditid)
         print("Exiting...")
         exit()

requirements.txt

@@ -11,7 +11,7 @@ rich==12.5.1
 toml==0.10.2
 translators==5.3.1
 pyttsx3==2.90
-Pillow~=9.1.1
+Pillow~=9.3.0
 tomlkit==0.11.4
 Flask==2.2.2
 spacy==3.4.1

utils/.config.template.toml

@@ -30,7 +30,7 @@ fps = { optional = true, default = 30, example = 30, explanation = "Sets the FPS
 
 
 [settings.background]
-background_choice = { optional = true, default = "minecraft", example = "rocket-league", options = ["", "minecraft", "gta", "rocket-league", "motor-gta", "csgo-surf", "cluster-truck"], explanation = "Sets the background for the video based on game name" }
+background_choice = { optional = true, default = "minecraft", example = "rocket-league", options = ["minecraft", "gta", "rocket-league", "motor-gta", "csgo-surf", "cluster-truck", "minecraft-2","multiversus","fall-guys","steep", ""], explanation = "Sets the background for the video based on game name" }
 #background_audio = { optional = true, type = "bool", default = false, example = false, options = [true, false,], explanation = "Sets a audio to play in the background (put a background.mp3 file in the assets/backgrounds directory for it to be used.)" }
 #background_audio_volume = { optional = true, type = "float", default = 0.3, example = 0.1, explanation="Sets the volume of the background audio. only used if the background_audio is also set to true" }
 

utils/backgrounds.json

@@ -35,5 +35,29 @@
         "cluster_truck.mp4",
         "No Copyright Gameplay",
         480
+    ],
+    "minecraft-2": [
+        "https://www.youtube.com/watch?v=Pt5_GSKIWQM",
+        "minecraft-2.mp4",
+        "Itslpsn",
+        "center"
+    ],
+    "multiversus": [
+        "https://www.youtube.com/watch?v=66oK1Mktz6g",
+        "multiversus.mp4",
+        "MKIceAndFire",
+        "center"
+    ],
+    "fall-guys": [
+        "https://www.youtube.com/watch?v=oGSsgACIc6Q",
+        "fall-guys.mp4",
+        "Throneful",
+        "center"
+    ],
+    "steep": [
+        "https://www.youtube.com/watch?v=EnGiQrWBrko",
+        "steep.mp4",
+        "joel",
+        "center"
     ]
-}
+}

utils/cleanup.py

@@ -12,20 +12,18 @@ def cleanup(id) -> int:
     Returns:
         int: How many files were deleted
     """
-    if exists("./assets/temp"):
+    if exists(f"../assets/temp/{id}/"):
         count = 0
-        files = [
-            f for f in os.listdir(".") if f.endswith(".mp4") and "temp" in f.lower()
-        ]
+        files = [f for f in os.listdir(f"../assets/temp/{id}/") if f.endswith(".mp4")]
         count += len(files)
         for f in files:
-            os.remove(f)
-        REMOVE_DIRS = [f"./assets/temp/{id}/mp3/", f"./assets/temp/{id}/png/"]
-        files_to_remove = list(map(_listdir, REMOVE_DIRS))
-        for directory in files_to_remove:
-            for file in directory:
-                count += 1
-                os.remove(file)
+            os.remove(f"../assets/temp/{id}/{f}")
+        REMOVE_DIRS = [f"../assets/temp/{id}/mp3/", f"../assets/temp/{id}/png/"]
+        for d in REMOVE_DIRS:
+            if exists(d):
+                count += len(_listdir(d))
+                for f in _listdir(d):
+                    os.remove(f)
+                os.rmdir(d)
+        os.rmdir(f"../assets/temp/{id}/")
         return count
-
-    return 0