.

triqxv · Jun 29, 2023 · d44ab20 · d44ab20
1 parent 67f98b3
commit d44ab20
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/__pycache__/Fonts.cpython-310.pyc b/__pycache__/Fonts.cpython-310.pyc
diff --git a/__pycache__/ffmpeg.cpython-310.pyc b/__pycache__/ffmpeg.cpython-310.pyc
diff --git a/__pycache__/json_handler.cpython-310.pyc b/__pycache__/json_handler.cpython-310.pyc
diff --git a/__pycache__/verse_handler.cpython-310.pyc b/__pycache__/verse_handler.cpython-310.pyc
diff --git a/ffmpeg.py b/ffmpeg.py
@@ -168,6 +168,12 @@ def create_video(text_verse, text_source, text_source_font, text_source_for_imag
 
     text2_y: int = image_text_source_y + verse_height + 75
 
+    # If ref text leaps to logo, move it to 1200, and adjust the verse accordingly
+    if (text2_y > 1200):
+        diff = text2_y - 1200
+        text2_y = 1200
+        image_text_source_y -= diff
+
     # print(f"{image_text_source_y}, {text2_y}")
 
     # fix bug that ':' and beyond wasn't showing on screen

diff --git a/main.py b/main.py
@@ -5,17 +5,17 @@
 from Fonts import Fonts
 
 # Define the paths and values to everything
-number_of_videos = 1
+number_of_videos = -1
 project_dir = os.getcwd().replace("\\", "/")
 
 video_folder = f"{project_dir}/videos"
 # video_folder = "E:/Bots/VideoMaker/videos/caribbean/darken0.4"
 audio_folder = f"{project_dir}/audio"
-json_file = f"{project_dir}/sources/verses_data/love_data.json"
+json_file = f"{project_dir}/sources/verses_data/gmfillmore_data.json"
 fonts_dir = f"{project_dir}/sources/fonts"
 output_folder = f"{project_dir}/customers"
 text_source_font = f'{project_dir}/sources/MouldyCheeseRegular-WyMWG.ttf'.replace(":/", "\:/")
-image_file = f"{project_dir}/sources/gm4.png"
+image_file = f"{project_dir}/sources/gm1.png"
 customer_name = "gmfillmore"
 verse_text_image_path = f"{project_dir}/verse_images/{customer_name}"
 fonts_paths = [f'{project_dir}/sources/fonts/CoffeeJellyUmai.ttf', f'{project_dir}/sources/fonts/CourierprimecodeRegular.ttf', f'{project_dir}/sources/fonts/EbGaramond08Regular-2mWe.ttf', f'{project_dir}/sources/fonts/FlowersSunday.otf', f'{project_dir}/sources/fonts/GreenTeaJelly.ttf', f'{project_dir}/sources/fonts/HeyMarch.ttf', f'{project_dir}/sources/fonts/Hugamour.ttf', f'{project_dir}/sources/fonts/LetsCoffee.otf', f'{project_dir}/sources/fonts/Lightning Script.ttf', f'{project_dir}/sources/fonts/LikeSlim.ttf', f'{project_dir}/sources/fonts/PineappleDays.ttf', f'{project_dir}/sources/fonts/SunnySpellsBasicRegular.ttf', f'{project_dir}/sources/fonts/TakeCoffee.ttf', f'{project_dir}/sources/fonts/WantCoffee.ttf']

diff --git a/videos/29.mp4 b/videos/29.mp4