refactored final_video.py

updated requirements.txt
simplified cleanup.py

requirements.txt

@@ -9,5 +9,3 @@ requests==2.28.1
 rich==12.5.1
 toml==0.10.2
 translators==5.3.1
-
-Pillow~=9.1.1

utils/cleanup.py

@@ -2,6 +2,10 @@ import os
 from os.path import exists
 
 
+def _listdir(d):  # listdir with full path
+    return [os.path.join(d, f) for f in os.listdir(d)]
+
+
 def cleanup() -> int:
     """Deletes all temporary assets in assets/temp
 
@@ -14,14 +18,12 @@ def cleanup() -> int:
         count += len(files)
         for f in files:
             os.remove(f)
-        try:
-            for file in os.listdir("./assets/temp/mp4"):
+        REMOVE_DIRS = ["./assets/temp/mp3/", "./assets/temp/png/"]
+        files_to_remove = list(map(_listdir, REMOVE_DIRS))
+        for directory in files_to_remove:
+            for file in directory:
                 count += 1
-                os.remove("./assets/temp/mp4/" + file)
-        except FileNotFoundError:
-            pass
-        for file in os.listdir("./assets/temp/mp3"):
-            count += 1
-            os.remove("./assets/temp/mp3/" + file)
+                os.remove(file)
         return count
+
     return 0

video_creation/final_video.py

@@ -43,8 +43,12 @@ def name_normalize(name: str) -> str:
         return name
 
 
-def make_final_video(number_of_clips: int, length: int, reddit_obj: dict,
-                     background_config: Tuple[str, str, str, Any], ):
+def make_final_video(
+    number_of_clips: int,
+    length: int,
+    reddit_obj: dict,
+    background_config: Tuple[str, str, str, Any],
+):
     """Gathers audio clips, gathers all screenshots, stitches them together and saves the final video to assets/temp
     Args:
         number_of_clips (int): Index to end at when going through the screenshots'
@@ -62,8 +66,11 @@ def make_final_video(number_of_clips: int, length: int, reddit_obj: dict,
     VideoFileClip.reH = lambda clip: clip.resize(width=H)
     opacity = settings.config["settings"]["opacity"]
     background_clip = (
-        VideoFileClip("assets/temp/background.mp4").without_audio().resize(height=H).crop(x1=1166.6, y1=0, x2=2246.6,
-                                                                                          y2=1920))
+        VideoFileClip("assets/temp/background.mp4")
+        .without_audio()
+        .resize(height=H)
+        .crop(x1=1166.6, y1=0, x2=2246.6, y2=1920)
+    )
 
     # Gather all audio clips
     audio_clips = [AudioFileClip(f"assets/temp/mp3/{i}.mp3") for i in range(number_of_clips)]
@@ -76,15 +83,21 @@ def make_final_video(number_of_clips: int, length: int, reddit_obj: dict,
     image_clips = []
     # Gather all images
     new_opacity = 1 if opacity is None or float(opacity) >= 1 else float(opacity)
-    image_clips.insert(0,
-                       ImageClip("assets/temp/png/title.png").set_duration(audio_clips[0].duration).resize(
-                           width=W - 100).set_opacity(
-                           new_opacity), )
+    image_clips.insert(
+        0,
+        ImageClip("assets/temp/png/title.png")
+        .set_duration(audio_clips[0].duration)
+        .resize(width=W - 100)
+        .set_opacity(new_opacity),
+    )
 
     for i in range(0, number_of_clips):
         image_clips.append(
-            ImageClip(f"assets/temp/png/comment_{i}.png").set_duration(audio_clips[i + 1].duration).resize(
-                width=W - 100).set_opacity(new_opacity))
+            ImageClip(f"assets/temp/png/comment_{i}.png")
+            .set_duration(audio_clips[i + 1].duration)
+            .resize(width=W - 100)
+            .set_opacity(new_opacity)
+        )
 
     # if os.path.exists("assets/mp3/posttext.mp3"):
     #    image_clips.insert(
@@ -98,7 +111,8 @@ def make_final_video(number_of_clips: int, length: int, reddit_obj: dict,
     # else: story mode stuff
     img_clip_pos = background_config[3]
     image_concat = concatenate_videoclips(image_clips).set_position(
-        img_clip_pos)  # note transition kwarg for delay in imgs
+        img_clip_pos
+    )  # note transition kwarg for delay in imgs
     image_concat.audio = audio_composite
     final = CompositeVideoClip([background_clip, image_concat])
     title = re.sub(r"[^\w\s-]", "", reddit_obj["thread_title"])
@@ -118,14 +132,29 @@ def make_final_video(number_of_clips: int, length: int, reddit_obj: dict,
     #    # lowered_audio = audio_background.multiply_volume( # todo get this to work
     #    #    VOLUME_MULTIPLIER)  # lower volume by background_audio_volume, use with fx
     #    final.set_audio(final_audio)
-    final = Video(final).add_watermark(text=f'Background credit: {background_config[2]}', opacity=0.4)
-    final.write_videofile("assets/temp/temp.mp4", fps=30, audio_codec="aac", audio_bitrate="192k", verbose=False,
-                          threads=multiprocessing.cpu_count(), )
-    ffmpeg_extract_subclip("assets/temp/temp.mp4", 0, final.duration, targetname=f"results/{subreddit}/{filename}", )
+    final = Video(final).add_watermark(
+        text=f"Background credit: {background_config[2]}", opacity=0.4
+    )
+    final.write_videofile(
+        "assets/temp/temp.mp4",
+        fps=30,
+        audio_codec="aac",
+        audio_bitrate="192k",
+        verbose=False,
+        threads=multiprocessing.cpu_count(),
+    )
+    ffmpeg_extract_subclip(
+        "assets/temp/temp.mp4",
+        0,
+        final.duration,
+        targetname=f"results/{subreddit}/{filename}",
+    )
     save_data(subreddit, filename, title, idx, background_config[2])
     print_step("Removing temporary files 🗑")
     cleanups = cleanup()
     print_substep(f"Removed {cleanups} temporary files 🗑")
     print_substep("See result in the results folder!")
 
-    print_step(f'Reddit title: {reddit_obj["thread_title"]} \n Background Credit: {background_config[2]}')
+    print_step(
+        f'Reddit title: {reddit_obj["thread_title"]} \n Background Credit: {background_config[2]}'
+    )