Update app.py

app.py

@@ -1,6 +1,7 @@
-import gradio as gr, glob, os, auditok, zipfile, wave, pytube.exceptions, librosa, time, librosa, librosa.display, matplotlib.pyplot as plt, numpy as np, urllib.error, traceback, yt_dlp
+import gradio as gr, glob, os, auditok, zipfile, wave, pytube.exceptions, urllib.error
 from pytube import YouTube
-from moviepy.editor import VideoFileClip
+from moviepy.editor import *
+import traceback, yt_dlp
 
 def download_video(url, download_as, use_ytdlp):
     if use_ytdlp == True:
@@ -101,7 +102,7 @@ def split_audio_from_yt_video(mindur, maxdur, name_for_split_files, show_amount_
                 os.remove(file2)
             return f"Files split successfully!\nCheck below for zipped files.\n\n{total_files} files created, {length_mins:.2f} minutes total.", zip_file_name
 
-def split_wav_or_mp3_file(audiofileuploader, mindur2, maxdur2, name_for_split_files2):
+def split_wav_or_mp3_file(audiofileuploader, mindur2, maxdur2, name_for_split_files2, strict):
     if audiofileuploader == None:
         raise gr.Error("Audio file cannot be empty!")
     if mindur2 == maxdur2:
@@ -117,7 +118,8 @@ def split_wav_or_mp3_file(audiofileuploader, mindur2, maxdur2, name_for_split_fi
             min_dur=mindur2,
             max_dur=maxdur2,
             max_silence=0.3,
-            energy_threshold=45
+            energy_threshold=45,
+            strict_min_dur=True if strict == True else False
         )
         os.remove(audio_path)
         for i, r in enumerate(audio_regions):
@@ -132,63 +134,7 @@ def split_wav_or_mp3_file(audiofileuploader, mindur2, maxdur2, name_for_split_fi
         os.remove(file2)
     return f"File split successfully!\nCheck below for zipped files.\nAmount created: {len(audio_files)}", zip_file_name2
 
-def all_in_one_inator(ytvideo, download_yt_video_as, min_duration, max_duration, name_for_outputted_split_files, progress=gr.Progress()):
-    if download_as == "mp3":
-        gr.Warning("MP3 is experimental, especially with this, so caution is advised.")
-    if min_duration == max_duration:
-        raise gr.Error(f"Cannot split mindur={min_duration} and maxdur={max_duration}, min and max are the same number.")
-    elif min_duration > max_duration:
-        raise gr.Error(f"Cannot split mindur={min_duration} and maxdur={max_duration}, mindur is higher than maxdur.")
-    elif name_for_outputted_split_files == None:
-        raise gr.Error("Split files name cannot be empty!")
-    else:
-        try:
-            progress(0, "Downloading video...")
-            yt = YouTube(ytvideo)
-        except pytube.exceptions.RegexMatchError:
-            raise gr.Error("URL not valid or was left empty! Please fix the link or enter one.")
-        except urllib.error.HTTPError as not_ok:
-            raise gr.Error(f"Recieved {not_ok}")
-        except pytube.exceptions.AgeRestrictedError:
-            raise gr.Error("The video you inputted is age-restricted! Please try another link.")
-        video = yt.streams.get_highest_resolution()
-        video.download()
-        video_path = f"{video.default_filename}"
-        video_clip = VideoFileClip(video_path)
-        audio_clip = video_clip.audio
-        if download_yt_video_as == "wav":
-            audio_clip.write_audiofile("output.wav")
-        elif download_yt_video_as == "mp3":
-            audio_clip.write_audiofile("output.mp3")
-        audio_clip.close()
-        video_clip.close()
-        for removemp4 in glob.glob("*.mp4"):
-            os.remove(removemp4)
-        progress(0.5, "Video downloaded! Starting split process...")
-        audio_path = "output.wav" if not os.path.exists("output.mp3") else "output.mp3"
-        audio_regions = auditok.split(
-            audio_path,
-            min_dur=min_duration,
-            max_dur=max_duration,
-            max_silence=0.3,
-            energy_threshold=45
-        )
-        os.remove(audio_path)
-        for i, r in enumerate(audio_regions):
-            filename = r.save(f"{name_for_outputted_split_files}-{i+1}.wav")
-        for f in sorted(glob.glob("*.wav")):
-            audio_files = glob.glob("*.wav")
-            zip_file_name = "audio_files.zip"
-            with zipfile.ZipFile(zip_file_name, 'w') as zip_file:
-                for audio_file in audio_files:
-                    zip_file.write(audio_file, os.path.basename(audio_file))
-        for file2 in glob.glob("*.wav"):
-            os.remove(file2)
-        progress(1, "Done! Cleaning up...")
-        time.sleep(2)
-        return "Process done successfully! Check below for zipped files!", zip_file_name
-
-def download_video_as_audio_only(yt_video, audio_output_format):
+def download_video_as_audio_only(yt_video, audio_output_format):      
     try:
         yt = YouTube(yt_video)
     except pytube.exceptions.RegexMatchError:
@@ -223,24 +169,32 @@ def download_video_as_audio_only(yt_video, audio_output_format):
             os.remove(outputmp3removal)
     return f"Done! Download the zip file below! This only contains the audio file.\n\nYou have downloaded {yt.title} by {yt.author}.", single_zip_name
 
-def check_for_remaining_wav_or_mp3_files(which_filetype):
-    audio_files = glob.glob(f"*.{which_filetype}")
-    return f"There are {len(audio_files)} leftover files."
-
-def display_audio_spectrogram(audio_file):
-    if audio_file == None:
-        raise gr.Error("Cannot leave WAV field empty! Please insert a WAV file.")
+def mp4_to_wav_or_mp3(mp4fileuploader, file_format):
+    if mp4fileuploader == None:
+        raise gr.Error("Input cannot be empty!")
     else:
-        y, sr = librosa.load(audio_file)
-        d = librosa.amplitude_to_db(np.abs(librosa.stft(y)), ref=np.max)
-        plt.figure(figsize=(12, 8))
-        librosa.display.specshow(d, sr=sr, x_axis="time", y_axis="log")
-        plt.colorbar(format="%+2.0f db")
-        plt.title("Spectrogram")
-        output = "spectrogram.png"
-        plt.savefig(output)
-        plt.close()
-        return output
+        try:
+            if file_format == "wav":
+                videoinput = AudioFileClip(mp4fileuploader)
+                videoinput.write_audiofile("convertedaudio.wav")
+                videoinput.close()
+            elif file_format == "mp3":
+                videoinput = AudioFileClip(mp4fileuploader)
+                videoinput.write_audiofile("convertedaudio.mp3")
+                videoinput.close()
+            what_to_return = "convertedaudio.wav" if file_format == "wav" else "convertedaudio.mp3"
+            os.remove(mp4fileuploader)
+            return "Converted mp4 file successfully!", what_to_return
+        except:
+            raise gr.Error(traceback.format_exc())
+        
+def remove_audio_file_from_directory():
+    for r in glob.glob("*.wav"):
+        os.remove(r)
+    for w in glob.glob("*.mp3"):
+        os.remove(w)
+    return gr.Info("File removed.")
+
 
 with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") as app:
     gr.HTML(
@@ -258,9 +212,6 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
     gr.HTML(
         "<h2> This Space's storage is ephemeral, meaning once you reload this space, all audio files will be lost. </h2>"
     )
-    gr.HTML(
-        "<h3> Colab version in development, this text will be updated when it's fully ready. </h3>" 
-    )
     with gr.Tabs():
         with gr.TabItem("Download Video"):
             with gr.Row():
@@ -272,7 +223,7 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                         convertion = gr.Button("Download", variant='primary')
             convertion.click(
                 fn=download_video,
-                inputs=[url, download_as],
+                inputs=[url, download_as, use_ytdlp],
                 outputs=gr.Text(label="Output")
             )
         with gr.TabItem("Split audio files"):
@@ -299,28 +250,14 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                             mindur2 = gr.Number(label="Min duration", minimum=1, maximum=10, value=1)
                             maxdur2 = gr.Number(label="Max duration", minimum=1, maximum=10, value=5)
                             name_for_split_files2 = gr.Textbox(label="Name for split files")
+                            strict = gr.Checkbox(True, label="Enable strict duration?", info="Use this option if you want to minimize the '(audio_file) is less than 0.76 seconds' warning on Colab. Keep in mind that this only applies for min duration, max is ignored.")
                             audiofileuploadbtn = gr.Button("Split", variant='primary')
                         audiofileuploadbtn.click(
                             split_wav_or_mp3_file,
-                            [audiofileuploader, mindur2, maxdur2, name_for_split_files2],
+                            [audiofileuploader, mindur2, maxdur2, name_for_split_files2, strict],
                             [gr.Text(label="Output"), gr.File(label="Zipped files")]
                         )
-            with gr.Tab("All-in-one downloader and splitter"):
-                gr.Markdown("This is very experimental and may break or change in the future. This essentially combines both the first 2 tabs into an all-in-one script.")
-                with gr.Row():
-                    with gr.Column():
-                        with gr.Row():
-                            ytvideo = gr.Textbox(label="URL")
-                            download_yt_video_as = gr.Radio(["wav", "mp3"], value="wav", label="Audio output format")
-                            min_duration = gr.Number(label="Min duration", minimum=1, maximum=10, value=1)
-                            max_duration = gr.Number(label="Max duration", minimum=1, maximum=10, value=5)
-                            name_for_outputted_split_files = gr.Textbox(label="Name for split files")
-                            download_and_split_btn = gr.Button("Download and split", variant='primary')
-                        download_and_split_btn.click(
-                            all_in_one_inator,
-                            [ytvideo, download_yt_video_as, min_duration, max_duration, name_for_outputted_split_files],
-                            [gr.Text(label="Result"), gr.File(label="Zipped files")]
-                        )
+
             with gr.Tab("Audio only download"):
                 gr.Markdown("If you want to download only the audio (to isolate bgm using UVR, etc), use this method, which will only extract audio and not split the audio.")
                 with gr.Row():
@@ -334,36 +271,30 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                             [yt_video, audio_output_format],
                             [gr.Text(label="Output"), gr.File(label="Zipped audio file")]
                         )
-            with gr.Tab("Check for leftover mp3, wav, or zip files"):
-                gr.Markdown("There might be instances where sometimes a few wav, mp3, or zip files are left over after a conversion. This section tells how many of those files are left, if any.")
+            with gr.Tab("MP4 to mp3/wav converter"):
+                gr.Markdown("If you have an mp4 file, you can convert it to mp3 or wav here. Only click the 'Remove file' button when done.")
                 with gr.Row():
                     with gr.Column():
                         with gr.Row():
-                            which_filetype = gr.Radio(["wav", "mp3", "zip"], value="wav", label="Search for what filetype?")
-                            checkbtn = gr.Button("Check for files", variant='primary')
-                        checkbtn.click(
-                            check_for_remaining_wav_or_mp3_files,
-                            which_filetype,
-                            gr.Text(label="Result")
+                            mp4fileuploader = gr.File(file_count='single', file_types=[".mp4"], label="mp4 file")
+                            file_format = gr.Radio(["wav", "mp3"], value="mp3", label="Convert mp4 file to:")
+                            convert_btn = gr.Button("Convert", variant='primary')
+                            remove_file_btn = gr.Button("Remove file from directory", variant='secondary')
+                        convert_btn.click(
+                            mp4_to_wav_or_mp3,
+                            [mp4fileuploader, file_format],
+                            [gr.Text(label="Output"), gr.File(label="Converted audio file")]
                         )
-            with gr.Tab("Audio spectrogram"):
-                gr.Markdown("Insert a wav file here and this will show the spectrogram for it.")
-                with gr.Row():
-                    with gr.Column():
-                        filetoanalyze = gr.File(file_count='single', file_types=[".wav"], label="WAV file")
-                        analyzebtn = gr.Button("Display", variant='primary')
-                    analyzebtn.click(
-                        display_audio_spectrogram,
-                        filetoanalyze,
-                        gr.Image(label="Spectrogram result", show_download_button=False, scale=2)
-                    )
+                        remove_file_btn.click(
+                            remove_audio_file_from_directory,
+                            None,
+                            None
+                        )
+
         with gr.TabItem("Changelog"):
-            gr.Markdown("v0.98.5 - Added an option to download yt link via yt_dlp if pytube cant download it.")
+            gr.Markdown("v0.99.2 - Added an mp4 file converter.")
+            gr.Markdown("v0.99.1 - Removed very old tools (including the 'Upcoming Features' tab) that did not fit with the nature of the program.")
+            gr.Markdown("v0.99 - Added 'Strict Duration' mode for the file splitter.")
             gr.Markdown("v0.98.2 - Added new upcoming features tab.")
-        with gr.TabItem("Upcoming features"):
-            gr.HTML(
-                """
-                <a href="https://imgbb.com/"><img src="https://i.ibb.co/4Vt9K3c/image-2024-01-26-052541742.png" border="0"></a><br />
-                """
-            )
+        
 app.launch()