refactor in final_video + fixes

pull/963/head
Drugsosos 2 years ago
parent 1d968ee7b7
commit a01da8a8bf
No known key found for this signature in database
GPG Key ID: 8E35176FE617E28D

@ -13,7 +13,7 @@ from utils import settings
from video_creation.background import (
get_background_config,
)
from video_creation.final_video import make_final_video
from video_creation.final_video import FinalVideo
from video_creation.screenshot_downloader import RedditScreenshot
from video_creation.voices import save_text_to_mp3
@ -45,7 +45,7 @@ async def main(
comments_created = save_text_to_mp3(reddit_object)
await RedditScreenshot(reddit_object, comments_created).download()
bg_config = get_background_config()
make_final_video(comments_created, reddit_object, bg_config)
FinalVideo().make(comments_created, reddit_object, bg_config)
async def run_many(times):

@ -15,6 +15,7 @@ from moviepy.editor import (
from moviepy.video.io.ffmpeg_tools import ffmpeg_extract_subclip
from rich.console import Console
from rich.progress import track
from attr import attrs
from utils.cleanup import cleanup
from utils.console import print_step, print_substep
@ -23,12 +24,34 @@ from utils.videos import save_data
from utils import settings
from video_creation.background import download_background, chop_background_video
console = Console()
@attrs
class FinalVideo:
video_duration: int = 0
console = Console()
def name_normalize(
def __attrs_post_init__(self):
self.W: int = int(settings.config["settings"]["video_width"])
self.H: int = int(settings.config["settings"]["video_height"])
if not self.W or not self.H:
self.W, self.H = 1080, 1920
self.vertical_video: bool = self.W < self.H
self.max_length: int = int(settings.config["settings"]["video_length"])
self.time_before_first_picture: float = settings.config["settings"]["time_before_first_picture"]
self.time_before_tts: float = settings.config["settings"]["time_before_tts"]
self.time_between_pictures: float = settings.config["settings"]["time_between_pictures"]
self.delay_before_end: float = settings.config["settings"]["delay_before_end"]
self.opacity = settings.config["settings"]["opacity"]
self.opacity = 1 if self.opacity is None or self.opacity >= 1 else self.opacity
@staticmethod
def name_normalize(
name: str
) -> str:
) -> str:
name = re.sub(r'[?\\"%*:|<>]', "", name)
name = re.sub(r"( [w,W]\s?\/\s?[o,O,0])", r" without", name)
name = re.sub(r"( [w,W]\s?\/)", r" with", name)
@ -46,12 +69,41 @@ def name_normalize(
return translated_name
return name
@staticmethod
def create_audio_clip(
clip_title: Union[str, int],
clip_start: float,
) -> AudioFileClip:
return (
AudioFileClip(f"assets/temp/mp3/{clip_title}.mp3")
.set_start(clip_start)
)
def create_image_clip(
self,
image_title: Union[str, int],
audio_start: float,
audio_duration: float,
clip_position: str,
) -> ImageClip:
return (
ImageClip(f"assets/temp/png/{image_title}.png")
.set_start(audio_start - self.time_before_tts)
.set_duration(self.time_before_tts * 2 + audio_duration)
.set_opacity(self.opacity)
.set_position(clip_position)
.resize(
width=self.W - self.W / 20 if self.vertical_video else None,
height=self.H - self.H / 5 if not self.vertical_video else None,
)
)
def make_final_video(
def make(
self,
indexes_of_clips: list,
reddit_obj: dict,
background_config: Tuple[str, str, str, Any],
) -> None:
) -> None:
"""
Gathers audio clips, gathers all screenshots, stitches them together and saves the final video to assets/temp
@ -60,43 +112,17 @@ def make_final_video(
reddit_obj (dict): The reddit object that contains the posts to read.
background_config (Tuple[str, str, str, Any]): The background config to use.
"""
W: int = int(settings.config["settings"]["video_width"])
H: int = int(settings.config["settings"]["video_height"])
if not W or not H:
W, H = 1080, 1920
max_length: int = int(settings.config["settings"]["video_length"])
time_before_first_picture: float = settings.config["settings"]["time_before_first_picture"]
time_before_tts: float = settings.config["settings"]["time_before_tts"]
time_between_pictures: float = settings.config["settings"]["time_between_pictures"]
delay_before_end: float = settings.config["settings"]["delay_before_end"]
print_step("Creating the final video 🎥")
VideoFileClip.reW = lambda clip: clip.resize(width=W)
VideoFileClip.reH = lambda clip: clip.resize(width=H)
opacity = settings.config["settings"]["opacity"] / 100
def create_audio_clip(
clip_title: Union[str, int],
clip_start: float,
) -> 'AudioFileClip':
return (
AudioFileClip(f"assets/temp/mp3/{clip_title}.mp3")
.set_start(clip_start)
)
video_duration = 0
# Gather all audio clips
audio_clips = list()
correct_audio_offset = time_before_tts * 2 + time_between_pictures
correct_audio_offset = self.time_before_tts * 2 + self.time_between_pictures
audio_title = create_audio_clip(
audio_title = self.create_audio_clip(
"title",
time_before_first_picture + time_before_tts,
self.time_before_first_picture + self.time_before_tts,
)
video_duration += audio_title.duration + time_before_first_picture + time_before_tts
self.video_duration += audio_title.duration + self.time_before_first_picture + self.time_before_tts
audio_clips.append(audio_title)
indexes_for_videos = list()
@ -105,49 +131,35 @@ def make_final_video(
description="Gathering audio clips...",
total=indexes_of_clips.__len__()
):
temp_audio_clip = create_audio_clip(
temp_audio_clip = self.create_audio_clip(
audio_title,
correct_audio_offset + video_duration,
correct_audio_offset + self.video_duration,
)
if video_duration + temp_audio_clip.duration + correct_audio_offset + delay_before_end <= max_length:
video_duration += temp_audio_clip.duration + correct_audio_offset
if self.video_duration + temp_audio_clip.duration + \
correct_audio_offset + self.delay_before_end <= self.max_length:
self.video_duration += temp_audio_clip.duration + correct_audio_offset
audio_clips.append(temp_audio_clip)
indexes_for_videos.append(audio_title)
video_duration += delay_before_end + time_before_tts
self.video_duration += self.delay_before_end + self.time_before_tts
# Can't use concatenate_audioclips here, it resets clips' start point
audio_composite = CompositeAudioClip(audio_clips)
console.log("[bold green] Video Will Be: %.2f Seconds Long" % video_duration)
self.console.log("[bold green] Video Will Be: %.2f Seconds Long" % self.video_duration)
# Gather all images
new_opacity = 1 if opacity is None or opacity >= 1 else opacity
def create_image_clip(
image_title: Union[str, int],
audio_start: float,
audio_duration: float,
) -> 'ImageClip':
return (
ImageClip(f"assets/temp/png/{image_title}.png")
.set_start(audio_start - time_before_tts)
.set_duration(time_before_tts * 2 + audio_duration)
.set_opacity(new_opacity)
.resize(width=W - 100)
)
# add title to video
image_clips = list()
# Accounting for title and other stuff if audio_clips
index_offset = 1
image_clips.append(
create_image_clip(
self.create_image_clip(
"title",
audio_clips[0].start,
audio_clips[0].duration
audio_clips[0].duration,
background_config[3],
)
)
@ -157,13 +169,14 @@ def make_final_video(
start=index_offset,
),
description="Gathering audio clips...",
total=indexes_for_videos[index_offset:].__len__()
total=indexes_for_videos.__len__()
):
image_clips.append(
create_image_clip(
self.create_image_clip(
f"comment_{photo_idx}",
audio_clips[idx].start,
audio_clips[idx].duration
audio_clips[idx].duration,
background_config[3],
)
)
@ -183,34 +196,34 @@ def make_final_video(
image_concat.set_position(background_config[3])
download_background(background_config)
chop_background_video(background_config, video_duration)
chop_background_video(background_config, self.video_duration)
background_clip = (
VideoFileClip("assets/temp/background.mp4")
.set_start(0)
.set_end(video_duration)
.set_end(self.video_duration)
.without_audio()
.resize(height=H)
.resize(height=self.H)
)
back_video_width, back_video_height = background_clip.size
# Fix for crop with vertical videos
if back_video_width < H:
if back_video_width < self.H:
background_clip = (
background_clip
.resize(width=W)
.resize(width=self.W)
)
back_video_width, back_video_height = background_clip.size
background_clip = background_clip.crop(
x1=0,
x2=back_video_width,
y1=back_video_height / 2 - H / 2,
y2=back_video_height / 2 + H / 2
y1=back_video_height / 2 - self.H / 2,
y2=back_video_height / 2 + self.H / 2
)
else:
background_clip = background_clip.crop(
x1=back_video_width / 2 - W / 2,
x2=back_video_width / 2 + W / 2,
x1=back_video_width / 2 - self.W / 2,
x2=back_video_width / 2 + self.W / 2,
y1=0,
y2=back_video_height
)
@ -221,18 +234,24 @@ def make_final_video(
title = re.sub(r"[^\w\s-]", "", reddit_obj["thread_title"])
idx = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"])
filename = f"{name_normalize(title)}.mp4"
filename = f"{self.name_normalize(title)}.mp4"
subreddit = str(settings.config["reddit"]["thread"]["subreddit"])
if not exists(f"./results/{subreddit}"):
print_substep("The results folder didn't exist so I made it")
os.makedirs(f"./results/{subreddit}")
# if settings.config["settings"]['background']["background_audio"] and exists(f"assets/backgrounds/background.mp3"):
# audioclip = mpe.AudioFileClip(f"assets/backgrounds/background.mp3").set_duration(final.duration)
# audioclip = audioclip.fx( volumex, 0.2)
# final_audio = mpe.CompositeAudioClip([final.audio, audioclip])
# # lowered_audio = audio_background.multiply_volume( # todo get this to work
# if (
# settings.config["settings"]['background']["background_audio"] and
# exists(f"assets/backgrounds/background.mp3")
# ):
# audioclip = (
# AudioFileClip(f"assets/backgrounds/background.mp3")
# .set_duration(final.duration)
# .volumex(0.2)
# )
# final_audio = CompositeAudioClip([final.audio, audioclip])
# # 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)
@ -251,7 +270,7 @@ def make_final_video(
ffmpeg_extract_subclip(
"assets/temp/temp.mp4",
0,
video_duration,
self.video_duration,
targetname=f"results/{subreddit}/{filename}",
)
save_data(subreddit, filename, title, idx, background_config[2])

Loading…
Cancel
Save