From 96f97fdf2418ff1158a1de66f3a299871cfa89d1 Mon Sep 17 00:00:00 2001
From: anthony lloyd <contact@anthonylloyd.net>
Date: Mon, 11 Jul 2022 23:55:04 +1000
Subject: [PATCH] final video revert

need to convert all of final video to ffmpeg as moviepy is good enough rn, doesnt produce audio glitches in this case
---
 utils/cleanup.py              | 12 +++++++++---
 video_creation/final_video.py | 12 ++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/utils/cleanup.py b/utils/cleanup.py
index ef4fc44..63a806b 100644
--- a/utils/cleanup.py
+++ b/utils/cleanup.py
@@ -20,8 +20,14 @@ def cleanup() -> int:
                 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)
+        try:
+            for file in os.listdir("./assets/temp/mp3"):
+                count += 1
+                os.remove("./assets/temp/mp3/" + file)
+        except FileNotFoundError:
+            pass
+        except PermissionError:
+            print("permission error")
+            pass
         return count
     return 0
diff --git a/video_creation/final_video.py b/video_creation/final_video.py
index 5054576..254c6ad 100755
--- a/video_creation/final_video.py
+++ b/video_creation/final_video.py
@@ -38,6 +38,7 @@ def name_normalize(name: str) -> str:
     name = re.sub(r"(\w+)\s?\/\s?(\w+)", r"\1 or \2", name)
     name = re.sub(r"\/", r"", name)
 
+    # was having issues with names too long
     name = name[0:140]
 
     lang = settings.config["reddit"]["thread"]["post_lang"]
@@ -77,7 +78,6 @@ def make_final_video(
     audio_clips.insert(0, AudioFileClip("assets/temp/mp3/title.mp3"))
     audio_concat = concatenate_audioclips(audio_clips)
     audio_composite = CompositeAudioClip([audio_concat])
-    audio_composite.write_audiofile(f"assets/temp/mp3/moviepy.mp3", fps=44100, verbose=False, logger=None)
 
     with open(f"assets/temp/mp3/list2.txt", 'w') as f:
         f.write("file " + f"'title.mp3'" + "\n")
@@ -86,10 +86,10 @@ def make_final_video(
 
     os.system("ffmpeg -f concat -y -hide_banner -loglevel panic -safe 0 " +
               "-i " + f"assets/temp/mp3/list2.txt " +
-              "-c copy " + f"assets/temp/mp3/concat_audio.mp4")
+              "-c copy " + f"assets/temp/mp3/concat_audio.mp3")
 
-    all_audio = AudioFileClip(f"assets/temp/mp3/concat_audio.mp4")
-    all_audio = CompositeAudioClip([audio_composite])
+    all_audio = AudioFileClip(f"assets/temp/mp3/concat_audio.mp3")
+    audio_composite = CompositeAudioClip([audio_composite])
 
 
 
@@ -126,8 +126,8 @@ def make_final_video(
     # else: story mode stuff
     img_clip_pos = background_config[3]
     image_concat = concatenate_videoclips(image_clips).set_position(img_clip_pos)
-    #image_concat.audio = audio_composite
-    image_concat.audio = all_audio
+    image_concat.audio = audio_composite
+    #image_concat.audio = all_audio
 
     final = CompositeVideoClip([background_clip, image_concat])
     title = re.sub(r"[^\w\s-]", "", reddit_obj["thread_title"])