fixed merge errors

video_creation/final_video.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 from moviepy.editor import (
     VideoFileClip,
     AudioFileClip,
@@ -9,22 +10,18 @@ from moviepy.editor import (
 )
 import reddit.subreddit
 import re
-from utils.console import print_step
+from utils.console import print_step, print_substep
 from dotenv import load_dotenv
 import os
-from rich.console import Console
-console = Console()
-
 
 W, H = 1080, 1920
 
 
-
 def make_final_video(number_of_clips):
 
     # Calls opacity from the .env
     load_dotenv()
-    opacity = os.getenv('OPACITY')
+    opacity = os.getenv("OPACITY")
 
     print_step("Creating the final video...")
 
@@ -42,9 +39,9 @@ def make_final_video(number_of_clips):
     audio_clips = []
     for i in range(0, number_of_clips):
         audio_clips.append(AudioFileClip(f"assets/mp3/{i}.mp3"))
-    audio_clips.insert(0, AudioFileClip(f"assets/mp3/title.mp3"))
+    audio_clips.insert(0, AudioFileClip("assets/mp3/title.mp3"))
     try:
-        audio_clips.insert(1, AudioFileClip(f"assets/mp3/posttext.mp3"))
+        audio_clips.insert(1, AudioFileClip("assets/mp3/posttext.mp3"))
     except:
         OSError()
     audio_concat = concatenate_audioclips(audio_clips)
@@ -57,6 +54,7 @@ def make_final_video(number_of_clips):
     #Output Length
     console.log(f"[bold green] Video Will Be: {int_total_length} Seconds Long")
     
+
     # Gather all images
     image_clips = []
     for i in range(0, number_of_clips):
@@ -67,10 +65,10 @@ 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 os.path.exists("assets/mp3/posttext.mp3"):
         image_clips.insert(
             0,
-            ImageClip(f"assets/png/title.png")
+            ImageClip("assets/png/title.png")
             .set_duration(audio_clips[0].duration + audio_clips[1].duration)
             .set_position("center")
             .resize(width=W - 100)
@@ -79,7 +77,7 @@ def make_final_video(number_of_clips):
     else:
         image_clips.insert(
             0,
-            ImageClip(f"assets/png/title.png")
+            ImageClip("assets/png/title.png")
             .set_duration(audio_clips[0].duration)
             .set_position("center")
             .resize(width=W - 100)
@@ -90,6 +88,14 @@ def make_final_video(number_of_clips):
     )
     image_concat.audio = audio_composite
     final = CompositeVideoClip([background_clip, image_concat])
+    final_video_path = "assets/"
+    if os.getenv("FINAL_VIDEO_PATH"):
+        final_video_path = os.getenv("FINAL_VIDEO_PATH")
+        filename = (re.sub('[?\"%*:|<>]', '', (final_video_path + reddit.subreddit.submission.title + ".mp4")))
+    try:
+        final.write_videofile(filename, fps=30, audio_codec="aac", audio_bitrate="192k")
+    except:
+        print_substep("Something's wrong with the path you inserted, the video will be saved in the default path (assets/)", style="bold red")
         filename = (re.sub('[?\"%*:|<>]', '', ("assets/" + 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):