diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 4de6e2f..9059b5b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -45,7 +45,7 @@ body: Python version : [e.g. Python 3.6] - App version / Branch [e.g. latest, V2.0, master, develop] + App version / Branch : [e.g. latest, V2.0, master, develop] validations: required: true - type: checkboxes diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index aca6d9f..3390cfc 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: true +blank_issues_enabled: false contact_links: - name: Ask a question about: Join our discord server to ask questions and discuss with maintainers and contributors. diff --git a/.gitignore b/.gitignore index 793db5d..5f4115f 100644 --- a/.gitignore +++ b/.gitignore @@ -232,6 +232,7 @@ fabric.properties .idea/caches/build_file_checksums.ser assets/ +/.vscode out .DS_Store .setup-done-before @@ -243,3 +244,4 @@ video_creation/data/videos.json video_creation/data/envvars.txt config.toml +video_creation/data/videos.json \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fc7d3d..3811f80 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents ## I Have a Question -> If you want to ask a question, we assume that you have read the available [Documentation](https://luka-hietala.gitbook.io/documentation-for-the-reddit-bot/). +> If you want to ask a question, we assume that you have read the available [Documentation](https://reddit-video-maker-bot.netlify.app/). Before you ask a question, it is best to search for existing [Issues](https://github.com/elebumm/RedditVideoMakerBot/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first. @@ -144,4 +144,4 @@ When making your PR, follow these guidelines: ### Improving The Documentation -All updates to the documentation should be made in a pull request to [this repo](https://github.com/LukaHietala/reddit-bot-docs) +All updates to the documentation should be made in a pull request to [this repo](https://github.com/LukaHietala/RedditVideoMakerBot-website) diff --git a/Dockerfile b/Dockerfile index 1f68ea0..6d090c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/playwright +FROM python:3.10.9-slim RUN apt update RUN apt install python3-pip -y diff --git a/GUI.py b/GUI.py index bc41838..47dfc25 100644 --- a/GUI.py +++ b/GUI.py @@ -1,32 +1,118 @@ -# Import the server module -import http.server import webbrowser +from pathlib import Path + +# Used "tomlkit" instead of "toml" because it doesn't change formatting on "dump" +import tomlkit +from flask import ( + Flask, + redirect, + render_template, + request, + send_from_directory, + url_for, +) + +import utils.gui_utils as gui # Set the hostname HOST = "localhost" # Set the port number PORT = 4000 -# Define class to display the index page of the web server -class PythonServer(http.server.SimpleHTTPRequestHandler): - def do_GET(self): - if self.path == "/GUI": - self.path = "index.html" - return http.server.SimpleHTTPRequestHandler.do_GET(self) - - -# Declare object of the class -webServer = http.server.HTTPServer((HOST, PORT), PythonServer) -# Print the URL of the webserver, new =2 opens in a new tab -print(f"Server started at http://{HOST}:{PORT}/GUI/") -webbrowser.open(f"http://{HOST}:{PORT}/GUI/", new=2) -print("Website opened in new tab") -print("Press Ctrl+C to quit") -try: - # Run the web server - webServer.serve_forever() -except KeyboardInterrupt: - # Stop the web server - webServer.server_close() - print("The server is stopped.") - exit() +# Configure application +app = Flask(__name__, template_folder="GUI") + +# Configure secret key only to use 'flash' +app.secret_key = b'_5#y2L"F4Q8z\n\xec]/' + + +# Ensure responses aren't cached +@app.after_request +def after_request(response): + response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate" + response.headers["Expires"] = 0 + response.headers["Pragma"] = "no-cache" + return response + + +# Display index.html +@app.route("/") +def index(): + return render_template("index.html", file="videos.json") + + +@app.route("/backgrounds", methods=["GET"]) +def backgrounds(): + return render_template("backgrounds.html", file="backgrounds.json") + + +@app.route("/background/add", methods=["POST"]) +def background_add(): + # Get form values + youtube_uri = request.form.get("youtube_uri").strip() + filename = request.form.get("filename").strip() + citation = request.form.get("citation").strip() + position = request.form.get("position").strip() + + gui.add_background(youtube_uri, filename, citation, position) + + return redirect(url_for("backgrounds")) + + +@app.route("/background/delete", methods=["POST"]) +def background_delete(): + key = request.form.get("background-key") + gui.delete_background(key) + + return redirect(url_for("backgrounds")) + + +@app.route("/settings", methods=["GET", "POST"]) +def settings(): + config_load = tomlkit.loads(Path("config.toml").read_text()) + config = gui.get_config(config_load) + + # Get checks for all values + checks = gui.get_checks() + + if request.method == "POST": + # Get data from form as dict + data = request.form.to_dict() + + # Change settings + config = gui.modify_settings(data, config_load, checks) + + return render_template( + "settings.html", file="config.toml", data=config, checks=checks + ) + + +# Make videos.json accessible +@app.route("/videos.json") +def videos_json(): + return send_from_directory("video_creation/data", "videos.json") + + +# Make backgrounds.json accessible +@app.route("/backgrounds.json") +def backgrounds_json(): + return send_from_directory("utils", "backgrounds.json") + + +# Make videos in results folder accessible +@app.route("/results/") +def results(name): + return send_from_directory("results", name, as_attachment=True) + + +# Make voices samples in voices folder accessible +@app.route("/voices/") +def voices(name): + return send_from_directory("GUI/voices", name, as_attachment=True) + + +# Run browser and start the app +if __name__ == "__main__": + webbrowser.open(f"http://{HOST}:{PORT}", new=2) + print("Website opened in new tab. Refresh if it didn't load.") + app.run(port=PORT) diff --git a/GUI/backgrounds.html b/GUI/backgrounds.html new file mode 100644 index 0000000..541e39f --- /dev/null +++ b/GUI/backgrounds.html @@ -0,0 +1,263 @@ +{% extends "layout.html" %} +{% block main %} + + + + + + + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/GUI/index.html b/GUI/index.html index c771adc..fe64e36 100644 --- a/GUI/index.html +++ b/GUI/index.html @@ -1,229 +1,131 @@ - - - - - - RedditVideoMakerBot - - - +{% extends "layout.html" %} +{% block main %} - - - - - -
-
-
- - - RedditVideoMakerBot - -
-
-
- -
-
+
+
-
-
- +
+
+ +
-
-
+
-
+
-
-
- - +
+
- - - - - - - - - + var searchFilter = () => { + const input = document.querySelector(".searchFilter"); + const cards = document.getElementsByClassName("col"); + console.log(cards[1]) + let filter = input.value + for (let i = 0; i < cards.length; i++) { + let title = cards[i].querySelector(".card-text"); + if (title.innerText.toLowerCase().indexOf(filter.toLowerCase()) > -1) { + cards[i].classList.remove("d-none") + } else { + cards[i].classList.add("d-none") + } + } + } + +{% endblock %} \ No newline at end of file diff --git a/GUI/layout.html b/GUI/layout.html new file mode 100644 index 0000000..d56299e --- /dev/null +++ b/GUI/layout.html @@ -0,0 +1,142 @@ + + + + + + + RedditVideoMakerBot + + + + + + + + + + + + + + +
+ {% if get_flashed_messages() %} + {% for category, message in get_flashed_messages(with_categories=true) %} + + {% if category == "error" %} + + + {% else %} + + {% endif %} + {% endfor %} + {% endif %} + +
+ + {% block main %}{% endblock %} + + + + + \ No newline at end of file diff --git a/GUI/settings.html b/GUI/settings.html new file mode 100644 index 0000000..1f0ef2e --- /dev/null +++ b/GUI/settings.html @@ -0,0 +1,621 @@ +{% extends "layout.html" %} +{% block main %} + +
+
+
+
+ + +

Reddit Credentials

+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ Need help? Click here to open step-by-step guide. +
+
+ + +

Reddit Thread

+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ Max number of characters a comment can have. +
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ The minimum number of comments a post should have to be + included. +
+
+ + +

General Settings

+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+ Used if you want to create multiple videos. +
+
+
+ +
+
+ +
+ Sets the opacity of the comments when overlayed over the + background. +
+
+
+ +
+
+ +
+ Sets the transition time (in seconds) between the + comments. Set to 0 if you want to disable it. +
+
+
+ +
+ + See all available + backgrounds +
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ + +

TTS Settings

