Merge pull request #520 from JasonLovesDoggo/master

TTS REWORK

TTS/GTTS.py

@@ -0,0 +1,13 @@
+from gtts import gTTS
+
+
+class GTTS:
+    def tts(
+        self,
+        req_text: str = "Google Text To Speech",
+        filename: str = "title.mp3",
+        random_speaker=False,
+        censer=False,
+    ):
+        tts = gTTS(text=req_text, lang="en", slow=False)
+        tts.save(f"{filename}")

TTS/TikTok.py

@@ -65,7 +65,7 @@ noneng = [
 #               'ok': ['en_au_002', 'en_uk_001']}  # less en_us_stormtrooper more less en_us_rocket en_us_ghostface
 
 
-class TTTTSWrapper:  # TikTok Text-to-Speech Wrapper
+class TikTok:  # TikTok Text-to-Speech Wrapper
     def __init__(self):
         self.URI_BASE = "https://api16-normal-useast5.us.tiktokv.com/media/api/text/speech/invoke/?text_speaker="
 

TTS/swapper.py

@@ -0,0 +1,20 @@
+from os import getenv
+
+from dotenv import load_dotenv
+
+from TTS.GTTS import GTTS
+from TTS.TikTok import TikTok
+
+CHOICE_DIR = {"tiktok": TikTok, "gtts": GTTS}
+
+
+class TTS:
+    def __new__(cls):
+        load_dotenv()
+        CHOICE = getenv("TTsChoice").casefold()
+        valid_keys = [key.lower() for key in CHOICE_DIR.keys()]
+        if CHOICE not in valid_keys:
+            raise ValueError(
+                f"{CHOICE} is not valid. Please use one of these {valid_keys} options"
+            )
+        return CHOICE_DIR.get(CHOICE)()

main.py

@@ -23,7 +23,7 @@ print(banner)
 load_dotenv()
 # Modified by JasonLovesDoggo
 print_markdown(
-    "### Thanks for using this tool! [Feel free to contribute to this project on GitHub!](https://lewismenelaws.com) If you have any questions, feel free to reach out to me on Twitter or submit a GitHub issue."
+    "### Thanks for using this tool! [Feel free to contribute to this project on GitHub!](https://lewismenelaws.com) If you have any questions, feel free to reach out to me on Twitter or submit a GitHub issue. You can find solutions to many common problems in the [Documentation](https://luka-hietala.gitbook.io/documentation-for-the-reddit-bot/)"
 )
 
 time.sleep(1)

utils/config.py

@@ -2,8 +2,18 @@
 
 from dotenv import dotenv_values
 
-DEFAULTS = {'SUBREDDIT': "AskReddit", 'ALLOW_NSFW': "False", 'POST_ID': "", 'THEME': "DARK", 'REDDIT_2FA': "no",
+DEFAULTS = {
-    'TIMES_TO_RUN': "", 'MAX_COMMENT_LENGTH': "500", 'OPACITY': "1", 'VOICE': "en_us_001", 'STORYMODE': "False"}
+    "SUBREDDIT": "AskReddit",
+    "ALLOW_NSFW": "False",
+    "POST_ID": "",
+    "THEME": "DARK",
+    "REDDIT_2FA": "no",
+    "TIMES_TO_RUN": "",
+    "MAX_COMMENT_LENGTH": "500",
+    "OPACITY": "1",
+    "VOICE": "en_us_001",
+    "STORYMODE": "False",
+}
 
 
 class Config:

utils/loader.py

@@ -1,4 +1,3 @@
-
 # Okay, have to admit. This code is from StackOverflow. It's so efficient, that it's probably the best way to do it.
 # Although, it is edited to use less threads.
 

utils/subreddit.py

@@ -3,6 +3,7 @@ import json
 from os import getenv
 from utils.console import print_substep
 
+
 def get_subreddit_undone(submissions: List, subreddit):
     """
     recursively checks if the top submission in the list was already done.

utils/videos.py

@@ -4,7 +4,9 @@ from os import getenv
 from utils.console import print_step
 
 
-def check_done(redditobj):  # don't set this to be run anyplace that isn't subreddit.py bc of inspect stack
+def check_done(
+    redditobj,
+):  # don't set this to be run anyplace that isn't subreddit.py bc of inspect stack
     """params:
     reddit_object: The Reddit Object you received in askreddit.py"""
     with open("./video_creation/data/videos.json", "r") as done_vids_raw:

video_creation/background.py

@@ -7,6 +7,7 @@ from moviepy.video.io.ffmpeg_tools import ffmpeg_extract_subclip
 from moviepy.editor import VideoFileClip
 from utils.console import print_step, print_substep
 
+
 def get_start_and_end_times(video_length, length_of_clip):
     random_time = randrange(180, int(length_of_clip) - int(video_length))
     return random_time, random_time + video_length
@@ -32,7 +33,7 @@ def download_background():
         )
         print_substep("Downloading the backgrounds videos... please be patient 🙏 ")
         for uri, filename, credit in background_options:
-            if Path(f'assets/backgrounds/{credit}-{filename}').is_file():
+            if Path(f"assets/backgrounds/{credit}-{filename}").is_file():
                 continue  # adds check to see if file exists before downloading
             print_substep(f"Downloading {filename} from {uri}")
             YouTube(uri).streams.filter(res="1080p").first().download(

video_creation/final_video.py

@@ -100,12 +100,9 @@ def make_final_video(number_of_clips, length):
     # else:
     image_clips.insert(
         0,
-            ImageClip("assets/temp/png/title.png")
+        ImageClip("assets/temp/png/title.png").set_duration(audio_clips[0].duration)
-            .set_duration(audio_clips[0].duration)
         # .set_duration(audixc vcco_clips[0].duration)
-            .set_position("center")
+        .set_position("center").resize(width=W - 100).set_opacity(float(opacity)),
-            .resize(width=W - 100)
-            .set_opacity(float(opacity)),
     )
     image_concat = concatenate_videoclips(image_clips).set_position(
         ("center", "center")

video_creation/voices.py

@@ -1,20 +1,19 @@
 #!/usr/bin/env python3
-from gtts import gTTS
+from os import getenv
 from pathlib import Path
 
-from os import getenv, name
 import sox
 from mutagen import MutagenError
 from mutagen.mp3 import MP3, HeaderNotFoundError
-from rich.progress import track
 from rich.console import Console
+from rich.progress import track
+
+from TTS.swapper import TTS
 
 console = Console()
-import re
 
 from utils.console import print_step, print_substep
 from utils.voice import sanitize_text
-from video_creation.TTSwrapper import TTTTSWrapper
 
 VIDEO_LENGTH: int = 40  # secs
 
@@ -29,9 +28,8 @@ def save_text_to_mp3(reddit_obj):
 
     # Create a folder for the mp3 files.
     Path("assets/temp/mp3").mkdir(parents=True, exist_ok=True)
-
+    TextToSpeech = TTS()
-    ttttsw = TTTTSWrapper()  # tiktok text to speech wrapper
+    TextToSpeech.tts(
-    ttttsw.tts(
         sanitize_text(reddit_obj["thread_title"]),
         filename=f"assets/temp/mp3/title.mp3",
         random_speaker=False,
@@ -41,7 +39,7 @@ def save_text_to_mp3(reddit_obj):
     except HeaderNotFoundError:  # note to self AudioFileClip
         length += sox.file_info.duration(f"assets/temp/mp3/title.mp3")
     if getenv("STORYMODE").casefold() == "true":
-        ttttsw.tts(
+        TextToSpeech.tts(
             sanitize_text(reddit_obj["thread_content"]),
             filename=f"assets/temp/mp3/story_content.mp3",
             random_speaker=False,
@@ -53,7 +51,7 @@ def save_text_to_mp3(reddit_obj):
         if length > VIDEO_LENGTH:
             break
 
-        ttttsw.tts(
+        TextToSpeech.tts(
             sanitize_text(comment["comment_body"]),
             filename=f"assets/temp/mp3/{com}.mp3",
             random_speaker=False,