From 6742a53889bf9039a108067e03d732178ddd1d77 Mon Sep 17 00:00:00 2001 From: reoccurcat Date: Thu, 2 Jun 2022 11:57:37 -0500 Subject: [PATCH 1/4] overhaul --- .env.template | 4 +++- .gitignore | 3 ++- README.md | 4 ++-- main.py | 2 +- reddit/askreddit.py | 18 +++++++++++++---- requirements.txt | 4 ++-- video_creation/background.py | 27 ++++++++++++++----------- video_creation/final_video.py | 2 +- video_creation/screenshot_downloader.py | 4 ++-- video_creation/test.py | 0 video_creation/voices.py | 8 ++++---- 11 files changed, 46 insertions(+), 30 deletions(-) delete mode 100644 video_creation/test.py diff --git a/.env.template b/.env.template index e00c242..ef95522 100644 --- a/.env.template +++ b/.env.template @@ -1,4 +1,6 @@ REDDIT_CLIENT_ID="" REDDIT_CLIENT_SECRET="" REDDIT_USERNAME="" -REDDIT_PASSWORD="" \ No newline at end of file +REDDIT_PASSWORD="" +# Valid options are "yes" and "no" for the variable below +REDDIT_2FA="" \ No newline at end of file diff --git a/.gitignore b/.gitignore index a4589e5..b541305 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ assets/ .env -reddit-bot-351418-5560ebc49cac.json \ No newline at end of file +reddit-bot-351418-5560ebc49cac.json +__pycache__ \ No newline at end of file diff --git a/README.md b/README.md index 26d8156..24a4d68 100644 --- a/README.md +++ b/README.md @@ -26,12 +26,12 @@ These videos on TikTok, YouTube and Instagram get MILLIONS of views across all p ## Requirements - Python 3.6+ -- Playwright (this should install automatically in installation) +- Playwright (this should install automatically during installation) ## Installation 👩‍💻 1. Clone this repository -2. Rename `.env.template` to `.env` and replace all values with the appropriate fields. To get Reddit keys (**required**), visit [the Reddit Apps page.](https://www.reddit.com/prefs/apps) TL;DR set up an app that is a "script". Copy your keys into the `.env` files. +2. Rename `.env.template` to `.env` and replace all values with the appropriate fields. To get Reddit keys (**required**), visit [the Reddit Apps page.](https://www.reddit.com/prefs/apps) TL;DR set up an app that is a "script". Copy your keys into the `.env` file, along with whether your account uses two-factor authentication. 3. Run `pip3 install -r requirements.txt` 4. Run `python3 main.py` 5. ... diff --git a/main.py b/main.py index 8fb3d50..474a062 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,7 @@ from video_creation.screenshot_downloader import download_screenshots_of_reddit_ from video_creation.final_video import make_final_video 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." ) time.sleep(3) diff --git a/reddit/askreddit.py b/reddit/askreddit.py index 7c7110a..a70fbe3 100644 --- a/reddit/askreddit.py +++ b/reddit/askreddit.py @@ -10,21 +10,31 @@ def get_askreddit_threads(): Returns a list of threads from the AskReddit subreddit. """ + load_dotenv() + print_step("Getting AskReddit threads...") + if os.getenv("REDDIT_2FA") == "yes" or "YES": + print("\nEnter your two-factor authentication code from your authenticator app.\n") + code = input("> ") + print() + pw = os.getenv("REDDIT_PASSWORD") + passkey = f'{pw}:{code}' + else: + passkey = os.getenv("REDDIT_PASSWORD") + content = {} - load_dotenv() reddit = praw.Reddit( client_id=os.getenv("REDDIT_CLIENT_ID"), client_secret=os.getenv("REDDIT_CLIENT_SECRET"), user_agent="Accessing AskReddit threads", username=os.getenv("REDDIT_USERNAME"), - password=os.getenv("REDDIT_PASSWORD"), + password=passkey, ) askreddit = reddit.subreddit("askreddit") threads = askreddit.hot(limit=25) submission = list(threads)[random.randrange(0, 25)] - print_substep(f"Video will be: {submission.title} :thumbsup:") + print_substep(f"Video will be: {submission.title}") try: content["thread_url"] = submission.url @@ -42,5 +52,5 @@ def get_askreddit_threads(): except AttributeError as e: pass - print_substep("Received AskReddit threads Successfully.", style="bold green") + print_substep("Received AskReddit threads successfully.", style="bold green") return content diff --git a/requirements.txt b/requirements.txt index da87ca9..d9ffcf9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ mccabe==0.6.1 moviepy==1.0.3 mutagen==1.45.1 mypy-extensions==0.4.3 -numpy==1.22.3 +numpy pathspec==0.8.0 Pillow==9.1.1 playwright==1.22.0 @@ -27,7 +27,6 @@ pyee==8.1.0 pyflakes==2.2.0 Pygments==2.12.0 python-dotenv==0.20.0 -pytube==12.1.0 regex==2020.10.15 requests==2.27.1 rich==12.4.4 @@ -40,3 +39,4 @@ update-checker==0.18.0 urllib3==1.26.9 websocket-client==1.3.2 websockets==10.1 +yt-dlp \ No newline at end of file diff --git a/video_creation/background.py b/video_creation/background.py index 20dbe73..e917b70 100644 --- a/video_creation/background.py +++ b/video_creation/background.py @@ -1,5 +1,5 @@ from random import randrange -from pytube import YouTube +from yt_dlp import YoutubeDL from pathlib import Path from moviepy.video.io.ffmpeg_tools import ffmpeg_extract_subclip from moviepy.editor import VideoFileClip @@ -20,20 +20,23 @@ def download_background(): if not Path("assets/mp4/background.mp4").is_file(): print_step( - "We need to download the Minecraft background video. This is fairly large but it's only done once. 😎" + "We need to download the Minecraft background video. This is fairly large but it's only done once." ) - print_substep("Downloading the background video... please be patient 🙏") - YouTube("https://www.youtube.com/watch?v=n_Dv4JMiwK8").streams.filter( - res="720p" - ).first().download( - "assets/mp4", - filename="background.mp4", - ) - print_substep("Background video downloaded successfully! 🎉", style="bold green") + print_substep("Downloading the background video... please be patient.") + + ydl_opts = { + 'outtmpl': 'assets/mp4/background', + 'merge_output_format': 'mp4', + } + + with YoutubeDL(ydl_opts) as ydl: + ydl.download("https://www.youtube.com/watch?v=n_Dv4JMiwK8") + + print_substep("Background video downloaded successfully!", style="bold green") def chop_background_video(video_length): - print_step("Finding a spot in the background video to chop...✂️") + print_step("Finding a spot in the background video to chop...") background = VideoFileClip("assets/mp4/background.mp4") start_time, end_time = get_start_and_end_times(video_length, background.duration) @@ -43,4 +46,4 @@ def chop_background_video(video_length): end_time, targetname="assets/mp4/clip.mp4", ) - print_substep("Background video chopped successfully! 🎉", style="bold green") + print_substep("Background video chopped successfully!", style="bold green") diff --git a/video_creation/final_video.py b/video_creation/final_video.py index 947ab04..e1f71ff 100644 --- a/video_creation/final_video.py +++ b/video_creation/final_video.py @@ -14,7 +14,7 @@ W, H = 1080, 1920 def make_final_video(number_of_clips): - print_step("Creating the final video 🎥") + print_step("Creating the final video...") VideoFileClip.reW = lambda clip: clip.resize(width=W) VideoFileClip.reH = lambda clip: clip.resize(width=H) diff --git a/video_creation/screenshot_downloader.py b/video_creation/screenshot_downloader.py index 66c96f1..91fed8a 100644 --- a/video_creation/screenshot_downloader.py +++ b/video_creation/screenshot_downloader.py @@ -28,7 +28,7 @@ def download_screenshots_of_reddit_posts(reddit_object, screenshot_num): if page.locator('[data-testid="content-gate"]').is_visible(): # This means the post is NSFW and requires to click the proceed button. - print_substep("Post is NSFW. You are spicy... :fire:") + print_substep("Post is NSFW. You are spicy...") page.locator('[data-testid="content-gate"] button').click() page.locator('[data-test-id="post-content"]').screenshot( @@ -50,4 +50,4 @@ def download_screenshots_of_reddit_posts(reddit_object, screenshot_num): page.locator(f"#t1_{comment['comment_id']}").screenshot( path=f"assets/png/comment_{idx}.png" ) - print_substep("Screenshots downloaded Successfully.", style="bold green") + print_substep("Screenshots downloaded successfully.", style="bold green") diff --git a/video_creation/test.py b/video_creation/test.py deleted file mode 100644 index e69de29..0000000 diff --git a/video_creation/voices.py b/video_creation/voices.py index d719ff9..e8d8e43 100644 --- a/video_creation/voices.py +++ b/video_creation/voices.py @@ -11,13 +11,13 @@ def save_text_to_mp3(reddit_obj): Args: reddit_obj : The reddit object you received from the reddit API in the askreddit.py file. """ - print_step("Saving Text to MP3 files 🎶") + print_step("Saving Text to MP3 files...") length = 0 # Create a folder for the mp3 files. Path("assets/mp3").mkdir(parents=True, exist_ok=True) - tts = gTTS(text=reddit_obj["thread_title"], lang="en", slow=False, tld="co.uk") + tts = gTTS(text=reddit_obj["thread_title"], lang="en", slow=False) tts.save(f"assets/mp3/title.mp3") length += MP3(f"assets/mp3/title.mp3").info.length @@ -25,10 +25,10 @@ def save_text_to_mp3(reddit_obj): # ! Stop creating mp3 files if the length is greater than 50 seconds. This can be longer, but this is just a good starting point if length > 50: break - tts = gTTS(text=comment["comment_body"], lang="en") + tts = gTTS(text=comment["comment_body"], lang="en", slow=False) tts.save(f"assets/mp3/{idx}.mp3") length += MP3(f"assets/mp3/{idx}.mp3").info.length - print_substep("Saved Text to MP3 files Successfully.", style="bold green") + print_substep("Saved Text to MP3 files successfully.", style="bold green") # ! Return the index so we know how many screenshots of comments we need to make. return length, idx From b05ac18476407285862a66d758050df90fd41038 Mon Sep 17 00:00:00 2001 From: reoccurcat Date: Thu, 2 Jun 2022 12:15:34 -0500 Subject: [PATCH 2/4] finished requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index d9ffcf9..b2f5ee4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ mccabe==0.6.1 moviepy==1.0.3 mutagen==1.45.1 mypy-extensions==0.4.3 -numpy +numpy==1.15.1 pathspec==0.8.0 Pillow==9.1.1 playwright==1.22.0 @@ -39,4 +39,4 @@ update-checker==0.18.0 urllib3==1.26.9 websocket-client==1.3.2 websockets==10.1 -yt-dlp \ No newline at end of file +yt-dlp==2022.5.18 \ No newline at end of file From 45e3a1144012b1dc5b9a1ced9402812ee0e5d52c Mon Sep 17 00:00:00 2001 From: Lewis Menelaws Date: Thu, 2 Jun 2022 14:51:34 -0400 Subject: [PATCH 3/4] Refactored for easier merging and fixed dependencies. --- main.py | 2 +- reddit/{askreddit.py => subreddit.py} | 10 ++++++---- requirements.txt | 2 +- video_creation/background.py | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) rename reddit/{askreddit.py => subreddit.py} (86%) diff --git a/main.py b/main.py index 474a062..1aa85d2 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,6 @@ from utils.console import print_markdown import time -from reddit.askreddit import get_askreddit_threads +from reddit.subreddit import get_askreddit_threads from video_creation.background import download_background, chop_background_video from video_creation.voices import save_text_to_mp3 from video_creation.screenshot_downloader import download_screenshots_of_reddit_posts diff --git a/reddit/askreddit.py b/reddit/subreddit.py similarity index 86% rename from reddit/askreddit.py rename to reddit/subreddit.py index a70fbe3..8c79ed9 100644 --- a/reddit/askreddit.py +++ b/reddit/subreddit.py @@ -13,13 +13,15 @@ def get_askreddit_threads(): load_dotenv() print_step("Getting AskReddit threads...") - - if os.getenv("REDDIT_2FA") == "yes" or "YES": - print("\nEnter your two-factor authentication code from your authenticator app.\n") + print(os.getenv("REDDIT_2FA")) + if os.getenv("REDDIT_2FA").lower() == "yes": + print( + "\nEnter your two-factor authentication code from your authenticator app.\n" + ) code = input("> ") print() pw = os.getenv("REDDIT_PASSWORD") - passkey = f'{pw}:{code}' + passkey = f"{pw}:{code}" else: passkey = os.getenv("REDDIT_PASSWORD") diff --git a/requirements.txt b/requirements.txt index b2f5ee4..8c5cc8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ mccabe==0.6.1 moviepy==1.0.3 mutagen==1.45.1 mypy-extensions==0.4.3 -numpy==1.15.1 +numpy==1.22.3 pathspec==0.8.0 Pillow==9.1.1 playwright==1.22.0 diff --git a/video_creation/background.py b/video_creation/background.py index e917b70..6884221 100644 --- a/video_creation/background.py +++ b/video_creation/background.py @@ -25,8 +25,8 @@ def download_background(): print_substep("Downloading the background video... please be patient.") ydl_opts = { - 'outtmpl': 'assets/mp4/background', - 'merge_output_format': 'mp4', + "outtmpl": "assets/mp4/background.mp4", + "merge_output_format": "mp4", } with YoutubeDL(ydl_opts) as ydl: From 49c1a8965801d059abb3cdf8bf48a610277f9fae Mon Sep 17 00:00:00 2001 From: Lewis Menelaws Date: Thu, 2 Jun 2022 14:57:53 -0400 Subject: [PATCH 4/4] Fixed merge Issues --- reddit/subreddit.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/reddit/subreddit.py b/reddit/subreddit.py index cd18f6c..5d020fe 100644 --- a/reddit/subreddit.py +++ b/reddit/subreddit.py @@ -5,18 +5,16 @@ from dotenv import load_dotenv import os - def get_subreddit_threads(): """ Returns a list of threads from the AskReddit subreddit. """ - load_dotenv() print_step("Getting AskReddit threads...") - print(os.getenv("REDDIT_2FA")) + if os.getenv("REDDIT_2FA").lower() == "yes": print( "\nEnter your two-factor authentication code from your authenticator app.\n" @@ -37,10 +35,6 @@ def get_subreddit_threads(): username=os.getenv("REDDIT_USERNAME"), password=passkey, ) - askreddit = reddit.subreddit("askreddit") - threads = askreddit.hot(limit=25) - submission = list(threads)[random.randrange(0, 25)] - print_substep(f"Video will be: {submission.title}") if os.getenv("SUBREDDIT"): subreddit = reddit.subreddit(os.getenv("SUBREDDIT"))