Update app_multi.py

app_multi.py

@@ -419,34 +419,51 @@ def youtube_downloader(
     url_base="",
     quiet=False,
     force=True,
+    full_song=True,
 ):
-    output_path = Path(output_filename)
-    if output_path.exists():
-        if not force:
+    if full_song:
+        ydl_opts = {
+            'noplaylist': True,
+            'format': 'bestaudio/best',
+            'postprocessors': [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': 'wav',
+            }],
+            "outtmpl": 'dl_audio/youtube_audio',
+        }
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            ydl.download([url])
+        audio_path = "dl_audio/youtube_audio.wav"
+    return audio_path
+    
+    else:
+        output_path = Path(output_filename)
+        if output_path.exists():
+            if not force:
+                return output_path
+            else:
+                output_path.unlink()
+    
+        quiet = "--quiet --no-warnings" if quiet else ""
+        command = f"""
+            yt-dlp {quiet} -x --audio-format wav -f bestaudio -o "{output_filename}" --download-sections "*{start_time}-{end_time}" "{url_base}{video_identifier}"  # noqa: E501
+        """.strip()
+    
+        attempts = 0
+        while True:
+            try:
+                _ = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
+            except subprocess.CalledProcessError:
+                attempts += 1
+                if attempts == num_attempts:
+                    return None
+            else:
+                break
+    
+        if output_path.exists():
             return output_path
         else:
-            output_path.unlink()
-
-    quiet = "--quiet --no-warnings" if quiet else ""
-    command = f"""
-        yt-dlp {quiet} -x --audio-format wav -f bestaudio -o "{output_filename}" --download-sections "*{start_time}-{end_time}" "{url_base}{video_identifier}"  # noqa: E501
-    """.strip()
-
-    attempts = 0
-    while True:
-        try:
-            _ = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
-        except subprocess.CalledProcessError:
-            attempts += 1
-            if attempts == num_attempts:
-                return None
-        else:
-            break
-
-    if output_path.exists():
-        return output_path
-    else:
-        return None
+            return None
 
 def audio_separated(audio_input, progress=gr.Progress()):
     # start progress
@@ -689,8 +706,10 @@ with app:
         with gr.Row():
             with gr.Column():
                 ydl_url_input  = gr.Textbox(label="音乐视频网址(可直接填写相应的BV号)", value = "https://www.bilibili.com/video/BV...")
-                start = gr.Number(value=0, label="起始时间 (秒)")
-                end = gr.Number(value=15, label="结束时间 (秒)")
+                with gr.Row():
+                    start = gr.Number(value=0, label="起始时间 (秒)")
+                    end = gr.Number(value=15, label="结束时间 (秒)")
+                    check_full = gr.Checkbox(label="是否上传整首歌曲", value=True)
                 with gr.Accordion('搜索歌曲名上传', open=False):
                     search_name = gr.Dropdown(label="通过歌曲名搜索", info="选一首您喜欢的歌曲吧", choices=["周杰伦晴天","周杰伦兰亭序","周杰伦七里香","周杰伦花海","周杰伦反方向的钟","周杰伦一路向北","周杰伦稻香","周杰伦明明就","周杰伦爱在西元前","孙燕姿逆光","陈奕迅富士山下","许嵩有何不可","薛之谦其实","邓紫棋光年之外","李荣浩年少有为"])
                     vc_search = gr.Button("用歌曲名来搜索吧")
@@ -705,7 +724,7 @@ with app:
                 as_audio_message   = gr.Textbox(label="Message", visible=False)
 
     vc_search.click(auto_search, [search_name], [ydl_audio_output])
-    ydl_url_submit.click(fn=youtube_downloader, inputs=[ydl_url_input, start, end], outputs=[ydl_audio_output])
+    ydl_url_submit.click(fn=youtube_downloader, inputs=[ydl_url_input, start, end, check_full], outputs=[ydl_audio_output])
     as_audio_submit.click(fn=audio_separated, inputs=[as_audio_input], outputs=[as_audio_vocals, as_audio_no_vocals, as_audio_message], show_progress=True, queue=True)
                     
     with gr.Row():