+
+ +
+ +
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ Time in seconds between TTS comments. +
+
+
+
+ + +
+
+
+ +
+ + + +{% endblock %} \ No newline at end of file diff --git a/GUI/voices/amy.mp3 b/GUI/voices/amy.mp3 new file mode 100644 index 0000000..29ea64b Binary files /dev/null and b/GUI/voices/amy.mp3 differ diff --git a/GUI/voices/br_001.mp3 b/GUI/voices/br_001.mp3 new file mode 100644 index 0000000..3b343dc Binary files /dev/null and b/GUI/voices/br_001.mp3 differ diff --git a/GUI/voices/br_003.mp3 b/GUI/voices/br_003.mp3 new file mode 100644 index 0000000..9a6b845 Binary files /dev/null and b/GUI/voices/br_003.mp3 differ diff --git a/GUI/voices/br_004.mp3 b/GUI/voices/br_004.mp3 new file mode 100644 index 0000000..47d0010 Binary files /dev/null and b/GUI/voices/br_004.mp3 differ diff --git a/GUI/voices/br_005.mp3 b/GUI/voices/br_005.mp3 new file mode 100644 index 0000000..104cc3a Binary files /dev/null and b/GUI/voices/br_005.mp3 differ diff --git a/GUI/voices/brian.mp3 b/GUI/voices/brian.mp3 new file mode 100644 index 0000000..9304703 Binary files /dev/null and b/GUI/voices/brian.mp3 differ diff --git a/GUI/voices/de_001.mp3 b/GUI/voices/de_001.mp3 new file mode 100644 index 0000000..ef4a1b5 Binary files /dev/null and b/GUI/voices/de_001.mp3 differ diff --git a/GUI/voices/de_002.mp3 b/GUI/voices/de_002.mp3 new file mode 100644 index 0000000..4d7f89f Binary files /dev/null and b/GUI/voices/de_002.mp3 differ diff --git a/GUI/voices/emma.mp3 b/GUI/voices/emma.mp3 new file mode 100644 index 0000000..07895f0 Binary files /dev/null and b/GUI/voices/emma.mp3 differ diff --git a/GUI/voices/en_au_001.mp3 b/GUI/voices/en_au_001.mp3 new file mode 100644 index 0000000..b940e5c Binary files /dev/null and b/GUI/voices/en_au_001.mp3 differ diff --git a/GUI/voices/en_au_002.mp3 b/GUI/voices/en_au_002.mp3 new file mode 100644 index 0000000..a6421bb Binary files /dev/null and b/GUI/voices/en_au_002.mp3 differ diff --git a/GUI/voices/en_uk_001.mp3 b/GUI/voices/en_uk_001.mp3 new file mode 100644 index 0000000..666cac6 Binary files /dev/null and b/GUI/voices/en_uk_001.mp3 differ diff --git a/GUI/voices/en_uk_003.mp3 b/GUI/voices/en_uk_003.mp3 new file mode 100644 index 0000000..eecf6f6 Binary files /dev/null and b/GUI/voices/en_uk_003.mp3 differ diff --git a/GUI/voices/en_us_001.mp3 b/GUI/voices/en_us_001.mp3 new file mode 100644 index 0000000..56f1e01 Binary files /dev/null and b/GUI/voices/en_us_001.mp3 differ diff --git a/GUI/voices/en_us_002.mp3 b/GUI/voices/en_us_002.mp3 new file mode 100644 index 0000000..56f1e01 Binary files /dev/null and b/GUI/voices/en_us_002.mp3 differ diff --git a/GUI/voices/en_us_006.mp3 b/GUI/voices/en_us_006.mp3 new file mode 100644 index 0000000..f980665 Binary files /dev/null and b/GUI/voices/en_us_006.mp3 differ diff --git a/GUI/voices/en_us_007.mp3 b/GUI/voices/en_us_007.mp3 new file mode 100644 index 0000000..446a911 Binary files /dev/null and b/GUI/voices/en_us_007.mp3 differ diff --git a/GUI/voices/en_us_009.mp3 b/GUI/voices/en_us_009.mp3 new file mode 100644 index 0000000..2dd624d Binary files /dev/null and b/GUI/voices/en_us_009.mp3 differ diff --git a/GUI/voices/en_us_010.mp3 b/GUI/voices/en_us_010.mp3 new file mode 100644 index 0000000..34a37fe Binary files /dev/null and b/GUI/voices/en_us_010.mp3 differ diff --git a/GUI/voices/en_us_c3po.mp3 b/GUI/voices/en_us_c3po.mp3 new file mode 100644 index 0000000..eeabfac Binary files /dev/null and b/GUI/voices/en_us_c3po.mp3 differ diff --git a/GUI/voices/en_us_chewbacca.mp3 b/GUI/voices/en_us_chewbacca.mp3 new file mode 100644 index 0000000..6257d10 Binary files /dev/null and b/GUI/voices/en_us_chewbacca.mp3 differ diff --git a/GUI/voices/en_us_ghostface.mp3 b/GUI/voices/en_us_ghostface.mp3 new file mode 100644 index 0000000..0ad75be Binary files /dev/null and b/GUI/voices/en_us_ghostface.mp3 differ diff --git a/GUI/voices/en_us_rocket.mp3 b/GUI/voices/en_us_rocket.mp3 new file mode 100644 index 0000000..66a0356 Binary files /dev/null and b/GUI/voices/en_us_rocket.mp3 differ diff --git a/GUI/voices/en_us_stitch.mp3 b/GUI/voices/en_us_stitch.mp3 new file mode 100644 index 0000000..3c2fcc0 Binary files /dev/null and b/GUI/voices/en_us_stitch.mp3 differ diff --git a/GUI/voices/en_us_stormtrooper.mp3 b/GUI/voices/en_us_stormtrooper.mp3 new file mode 100644 index 0000000..8773ee4 Binary files /dev/null and b/GUI/voices/en_us_stormtrooper.mp3 differ diff --git a/GUI/voices/es_002.mp3 b/GUI/voices/es_002.mp3 new file mode 100644 index 0000000..4fb1d01 Binary files /dev/null and b/GUI/voices/es_002.mp3 differ diff --git a/GUI/voices/es_mx_002.mp3 b/GUI/voices/es_mx_002.mp3 new file mode 100644 index 0000000..18d0dfe Binary files /dev/null and b/GUI/voices/es_mx_002.mp3 differ diff --git a/GUI/voices/fr_001.mp3 b/GUI/voices/fr_001.mp3 new file mode 100644 index 0000000..deec4c8 Binary files /dev/null and b/GUI/voices/fr_001.mp3 differ diff --git a/GUI/voices/fr_002.mp3 b/GUI/voices/fr_002.mp3 new file mode 100644 index 0000000..c2b7512 Binary files /dev/null and b/GUI/voices/fr_002.mp3 differ diff --git a/GUI/voices/geraint.mp3 b/GUI/voices/geraint.mp3 new file mode 100644 index 0000000..403e0b6 Binary files /dev/null and b/GUI/voices/geraint.mp3 differ diff --git a/GUI/voices/id_001.mp3 b/GUI/voices/id_001.mp3 new file mode 100644 index 0000000..19febf9 Binary files /dev/null and b/GUI/voices/id_001.mp3 differ diff --git a/GUI/voices/ivy.mp3 b/GUI/voices/ivy.mp3 new file mode 100644 index 0000000..0d649c3 Binary files /dev/null and b/GUI/voices/ivy.mp3 differ diff --git a/GUI/voices/joanna.mp3 b/GUI/voices/joanna.mp3 new file mode 100644 index 0000000..f53b393 Binary files /dev/null and b/GUI/voices/joanna.mp3 differ diff --git a/GUI/voices/joey.mp3 b/GUI/voices/joey.mp3 new file mode 100644 index 0000000..d83c9d2 Binary files /dev/null and b/GUI/voices/joey.mp3 differ diff --git a/GUI/voices/jp_001.mp3 b/GUI/voices/jp_001.mp3 new file mode 100644 index 0000000..b6505cd Binary files /dev/null and b/GUI/voices/jp_001.mp3 differ diff --git a/GUI/voices/jp_003.mp3 b/GUI/voices/jp_003.mp3 new file mode 100644 index 0000000..1ef5782 Binary files /dev/null and b/GUI/voices/jp_003.mp3 differ diff --git a/GUI/voices/jp_005.mp3 b/GUI/voices/jp_005.mp3 new file mode 100644 index 0000000..5d3d5bf Binary files /dev/null and b/GUI/voices/jp_005.mp3 differ diff --git a/GUI/voices/jp_006.mp3 b/GUI/voices/jp_006.mp3 new file mode 100644 index 0000000..3e493fb Binary files /dev/null and b/GUI/voices/jp_006.mp3 differ diff --git a/GUI/voices/justin.mp3 b/GUI/voices/justin.mp3 new file mode 100644 index 0000000..1275f14 Binary files /dev/null and b/GUI/voices/justin.mp3 differ diff --git a/GUI/voices/kendra.mp3 b/GUI/voices/kendra.mp3 new file mode 100644 index 0000000..2bb35a8 Binary files /dev/null and b/GUI/voices/kendra.mp3 differ diff --git a/GUI/voices/kimberly.mp3 b/GUI/voices/kimberly.mp3 new file mode 100644 index 0000000..e51652c Binary files /dev/null and b/GUI/voices/kimberly.mp3 differ diff --git a/GUI/voices/kr_002.mp3 b/GUI/voices/kr_002.mp3 new file mode 100644 index 0000000..e9ef657 Binary files /dev/null and b/GUI/voices/kr_002.mp3 differ diff --git a/GUI/voices/kr_003.mp3 b/GUI/voices/kr_003.mp3 new file mode 100644 index 0000000..8411cd2 Binary files /dev/null and b/GUI/voices/kr_003.mp3 differ diff --git a/GUI/voices/kr_004.mp3 b/GUI/voices/kr_004.mp3 new file mode 100644 index 0000000..182b407 Binary files /dev/null and b/GUI/voices/kr_004.mp3 differ diff --git a/GUI/voices/matthew.mp3 b/GUI/voices/matthew.mp3 new file mode 100644 index 0000000..cce7967 Binary files /dev/null and b/GUI/voices/matthew.mp3 differ diff --git a/GUI/voices/nicole.mp3 b/GUI/voices/nicole.mp3 new file mode 100644 index 0000000..5e972e2 Binary files /dev/null and b/GUI/voices/nicole.mp3 differ diff --git a/GUI/voices/raveena.mp3 b/GUI/voices/raveena.mp3 new file mode 100644 index 0000000..558403f Binary files /dev/null and b/GUI/voices/raveena.mp3 differ diff --git a/GUI/voices/russell.mp3 b/GUI/voices/russell.mp3 new file mode 100644 index 0000000..b8d8e7a Binary files /dev/null and b/GUI/voices/russell.mp3 differ diff --git a/GUI/voices/salli.mp3 b/GUI/voices/salli.mp3 new file mode 100644 index 0000000..467f98d Binary files /dev/null and b/GUI/voices/salli.mp3 differ diff --git a/README.md b/README.md index ec834f2..f381452 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,11 @@ The only original thing being done is the editing and gathering of all materials 1. Clone this repository 2. Run `pip install -r requirements.txt` - 3. Run `python -m playwright install` and `python -m playwright install-deps` **EXPERIMENTAL!!!!** -On MacOS and Linux (debian, arch, fedora and centos, and based on those), you can run an install script that will automatically install steps 1 to 3. (requires bash) +On macOS and Linux (debian, arch, fedora and centos, and based on those), you can run an install script that will automatically install steps 1 to 3. (requires bash) `bash <(curl -sL https://raw.githubusercontent.com/elebumm/RedditVideoMakerBot/master/install.sh)` @@ -58,7 +57,7 @@ This can also be used to update the installation (Note if you got an error installing or running the bot try first rerunning the command with a three after the name e.g. python3 or pip3) -If you want to read more detailed guide about the bot, please refer to the [documentation](https://luka-hietala.gitbook.io/documentation-for-the-reddit-bot/) +If you want to read more detailed guide about the bot, please refer to the [documentation](https://reddit-video-maker-bot.netlify.app/) ## Video @@ -82,16 +81,26 @@ I have tried to simplify the code so anyone can read it and start contributing a Please read our [contributing guidelines](CONTRIBUTING.md) for more detailed information. +### For any questions or support join the [Discord](https://discord.com/channels/897666935708352582/) server + ## Developers and maintainers. Elebumm (Lewis#6305) - https://github.com/elebumm (Founder) Jason (JasonLovesDoggo#1904) - https://github.com/JasonLovesDoggo (Maintainer) +Simon (OpenSourceSimon) - https://github.com/OpenSourceSimon + CallumIO (c.#6837) - https://github.com/CallumIO -Verq (Verq#2338) - https://github.com/CordlessCoder +Verq (Verq#2338) - https://github.com/CordlessCoder LukaHietala (Pix.#0001) - https://github.com/LukaHietala Freebiell (Freebie#3263) - https://github.com/FreebieII + +Aman Raza (electro199#8130) - https://github.com/electro199 + + +## LICENSE +[Roboto Fonts](https://fonts.google.com/specimen/Roboto/about) are licensed under [Apache License V2](https://www.apache.org/licenses/LICENSE-2.0) diff --git a/TTS/GTTS.py b/TTS/GTTS.py index cef1b24..bff100f 100644 --- a/TTS/GTTS.py +++ b/TTS/GTTS.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python3 import random -from utils import settings + from gtts import gTTS -max_chars = 0 +from utils import settings class GTTS: diff --git a/TTS/TikTok.py b/TTS/TikTok.py index 743118c..b370455 100644 --- a/TTS/TikTok.py +++ b/TTS/TikTok.py @@ -1,24 +1,28 @@ +# documentation for tiktok api: https://github.com/oscie57/tiktok-voice/wiki import base64 -from utils import settings import random +import time +from typing import Optional, Final + import requests -from requests.adapters import HTTPAdapter, Retry -# from profanity_filter import ProfanityFilter -# pf = ProfanityFilter() -# Code by @JasonLovesDoggo -# https://twitter.com/scanlime/status/1512598559769702406 +from utils import settings + +__all__ = ["TikTok", "TikTokTTSException"] -nonhuman = [ # DISNEY VOICES +disney_voices: Final[tuple] = ( "en_us_ghostface", # Ghost Face "en_us_chewbacca", # Chewbacca "en_us_c3po", # C3PO "en_us_stitch", # Stitch "en_us_stormtrooper", # Stormtrooper "en_us_rocket", # Rocket - # ENGLISH VOICES -] -human = [ + "en_female_madam_leota", # Madame Leota + "en_male_ghosthost", # Ghost Host + "en_male_pirate", # pirate +) + +eng_voices: Final[tuple] = ( "en_au_001", # English AU - Female "en_au_002", # English AU - Male "en_uk_001", # English UK - Male 1 @@ -28,23 +32,28 @@ human = [ "en_us_006", # English US - Male 1 "en_us_007", # English US - Male 2 "en_us_009", # English US - Male 3 - "en_us_010", -] -voices = nonhuman + human + "en_us_010", # English US - Male 4 + "en_male_narration", # Narrator + "en_male_funny", # Funny + "en_female_emotional", # Peaceful + "en_male_cody", # Serious +) -noneng = [ +non_eng_voices: Final[tuple] = ( + # Western European voices "fr_001", # French - Male 1 "fr_002", # French - Male 2 "de_001", # German - Female "de_002", # German - Male "es_002", # Spanish - Male - # AMERICA VOICES + "it_male_m18" # Italian - Male + # South american voices "es_mx_002", # Spanish MX - Male "br_001", # Portuguese BR - Female 1 "br_003", # Portuguese BR - Female 2 "br_004", # Portuguese BR - Female 3 "br_005", # Portuguese BR - Male - # ASIA VOICES + # asian voices "id_001", # Indonesian - Female "jp_001", # Japanese - Female 1 "jp_003", # Japanese - Female 2 @@ -53,49 +62,101 @@ noneng = [ "kr_002", # Korean - Male 1 "kr_003", # Korean - Female "kr_004", # Korean - Male 2 -] - +) -# good_voices = {'good': ['en_us_002', 'en_us_006'], -# 'ok': ['en_au_002', 'en_uk_001']} # less en_us_stormtrooper more less en_us_rocket en_us_ghostface +vocals: Final[tuple] = ( + "en_female_f08_salut_damour", # Alto + "en_male_m03_lobby", # Tenor + "en_male_m03_sunshine_soon", # Sunshine Soon + "en_female_f08_warmy_breeze", # Warmy Breeze + "en_female_ht_f08_glorious", # Glorious + "en_male_sing_funny_it_goes_up", # It Goes Up + "en_male_m2_xhxs_m03_silly", # Chipmunk + "en_female_ht_f08_wonderful_world", # Dramatic +) -class TikTok: # 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=" - ) + headers = { + "User-Agent": "com.zhiliaoapp.musically/2022600030 (Linux; U; Android 7.1.2; es_ES; SM-G988N; " + "Build/NRD90M;tt-ok/3.12.13.1)", + "Cookie": f"sessionid={settings.config['settings']['tts']['tiktok_sessionid']}", + } + + self.URI_BASE = "https://api16-normal-c-useast1a.tiktokv.com/media/api/text/speech/invoke/" self.max_chars = 300 - self.voices = {"human": human, "nonhuman": nonhuman, "noneng": noneng} - - def run(self, text, filepath, random_voice: bool = False): - # if censor: - # req_text = pf.censor(req_text) - # pass - voice = ( - self.randomvoice() - if random_voice - else ( - settings.config["settings"]["tts"]["tiktok_voice"] - or random.choice(self.voices["human"]) - ) - ) + + self._session = requests.Session() + # set the headers to the session, so we don't have to do it for every request + self._session.headers = headers + + def run(self, text: str, filepath: str, random_voice: bool = False): + if random_voice: + voice = self.random_voice() + else: + # if tiktok_voice is not set in the config file, then use a random voice + voice = settings.config["settings"]["tts"].get("tiktok_voice", None) + + # get the audio from the TikTok API + data = self.get_voices(voice=voice, text=text) + + # check if there was an error in the request + status_code = data["status_code"] + if status_code != 0: + raise TikTokTTSException(status_code, data["message"]) + + # decode data from base64 to binary try: - r = requests.post(f"{self.URI_BASE}{voice}&req_text={text}&speaker_map_type=0") - except requests.exceptions.SSLError: - # https://stackoverflow.com/a/47475019/18516611 - session = requests.Session() - retry = Retry(connect=3, backoff_factor=0.5) - adapter = HTTPAdapter(max_retries=retry) - session.mount("http://", adapter) - session.mount("https://", adapter) - r = session.post(f"{self.URI_BASE}{voice}&req_text={text}&speaker_map_type=0") - # print(r.text) - vstr = [r.json()["data"]["v_str"]][0] - b64d = base64.b64decode(vstr) + raw_voices = data["data"]["v_str"] + except: + print("The TikTok TTS returned an invalid response. Please try again later, and report this bug.") + raise TikTokTTSException(0, "Invalid response") + decoded_voices = base64.b64decode(raw_voices) + # write voices to specified filepath with open(filepath, "wb") as out: - out.write(b64d) + out.write(decoded_voices) + + def get_voices(self, text: str, voice: Optional[str] = None) -> dict: + """If voice is not passed, the API will try to use the most fitting voice""" + # sanitize text + text = text.replace("+", "plus").replace("&", "and").replace("r/", "") + + # prepare url request + params = {"req_text": text, "speaker_map_type": 0, "aid": 1233} + + if voice is not None: + params["text_speaker"] = voice + + # send request + try: + response = self._session.post(self.URI_BASE, params=params) + except ConnectionError: + time.sleep(random.randrange(1, 7)) + response = self._session.post(self.URI_BASE, params=params) + + return response.json() + + @staticmethod + def random_voice(): + return random.choice(eng_voices) + + +class TikTokTTSException(Exception): + def __init__(self, code: int, message: str): + self._code = code + self._message = message + + def __str__(self) -> str: + if self._code == 1: + return f"Code: {self._code}, reason: probably the aid value isn't correct, message: {self._message}" + + if self._code == 2: + return f"Code: {self._code}, reason: the text is too long, message: {self._message}" + + if self._code == 4: + return f"Code: {self._code}, reason: the speaker doesn't exist, message: {self._message}" - def randomvoice(self): - return random.choice(self.voices["human"]) + return f"Code: {self._message}, reason: unknown, message: {self._message}" diff --git a/TTS/aws_polly.py b/TTS/aws_polly.py index eac5884..58323f9 100644 --- a/TTS/aws_polly.py +++ b/TTS/aws_polly.py @@ -1,9 +1,10 @@ -#!/usr/bin/env python3 +import random +import sys + from boto3 import Session from botocore.exceptions import BotoCoreError, ClientError, ProfileNotFound -import sys + from utils import settings -import random voices = [ "Brian", @@ -40,7 +41,9 @@ class AWSPolly: raise ValueError( f"Please set the TOML variable AWS_VOICE to a valid voice. options are: {voices}" ) - voice = str(settings.config["settings"]["tts"]["aws_polly_voice"]).capitalize() + voice = str( + settings.config["settings"]["tts"]["aws_polly_voice"] + ).capitalize() try: # Request speech synthesis response = polly.synthesize_speech( diff --git a/TTS/engine_wrapper.py b/TTS/engine_wrapper.py index 12668df..6ca63d5 100644 --- a/TTS/engine_wrapper.py +++ b/TTS/engine_wrapper.py @@ -1,19 +1,23 @@ -#!/usr/bin/env python3 +import os +import re from pathlib import Path from typing import Tuple -import re # import sox # from mutagen import MutagenError # from mutagen.mp3 import MP3, HeaderNotFoundError +import numpy as np import translators as ts +from moviepy.audio.AudioClip import AudioClip +from moviepy.audio.fx.volumex import volumex +from moviepy.editor import AudioFileClip from rich.progress import track -from moviepy.editor import AudioFileClip, CompositeAudioClip, concatenate_audioclips + +from utils import settings from utils.console import print_step, print_substep from utils.voice import sanitize_text -from utils import settings -DEFAULT_MAX_LENGTH: int = 50 # video length variable +DEFAULT_MAX_LENGTH: int = 50 # video length variable class TTSEngine: @@ -21,7 +25,7 @@ class TTSEngine: """Calls the given TTS engine to reduce code duplication and allow multiple TTS engines. Args: - tts_module : The TTS module. Your module should handle the TTS itself and saving to the given path under the run method. + tts_module : The TTS module. Your module should handle the TTS itself and saving to the given path under the run method. reddit_object : The reddit object that contains the posts to read. path (Optional) : The unix style path to save the mp3 files to. This must not have leading or trailing slashes. max_length (Optional) : The maximum length of the mp3 files in total. @@ -40,6 +44,7 @@ class TTSEngine: ): self.tts_module = tts_module() self.reddit_object = reddit_object + self.redditid = re.sub(r"[^\w\s-]", "", reddit_object["thread_id"]) self.path = path + self.redditid + "/mp3" self.max_length = max_length @@ -49,38 +54,46 @@ class TTSEngine: def run(self) -> Tuple[int, int]: Path(self.path).mkdir(parents=True, exist_ok=True) - - # This file needs to be removed in case this post does not use post text, so that it won't appear in the final video - try: - Path(f"{self.path}/posttext.mp3").unlink() - except OSError: - pass - print_step("Saving Text to MP3 files...") self.call_tts("title", process_text(self.reddit_object["thread_title"])) - processed_text = process_text(self.reddit_object["thread_post"]) - if processed_text != "" and settings.config["settings"]["storymode"] == True: - self.call_tts("posttext", processed_text) - + # processed_text = ##self.reddit_object["thread_post"] != "" idx = None - for idx, comment in track(enumerate(self.reddit_object["comments"]), "Saving..."): - # ! Stop creating mp3 files if the length is greater than max length. - if self.length > self.max_length: - self.length -= self.last_clip_length - idx -= 1 - break - if ( - len(comment["comment_body"]) > self.tts_module.max_chars - ): # Split the comment if it is too long - self.split_post(comment["comment_body"], idx) # Split the comment - else: # If the comment is not too long, just call the tts engine - self.call_tts(f"{idx}", process_text(comment["comment_body"])) + + if settings.config["settings"]["storymode"]: + if settings.config["settings"]["storymodemethod"] == 0: + if len(self.reddit_object["thread_post"]) > self.tts_module.max_chars: + self.split_post(self.reddit_object["thread_post"], "postaudio") + else: + self.call_tts( + "postaudio", process_text(self.reddit_object["thread_post"]) + ) + elif settings.config["settings"]["storymodemethod"] == 1: + + for idx, text in track(enumerate(self.reddit_object["thread_post"])): + self.call_tts(f"postaudio-{idx}", process_text(text)) + + else: + + for idx, comment in track( + enumerate(self.reddit_object["comments"]), "Saving..." + ): + # ! Stop creating mp3 files if the length is greater than max length. + if self.length > self.max_length and idx > 1: + self.length -= self.last_clip_length + idx -= 1 + break + if ( + len(comment["comment_body"]) > self.tts_module.max_chars + ): # Split the comment if it is too long + self.split_post(comment["comment_body"], idx) # Split the comment + else: # If the comment is not too long, just call the tts engine + self.call_tts(f"{idx}", process_text(comment["comment_body"])) print_substep("Saved Text to MP3 files successfully.", style="bold green") return self.length, idx - def split_post(self, text: str, idx: int): + def split_post(self, text: str, idx): split_files = [] split_text = [ x.group().strip() @@ -88,37 +101,45 @@ class TTSEngine: r" *(((.|\n){0," + str(self.tts_module.max_chars) + "})(\.|.$))", text ) ] - offset = 0 - for idy, text_cut in enumerate(split_text): - # print(f"{idx}-{idy}: {text_cut}\n") - new_text = process_text(text_cut) - if not new_text or new_text.isspace(): - offset += 1 - continue - - self.call_tts(f"{idx}-{idy - offset}.part", new_text) - split_files.append(AudioFileClip(f"{self.path}/{idx}-{idy - offset}.part.mp3")) - - CompositeAudioClip([concatenate_audioclips(split_files)]).write_audiofile( - f"{self.path}/{idx}.mp3", fps=44100, verbose=False, logger=None - ) - - for i in split_files: - name = i.filename - i.close() - Path(name).unlink() + self.create_silence_mp3() - # for i in range(0, idy + 1): - # print(f"Cleaning up {self.path}/{idx}-{i}.part.mp3") + idy = None + for idy, text_cut in enumerate(split_text): + newtext = process_text(text_cut) + # print(f"{idx}-{idy}: {newtext}\n") - # Path(f"{self.path}/{idx}-{i}.part.mp3").unlink() + if not newtext or newtext.isspace(): + print("newtext was blank because sanitized split text resulted in none") + continue + else: + self.call_tts(f"{idx}-{idy}.part", newtext) + with open(f"{self.path}/list.txt", "w") as f: + for idz in range(0, len(split_text)): + f.write("file " + f"'{idx}-{idz}.part.mp3'" + "\n") + split_files.append(str(f"{self.path}/{idx}-{idy}.part.mp3")) + f.write("file " + f"'silence.mp3'" + "\n") + + os.system( + "ffmpeg -f concat -y -hide_banner -loglevel panic -safe 0 " + + "-i " + + f"{self.path}/list.txt " + + "-c copy " + + f"{self.path}/{idx}.mp3" + ) + try: + for i in range(0, len(split_files)): + os.unlink(split_files[i]) + except FileNotFoundError as e: + print("File not found: " + e.filename) + except OSError: + print("OSError") def call_tts(self, filename: str, text: str): self.tts_module.run(text, filepath=f"{self.path}/{filename}.mp3") - # try: - # self.length += MP3(f"{self.path}/{filename}.mp3").info.length - # except (MutagenError, HeaderNotFoundError): - # self.length += sox.file_info.duration(f"{self.path}/{filename}.mp3") + # try: + # self.length += MP3(f"{self.path}/{filename}.mp3").info.length + # except (MutagenError, HeaderNotFoundError): + # self.length += sox.file_info.duration(f"{self.path}/{filename}.mp3") try: clip = AudioFileClip(f"{self.path}/{filename}.mp3") self.last_clip_length = clip.duration @@ -127,10 +148,22 @@ class TTSEngine: except: self.length = 0 + def create_silence_mp3(self): + silence_duration = settings.config["settings"]["tts"]["silence_duration"] + silence = AudioClip( + make_frame=lambda t: np.sin(440 * 2 * np.pi * t), + duration=silence_duration, + fps=44100, + ) + silence = volumex(silence, 0) + silence.write_audiofile( + f"{self.path}/silence.mp3", fps=44100, verbose=False, logger=None + ) + -def process_text(text: str): +def process_text(text: str , clean : bool = True): lang = settings.config["reddit"]["thread"]["post_lang"] - new_text = sanitize_text(text) + new_text = sanitize_text(text) if clean else text if lang: print_substep("Translating Text...") translated_text = ts.google(text, to_language=lang) diff --git a/TTS/pyttsx.py b/TTS/pyttsx.py index b5ffb29..a80bf2d 100644 --- a/TTS/pyttsx.py +++ b/TTS/pyttsx.py @@ -1,5 +1,7 @@ import random + import pyttsx3 + from utils import settings @@ -19,7 +21,9 @@ class pyttsx: if voice_id == "" or voice_num == "": voice_id = 2 voice_num = 3 - raise ValueError("set pyttsx values to a valid value, switching to defaults") + raise ValueError( + "set pyttsx values to a valid value, switching to defaults" + ) else: voice_id = int(voice_id) voice_num = int(voice_num) diff --git a/TTS/streamlabs_polly.py b/TTS/streamlabs_polly.py index 75c4f49..721dd78 100644 --- a/TTS/streamlabs_polly.py +++ b/TTS/streamlabs_polly.py @@ -1,6 +1,8 @@ import random + import requests from requests.exceptions import JSONDecodeError + from utils import settings from utils.voice import check_ratelimit @@ -40,7 +42,9 @@ class StreamlabsPolly: raise ValueError( f"Please set the config variable STREAMLABS_POLLY_VOICE to a valid voice. options are: {voices}" ) - voice = str(settings.config["settings"]["tts"]["streamlabs_polly_voice"]).capitalize() + voice = str( + settings.config["settings"]["tts"]["streamlabs_polly_voice"] + ).capitalize() body = {"voice": voice, "text": text, "service": "polly"} response = requests.post(self.url, data=body) if not check_ratelimit(response): diff --git a/fonts/LICENSE.txt b/fonts/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/fonts/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/fonts/Roboto-Black.ttf b/fonts/Roboto-Black.ttf new file mode 100644 index 0000000..0112e7d Binary files /dev/null and b/fonts/Roboto-Black.ttf differ diff --git a/fonts/Roboto-Bold.ttf b/fonts/Roboto-Bold.ttf new file mode 100644 index 0000000..43da14d Binary files /dev/null and b/fonts/Roboto-Bold.ttf differ diff --git a/fonts/Roboto-Medium.ttf b/fonts/Roboto-Medium.ttf new file mode 100644 index 0000000..ac0f908 Binary files /dev/null and b/fonts/Roboto-Medium.ttf differ diff --git a/fonts/Roboto-Regular.ttf b/fonts/Roboto-Regular.ttf new file mode 100644 index 0000000..ddf4bfa Binary files /dev/null and b/fonts/Roboto-Regular.ttf differ diff --git a/install.sh b/install.sh index f85c80b..38c1708 100644 --- a/install.sh +++ b/install.sh @@ -62,7 +62,13 @@ function install_macos(){ fi # Install the required packages echo "Installing required Packages" - brew install python@3.10 tcl-tk python-tk + if [! command --version python3 &> /dev/null ]; then + echo "Installing python3" + brew install python@3.10 + else + echo "python3 already installed." + fi + brew install tcl-tk python-tk } # Function to install for arch (and other forks like manjaro) diff --git a/main.py b/main.py index 7bfe8a0..dcb1861 100755 --- a/main.py +++ b/main.py @@ -1,28 +1,29 @@ #!/usr/bin/env python import math -import re -from subprocess import Popen +import sys +from logging import error from os import name +from pathlib import Path +from subprocess import Popen from prawcore import ResponseException from reddit.subreddit import get_subreddit_threads -from utils.cleanup import cleanup -from utils.console import print_markdown, print_step, print_substep from utils import settings +from utils.cleanup import cleanup +from utils.console import print_markdown, print_step from utils.id import id from utils.version import checkversion - from video_creation.background import ( download_background, chop_background_video, get_background_config, ) from video_creation.final_video import make_final_video -from video_creation.screenshot_downloader import download_screenshots_of_reddit_posts +from video_creation.screenshot_downloader import get_screenshots_of_reddit_posts from video_creation.voices import save_text_to_mp3 -__VERSION__ = "2.4.2" +__VERSION__ = "3.0" print( """ @@ -36,18 +37,18 @@ print( ) # 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. You can find solutions to many common problems in the [Documentation](https://luka-hietala.gitbook.io/documentation-for-the-reddit-bot/)" + "### 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://reddit-video-maker-bot.netlify.app/" ) checkversion(__VERSION__) def main(POST_ID=None): + global redditid ,reddit_object reddit_object = get_subreddit_threads(POST_ID) - global redditid redditid = id(reddit_object) length, number_of_comments = save_text_to_mp3(reddit_object) length = math.ceil(length) - download_screenshots_of_reddit_posts(reddit_object, number_of_comments) + get_screenshots_of_reddit_posts(reddit_object, number_of_comments) bg_config = get_background_config() download_background(bg_config) chop_background_video(bg_config, length, reddit_object) @@ -64,32 +65,38 @@ def run_many(times): def shutdown(): - print_markdown("## Clearing temp files") try: redditid except NameError: print("Exiting...") exit() else: + print_markdown("## Clearing temp files") cleanup(redditid) print("Exiting...") exit() + if __name__ == "__main__": - config = settings.check_toml("utils/.config.template.toml", "config.toml") + assert sys.version_info >= (3, 9), "Python 3.10 or higher is required" + directory = Path().absolute() + config = settings.check_toml( + f"{directory}/utils/.config.template.toml", "config.toml" + ) config is False and exit() try: - if config["settings"]["times_to_run"]: - run_many(config["settings"]["times_to_run"]) - - elif len(config["reddit"]["thread"]["post_id"].split("+")) > 1: - for index, post_id in enumerate(config["reddit"]["thread"]["post_id"].split("+")): + if config["reddit"]["thread"]["post_id"] : + for index, post_id in enumerate( + config["reddit"]["thread"]["post_id"].split("+") + ): index += 1 print_step( f'on the {index}{("st" if index % 10 == 1 else ("nd" if index % 10 == 2 else ("rd" if index % 10 == 3 else "th")))} post of {len(config["reddit"]["thread"]["post_id"].split("+"))}' ) main(post_id) Popen("cls" if name == "nt" else "clear", shell=True).wait() + elif config["settings"]["times_to_run"]: + run_many(config["settings"]["times_to_run"]) else: main() except KeyboardInterrupt: @@ -100,5 +107,12 @@ if __name__ == "__main__": print_markdown("Please check your credentials in the config.toml file") shutdown() - + except Exception as err: + print_step(f''' + Sorry, something went wrong with this version! Try again, and feel free to report this issue at GitHub or the Discord community.\n + Version: {__VERSION__} \n + Story mode: {str(config["settings"]["storymode"])} \n + Story mode method: {str(config["settings"]["storymodemethod"])} + ''') + raise err # todo error diff --git a/reddit/subreddit.py b/reddit/subreddit.py index 5b87430..8fb9e9d 100644 --- a/reddit/subreddit.py +++ b/reddit/subreddit.py @@ -5,11 +5,13 @@ from prawcore.exceptions import ResponseException from utils import settings import praw from praw.models import MoreComments +from prawcore.exceptions import ResponseException from utils.console import print_step, print_substep from utils.subreddit import get_subreddit_undone from utils.videos import check_done from utils.voice import sanitize_text +from utils.posttextparser import posttextparser from utils.ai_methods import sort_by_similarity @@ -22,7 +24,9 @@ def get_subreddit_threads(POST_ID: str): content = {} if settings.config["reddit"]["creds"]["2fa"]: - print("\nEnter your two-factor authentication code from your authenticator app.\n") + print( + "\nEnter your two-factor authentication code from your authenticator app.\n" + ) code = input("> ") print() pw = settings.config["reddit"]["creds"]["password"] @@ -42,9 +46,8 @@ def get_subreddit_threads(POST_ID: str): check_for_async=False, ) except ResponseException as e: - match e.response.status_code: - case 401: - print("Invalid credentials - please check them in config.toml") + if e.response.status_code == 401: + print("Invalid credentials - please check them in config.toml") except: print("Something went wrong...") @@ -56,7 +59,9 @@ def get_subreddit_threads(POST_ID: str): ]: # note to user. you can have multiple subreddits via reddit.subreddit("redditdev+learnpython") try: subreddit = reddit.subreddit( - re.sub(r"r\/", "", input("What subreddit would you like to pull from? ")) + re.sub( + r"r\/", "", input("What subreddit would you like to pull from? ") + ) # removes the r/ from the input ) except ValueError: @@ -66,12 +71,15 @@ def get_subreddit_threads(POST_ID: str): sub = settings.config["reddit"]["thread"]["subreddit"] print_substep(f"Using subreddit: r/{sub} from TOML config") subreddit_choice = sub - if str(subreddit_choice).casefold().startswith("r/"): # removes the r/ from the input + if ( + str(subreddit_choice).casefold().startswith("r/") + ): # removes the r/ from the input subreddit_choice = subreddit_choice[2:] subreddit = reddit.subreddit(subreddit_choice) if POST_ID: # would only be called if there are multiple queued posts submission = reddit.submission(id=POST_ID) + elif ( settings.config["reddit"]["thread"]["post_id"] and len(str(settings.config["reddit"]["thread"]["post_id"]).split("+")) == 1 @@ -89,48 +97,78 @@ def get_subreddit_threads(POST_ID: str): else: threads = subreddit.hot(limit=25) submission = get_subreddit_undone(threads, subreddit) + + if submission is None: + return get_subreddit_threads(POST_ID) # submission already done. rerun + + if settings.config["settings"]["storymode"]: + if not submission.selftext: + print_substep("You are trying to use story mode on post with no post text") + exit() + else: + # Check for the length of the post text + if len(submission.selftext) > (settings.config["settings"]["storymode_max_length"] or 2000): + print_substep( + f"Post is too long ({len(submission.selftext)}), try with a different post. ({settings.config['settings']['storymode_max_length']} character limit)" + ) + exit() + elif not submission.num_comments: + print_substep("No comments found. Skipping.") + exit() + submission = check_done(submission) # double-checking - if submission is None or not submission.num_comments: - return get_subreddit_threads(POST_ID) # submission already done. rerun + upvotes = submission.score ratio = submission.upvote_ratio * 100 num_comments = submission.num_comments + threadurl = f"https://reddit.com{submission.permalink}" print_substep(f"Video will be: {submission.title} :thumbsup:", style="bold green") + print_substep(f"Thread url is : {threadurl } :thumbsup:", style="bold green") print_substep(f"Thread has {upvotes} upvotes", style="bold blue") print_substep(f"Thread has a upvote ratio of {ratio}%", style="bold blue") print_substep(f"Thread has {num_comments} comments", style="bold blue") if similarity_score: print_substep(f"Thread has a similarity score up to {round(similarity_score * 100)}%", style="bold blue") - content["thread_url"] = f"https://reddit.com{submission.permalink}" + content["thread_url"] = threadurl content["thread_title"] = submission.title - content["thread_post"] = submission.selftext content["thread_id"] = submission.id content["comments"] = [] - - for top_level_comment in submission.comments: - if isinstance(top_level_comment, MoreComments): - continue - if top_level_comment.body in ["[removed]", "[deleted]"]: - continue # # see https://github.com/JasonLovesDoggo/RedditVideoMakerBot/issues/78 - if not top_level_comment.stickied: - sanitised = sanitize_text(top_level_comment.body) - if not sanitised or sanitised == " ": + if settings.config["settings"]["storymode"]: + if settings.config["settings"]["storymodemethod"] == 1: + content["thread_post"] = posttextparser(submission.selftext) + else: + content["thread_post"] = submission.selftext + else: + for top_level_comment in submission.comments: + if isinstance(top_level_comment, MoreComments): continue - if len(top_level_comment.body) <= int( - settings.config["reddit"]["thread"]["max_comment_length"] - ): - if ( - top_level_comment.author is not None - and sanitize_text(top_level_comment.body) is not None - ): # if errors occur with this change to if not. - content["comments"].append( - { - "comment_body": top_level_comment.body, - "comment_url": top_level_comment.permalink, - "comment_id": top_level_comment.id, - } - ) + + if top_level_comment.body in ["[removed]", "[deleted]"]: + continue # # see https://github.com/JasonLovesDoggo/RedditVideoMakerBot/issues/78 + if not top_level_comment.stickied: + sanitised = sanitize_text(top_level_comment.body) + if not sanitised or sanitised == " ": + continue + if len(top_level_comment.body) <= int( + settings.config["reddit"]["thread"]["max_comment_length"] + ): + if len(top_level_comment.body) >= int( + settings.config["reddit"]["thread"]["min_comment_length"] + ): + + if ( + top_level_comment.author is not None + and sanitize_text(top_level_comment.body) is not None + ): # if errors occur with this change to if not. + content["comments"].append( + { + "comment_body": top_level_comment.body, + "comment_url": top_level_comment.permalink, + "comment_id": top_level_comment.id, + } + ) + print_substep("Received subreddit threads Successfully.", style="bold green") return content diff --git a/requirements.txt b/requirements.txt index 6b1a786..a9564c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,13 +3,19 @@ botocore==1.27.24 gTTS==2.2.4 moviepy==1.0.3 playwright==1.23.0 -praw==7.6.0 +praw==7.6.1 +prawcore~=2.3.0 pytube==12.1.0 requests==2.28.1 rich==12.5.1 toml==0.10.2 translators==5.3.1 pyttsx3==2.90 -Pillow~=9.3.0 +Pillow~=9.4.0 +tomlkit==0.11.4 +Flask==2.2.2 +clean-text==0.6.0 +unidecode==1.3.2 +spacy==3.4.1 torch==1.12.1 transformers==4.25.1 \ No newline at end of file diff --git a/utils/.config.template.toml b/utils/.config.template.toml index ec9281e..ec5bb2a 100644 --- a/utils/.config.template.toml +++ b/utils/.config.template.toml @@ -3,40 +3,52 @@ client_id = { optional = false, nmin = 12, nmax = 30, explanation = "The ID of y client_secret = { optional = false, nmin = 20, nmax = 40, explanation = "The SECRET of your Reddit app of SCRIPT type", example = "fFAGRNJru1FTz70BzhT3Zg", regex = "^[-a-zA-Z0-9._~+/]+=*$", input_error = "The client ID can only contain printable characters.", oob_error = "The secret should be over 20 and under 40 characters, double check your input." } username = { optional = false, nmin = 3, nmax = 20, explanation = "The username of your reddit account", example = "JasonLovesDoggo", regex = "^[-_0-9a-zA-Z]+$", oob_error = "A username HAS to be between 3 and 20 characters" } password = { optional = false, nmin = 8, explanation = "The password of your reddit account", example = "fFAGRNJru1FTz70BzhT3Zg", oob_error = "Password too short" } -2fa = { optional = true, type = "bool", options = [true, false,], default = false, explanation = "Whether you have Reddit 2FA enabled, Valid options are True and False", example = true } +2fa = { optional = true, type = "bool", options = [true, false, ], default = false, explanation = "Whether you have Reddit 2FA enabled, Valid options are True and False", example = true } [reddit.thread] -random = { optional = true, options = [true, false,], default = false, type = "bool", explanation = "If set to no, it will ask you a thread link to extract the thread, if yes it will randomize it. Default: 'False'", example = "True" } -subreddit = { optional = false, regex = "[_0-9a-zA-Z]+$", nmin = 3, explanation = "What subreddit to pull posts from, the name of the sub, not the URL. You can have multiple subreddits, add an + with no spaces.", example = "AskReddit+Redditdev", oob_error = "A subreddit name HAS to be between 3 and 20 characters" } +random = { optional = true, options = [true, false, ], default = false, type = "bool", explanation = "If set to no, it will ask you a thread link to extract the thread, if yes it will randomize it. Default: 'False'", example = "True" } +subreddit = { optional = false, regex = "[_0-9a-zA-Z\\+]+$", nmin = 3, explanation = "What subreddit to pull posts from, the name of the sub, not the URL. You can have multiple subreddits, add an + with no spaces.", example = "AskReddit+Redditdev", oob_error = "A subreddit name HAS to be between 3 and 20 characters" } post_id = { optional = true, default = "", regex = "^((?!://|://)[+a-zA-Z0-9])*$", explanation = "Used if you want to use a specific post.", example = "urdtfx" } max_comment_length = { default = 500, optional = false, nmin = 10, nmax = 10000, type = "int", explanation = "max number of characters a comment can have. default is 500", example = 500, oob_error = "the max comment length should be between 10 and 10000" } -post_lang = { default = "", optional = true, explanation = "The language you would like to translate to.", example = "es-cr" } -min_comments = { default = 20, optional = false, nmin = 15, type = "int", explanation = "The minimum number of comments a post should have to be included. default is 20", example = 29, oob_error = "the minimum number of comments should be between 15 and 999999" } +min_comment_length = { default = 1, optional = true, nmin = 0, nmax = 10000, type = "int", explanation = "min_comment_length number of characters a comment can have. default is 0", example = 50, oob_error = "the max comment length should be between 1 and 100" } +post_lang = { default = "", optional = true, explanation = "The language you would like to translate to.", example = "es-cr", options = ['','af', 'ak', 'am', 'ar', 'as', 'ay', 'az', 'be', 'bg', 'bho', 'bm', 'bn', 'bs', 'ca', 'ceb', 'ckb', 'co', 'cs', 'cy', 'da', 'de', 'doi', 'dv', 'ee', 'el', 'en', 'en-US', 'eo', 'es', 'et', 'eu', 'fa', 'fi', 'fr', 'fy', 'ga', 'gd', 'gl', 'gn', 'gom', 'gu', 'ha', 'haw', 'hi', 'hmn', 'hr', 'ht', 'hu', 'hy', 'id', 'ig', 'ilo', 'is', 'it', 'iw', 'ja', 'jw', 'ka', 'kk', 'km', 'kn', 'ko', 'kri', 'ku', 'ky', 'la', 'lb', 'lg', 'ln', 'lo', 'lt', 'lus', 'lv', 'mai', 'mg', 'mi', 'mk', 'ml', 'mn', 'mni-Mtei', 'mr', 'ms', 'mt', 'my', 'ne', 'nl', 'no', 'nso', 'ny', 'om', 'or', 'pa', 'pl', 'ps', 'pt', 'qu', 'ro', 'ru', 'rw', 'sa', 'sd', 'si', 'sk', 'sl', 'sm', 'sn', 'so', 'sq', 'sr', 'st', 'su', 'sv', 'sw', 'ta', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tr', 'ts', 'tt', 'ug', 'uk', 'ur', 'uz', 'vi', 'xh', 'yi', 'yo', 'zh-CN', 'zh-TW', 'zu'] } +min_comments = { default = 20, optional = false, nmin = 10, type = "int", explanation = "The minimum number of comments a post should have to be included. default is 20", example = 29, oob_error = "the minimum number of comments should be between 15 and 999999" } +#post_url = { optional = true, default = "", regex = "^https:\\/\\/www\\.reddit\\.com\\/r\\/[a-zA-Z0-9]+\\/comments\\/[a-zA-Z0-9]+\\/[a-zA-Z0-9_]+\\/$", explanation = "Not working currently Use if you want to use a specific post.", example = "https://www.reddit.com/r/buildapc/comments/yzh07p/have_you_switched_to_windows_11/" } [ai] ai_similarity_enabled = {optional = true, option = [true, false], default = false, type = "bool", explanation = "Threads read from Reddit are sorted based on their similarity to the keywords given below"} ai_similarity_keywords = {optional = true, type="str", example= 'Elon Musk, Twitter, Stocks', explanation = "Every keyword or even sentence, seperated with comma, is used to sort the reddit threads based on similarity"} [settings] -allow_nsfw = { optional = false, type = "bool", default = false, example = false, options = [true, false,], explanation = "Whether to allow NSFW content, True or False" } -theme = { optional = false, default = "dark", example = "light", options = ["dark", "light",], explanation = "Sets the Reddit theme, either LIGHT or DARK" } +allow_nsfw = { optional = false, type = "bool", default = false, example = false, options = [true, false, ], explanation = "Whether to allow NSFW content, True or False" } +theme = { optional = false, default = "dark", example = "light", options = ["dark", "light", ], explanation = "Sets the Reddit theme, either LIGHT or DARK" } times_to_run = { optional = false, default = 1, example = 2, explanation = "Used if you want to run multiple times. Set to an int e.g. 4 or 29 or 1", type = "int", nmin = 1, oob_error = "It's very hard to run something less than once." } opacity = { optional = false, default = 0.9, example = 0.8, explanation = "Sets the opacity of the comments when overlayed over the background", type = "float", nmin = 0, nmax = 1, oob_error = "The opacity HAS to be between 0 and 1", input_error = "The opacity HAS to be a decimal number between 0 and 1" } transition = { optional = true, default = 0.2, example = 0.2, explanation = "Sets the transition time (in seconds) between the comments. Set to 0 if you want to disable it.", type = "float", nmin = 0, nmax = 2, oob_error = "The transition HAS to be between 0 and 2", input_error = "The opacity HAS to be a decimal number between 0 and 2" } -storymode = { optional = true, type = "bool", default = false, example = false, options = [true, false,], explanation = "Only read out title and post content, not yet implemented" } - +storymode = { optional = true, type = "bool", default = false, example = false, options = [true, false,], explanation = "Only read out title and post content, great for subreddits with stories" } +storymodemethod= { optional = true, default = 1, example = 1, explanation = "Style that's used for the storymode. Set to 0 for single picture display in whole video, set to 1 for fancy looking video ", type = "int", nmin = 0, oob_error = "It's very hard to run something less than once.", options = [0, 1] } +storymode_max_length = { optional = true, default = 1000, example = 1000, explanation = "Max length of the storymode video in characters. 200 characters are approximately 50 seconds.", type = "int", nmin = 1, oob_error = "It's very hard to make a video under a second." } +fps = { optional = false, default = 30, example = 30, explanation = "Sets the FPS of the video, 30 is default for best performance. 60 FPS is smoother.", type = "int", nmin = 1, nmax = 60, oob_error = "The FPS HAS to be between 1 and 60" } +resolution_w = { optional = false, default = 1080, example = 1440, explantation = "Sets the width in pixels of the final video" } +resolution_h = { optional = false, default = 1920, example = 2560, explantation = "Sets the height in pixels of the final video" } [settings.background] -background_choice = { optional = true, default = "minecraft", example = "rocket-league", options = ["minecraft", "gta", "rocket-league", "motor-gta", "csgo-surf", "cluster-truck", ""], explanation = "Sets the background for the video based on game name" } +background_choice = { optional = true, default = "minecraft", example = "rocket-league", options = ["minecraft", "gta", "rocket-league", "motor-gta", "csgo-surf", "cluster-truck", "minecraft-2","multiversus","fall-guys","steep", ""], explanation = "Sets the background for the video based on game name" } #background_audio = { optional = true, type = "bool", default = false, example = false, options = [true, false,], explanation = "Sets a audio to play in the background (put a background.mp3 file in the assets/backgrounds directory for it to be used.)" } #background_audio_volume = { optional = true, type = "float", default = 0.3, example = 0.1, explanation="Sets the volume of the background audio. only used if the background_audio is also set to true" } - +background_thumbnail = { optional = true, type = "bool", default = false, example = false, options = [true, false,], explanation = "Generate a thumbnail for the video (put a thumbnail.png file in the assets/backgrounds directory.)" } +background_thumbnail_font_family = { optional = true, default = "arial", example = "arial", explanation = "Font family for the thumbnail text" } +background_thumbnail_font_size = { optional = true, type = "int", default = 96, example = 96, explanation = "Font size in pixels for the thumbnail text" } +background_thumbnail_font_color = { optional = true, default = "255,255,255", example = "255,255,255", explanation = "Font color in RGB format for the thumbnail text" } [settings.tts] -voice_choice = { optional = false, default = "", options = ["streamlabspolly", "tiktok", "googletranslate", "awspolly", "pyttsx",], example = "tiktok", explanation = "The voice platform used for TTS generation. This can be left blank and you will be prompted to choose at runtime." } +voice_choice = { optional = false, default = "tiktok", options = ["streamlabspolly", "tiktok", "googletranslate", "awspolly", "pyttsx", ], example = "tiktok", explanation = "The voice platform used for TTS generation. This can be left blank and you will be prompted to choose at runtime." } aws_polly_voice = { optional = false, default = "Matthew", example = "Matthew", explanation = "The voice used for AWS Polly" } streamlabs_polly_voice = { optional = false, default = "Matthew", example = "Matthew", explanation = "The voice used for Streamlabs Polly" } -tiktok_voice = { optional = false, default = "en_us_006", example = "en_us_006", explanation = "The voice used for TikTok TTS" } -python_voice = {optional = false, default = "1", example = "1", explanation = "The index of the system tts voices (can be downloaded externally, run ptt.py to find value, start from zero)"} -py_voice_num = {optional = false, default = "2", example = "2", explanation= "the number of system voices(2 are pre-installed in windows)"} +tiktok_voice = { optional = true, default = "en_us_001", example = "en_us_006", explanation = "The voice used for TikTok TTS" } +tiktok_sessionid = { optional = true, example = "c76bcc3a7625abcc27b508c7db457ff1", explanation = "TikTok sessionid needed for the TTS API request. Check documentation if you don't know how to obtain it." } +python_voice = { optional = false, default = "1", example = "1", explanation = "The index of the system tts voices (can be downloaded externally, run ptt.py to find value, start from zero)" } +py_voice_num = { optional = false, default = "2", example = "2", explanation = "The number of system voices (2 are pre-installed in Windows)" } +silence_duration = { optional = true, example = "0.1", explanation = "Time in seconds between TTS comments", default = 0.3, type = "float" } +no_emojis = { optional = false, type = "bool", default = false, example = false, options = [true, false,], explanation = "Whether to remove emojis from the comments" } \ No newline at end of file diff --git a/utils/CONSTANTS.py b/utils/CONSTANTS.py deleted file mode 100644 index e46ebbc..0000000 --- a/utils/CONSTANTS.py +++ /dev/null @@ -1,45 +0,0 @@ -# Supported Background. Can add/remove background video here.... -# - : 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), - ), -} diff --git a/utils/backgrounds.json b/utils/backgrounds.json new file mode 100644 index 0000000..8cb01d1 --- /dev/null +++ b/utils/backgrounds.json @@ -0,0 +1,63 @@ +{ + "__comment": "Supported Backgrounds. Can add/remove background video here...", + "motor-gta": [ + "https://www.youtube.com/watch?v=vw5L4xCPy9Q", + "bike-parkour-gta.mp4", + "Achy Gaming", + 480 + ], + "rocket-league": [ + "https://www.youtube.com/watch?v=2X9QGY__0II", + "rocket_league.mp4", + "Orbital Gameplay", + 200 + ], + "minecraft": [ + "https://www.youtube.com/watch?v=n_Dv4JMiwK8", + "parkour.mp4", + "bbswitzer", + "center" + ], + "gta": [ + "https://www.youtube.com/watch?v=qGa9kWREOnE", + "gta-stunt-race.mp4", + "Achy Gaming", + 480 + ], + "csgo-surf": [ + "https://www.youtube.com/watch?v=E-8JlyO59Io", + "csgo-surf.mp4", + "Aki", + "center" + ], + "cluster-truck": [ + "https://www.youtube.com/watch?v=uVKxtdMgJVU", + "cluster_truck.mp4", + "No Copyright Gameplay", + 480 + ], + "minecraft-2": [ + "https://www.youtube.com/watch?v=Pt5_GSKIWQM", + "minecraft-2.mp4", + "Itslpsn", + "center" + ], + "multiversus": [ + "https://www.youtube.com/watch?v=66oK1Mktz6g", + "multiversus.mp4", + "MKIceAndFire", + "center" + ], + "fall-guys": [ + "https://www.youtube.com/watch?v=oGSsgACIc6Q", + "fall-guys.mp4", + "Throneful", + "center" + ], + "steep": [ + "https://www.youtube.com/watch?v=EnGiQrWBrko", + "steep.mp4", + "joel", + "center" + ] +} diff --git a/utils/cleanup.py b/utils/cleanup.py index f7bde35..e035980 100644 --- a/utils/cleanup.py +++ b/utils/cleanup.py @@ -12,18 +12,18 @@ def cleanup(id) -> int: Returns: int: How many files were deleted """ - if exists("./assets/temp"): + if exists(f"../assets/temp/{id}/"): count = 0 - files = [f for f in os.listdir(".") if f.endswith(".mp4") and "temp" in f.lower()] + files = [f for f in os.listdir(f"../assets/temp/{id}/") if f.endswith(".mp4")] count += len(files) for f in files: - os.remove(f) - REMOVE_DIRS = [f"./assets/temp/{id}/mp3/", f"./assets/temp/{id}/png/"] - files_to_remove = list(map(_listdir, REMOVE_DIRS)) - for directory in files_to_remove: - for file in directory: - count += 1 - os.remove(file) + os.remove(f"../assets/temp/{id}/{f}") + REMOVE_DIRS = [f"../assets/temp/{id}/mp3/", f"../assets/temp/{id}/png/"] + for d in REMOVE_DIRS: + if exists(d): + count += len(_listdir(d)) + for f in _listdir(d): + os.remove(f) + os.rmdir(d) + os.rmdir(f"../assets/temp/{id}/") return count - - return 0 diff --git a/utils/console.py b/utils/console.py index 6f99a41..3419f05 100644 --- a/utils/console.py +++ b/utils/console.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python3 +import re + +from rich.columns import Columns from rich.console import Console from rich.markdown import Markdown from rich.padding import Padding from rich.panel import Panel from rich.text import Text -from rich.columns import Columns -import re console = Console() @@ -49,7 +49,10 @@ def handle_input( optional=False, ): if optional: - console.print(message + "\n[green]This is an optional value. Do you want to skip it? (y/n)") + console.print( + message + + "\n[green]This is an optional value. Do you want to skip it? (y/n)" + ) if input().casefold().startswith("y"): return default if default is not NotImplemented else "" if default is not NotImplemented: @@ -83,7 +86,11 @@ def handle_input( console.print("[red]" + err_message) continue elif match != "" and re.match(match, user_input) is None: - console.print("[red]" + err_message + "\nAre you absolutely sure it's correct?(y/n)") + console.print( + "[red]" + + err_message + + "\nAre you absolutely sure it's correct?(y/n)" + ) if input().casefold().startswith("y"): break continue @@ -116,5 +123,9 @@ def handle_input( if user_input in options: return user_input console.print( - "[red bold]" + err_message + "\nValid options are: " + ", ".join(map(str, options)) + "." + "[red bold]" + + err_message + + "\nValid options are: " + + ", ".join(map(str, options)) + + "." ) diff --git a/utils/gui_utils.py b/utils/gui_utils.py new file mode 100644 index 0000000..9d644d8 --- /dev/null +++ b/utils/gui_utils.py @@ -0,0 +1,226 @@ +import json +import re +from pathlib import Path + +import toml +import tomlkit +from flask import flash + + +# Get validation checks from template +def get_checks(): + template = toml.load("utils/.config.template.toml") + checks = {} + + def unpack_checks(obj: dict): + for key in obj.keys(): + if "optional" in obj[key].keys(): + checks[key] = obj[key] + else: + unpack_checks(obj[key]) + + unpack_checks(template) + + return checks + + +# Get current config (from config.toml) as dict +def get_config(obj: dict, done={}): + for key in obj.keys(): + if not isinstance(obj[key], dict): + done[key] = obj[key] + else: + get_config(obj[key], done) + + return done + + +# Checks if value is valid +def check(value, checks): + incorrect = False + + if value == "False": + value = "" + + if not incorrect and "type" in checks: + try: + value = eval(checks["type"])(value) + except Exception: + incorrect = True + + if ( + not incorrect and "options" in checks and value not in checks["options"] + ): # FAILSTATE Value is not one of the options + incorrect = True + if ( + not incorrect + and "regex" in checks + and ( + (isinstance(value, str) and re.match(checks["regex"], value) is None) + or not isinstance(value, str) + ) + ): # FAILSTATE Value doesn't match regex, or has regex but is not a string. + incorrect = True + + if ( + not incorrect + and not hasattr(value, "__iter__") + and ( + ("nmin" in checks and checks["nmin"] is not None and value < checks["nmin"]) + or ( + "nmax" in checks + and checks["nmax"] is not None + and value > checks["nmax"] + ) + ) + ): + incorrect = True + + if ( + not incorrect + and hasattr(value, "__iter__") + and ( + ( + "nmin" in checks + and checks["nmin"] is not None + and len(value) < checks["nmin"] + ) + or ( + "nmax" in checks + and checks["nmax"] is not None + and len(value) > checks["nmax"] + ) + ) + ): + incorrect = True + + if incorrect: + return "Error" + + return value + + +# Modify settings (after form is submitted) +def modify_settings(data: dict, config_load, checks: dict): + # Modify config settings + def modify_config(obj: dict, name: str, value: any): + for key in obj.keys(): + if name == key: + obj[key] = value + elif not isinstance(obj[key], dict): + continue + else: + modify_config(obj[key], name, value) + + # Remove empty/incorrect key-value pairs + data = {key: value for key, value in data.items() if value and key in checks.keys()} + + # Validate values + for name in data.keys(): + value = check(data[name], checks[name]) + + # Value is invalid + if value == "Error": + flash("Some values were incorrect and didn't save!", "error") + else: + # Value is valid + modify_config(config_load, name, value) + + # Save changes in config.toml + with Path("config.toml").open("w") as toml_file: + toml_file.write(tomlkit.dumps(config_load)) + + flash("Settings saved!") + + return get_config(config_load) + + +# Delete background video +def delete_background(key): + # Read backgrounds.json + with open("utils/backgrounds.json", "r", encoding="utf-8") as backgrounds: + data = json.load(backgrounds) + + # Remove background from backgrounds.json + with open("utils/backgrounds.json", "w", encoding="utf-8") as backgrounds: + if data.pop(key, None): + json.dump(data, backgrounds, ensure_ascii=False, indent=4) + else: + flash("Couldn't find this background. Try refreshing the page.", "error") + return + + # Remove background video from ".config.template.toml" + config = tomlkit.loads(Path("utils/.config.template.toml").read_text()) + config["settings"]["background"]["background_choice"]["options"].remove(key) + + with Path("utils/.config.template.toml").open("w") as toml_file: + toml_file.write(tomlkit.dumps(config)) + + flash(f'Successfully removed "{key}" background!') + + +# Add background video +def add_background(youtube_uri, filename, citation, position): + # Validate YouTube URI + regex = re.compile(r"(?:\/|%3D|v=|vi=)([0-9A-z\-_]{11})(?:[%#?&]|$)").search( + youtube_uri + ) + + if not regex: + flash("YouTube URI is invalid!", "error") + return + + youtube_uri = f"https://www.youtube.com/watch?v={regex.group(1)}" + + # Check if position is valid + if position == "" or position == "center": + position = "center" + + elif position.isdecimal(): + position = int(position) + + else: + flash('Position is invalid! It can be "center" or decimal number.', "error") + return + + # Sanitize filename + regex = re.compile(r"^([a-zA-Z0-9\s_-]{1,100})$").match(filename) + + if not regex: + flash("Filename is invalid!", "error") + return + + filename = filename.replace(" ", "_") + + # Check if background doesn't already exist + with open("utils/backgrounds.json", "r", encoding="utf-8") as backgrounds: + data = json.load(backgrounds) + + # Check if key isn't already taken + if filename in list(data.keys()): + flash("Background video with this name already exist!", "error") + return + + # Check if the YouTube URI isn't already used under different name + if youtube_uri in [data[i][0] for i in list(data.keys())]: + flash("Background video with this YouTube URI is already added!", "error") + return + + # Add background video to json file + with open("utils/backgrounds.json", "r+", encoding="utf-8") as backgrounds: + data = json.load(backgrounds) + + data[filename] = [youtube_uri, filename + ".mp4", citation, position] + backgrounds.seek(0) + json.dump(data, backgrounds, ensure_ascii=False, indent=4) + + # Add background video to ".config.template.toml" + config = tomlkit.loads(Path("utils/.config.template.toml").read_text()) + config["settings"]["background"]["background_choice"]["options"].append(filename) + + with Path("utils/.config.template.toml").open("w") as toml_file: + toml_file.write(tomlkit.dumps(config)) + + flash(f'Added "{citation}-{filename}.mp4" as a new background video!') + + return diff --git a/utils/id.py b/utils/id.py index c66d77a..3d76593 100644 --- a/utils/id.py +++ b/utils/id.py @@ -1,10 +1,12 @@ import re + from utils.console import print_substep + def id(reddit_obj: dict): """ This function takes a reddit object and returns the post id """ id = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"]) print_substep(f"Thread ID is {id}", style="bold blue") - return id \ No newline at end of file + return id diff --git a/utils/imagenarator.py b/utils/imagenarator.py new file mode 100644 index 0000000..8c6dc58 --- /dev/null +++ b/utils/imagenarator.py @@ -0,0 +1,76 @@ +import re +import textwrap +import os + +from PIL import Image, ImageDraw, ImageFont +from rich.progress import track +from TTS.engine_wrapper import process_text + +def draw_multiple_line_text(image, text, font, text_color, padding, wrap=50): + """ + Draw multiline text over given image + """ + draw = ImageDraw.Draw(image) + Fontperm = font.getsize(text) + image_width, image_height = image.size + lines = textwrap.wrap(text, width=wrap) + y = (image_height / 2) - ( + ((Fontperm[1] + (len(lines) * padding) / len(lines)) * len(lines)) / 2 + ) + for line in lines: + line_width, line_height = font.getsize(line) + draw.text(((image_width - line_width) / 2, y), line, font=font, fill=text_color) + y += line_height + padding + + +# theme=bgcolor,reddit_obj=reddit_object,txtclr=txtcolor +def imagemaker(theme, reddit_obj: dict, txtclr, padding=5): + """ + Render Images for video + """ + title = process_text(reddit_obj["thread_title"], False) #TODO if second argument cause any error + texts = reddit_obj["thread_post"] + id = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"]) + + tfont = ImageFont.truetype(os.path.join("fonts", "Roboto-Bold.ttf"), 27) # for title + font = ImageFont.truetype( + os.path.join("fonts", "Roboto-Regular.ttf"), 20 + ) # for despcription|comments + size = (500, 176) + + image = Image.new("RGBA", size, theme) + draw = ImageDraw.Draw(image) + + # for title + if len(title) > 40: + draw_multiple_line_text(image, title, tfont, txtclr, padding, wrap=30) + else: + + Fontperm = tfont.getsize(title) + draw.text( + ((image.size[0] - Fontperm[0]) / 2, (image.size[1] - Fontperm[1]) / 2), + font=tfont, + text=title, + ) # (image.size[1]/2)-(Fontperm[1]/2) + + image.save(f"assets/temp/{id}/png/title.png") + + # for comment|description + + for idx, text in track(enumerate(texts), "Rendering Image"):#, total=len(texts)): + + image = Image.new("RGBA", size, theme) + draw = ImageDraw.Draw(image) + text = process_text(text,False) + if len(text) > 50: + draw_multiple_line_text(image, text, font, txtclr, padding) + + else: + + Fontperm = font.getsize(text) + draw.text( + ((image.size[0] - Fontperm[0]) / 2, (image.size[1] - Fontperm[1]) / 2), + font=font, + text=text, + ) # (image.size[1]/2)-(Fontperm[1]/2) + image.save(f"assets/temp/{id}/png/img{idx}.png") diff --git a/utils/posttextparser.py b/utils/posttextparser.py new file mode 100644 index 0000000..4b3ae7e --- /dev/null +++ b/utils/posttextparser.py @@ -0,0 +1,29 @@ +import re + +import spacy + +from utils.console import print_step +from utils.voice import sanitize_text + + +# working good +def posttextparser(obj): + text = re.sub("\n", "", obj) + + try: + nlp = spacy.load('en_core_web_sm') + except OSError: + print_step("The spacy model can't load. You need to install it with \npython -m spacy download en") + exit() + + doc = nlp(text) + + newtext: list = [] + + # to check for space str + for line in doc.sents: + if sanitize_text(line.text): + newtext.append(line.text) + # print(line) + + return newtext diff --git a/utils/settings.py b/utils/settings.py index a9d7726..221a09c 100755 --- a/utils/settings.py +++ b/utils/settings.py @@ -1,13 +1,11 @@ -#!/usr/bin/env python -import toml -from rich.console import Console import re - from typing import Tuple, Dict +from pathlib import Path +import toml +from rich.console import Console from utils.console import handle_input - console = Console() config = dict # autocomplete @@ -54,7 +52,11 @@ def check(value, checks, name): and not hasattr(value, "__iter__") and ( ("nmin" in checks and checks["nmin"] is not None and value < checks["nmin"]) - or ("nmax" in checks and checks["nmax"] is not None and value > checks["nmax"]) + or ( + "nmax" in checks + and checks["nmax"] is not None + and value > checks["nmax"] + ) ) ): incorrect = True @@ -62,8 +64,16 @@ def check(value, checks, name): not incorrect and hasattr(value, "__iter__") and ( - ("nmin" in checks and checks["nmin"] is not None and len(value) < checks["nmin"]) - or ("nmax" in checks and checks["nmax"] is not None and len(value) > checks["nmax"]) + ( + "nmin" in checks + and checks["nmin"] is not None + and len(value) < checks["nmin"] + ) + or ( + "nmax" in checks + and checks["nmax"] is not None + and len(value) > checks["nmax"] + ) ) ): incorrect = True @@ -71,9 +81,15 @@ def check(value, checks, name): if incorrect: value = handle_input( message=( - (("[blue]Example: " + str(checks["example"]) + "\n") if "example" in checks else "") + ( + ("[blue]Example: " + str(checks["example"]) + "\n") + if "example" in checks + else "" + ) + "[red]" - + ("Non-optional ", "Optional ")["optional" in checks and checks["optional"] is True] + + ("Non-optional ", "Optional ")[ + "optional" in checks and checks["optional"] is True + ] ) + "[#C0CAF5 bold]" + str(name) @@ -114,7 +130,9 @@ def check_toml(template_file, config_file) -> Tuple[bool, Dict]: try: template = toml.load(template_file) except Exception as error: - console.print(f"[red bold]Encountered error when trying to to load {template_file}: {error}") + console.print( + f"[red bold]Encountered error when trying to to load {template_file}: {error}" + ) return False try: config = toml.load(config_file) @@ -167,4 +185,5 @@ If you see any prompts, that means that you have unset/incorrectly set variables if __name__ == "__main__": - check_toml("utils/.config.template.toml", "config.toml") + directory = Path().absolute() + check_toml(f"{directory}/utils/.config.template.toml", "config.toml") diff --git a/utils/subreddit.py b/utils/subreddit.py index 95bbbf6..cec8b46 100644 --- a/utils/subreddit.py +++ b/utils/subreddit.py @@ -25,7 +25,9 @@ def get_subreddit_undone(submissions: list, subreddit, times_checked=0, similari if not exists("./video_creation/data/videos.json"): with open("./video_creation/data/videos.json", "w+") as f: json.dump([], f) - with open("./video_creation/data/videos.json", "r", encoding="utf-8") as done_vids_raw: + with open( + "./video_creation/data/videos.json", "r", encoding="utf-8" + ) as done_vids_raw: done_videos = json.load(done_vids_raw) for i, submission in enumerate(submissions): if already_done(done_videos, submission): @@ -40,11 +42,15 @@ def get_subreddit_undone(submissions: list, subreddit, times_checked=0, similari if submission.stickied: print_substep("This post was pinned by moderators. Skipping...") continue - if submission.num_comments <= int(settings.config["reddit"]["thread"]["min_comments"]): + if submission.num_comments <= int( + settings.config["reddit"]["thread"]["min_comments"] + ) and not settings.config["settings"]["storymode"]: print_substep( f'This post has under the specified minimum of comments ({settings.config["reddit"]["thread"]["min_comments"]}). Skipping...' ) continue + if settings.config["settings"]["storymode"] and not submission.is_self: + continue if similarity_scores is not None: return submission, similarity_scores[i].item() return submission @@ -63,7 +69,8 @@ def get_subreddit_undone(submissions: list, subreddit, times_checked=0, similari return get_subreddit_undone( subreddit.top( - time_filter=VALID_TIME_FILTERS[index], limit=(50 if int(index) == 0 else index + 1 * 50) + time_filter=VALID_TIME_FILTERS[index], + limit=(50 if int(index) == 0 else index + 1 * 50), ), subreddit, times_checked=index, diff --git a/utils/thumbnail.py b/utils/thumbnail.py new file mode 100644 index 0000000..6f01e6c --- /dev/null +++ b/utils/thumbnail.py @@ -0,0 +1,37 @@ +from PIL import ImageDraw, ImageFont + + +def create_thumbnail(thumbnail, font_family, font_size, font_color, width, height, title): + + font = ImageFont.truetype(font_family + ".ttf", font_size) + Xaxis = width - (width * 0.2) # 20% of the width + sizeLetterXaxis = font_size * 0.5 # 50% of the font size + XaxisLetterQty = round(Xaxis / sizeLetterXaxis) # Quantity of letters that can fit in the X axis + MarginYaxis = (height * 0.12) # 12% of the height + MarginXaxis = (width * 0.05) # 5% of the width + # 1.1 rem + LineHeight = font_size * 1.1 + # rgb = "255,255,255" transform to list + rgb = font_color.split(",") + rgb = (int(rgb[0]), int(rgb[1]), int(rgb[2])) + + arrayTitle = [] + for word in title.split(): + if len(arrayTitle) == 0: + # colocar a primeira palavra no arrayTitl# put the first word in the arrayTitle + arrayTitle.append(word) + else: + # if the size of arrayTitle is less than qtLetters + if len(arrayTitle[-1]) + len(word) < XaxisLetterQty: + arrayTitle[-1] = arrayTitle[-1] + " " + word + else: + arrayTitle.append(word) + + draw = ImageDraw.Draw(thumbnail) + # loop for put the title in the thumbnail + for i in range(0, len(arrayTitle)): + # 1.1 rem + draw.text((MarginXaxis, MarginYaxis + (LineHeight * i)), + arrayTitle[i], rgb, font=font) + + return thumbnail diff --git a/utils/version.py b/utils/version.py index a8177cc..0818c87 100644 --- a/utils/version.py +++ b/utils/version.py @@ -1,8 +1,9 @@ import requests + from utils.console import print_step -def checkversion(__VERSION__): +def checkversion(__VERSION__: str): response = requests.get( "https://api.github.com/repos/elebumm/RedditVideoMakerBot/releases/latest" ) @@ -10,7 +11,11 @@ def checkversion(__VERSION__): if __VERSION__ == latestversion: print_step(f"You are using the newest version ({__VERSION__}) of the bot") return True - else: + elif __VERSION__ < latestversion: print_step( f"You are using an older version ({__VERSION__}) of the bot. Download the newest version ({latestversion}) from https://github.com/elebumm/RedditVideoMakerBot/releases/latest" ) + else: + print_step( + f"Welcome to the test version ({__VERSION__}) of the bot. Thanks for testing and feel free to report any bugs you find." + ) diff --git a/utils/video.py b/utils/video.py index 5566cd1..a785df4 100644 --- a/utils/video.py +++ b/utils/video.py @@ -1,7 +1,6 @@ from __future__ import annotations -from ast import Str -import re +import re from typing import Tuple from PIL import ImageFont, Image, ImageDraw, ImageEnhance @@ -38,16 +37,27 @@ class Video: return ImageClip(path) def add_watermark( - self, text, redditid, opacity=0.5, duration: int | float = 5, position: Tuple = (0.7, 0.9), fontsize=15 + self, + text, + redditid, + opacity=0.5, + duration: int | float = 5, + position: Tuple = (0.7, 0.9), + fontsize=15, ): compensation = round( - (position[0] / ((len(text) * (fontsize / 5) / 1.5) / 100 + position[0] * position[0])), + ( + position[0] + / ((len(text) * (fontsize / 5) / 1.5) / 100 + position[0] * position[0]) + ), ndigits=2, ) position = (compensation, position[1]) # print(f'{compensation=}') # print(f'{position=}') - img_clip = self._create_watermark(text, redditid, fontsize=fontsize, opacity=opacity) + img_clip = self._create_watermark( + text, redditid, fontsize=fontsize, opacity=opacity + ) img_clip = img_clip.set_opacity(opacity).set_duration(duration) img_clip = img_clip.set_position( position, relative=True diff --git a/utils/videos.py b/utils/videos.py index 4a91e8c..c30cb2c 100755 --- a/utils/videos.py +++ b/utils/videos.py @@ -1,6 +1,5 @@ import json import time -from typing import Dict from praw.models import Submission @@ -20,7 +19,9 @@ def check_done( Returns: Submission|None: Reddit object in args """ - with open("./video_creation/data/videos.json", "r", encoding="utf-8") as done_vids_raw: + with open( + "./video_creation/data/videos.json", "r", encoding="utf-8" + ) as done_vids_raw: done_videos = json.load(done_vids_raw) for video in done_videos: if video["id"] == str(redditobj): @@ -34,7 +35,9 @@ def check_done( return redditobj -def save_data(subreddit: str, filename: str, reddit_title: str, reddit_id: str, credit: str): +def save_data( + subreddit: str, filename: str, reddit_title: str, reddit_id: str, credit: str +): """Saves the videos that have already been generated to a JSON file in video_creation/data/videos.json Args: diff --git a/utils/voice.py b/utils/voice.py index a0709fa..a88c87d 100644 --- a/utils/voice.py +++ b/utils/voice.py @@ -1,11 +1,14 @@ import re import sys -from datetime import datetime import time as pytime +from datetime import datetime from time import sleep from requests import Response +from utils import settings +from cleantext import clean + if sys.version_info[0] >= 3: from datetime import timezone @@ -40,7 +43,9 @@ def sleep_until(time): if sys.version_info[0] >= 3 and time.tzinfo: end = time.astimezone(timezone.utc).timestamp() else: - zoneDiff = pytime.time() - (datetime.now() - datetime(1970, 1, 1)).total_seconds() + zoneDiff = ( + pytime.time() - (datetime.now() - datetime(1970, 1, 1)).total_seconds() + ) end = (time - datetime(1970, 1, 1)).total_seconds() + zoneDiff # Type check @@ -81,8 +86,13 @@ def sanitize_text(text: str) -> str: result = re.sub(regex_urls, " ", text) # note: not removing apostrophes - regex_expr = r"\s['|’]|['|’]\s|[\^_~@!&;#:\-–—%“”‘\"%\*/{}\[\]\(\)\\|<>=+]" + regex_expr = r"\s['|’]|['|’]\s|[\^_~@!&;#:\-%—“”‘\"%\*/{}\[\]\(\)\\|<>=+]" result = re.sub(regex_expr, " ", result) result = result.replace("+", "plus").replace("&", "and") + + # emoji removal if the setting is enabled + if settings.config["settings"]["tts"]["no_emojis"]: + result = clean(result, no_emoji=True) + # remove extra whitespace return " ".join(result.split()) diff --git a/video_creation/background.py b/video_creation/background.py index 1676f97..0458ce6 100644 --- a/video_creation/background.py +++ b/video_creation/background.py @@ -1,19 +1,32 @@ -from pathlib import Path +import json import random -from random import randrange import re +from pathlib import Path +from random import randrange from typing import Any, Tuple - from moviepy.editor import VideoFileClip from moviepy.video.io.ffmpeg_tools import ffmpeg_extract_subclip 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 +# Load background videos +with open("./utils/backgrounds.json") as json_file: + background_options = json.load(json_file) + +# Remove "__comment" from backgrounds +background_options.pop("__comment", None) + +# Add position lambda function +# (https://zulko.github.io/moviepy/ref/VideoClip/VideoClip.html#moviepy.video.VideoClip.VideoClip.set_position) +for name in list(background_options.keys()): + pos = background_options[name][3] + + if pos != "center": + background_options[name][3] = lambda t: ("center", pos + 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. @@ -32,7 +45,9 @@ def get_start_and_end_times(video_length: int, length_of_clip: int) -> Tuple[int def get_background_config(): """Fetch the background/s configuration""" try: - choice = str(settings.config["settings"]["background"]["background_choice"]).casefold() + choice = str( + settings.config["settings"]["background"]["background_choice"] + ).casefold() except AttributeError: print_substep("No background selected. Picking random background'") choice = None @@ -57,13 +72,15 @@ def download_background(background_config: Tuple[str, str, str, Any]): ) print_substep("Downloading the backgrounds videos... please be patient 🙏 ") print_substep(f"Downloading {filename} from {uri}") - YouTube(uri, on_progress_callback=on_progress).streams.filter(res="1080p").first().download( - "assets/backgrounds", filename=f"{credit}-{filename}" - ) + YouTube(uri, on_progress_callback=on_progress).streams.filter( + res="1080p" + ).first().download("assets/backgrounds", filename=f"{credit}-{filename}") print_substep("Background video downloaded successfully! 🎉", style="bold green") -def chop_background_video(background_config: Tuple[str, str, str, Any], video_length: int, reddit_object: dict): +def chop_background_video( + background_config: Tuple[str, str, str, Any], video_length: int, reddit_object: dict +): """Generates the background footage to be used in the video and writes it to assets/temp/background.mp4 Args: diff --git a/video_creation/data/videos.json b/video_creation/data/videos.json index 0637a08..fe51488 100644 --- a/video_creation/data/videos.json +++ b/video_creation/data/videos.json @@ -1 +1 @@ -[] \ No newline at end of file +[] diff --git a/video_creation/final_video.py b/video_creation/final_video.py index 743e561..ad5ff95 100755 --- a/video_creation/final_video.py +++ b/video_creation/final_video.py @@ -1,9 +1,13 @@ -#!/usr/bin/env python3 -import multiprocessing import os import re +import multiprocessing from os.path import exists +from typing import Tuple, Any, Final +import translators as ts +import shutil from typing import Tuple, Any +from PIL import Image + from moviepy.audio.AudioClip import concatenate_audioclips, CompositeAudioClip from moviepy.audio.io.AudioFileClip import AudioFileClip from moviepy.video.VideoClip import ImageClip @@ -12,15 +16,17 @@ from moviepy.video.compositing.concatenate import concatenate_videoclips from moviepy.video.io.VideoFileClip import VideoFileClip from moviepy.video.io.ffmpeg_tools import ffmpeg_extract_subclip from rich.console import Console +from rich.progress import track 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.thumbnail import create_thumbnail from utils import settings +from utils.thumbnail import create_thumbnail console = Console() -W, H = 1080, 1920 def name_normalize(name: str) -> str: @@ -30,20 +36,34 @@ def name_normalize(name: str) -> str: name = re.sub(r"(\d+)\s?\/\s?(\d+)", r"\1 of \2", name) name = re.sub(r"(\w+)\s?\/\s?(\w+)", r"\1 or \2", name) name = re.sub(r"\/", r"", name) - name[:30] lang = settings.config["reddit"]["thread"]["post_lang"] if lang: - import translators as ts - print_substep("Translating filename...") translated_name = ts.google(name, to_language=lang) return translated_name - else: return name +def prepare_background(reddit_id: str, W: int, H: int) -> VideoFileClip: + clip = ( + VideoFileClip(f"assets/temp/{reddit_id}/background.mp4") + .without_audio() + .resize(height=H) + ) + + # calculate the center of the background clip + c = clip.w // 2 + + # calculate the coordinates where to crop + half_w = W // 2 + x1 = c - half_w + x2 = c + half_w + + return clip.crop(x1=x1, y1=0, x2=x2, y2=H) + + def make_final_video( number_of_clips: int, length: int, @@ -57,27 +77,47 @@ 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. """ + # settings values + W: Final[int] = int(settings.config["settings"]["resolution_w"]) + H: Final[int] = int(settings.config["settings"]["resolution_h"]) + # try: # if it isn't found (i.e you just updated and copied over config.toml) it will throw an error # VOLUME_MULTIPLIER = settings.config["settings"]['background']["background_audio_volume"] # except (TypeError, KeyError): # print('No background audio volume found in config.toml. Using default value of 1.') # VOLUME_MULTIPLIER = 1 - id = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"]) + + reddit_id = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"]) 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"] transition = settings.config["settings"]["transition"] - background_clip = ( - VideoFileClip(f"assets/temp/{id}/background.mp4") - .without_audio() - .resize(height=H) - .crop(x1=1166.6, y1=0, x2=2246.6, y2=1920) - ) + + background_clip = prepare_background(reddit_id, W=W, H=H) # Gather all audio clips - audio_clips = [AudioFileClip(f"assets/temp/{id}/mp3/{i}.mp3") for i in range(number_of_clips)] - audio_clips.insert(0, AudioFileClip(f"assets/temp/{id}/mp3/title.mp3")) + if settings.config["settings"]["storymode"]: + if settings.config["settings"]["storymodemethod"] == 0: + audio_clips = [AudioFileClip(f"assets/temp/{reddit_id}/mp3/title.mp3")] + audio_clips.insert(1, AudioFileClip(f"assets/temp/{reddit_id}/mp3/postaudio.mp3")) + elif settings.config["settings"]["storymodemethod"] == 1: + audio_clips = [ + AudioFileClip(f"assets/temp/{reddit_id}/mp3/postaudio-{i}.mp3") + for i in track( + range(number_of_clips + 1), "Collecting the audio files..." + ) + ] + audio_clips.insert(0, AudioFileClip(f"assets/temp/{reddit_id}/mp3/title.mp3")) + + else: + audio_clips = [ + AudioFileClip(f"assets/temp/{reddit_id}/mp3/{i}.mp3") + for i in range(number_of_clips) + ] + audio_clips.insert(0, AudioFileClip(f"assets/temp/{reddit_id}/mp3/title.mp3")) audio_concat = concatenate_audioclips(audio_clips) audio_composite = CompositeAudioClip([audio_concat]) @@ -86,37 +126,52 @@ def make_final_video( image_clips = [] # Gather all images new_opacity = 1 if opacity is None or float(opacity) >= 1 else float(opacity) - new_transition = 0 if transition is None or float(transition) > 2 else float(transition) + new_transition = ( + 0 if transition is None or float(transition) > 2 else float(transition) + ) + screenshot_width = int((W * 90) // 100) image_clips.insert( 0, - ImageClip(f"assets/temp/{id}/png/title.png") + ImageClip(f"assets/temp/{reddit_id}/png/title.png") .set_duration(audio_clips[0].duration) - .resize(width=W - 100) + .resize(width=screenshot_width) .set_opacity(new_opacity) .crossfadein(new_transition) .crossfadeout(new_transition), ) + if settings.config["settings"]["storymode"]: + if settings.config["settings"]["storymodemethod"] == 0: + image_clips.insert( + 1, + ImageClip(f"assets/temp/{reddit_id}/png/story_content.png") + .set_duration(audio_clips[1].duration) + .set_position("center") + .resize(width=screenshot_width) + .set_opacity(float(opacity)), + ) + elif settings.config["settings"]["storymodemethod"] == 1: + for i in track( + range(0, number_of_clips + 1), "Collecting the image files..." + ): + image_clips.append( + ImageClip(f"assets/temp/{reddit_id}/png/img{i}.png") + .set_duration(audio_clips[i + 1].duration) + .resize(width=screenshot_width) + .set_opacity(new_opacity) + # .crossfadein(new_transition) + # .crossfadeout(new_transition) + ) + else: + for i in range(0, number_of_clips): + image_clips.append( + ImageClip(f"assets/temp/{reddit_id}/png/comment_{i}.png") + .set_duration(audio_clips[i + 1].duration) + .resize(width=screenshot_width) + .set_opacity(new_opacity) + .crossfadein(new_transition) + .crossfadeout(new_transition) + ) - for i in range(0, number_of_clips): - image_clips.append( - ImageClip(f"assets/temp/{id}/png/comment_{i}.png") - .set_duration(audio_clips[i + 1].duration) - .resize(width=W - 100) - .set_opacity(new_opacity) - .crossfadein(new_transition) - .crossfadeout(new_transition) - ) - - # if os.path.exists("assets/mp3/posttext.mp3"): - # image_clips.insert( - # 0, - # ImageClip("assets/png/title.png") - # .set_duration(audio_clips[0].duration + audio_clips[1].duration) - # .set_position("center") - # .resize(width=W - 100) - # .set_opacity(float(opacity)), - # ) - # else: story mode stuff img_clip_pos = background_config[3] image_concat = concatenate_videoclips(image_clips).set_position( img_clip_pos @@ -125,14 +180,75 @@ def make_final_video( final = CompositeVideoClip([background_clip, image_concat]) title = re.sub(r"[^\w\s-]", "", reddit_obj["thread_title"]) idx = re.sub(r"[^\w\s-]", "", reddit_obj["thread_id"]) + title_thumb = reddit_obj["thread_title"] - filename = f"{name_normalize(title)[:251]}.mp4" + filename = f"{name_normalize(title)[:251]}" subreddit = 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}") + # create a tumbnail for the video + settingsbackground = settings.config["settings"]["background"] + + if settingsbackground["background_thumbnail"]: + if not exists(f"./results/{subreddit}/thumbnails"): + print_substep( + "The results/thumbnails folder didn't exist so I made it") + os.makedirs(f"./results/{subreddit}/thumbnails") + # get the first file with the .png extension from assets/backgrounds and use it as a background for the thumbnail + first_image = next( + ( + file + for file in os.listdir("assets/backgrounds") + if file.endswith(".png") + ), + None, + ) + if first_image is None: + print_substep("No png files found in assets/backgrounds", "red") + + if settingsbackground["background_thumbnail"] and first_image: + font_family = settingsbackground["background_thumbnail_font_family"] + font_size = settingsbackground["background_thumbnail_font_size"] + font_color = settingsbackground["background_thumbnail_font_color"] + thumbnail = Image.open(f"assets/backgrounds/{first_image}") + width, height = thumbnail.size + thumbnailSave = create_thumbnail(thumbnail, font_family, font_size, font_color, width, height, title_thumb) + thumbnailSave.save(f"./assets/temp/{reddit_id}/thumbnail.png") + print_substep(f"Thumbnail - Building Thumbnail in assets/temp/{reddit_id}/thumbnail.png") + + # create a tumbnail for the video + settingsbackground = settings.config["settings"]["background"] + + if settingsbackground["background_thumbnail"]: + if not exists(f"./results/{subreddit}/thumbnails"): + print_substep( + "The results/thumbnails folder didn't exist so I made it") + os.makedirs(f"./results/{subreddit}/thumbnails") + # get the first file with the .png extension from assets/backgrounds and use it as a background for the thumbnail + first_image = next( + ( + file + for file in os.listdir("assets/backgrounds") + if file.endswith(".png") + ), + None, + ) + if first_image is None: + print_substep("No png files found in assets/backgrounds", "red") + + if settingsbackground["background_thumbnail"] and first_image: + font_family = settingsbackground["background_thumbnail_font_family"] + font_size = settingsbackground["background_thumbnail_font_size"] + font_color = settingsbackground["background_thumbnail_font_color"] + thumbnail = Image.open(f"assets/backgrounds/{first_image}") + width, height = thumbnail.size + thumbnailSave = create_thumbnail(thumbnail, font_family, font_size, font_color, width, height, title_thumb) + thumbnailSave.save(f"./assets/temp/{reddit_id}/thumbnail.png") + print_substep(f"Thumbnail - Building Thumbnail in assets/temp/{reddit_id}/thumbnail.png") + # 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) @@ -140,26 +256,34 @@ 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, redditid=reddit_obj - ) + text=f"Background credit: {background_config[2]}", + opacity=0.4, + redditid=reddit_obj, + ) final.write_videofile( - f"assets/temp/{id}/temp.mp4", - fps=30, + f"assets/temp/{reddit_id}/temp.mp4", + fps=int(settings.config["settings"]["fps"]), audio_codec="aac", audio_bitrate="192k", verbose=False, threads=multiprocessing.cpu_count(), + #preset="ultrafast", # for testing purposes ) ffmpeg_extract_subclip( - f"assets/temp/{id}/temp.mp4", + f"assets/temp/{reddit_id}/temp.mp4", 0, length, - targetname=f"results/{subreddit}/{filename}", + targetname=f"results/{subreddit}/{filename}.mp4", ) - save_data(subreddit, filename, title, idx, background_config[2]) + #get the thumbnail image from assets/temp/id/thumbnail.png and save it in results/subreddit/thumbnails + if settingsbackground["background_thumbnail"] and exists(f"assets/temp/{id}/thumbnail.png"): + shutil.move(f"assets/temp/{id}/thumbnail.png", f"./results/{subreddit}/thumbnails/{filename}.png") + + save_data(subreddit, filename+".mp4", title, idx, background_config[2]) print_step("Removing temporary files 🗑") - cleanups = cleanup(id) + cleanups = cleanup(reddit_id) print_substep(f"Removed {cleanups} temporary files 🗑") print_substep("See result in the results folder!") diff --git a/video_creation/screenshot_downloader.py b/video_creation/screenshot_downloader.py index 2344fce..3a76b5b 100644 --- a/video_creation/screenshot_downloader.py +++ b/video_creation/screenshot_downloader.py @@ -1,50 +1,81 @@ import json - -from pathlib import Path import re -from typing import Dict -from utils import settings -from playwright.async_api import async_playwright # pylint: disable=unused-import - -# do not remove the above line +from pathlib import Path +from typing import Dict, Final -from playwright.sync_api import sync_playwright, ViewportSize -from rich.progress import track import translators as ts +from playwright.async_api import async_playwright # pylint: disable=unused-import +from playwright.sync_api import ViewportSize, sync_playwright +from rich.progress import track +from utils import settings from utils.console import print_step, print_substep +from utils.imagenarator import imagemaker -storymode = False +__all__ = ["download_screenshots_of_reddit_posts"] -def download_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): +def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): """Downloads screenshots of reddit posts as seen on the web. Downloads to assets/temp/png Args: reddit_object (Dict): Reddit object received from reddit/subreddit.py screenshot_num (int): Number of screenshots to download """ + # settings values + W: Final[int] = int(settings.config["settings"]["resolution_w"]) + H: Final[int] = int(settings.config["settings"]["resolution_h"]) + lang: Final[str] = settings.config["reddit"]["thread"]["post_lang"] + storymode: Final[bool] = settings.config["settings"]["storymode"] + print_step("Downloading screenshots of reddit posts...") - id = re.sub(r"[^\w\s-]", "", reddit_object["thread_id"]) + reddit_id = re.sub(r"[^\w\s-]", "", reddit_object["thread_id"]) # ! Make sure the reddit screenshots folder exists - Path(f"assets/temp/{id}/png").mkdir(parents=True, exist_ok=True) + Path(f"assets/temp/{reddit_id}/png").mkdir(parents=True, exist_ok=True) + screenshot_num: int with sync_playwright() as p: print_substep("Launching Headless Browser...") - browser = p.chromium.launch() + browser = p.chromium.launch() # headless=False #to check for chrome view context = browser.new_context() - + # Device scale factor (or dsf for short) allows us to increase the resolution of the screenshots + # When the dsf is 1, the width of the screenshot is 600 pixels + # so we need a dsf such that the width of the screenshot is greater than the final resolution of the video + dsf = (W // 600) + 1 + + context = browser.new_context( + locale=lang or "en-us", + color_scheme="dark", + viewport=ViewportSize(width=W, height=H), + device_scale_factor=dsf, + ) + # set the theme and disable non-essential cookies if settings.config["settings"]["theme"] == "dark": - cookie_file = open("./video_creation/data/cookie-dark-mode.json", encoding="utf-8") + cookie_file = open( + "./video_creation/data/cookie-dark-mode.json", encoding="utf-8" + ) + bgcolor = (33, 33, 36, 255) + txtcolor = (240, 240, 240) else: - cookie_file = open("./video_creation/data/cookie-light-mode.json", encoding="utf-8") + cookie_file = open( + "./video_creation/data/cookie-light-mode.json", encoding="utf-8" + ) + bgcolor = (255, 255, 255, 255) + txtcolor = (0, 0, 0) + if storymode and settings.config["settings"]["storymodemethod"] == 1: + # for idx,item in enumerate(reddit_object["thread_post"]): + return imagemaker(theme=bgcolor, reddit_obj=reddit_object, txtclr=txtcolor) cookies = json.load(cookie_file) + cookie_file.close() + context.add_cookies(cookies) # load preference cookies + # Get the thread screenshot page = context.new_page() page.goto(reddit_object["thread_url"], timeout=0) - page.set_viewport_size(ViewportSize(width=1920, height=1080)) + page.set_viewport_size(ViewportSize(width=W, height=H)) + if page.locator('[data-testid="content-gate"]').is_visible(): # This means the post is NSFW and requires to click the proceed button. @@ -57,13 +88,13 @@ def download_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: in '[data-click-id="text"] button' ).click() # Remove "Click to see nsfw" Button in Screenshot - # translate code + # translate code - if settings.config["reddit"]["thread"]["post_lang"]: + if lang: print_substep("Translating post...") texts_in_tl = ts.google( reddit_object["thread_title"], - to_language=settings.config["reddit"]["thread"]["post_lang"], + to_language=lang, ) page.evaluate( @@ -73,16 +104,19 @@ def download_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: in else: print_substep("Skipping translation...") - postcontentpath = f"assets/temp/{id}/png/title.png" - page.locator('[data-test-id="post-content"]').screenshot(path= postcontentpath) + postcontentpath = f"assets/temp/{reddit_id}/png/title.png" + page.locator('[data-test-id="post-content"]').screenshot(path=postcontentpath) if storymode: - page.locator('[data-click-id="text"]').screenshot( - path=f"assets/temp/{id}/png/story_content.png" + page.locator('[data-click-id="text"]').first.screenshot( + path=f"assets/temp/{reddit_id}/png/story_content.png" ) else: for idx, comment in enumerate( - track(reddit_object["comments"], "Downloading screenshots...") + track( + reddit_object["comments"][:screenshot_num], + "Downloading screenshots...", + ) ): # Stop if we have reached the screenshot_num if idx >= screenshot_num: @@ -106,11 +140,17 @@ def download_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: in ) try: page.locator(f"#t1_{comment['comment_id']}").screenshot( - path=f"assets/temp/{id}/png/comment_{idx}.png" + path=f"assets/temp/{reddit_id}/png/comment_{idx}.png" ) except TimeoutError: del reddit_object["comments"] screenshot_num += 1 print("TimeoutError: Skipping screenshot...") continue - print_substep("Screenshots downloaded Successfully.", style="bold green") + + # close browser instance when we are done using it + browser.close() + + + + print_substep("Screenshots downloaded Successfully.", style="bold green") \ No newline at end of file diff --git a/video_creation/voices.py b/video_creation/voices.py index f49514d..425f589 100644 --- a/video_creation/voices.py +++ b/video_creation/voices.py @@ -1,19 +1,16 @@ -#!/usr/bin/env python - -from typing import Dict, Tuple +from typing import Tuple from rich.console import Console -from TTS.engine_wrapper import TTSEngine from TTS.GTTS import GTTS -from TTS.streamlabs_polly import StreamlabsPolly -from TTS.aws_polly import AWSPolly from TTS.TikTok import TikTok +from TTS.aws_polly import AWSPolly +from TTS.engine_wrapper import TTSEngine from TTS.pyttsx import pyttsx +from TTS.streamlabs_polly import StreamlabsPolly from utils import settings from utils.console import print_table, print_step - console = Console() TTSProviders = { @@ -37,7 +34,9 @@ def save_text_to_mp3(reddit_obj) -> Tuple[int, int]: voice = settings.config["settings"]["tts"]["voice_choice"] if str(voice).casefold() in map(lambda _: _.casefold(), TTSProviders): - text_to_mp3 = TTSEngine(get_case_insensitive_key_value(TTSProviders, voice), reddit_obj) + text_to_mp3 = TTSEngine( + get_case_insensitive_key_value(TTSProviders, voice), reddit_obj + ) else: while True: print_step("Please choose one of the following TTS providers: ") @@ -46,12 +45,18 @@ def save_text_to_mp3(reddit_obj) -> Tuple[int, int]: if choice.casefold() in map(lambda _: _.casefold(), TTSProviders): break print("Unknown Choice") - text_to_mp3 = TTSEngine(get_case_insensitive_key_value(TTSProviders, choice), reddit_obj) + text_to_mp3 = TTSEngine( + get_case_insensitive_key_value(TTSProviders, choice), reddit_obj + ) return text_to_mp3.run() def get_case_insensitive_key_value(input_dict, key): return next( - (value for dict_key, value in input_dict.items() if dict_key.lower() == key.lower()), + ( + value + for dict_key, value in input_dict.items() + if dict_key.lower() == key.lower() + ), None, )