From aa25749caf152d91026a18b927def646698d6388 Mon Sep 17 00:00:00 2001
From: HallowedDust5 <ashibrahim16@yahoo.com>
Date: Thu, 9 Jun 2022 08:11:33 -0400
Subject: [PATCH 1/2] Changed all occurences of os.path to Path()

---
 main.py                       |  4 ++--
 setup.py                      |  4 ++--
 video_creation/final_video.py | 10 ++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 9aabe78..6ef9917 100644
--- a/main.py
+++ b/main.py
@@ -11,6 +11,7 @@ from video_creation.screenshot_downloader import download_screenshots_of_reddit_
 from video_creation.final_video import make_final_video
 from utils.loader import Loader
 from dotenv import load_dotenv
+from pathlib import Path
 
 console = Console()
 from dotenv import load_dotenv
@@ -48,8 +49,7 @@ load_dotenv()
 console.log("[bold green]Checking environment variables...")
 time.sleep(1)
 
-
-if not os.path.exists(".env"):
+if not Path(".env").is_file():
     configured = False
     console.log("[red] Your .env file is invalid, or was never created. Standby.")
 
diff --git a/setup.py b/setup.py
index feaa344..e6833e1 100644
--- a/setup.py
+++ b/setup.py
@@ -12,10 +12,10 @@ from utils.console import print_step
 from utils.console import print_substep
 from rich.console import Console
 from utils.loader import Loader
-from os.path import exists
+from pathlib import Path
 console = Console()
 
-setup_done = exists(".setup-done-before")
+setup_done = Path(".setup-done-before").is_file()
 
 if setup_done == True:
 	console.log("[red]Setup was already completed! Please make sure you have to run this script again. If you have to, please delete the file .setup-done-before")
diff --git a/video_creation/final_video.py b/video_creation/final_video.py
index 93bac6f..75bda37 100644
--- a/video_creation/final_video.py
+++ b/video_creation/final_video.py
@@ -12,6 +12,7 @@ import re
 from utils.console import print_step
 from dotenv import load_dotenv
 import os
+from pathlib import Path
 
 W, H = 1080, 1920
 
@@ -57,7 +58,7 @@ def make_final_video(number_of_clips):
             .resize(width=W - 100)
             .set_opacity(float(opacity)),
         )
-    if os.path.exists(f"assets/mp3/posttext.mp3"):
+    if Path(f"assets/mp3/posttext.mp3").is_file():
         image_clips.insert(
             0,
             ImageClip(f"assets/png/title.png")
@@ -80,7 +81,12 @@ def make_final_video(number_of_clips):
     )
     image_concat.audio = audio_composite
     final = CompositeVideoClip([background_clip, image_concat])
-    filename = (re.sub('[?\"%*:|<>]', '', ("assets/" + reddit.subreddit.submission.title + ".mp4")))
+
+    if not Path("assets/generated-videos").is_dir():
+        Path.mkdir("assets/generated-videos")
+
+
+    filename = (re.sub('[?\"%*:|<>]', '', ("assets/generated-videos/" + reddit.subreddit.submission.title + ".mp4")))
     final.write_videofile(filename, fps=30, audio_codec="aac", audio_bitrate="192k")
     for i in range(0, number_of_clips):
         pass

From c67d157ce80d5f6491e873e1a6328cdbca3b4313 Mon Sep 17 00:00:00 2001
From: HallowedDust5 <ashibrahim16@yahoo.com>
Date: Thu, 9 Jun 2022 08:29:08 -0400
Subject: [PATCH 2/2] Improved path cleaning readability

---
 video_creation/final_video.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/video_creation/final_video.py b/video_creation/final_video.py
index 75bda37..001de06 100644
--- a/video_creation/final_video.py
+++ b/video_creation/final_video.py
@@ -86,7 +86,6 @@ def make_final_video(number_of_clips):
         Path.mkdir("assets/generated-videos")
 
 
-    filename = (re.sub('[?\"%*:|<>]', '', ("assets/generated-videos/" + reddit.subreddit.submission.title + ".mp4")))
-    final.write_videofile(filename, fps=30, audio_codec="aac", audio_bitrate="192k")
-    for i in range(0, number_of_clips):
-        pass
+    raw_filename = Path("assets", "generated-videos") / (reddit.subreddit.submission.title + ".mp4")
+    cleaned_filename = (re.sub('[?\"%*:|<>]', '', str(raw_filename)))
+    final.write_videofile(cleaned_filename, fps=30, audio_codec="aac", audio_bitrate="192k")
\ No newline at end of file