diff --git a/Dockerfile b/Dockerfile index 6d090c6..4cf2a71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM python:3.10.9-slim RUN apt update +RUN apt-get install -y ffmpeg RUN apt install python3-pip -y RUN mkdir /app diff --git a/utils/ffmpeg_install.py b/utils/ffmpeg_install.py index 87a6a98..930fc26 100644 --- a/utils/ffmpeg_install.py +++ b/utils/ffmpeg_install.py @@ -80,4 +80,4 @@ def ffmpeg_install(): except Exception as e: print("Welcome fellow traveler! You're one of the few who have made it this far. We have no idea how you got at this error, but we're glad you're here. Please report this error to the developer, and we'll try to fix it as soon as possible. Thank you for your patience!") print(e) - return None \ No newline at end of file + return None diff --git a/video_creation/background.py b/video_creation/background.py index 6f83f4c..45991bd 100644 --- a/video_creation/background.py +++ b/video_creation/background.py @@ -45,7 +45,14 @@ def get_start_and_end_times(video_length: int, length_of_clip: int) -> Tuple[int Returns: tuple[int,int]: Start and end time of the randomized interval """ - random_time = randrange(180, int(length_of_clip) - int(video_length)) + initialValue = 180 + # Issue #1649 - Ensures that will be a valid interval in the video + while(int(length_of_clip) <= int(video_length+initialValue)): + if(initialValue == initialValue //2): + raise Exception("Your background is too short for this video length") + else: + initialValue //= 2 #Divides the initial value by 2 until reach 0 + random_time = randrange(initialValue, int(length_of_clip) - int(video_length)) return random_time, random_time + video_length @@ -155,4 +162,4 @@ def chop_background( return background_config["video"][2] # Create a tuple for downloads background (background_audio_options, background_video_options) -background_options = load_background_options() \ No newline at end of file +background_options = load_background_options()