Merge branch 'develop' into CordlessCoder-TOML

pull/861/head
Callum Leslie 2 years ago committed by GitHub
commit 759c883d4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -26,6 +26,17 @@ console = Console()
W, H = 1080, 1920 W, H = 1080, 1920
def name_normalize(
name: 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)
name = re.sub(r'([0-9]+)\s?\/\s?([0-9]+)', r'\1 of \2', name)
name = re.sub(r'(\w+)\s?\/\s?(\w+)', r'\1 or \2', name)
name = re.sub(r'\/', r'', name)
return name
def make_final_video( def make_final_video(
number_of_clips: int, length: int, reddit_obj: dict, background_credit: str number_of_clips: int, length: int, reddit_obj: dict, background_credit: str
@ -97,7 +108,8 @@ def make_final_video(
final = CompositeVideoClip([background_clip, image_concat]) final = CompositeVideoClip([background_clip, image_concat])
title = re.sub(r"[^\w\s-]", "", reddit_obj["thread_title"]) title = re.sub(r"[^\w\s-]", "", reddit_obj["thread_title"])
idx = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"]) idx = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"])
filename = f"{title}.mp4"
filename = f"{name_normalize(title)}.mp4"
subreddit = settings.config["reddit"]["thread"]["subreddit"] subreddit = settings.config["reddit"]["thread"]["subreddit"]
save_data(filename, title, idx, background_credit) save_data(filename, title, idx, background_credit)

Loading…
Cancel
Save