Merge branch 'feat/watermark' into develop

2022-07-13 21:56:25 -04:00
commit c0cded355a
@@ -13,7 +13,7 @@ from utils.console import print_step, print_substep
 from utils.voice import sanitize_text
 from utils import settings

-DEFUALT_MAX_LENGTH: int = 50  # video length variable
+DEFAULT_MAX_LENGTH: int = 50  # video length variable


 class TTSEngine:
@@ -35,7 +35,7 @@ class TTSEngine:
        tts_module,
        reddit_object: dict,
        path: str = "assets/temp/mp3",
-        max_length: int = DEFUALT_MAX_LENGTH,
+        max_length: int = DEFAULT_MAX_LENGTH,
    ):
        self.tts_module = tts_module()
        self.reddit_object = reddit_object
@@ -16,8 +16,8 @@ from video_creation.final_video import make_final_video
 from video_creation.screenshot_downloader import download_screenshots_of_reddit_posts
 from video_creation.voices import save_text_to_mp3

-__VERSION__ = "2.3"
-__BRANCH__ = "master"
+__VERSION__ = "2.3.1"
+__BRANCH__ = "develop"

 print(
    """
@@ -0,0 +1,46 @@
+
+# Supported Background. Can add/remove background video here....
+# <key>-<value> : key -> used as keyword for TOML file. value -> background configuration
+# Format (value):
+# 1. Youtube URI
+# 2. filename
+# 3. Citation (owner of the video)
+# 4. Position of image clips in the background. See moviepy reference for more information. (https://zulko.github.io/moviepy/ref/VideoClip/VideoClip.html#moviepy.video.VideoClip.VideoClip.set_position)
+background_options = {
+    "motor-gta": (  # Motor-GTA Racing
+        "https://www.youtube.com/watch?v=vw5L4xCPy9Q",
+        "bike-parkour-gta.mp4",
+        "Achy Gaming",
+        lambda t: ("center", 480 + t),
+    ),
+    "rocket-league": (  # Rocket League
+        "https://www.youtube.com/watch?v=2X9QGY__0II",
+        "rocket_league.mp4",
+        "Orbital Gameplay",
+        lambda t: ("center", 200 + t),
+    ),
+    "minecraft": (  # Minecraft parkour
+        "https://www.youtube.com/watch?v=n_Dv4JMiwK8",
+        "parkour.mp4",
+        "bbswitzer",
+        "center",
+    ),
+    "gta": (  # GTA Stunt Race
+        "https://www.youtube.com/watch?v=qGa9kWREOnE",
+        "gta-stunt-race.mp4",
+        "Achy Gaming",
+        lambda t: ("center", 480 + t),
+    ),
+    "csgo-surf": (  # CSGO Surf
+        "https://www.youtube.com/watch?v=E-8JlyO59Io",
+        "csgo-surf.mp4",
+        "Aki",
+        "center",
+    ),
+    "cluster-truck": (  # Cluster Truck Gameplay
+        "https://www.youtube.com/watch?v=uVKxtdMgJVU",
+        "cluster_truck.mp4",
+        "No Copyright Gameplay",
+        lambda t: ("center", 480 + t),
+    ),
+}
@@ -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
@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from typing import Tuple
+
+from moviepy.video.VideoClip import VideoClip, TextClip
+from moviepy.video.io.VideoFileClip import VideoFileClip
+from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip
+
+
+class Video:
+    def __init__(self, video: VideoClip | VideoFileClip, *args, **kwargs):
+        self.video: VideoClip = video
+        self.fps = self.video.fps
+        self.duration = self.video.duration
+
+    @staticmethod
+    def _create_watermark(text, fontsize, opacity=0.5):
+        txt_clip = TextClip(text, fontsize=fontsize, color='black').set_opacity(opacity)
+        return txt_clip
+
+    def add_watermark(self, text, opacity=0.5, position: Tuple = (0.95, 0.95), fontsize=15):
+        txt_clip = self._create_watermark(text, opacity=opacity, fontsize=fontsize)
+        txt_clip = txt_clip.set_pos(position).set_duration(10)
+
+        # Overlay the text clip on the first video clip
+        self.video = CompositeVideoClip([self.video, txt_clip])
+        return self.video
@@ -10,55 +10,9 @@ from pytube import YouTube
 from pytube.cli import on_progress

 from utils import settings
+from utils.CONSTANTS import background_options
 from utils.console import print_step, print_substep

-# Supported Background. Can add/remove background video here....
-# <key>-<value> : key -> used as keyword for TOML file. value -> background configuration
-# Format (value):
-# 1. Youtube URI
-# 2. filename
-# 3. Citation (owner of the video)
-# 4. Position of image clips in the background. See moviepy reference for more information. (https://zulko.github.io/moviepy/ref/VideoClip/VideoClip.html#moviepy.video.VideoClip.VideoClip.set_position)
-background_options = {
-    "motor-gta": (  # Motor-GTA Racing
-        "https://www.youtube.com/watch?v=vw5L4xCPy9Q",
-        "bike-parkour-gta.mp4",
-        "Achy Gaming",
-        lambda t: ("center", 480 + t),
-    ),
-    "rocket-league": (  # Rocket League
-        "https://www.youtube.com/watch?v=2X9QGY__0II",
-        "rocket_league.mp4",
-        "Orbital Gameplay",
-        lambda t: ("center", 200 + t),
-    ),
-    "minecraft": (  # Minecraft parkour
-        "https://www.youtube.com/watch?v=n_Dv4JMiwK8",
-        "parkour.mp4",
-        "bbswitzer",
-        "center",
-    ),
-    "gta": (  # GTA Stunt Race
-        "https://www.youtube.com/watch?v=qGa9kWREOnE",
-        "gta-stunt-race.mp4",
-        "Achy Gaming",
-        lambda t: ("center", 480 + t),
-    ),
-    "csgo-surf": (  # CSGO Surf
-        "https://www.youtube.com/watch?v=E-8JlyO59Io",
-        "csgo-surf.mp4",
-        "Aki",
-        "center",
-    ),
-    "cluster-truck": (  # Cluster Truck Gameplay
-        "https://www.youtube.com/watch?v=uVKxtdMgJVU",
-        "cluster_truck.mp4",
-        "No Copyright Gameplay",
-        lambda t: ("center", 480 + t),
-    ),
-}
-
-
 def get_start_and_end_times(video_length: int, length_of_clip: int) -> Tuple[int, int]:
    """Generates a random interval of time to be used as the background of the video.

@@ -15,6 +15,7 @@ from rich.console import Console

 from utils.cleanup import cleanup
 from utils.console import print_step, print_substep
+from utils.video import Video
 from utils.videos import save_data
 from utils import settings

@@ -109,7 +110,9 @@ 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 = concatenate_videoclips(image_clips).set_position(
+        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"])
@@ -129,7 +132,9 @@ def make_final_video(
    #    # 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,