Merge pull request #2060 from elebumm/develop

Update 3.3.0

Author: JasonLovesDoggo

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/autoblack.yml .github/workflows/fmt.yml.github/workflows/autoblack.yml renamed to .github/workflows/fmt.yml

@@ -3,30 +3,35 @@
 # Othewrwise, Black is run and its changes are committed back to the incoming pull request.
 # https://github.com/cclauss/autoblack
 
-name: autoblack
+name: fmt
 on:
   push:
     branches: ["develop"]
 jobs:
-  build:
+  format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
-      - name: Install Black
-        run: pip install black
-      - name: Run black --check .
-        run: black --check .
-      - name: If needed, commit black changes to the pull request
+          python-version: 3.10.14
+      - name: Install Black & isort
+        run: pip install black isort
+      - name: Run black check
+        run: black --check . --line-length 101
+      - name: Run isort check
+        run: isort . --check-only --diff --profile black
+      - name: If needed, commit changes to the pull request
         if: failure()
         run: |
           black . --line-length 101
+          isort . --profile black
           git config --global user.name github-actions
           git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
           git checkout $GITHUB_HEAD_REF
           git commit -am "fixup: Format Python code with Black"
           git push origin HEAD:develop
+
+          

.github/workflows/lint.yml

@@ -6,7 +6,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: psf/black@stable
         with:
           options: "--line-length 101"
+      - uses: isort/isort-action@v1
+        with:
+          configuration: "--check-only --diff --profile black"

.gitignore

@@ -231,7 +231,8 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-assets/
+assets/temp
+assets/backgrounds
 /.vscode
 out
 .DS_Store
@@ -244,4 +245,4 @@ video_creation/data/videos.json
 video_creation/data/envvars.txt
 
 config.toml
-*.exe
+*.exe

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10.9-slim
+FROM python:3.10.14-slim
 
 RUN apt update
 RUN apt-get install -y ffmpeg
@@ -9,8 +9,4 @@ ADD . /app
 WORKDIR /app
 RUN pip install -r requirements.txt
 
-# tricks for pytube : https://github.com/elebumm/RedditVideoMakerBot/issues/142 
-# (NOTE : This is no longer useful since pytube was removed from the dependencies)
-# RUN sed -i 's/re.compile(r"^\\w+\\W")/re.compile(r"^\\$*\\w+\\W")/' /usr/local/lib/python3.8/dist-packages/pytube/cipher.py
-
 CMD ["python3", "main.py"]

GUI/settings.html

@@ -205,7 +205,7 @@
                     <select name="background_choice" class="form-select" data-toggle="tooltip"
                         data-original-title='Sets the background of the video'>
                         <option value=" ">Random Video</option>
-                        {% for background in checks["background_choice"]["options"][1:] %}
+                        {% for background in checks["background_video"]["options"][1:] %}
                         <option value="{{background}}">{{background}}</option>
                         {% endfor %}
                     </select>
@@ -618,4 +618,4 @@
     });
 </script>
 
-{% endblock %}
+{% endblock %}

README.md

@@ -50,7 +50,7 @@ On macOS and Linux (debian, arch, fedora and centos, and based on those), you ca
 This can also be used to update the installation
 
 4. Run `python main.py`
-5. Visit [the Reddit Apps page.](https://www.reddit.com/prefs/apps), and set up an app that is a "script". Paste any URL in redirect URL. Ex:google.com
+5. Visit [the Reddit Apps page.](https://www.reddit.com/prefs/apps), and set up an app that is a "script". Paste any URL in redirect URL. Ex:`https://jasoncameron.dev`
 6. The bot will ask you to fill in your details to connect to the Reddit API, and configure the bot to your liking
 7. Enjoy 😎
 8. If you need to reconfigure the bot, simply open the `config.toml` file and delete the lines that need to be changed. On the next run of the bot, it will help you reconfigure those options.
@@ -81,7 +81,7 @@ 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.gg/WBQT52RrHV) server
+### For any questions or support join the [Discord](https://discord.gg/qfQSx45xCV) server
 
 ## Developers and maintainers.
 
@@ -101,6 +101,8 @@ Freebiell (Freebie#3263) - https://github.com/FreebieII
 
 Aman Raza (electro199#8130) - https://github.com/electro199
 
+Cyteon (cyteon) - https://github.com/cyteon
+
 
 ## LICENSE
 [Roboto Fonts](https://fonts.google.com/specimen/Roboto/about) are licensed under [Apache License V2](https://www.apache.org/licenses/LICENSE-2.0)

TTS/TikTok.py

@@ -2,7 +2,7 @@
 import base64
 import random
 import time
-from typing import Optional, Final
+from typing import Final, Optional
 
 import requests
 

TTS/elevenlabs.py

@@ -1,42 +1,38 @@
 import random
 
-from elevenlabs import generate, save
+from elevenlabs import save
+from elevenlabs.client import ElevenLabs
 
 from utils import settings
 
-voices = [
-    "Adam",
-    "Antoni",
-    "Arnold",
-    "Bella",
-    "Domi",
-    "Elli",
-    "Josh",
-    "Rachel",
-    "Sam",
-]
-
 
 class elevenlabs:
     def __init__(self):
         self.max_chars = 2500
-        self.voices = voices
+        self.client: ElevenLabs = None
 
     def run(self, text, filepath, random_voice: bool = False):
+        if self.client is None:
+            self.initialize()
         if random_voice:
             voice = self.randomvoice()
         else:
             voice = str(settings.config["settings"]["tts"]["elevenlabs_voice_name"]).capitalize()
 
+        audio = self.client.generate(text=text, voice=voice, model="eleven_multilingual_v1")
+        save(audio=audio, filename=filepath)
+
+    def initialize(self):
         if settings.config["settings"]["tts"]["elevenlabs_api_key"]:
             api_key = settings.config["settings"]["tts"]["elevenlabs_api_key"]
         else:
             raise ValueError(
                 "You didn't set an Elevenlabs API key! Please set the config variable ELEVENLABS_API_KEY to a valid API key."
             )
 
-        audio = generate(api_key=api_key, text=text, voice=voice, model="eleven_multilingual_v1")
-        save(audio=audio, filename=filepath)
+        self.client = ElevenLabs(api_key=api_key)
 
     def randomvoice(self):
-        return random.choice(self.voices)
+        if self.client is None:
+            self.initialize()
+        return random.choice(self.client.voices.get_all().voices).voice_name

TTS/engine_wrapper.py

@@ -14,14 +14,12 @@
 from utils.console import print_step, print_substep
 from utils.voice import sanitize_text
 
-
 DEFAULT_MAX_LENGTH: int = (
     50  # Video length variable, edit this on your own risk. It should work, but it's not supported
 )
 
 
 class TTSEngine:
-
     """Calls the given TTS engine to reduce code duplication and allow multiple TTS engines.
 
     Args: