check changelog tab, this is a massive update

app.py

@@ -7,6 +7,10 @@ def download_video(url, download_as):
         yt = YouTube(url)
     except pytube.exceptions.RegexMatchError:
         raise gr.Error("URL not valid or is empty! Please fix the link or enter one!")
+    except urllib.error.HTTPError as not_ok:
+        raise gr.Error(f"{not_ok}")
+    except pytube.exceptions.AgeRestrictedError:
+        raise gr.Error("The video you are trying to convert is age-restricted and cannot be downloaded! A proper login system may be implemented in the future.")
     video = yt.streams.get_highest_resolution()
     video.download()
     video_path = f"{video.default_filename}"
@@ -146,6 +150,10 @@ def all_in_one_inator(ytvideo, download_yt_video_as, min_duration, max_duration,
             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"{not_ok}")
+        except pytube.exceptions.AgeRestrictedError:
+            raise gr.Error("The video you are trying to convert is age-restricted and cannot be downloaded! A proper login system may be implemented in the future.")
         video = yt.streams.get_highest_resolution()
         video.download()
         video_path = f"{video.default_filename}"
@@ -183,11 +191,15 @@ def all_in_one_inator(ytvideo, download_yt_video_as, min_duration, max_duration,
         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, download_as_zip_or_wav):
     try:
         yt = YouTube(yt_video)
     except pytube.exceptions.RegexMatchError:
         raise gr.Error("URL not valid or is empty! Please fix the link or enter one!")
+    except urllib.error.HTTPError as not_ok:
+        raise gr.Error(f"{not_ok}")
+    except pytube.exceptions.AgeRestrictedError:
+        raise gr.Error("The video you are trying to convert is age-restricted and cannot be downloaded! A proper login system may be implemented in the future.")
     video = yt.streams.get_highest_resolution()
     video.download()
     video_path = f"{video.default_filename}"
@@ -203,16 +215,13 @@ def download_video_as_audio_only(yt_video, audio_output_format):
         os.remove(mp4remove)
     single_zip_name = "only_audio.zip"
     audio_files = glob.glob("*.wav") if audio_output_format == "wav" else glob.glob("*.mp3")
-    with zipfile.ZipFile(single_zip_name, 'w') as zip_file:
-        for audio_file in audio_files:
-            zip_file.write(audio_file, os.path.basename(audio_file))
-    for outputwavremoval in glob.glob("*.wav"):
-        if os.path.exists(outputwavremoval):
-            os.remove(outputwavremoval)
-    for outputmp3removal in glob.glob("*.mp3"):
-        if os.path.exists(outputmp3removal):
-            os.remove(outputmp3removal)
-    return "Done! Download the zip file below! This only contains the audio file.", single_zip_name
+    if download_as_zip_or_wav == "zip":
+        with zipfile.ZipFile(single_zip_name, 'w') as zip_file:
+            for audio_file in audio_files:
+                zip_file.write(audio_file, os.path.basename(audio_file))
+        return "Done! Download the zip file below! This only contains the audio file.", single_zip_name
+    elif download_as_zip_or_wav == "wav":
+        return "Done! Download the audio file below!", "output.wav"
 
 def check_for_remaining_wav_or_mp3_files(which_filetype):
     audio_files = glob.glob(f"*.{which_filetype}")
@@ -277,18 +286,6 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                 outputs=[gr.Text(label="Output"), gr.File(label="Zipped files")]
             )
         with gr.TabItem("Misc tools"):
-            with gr.Tab("SR analyzer"):
-                gr.Markdown("Upload a zip file of your wavs here and this will determine the average sample rate.")
-                with gr.Row():
-                    with gr.Column():
-                        with gr.Row():
-                            zipuploader = gr.File(file_count='single', file_types=[".zip"], label="ZIP file")
-                        uploadbtn = gr.Button("Analyze", variant='primary')
-                    uploadbtn.click(
-                        analyze_audio,
-                        [zipuploader],
-                        [gr.Text(label="Result")]
-                    )
             with gr.Tab("File splitter"):
                 gr.Markdown("If you would rather split a single WAV or mp3 audio file, use this method instead.")
                 with gr.Row():
@@ -327,11 +324,12 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                         with gr.Row():
                             yt_video = gr.Textbox(label="URL")
                             audio_output_format = gr.Radio(["wav", "mp3"], value="wav", label="Download audio as:")
+                            download_as_zip_or_wav = gr.Radio(["zip", "wav"], value="wav", label="Get returned audio file as:")
                             commence_download = gr.Button("Download", variant='primary')
                         commence_download.click(
                             download_video_as_audio_only,
-                            [yt_video, audio_output_format],
-                            [gr.Text(label="Output"), gr.File(label="Zipped audio file")]
+                            [yt_video, audio_output_format, download_as_zip_or_wav],
+                            [gr.Text(label="Output"), gr.File(label="Audio file")]
                         )
             with gr.Tab("Check for leftover mp3 or wav files"):
                 gr.Markdown("There might be instances where sometimes a few wav or mp3 files are left over after a conversion. This section tells how many of those files are left, if any.")
@@ -357,6 +355,7 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                         gr.Image(label="Spectrogram result", show_download_button=False, scale=2)
                     )
         with gr.TabItem("Changelog"):
+            gr.Markdown("v0.98 - Added more error checking for downloading a video, removed SR Analyzer, and added WAV as a returned audio file option (for 'audio only download' tab only).")
             gr.Markdown("v0.97a - Fixed issue with spectrogram tab if no WAV file was selected.")
             gr.Markdown("v0.97 - Added new spectrogram tool in Misc Tools and removed pitch analyzer as it did not fit with the purpose of this Space.")
             gr.Markdown("v0.96 - Added new remaining files tool in Misc Tools.")