From 99af58bcf1832ce7ab1839409c3661abfb394f8f Mon Sep 17 00:00:00 2001 From: RapidStoned Date: Mon, 22 Aug 2022 16:16:22 +0200 Subject: [PATCH] Conflict fixing Fixed?? --- .gitignore | 1 + TTS/GTTS.py | 4 ++-- install.sh | 9 +-------- video_creation/data/videos.json | 11 +---------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index bd8c2f2..3da725f 100644 --- a/.gitignore +++ b/.gitignore @@ -231,6 +231,7 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser +assets/ out .DS_Store .setup-done-before diff --git a/TTS/GTTS.py b/TTS/GTTS.py index 76ff2d2..a0662b4 100644 --- a/TTS/GTTS.py +++ b/TTS/GTTS.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 import random - +from utils import settings from gtts import gTTS -from utils import settings +max_chars = 0 class GTTS: def __init__(self): diff --git a/install.sh b/install.sh index 314b660..f85c80b 100644 --- a/install.sh +++ b/install.sh @@ -62,14 +62,7 @@ function install_macos(){ fi # Install the required packages echo "Installing required Packages" - - 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 + brew install python@3.10 tcl-tk python-tk } # Function to install for arch (and other forks like manjaro) diff --git a/video_creation/data/videos.json b/video_creation/data/videos.json index 7aaa0c1..0637a08 100644 --- a/video_creation/data/videos.json +++ b/video_creation/data/videos.json @@ -1,10 +1 @@ -[ - { - "subreddit": "AskReddit", - "id": "w2orm0", - "time": "1658271429", - "background_credit": "No Copyright Gameplay", - "reddit_title": "What comedian has never ever made you laugh", - "filename": "What comedian has never ever made you laugh.mp4" - } -] \ No newline at end of file +[] \ No newline at end of file