single results directory

catch bug in trimmer when start time was lefft blank

.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
 __pycache__/
 flagged/
-results_*/
+results*/
 logs/

app.py

@@ -45,10 +45,10 @@ def set_output_file(input_file, output_format, folder, insert_string = 'trimmed'
     return output_file
 
 def trim_video_helper(input_file, output_file, start_time, end_time):
-    if start_time == "":
+    if not start_time:
         start_time = 0
         end_time = 300
-    elif start_time != "" and end_time == "":
+    elif start_time and not end_time:
         end_time = 300 + HHMMSS_to_sec(time_str=start_time)
     print("start time (s): ", start_time)
     print("end time (s): ", end_time)
@@ -89,11 +89,11 @@ def trim_video_vtr(input_file, output_format):
         
         # set output file
         insert_string = f"start{start_time}_end{end_time}"
-        output_folder = f"{os.getcwd()}/results_vtr/"
+        output_folder = f"{os.getcwd()}/results/"
         output_file = set_output_file(input_file, output_format, output_folder, insert_string)
 
         # write the start time, and end time to a txt file
-        log_file = f"{os.getcwd()}/results_vtr/{audio_base_name}_start_end_time.txt"
+        log_file = f"{os.getcwd()}/results/{audio_base_name}_start_end_time.txt"
         print("log_file: ", log_file)
         with open(log_file, "w") as f:
             f.write(f"{start_time}\n")
@@ -115,7 +115,7 @@ def trim_video_wt(input_file, input_transcript, output_format, start_time, end_t
     # trim video with transcript
     try:
         # set output file
-        output_folder = f"{os.getcwd()}/results_wt/"
+        output_folder = f"{os.getcwd()}/results/"
         output_file = set_output_file(input_file, output_format, output_folder)
         output_transcript = set_output_file(input_transcript, "tsv", output_folder)
 
@@ -145,7 +145,7 @@ def sort_transcript_helper(input_transcript, output_transcript):
     return output_transcript
 
 def sort_transcript_wrapper(input_file):
-    output_folder = f"{os.getcwd()}/results_st/"
+    output_folder = f"{os.getcwd()}/results/"
     output_file_path = set_output_file(input_file, "tsv", output_folder, insert_string = 'sorted')
     output_file_path = sort_transcript_helper(input_file.name, output_file_path)
     return output_file_path
@@ -153,7 +153,7 @@ def sort_transcript_wrapper(input_file):
 def trim_video(input_file, output_format, start_time, end_time):
     try:
         # Set output file
-        output_folder = f"{os.getcwd()}/results_vt/"
+        output_folder = f"{os.getcwd()}/results/"
         output_file = set_output_file(input_file, output_format, output_folder)
 
         # Trim the video
@@ -171,7 +171,7 @@ def trim_video(input_file, output_format, start_time, end_time):
 def convert_video(input_file, output_format):
     try:
         # Set output file
-        output_folder = f"{os.getcwd()}/results_vc/"
+        output_folder = f"{os.getcwd()}/results/"
         output_file = set_output_file(input_file, output_format, output_folder, \
                                       insert_string = 'converted')
         print(f"Begin converting to output format: {output_format}" )
@@ -192,7 +192,7 @@ def convert_video(input_file, output_format):
 input_file = gr.File(label="Select video file")
 output_format = gr.Dropdown(choices=["mkv", "MOV", "mp4", "wav"], label="Select output format", value="mp4", )
 start_time = gr.Textbox(label="Start time (in seconds or HH:MM:SS). Leave blank to start at beginning.")
-end_time = gr.Textbox(label="End time (in seconds or HH:MM:SS). Leave blank to trim a  5-minute interval since start.")
+end_time = gr.Textbox(label="End time (in seconds or HH:MM:SS). Leave blank to trim a 5-minute interval since start.")
 output_file = gr.File(label="Download trimmed file")
 interface = gr.Interface(fn=trim_video, inputs=[input_file, output_format, start_time, end_time], outputs=output_file, title="Video Trimmer", allow_flagging="never",
                         description="Trim a video file to a specific time interval. Please wait for the file to upload before clicking the 'Submit' button.")
@@ -249,4 +249,4 @@ interface_wt = gr.Interface(fn=trim_video_wt, inputs=[input_file_wt, input_trans
                                         `Error Type`: a string that may be blank, representing any errors in the transcription of the utterance. ")
 
 demo = gr.TabbedInterface([interface_c, interface,  interface_vtr, interface_wt ], ["Video Converter", "Video Trimmer", "Video Trimmer with Random Start Time", "Video Trimmer with Transcript"])
-demo.launch(server_name="0.0.0.0", server_port=7860)
+demo.launch(server_name="0.0.0.0", server_port=7860, show_error=True)

utils.py

@@ -9,6 +9,8 @@ import gradio as gr
 import pandas as pd
 
 os.makedirs(f'{os.getcwd()}/logs', exist_ok=True)
+os.makedirs(f'{os.getcwd()}/results', exist_ok=True)
+
 logging.basicConfig(filename=f'{os.getcwd()}/logs/logfile.log', level=logging.INFO, 
                     format='%(asctime)s - %(levelname)s - %(message)s')
 logging.info('Starting the application...')
@@ -185,19 +187,18 @@ def convert_and_trim_video(media_in, media_out, start=None, end=None):
     start_sec = HHMMSS_to_sec(start)
     end_sec = HHMMSS_to_sec(end)
     try:
-        if start is None and end is None:
+        if start_sec is None and end_sec is None:
             logging.info(f'...No start and end times provided. Converting entire video without trimming...')
             trim_command=[]
         else:
-            if start is None:
+            if start_sec is None:
                 logging.info(f'...No start time provided. Trimming video from start to specified end...')
                 start_sec = 0.0
             trim_command = ['-ss',f'{start_sec}']
-            if end is None:
+            if end_sec is None:
                 logging.info(f'...No end time provided. Trimming video from specified start to end of video...')
                 end_sec = None
             else:
-                end_sec = HHMMSS_to_sec(end)
                 trim_command.extend(['-to', f'{end_sec}'])
 
         if not isinstance(media_in, (str, Path)):