big fixes

adjust.py

@@ -116,7 +116,7 @@ def start_adjust(input_file, to_name, start_time, end_time, progress=gr.Progress
     # Adding subtitle to video
     progress(0.8, desc=ui_lang["progress_add_subtitle"])
     add_subtitle_to_video(
-        input_file, subtitle_adjusted_file_parsed, video_subtitle_file, start_time, end_time)
+        input_file, base_subtitle_adjusted_file, video_subtitle_file, start_time, end_time)
 
     # Return video file link, transcribe string, transcribe.txt, subtitle.txt
     transcribe_txt_list, _ = utils.read_transcribe_subtitle_file(

file_name.py

@@ -3,16 +3,17 @@ import os
 
 current_working_directory = os.getcwd()
 
-download_file = f"{current_working_directory}/download_video.mp4"
-audio_file = f"{current_working_directory}/input.wav"
-transcribe_file = f"{current_working_directory}/transcribe.txt"
+download_file = f"{current_working_directory}\\download_video.mp4"
+audio_file = f"{current_working_directory}\\input.wav"
+transcribe_file = f"{current_working_directory}\\transcribe.txt"
+cut_video_file = "cut_video.mp4"
 
-subtitle_file = f"{current_working_directory}/subtitle.srt"
-subtitle_file_parsed = "subtitle.srt"
-subtitle_adjusted_file = f"{current_working_directory}/subtitle_adjusted.srt"
-subtitle_adjusted_file_parsed = "subtitle_adjusted.srt"
+subtitle_file = f"{current_working_directory}\\subtitle.srt"
+base_subtitle_file = "subtitle.srt"
+subtitle_adjusted_file = f"{current_working_directory}\\subtitle_adjusted.srt"
+base_subtitle_adjusted_file = "subtitle_adjusted.srt"
 
-transcribe_adjusted_file = f"{current_working_directory}/transcribe_adjusted.txt"
-video_subtitle_file = f"{current_working_directory}/output.mp4"
-sample_groups_json = f"{current_working_directory}/sample_groups.json"
-speaker_groups_json = f"{current_working_directory}/speaker_groups.json"
+transcribe_adjusted_file = f"{current_working_directory}\\transcribe_adjusted.txt"
+video_subtitle_file = f"{current_working_directory}\\output.mp4"
+sample_groups_json = f"{current_working_directory}\\sample_groups.json"
+speaker_groups_json = f"{current_working_directory}\\speaker_groups.json"

set_up.py

@@ -21,6 +21,7 @@ def prepare_input(input_file, start_time, end_time, lang, model_size, progress=g
     if validate_time_format(end_time) is False:
         gr.Warning(ui_lang["end_time_warning"])
         return [None, None, [None, None]]
+    # Check if start time is lower than end time
     if lang is None:
         gr.Warning(ui_lang["lang_radio_warning"])
         return [None, None, [None, None]]
@@ -46,7 +47,7 @@ def prepare_input(input_file, start_time, end_time, lang, model_size, progress=g
 
     # Add subtitle to video
     progress(0.8, desc=ui_lang["progress_add_subtitle"])
-    add_subtitle_to_video(input_file, subtitle_file_parsed,
+    add_subtitle_to_video(input_file, base_subtitle_file,
                           video_subtitle_file, start_time, end_time)
 
     # Return video file link, transcribe string, transcribe.txt, subtitle.txt

transcribe.py

@@ -33,11 +33,12 @@ def start_transcribe(input_file, lang_choice: int, model_size_choice: int, progr
 
         speaker_txt_list = []
         shift = speaker_groups[speaker][0] + 1
-        print(f"Current starting point: {shift}s or {time_str(shift)}")
+        print(
+            f"Current starting point: {shift}s or {time_str_subtitle(shift)}")
         name = str(speaker)[:10]
         for segment in segments_list:
-            start = time_str(segment.start + shift)
-            end = time_str(segment.end + shift)
+            start = time_str_subtitle(segment.start + shift)
+            end = time_str_subtitle(segment.end + shift)
 
             segment_txt = segment.text
             speaker_txt_list.append(segment_txt)
@@ -46,13 +47,14 @@ def start_transcribe(input_file, lang_choice: int, model_size_choice: int, progr
             subtitle_txt_list.append(subtitle)
 
         speaker_txt = " ".join(speaker_txt_list)
-        transcribe_txt_list.append(f"[{name}] {speaker_txt}\n")
+        transcribe_txt_list.append(
+            f"[{time_str(shift)}]\n[{name}] {speaker_txt}\n")
 
     utils.write_transcribe_subtitle_file(
         input_file, transcribe_txt_list, subtitle_txt_list, False)
 
 
-def time_str(t):
+def time_str_subtitle(t):
     return '{0:02d}:{1:02d}:{2:06.3f}'.format(round(t // 3600),
                                               round(t % 3600 // 60),
                                               t % 60)

video_tool.py

@@ -1,4 +1,5 @@
 import ffmpeg
+import file_name
 
 
 def convert_video_to_audio(input_file, output_file, start_time, end_time):
@@ -14,21 +15,20 @@ def convert_video_to_audio(input_file, output_file, start_time, end_time):
 
 
 def add_subtitle_to_video(input_file, subtitle_file, output_file, start_time, end_time):
-    print("ADD SUBTITLE")
     print(f"INPUT: {input_file}")
     print(f"SUBTITLE: {subtitle_file}")
     print(f"OUTPUT: {output_file}")
-    # 1: Add subtitle
+
     (
         ffmpeg
         .input(input_file)
-        .output(output_file, vf='subtitles=' + subtitle_file, acodec='copy')
+        .output(file_name.cut_video_file, ss=start_time, to=end_time, acodec='copy', vcodec='copy')
         .run(overwrite_output=True)
     )
-    # 2: Cut the video
+
     (
         ffmpeg
-        .input(output_file)
-        .output(output_file, ss=start_time, to=end_time, acodec='copy')
+        .input(file_name.cut_video_file)
+        .output(output_file, vf=f'subtitles={subtitle_file}', acodec='copy')
         .run(overwrite_output=True)
     )