Update app.py

app.py

@@ -351,14 +351,8 @@ def download_audio(url, cookie_file=None):
         return download_from_youtube(url, cookie_path)
 
 def download_from_youtube(url, cookie_path):
-    # Configuration for video+audio download (first attempt)
-    ydl_opts_video = {
-        'format': 'bestvideo+bestaudio/best',
-        'postprocessors': [{
-            'key': 'FFmpegExtractAudio',
-            'preferredcodec': 'wav',
-            'preferredquality': '192',
-        }],
+    # Common options
+    base_opts = {
         'outtmpl': 'ytdl/%(title)s.%(ext)s',
         'user_agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36',
         'geo_bypass': True,
@@ -370,69 +364,116 @@ def download_from_youtube(url, cookie_path):
         'ignoreerrors': False,
         'no_check_certificate': True,
         'verbose': True,
-        'merge_output_format': 'mp4',
     }
     
+    # Strategy 1: Video+audio (best quality)
     try:
-        logger.info("Attempting video+audio download to extract audio")
-        with yt_dlp.YoutubeDL(ydl_opts_video) as ydl:
+        logger.info("Attempting video+audio download")
+        ydl_opts = base_opts.copy()
+        ydl_opts.update({
+            'format': 'bestvideo+bestaudio/best',
+            'postprocessors': [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': 'wav',
+            }],
+            'merge_output_format': 'mp4',
+        })
+        
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             info_dict = ydl.extract_info(url, download=True)
             file_path = ydl.prepare_filename(info_dict).rsplit('.', 1)[0] + '.wav'
             
-            if not os.path.exists(file_path):
-                return None, "Downloaded audio file not found after video processing", None
+            if os.path.exists(file_path):
+                sample_rate, data = scipy.io.wavfile.read(file_path)
+                return file_path, "YouTube video+audio download successful", (sample_rate, data)
+            else:
+                logger.warning("Video+audio download succeeded but output file missing")
+    except Exception as e:
+        logger.warning(f"Video+audio download failed: {str(e)}")
+    
+    # Strategy 2: Audio-only (best quality)
+    try:
+        logger.info("Attempting audio-only download")
+        ydl_opts = base_opts.copy()
+        ydl_opts.update({
+            'format': 'bestaudio/best',
+            'postprocessors': [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': 'wav',
+            }],
+        })
+        
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info_dict = ydl.extract_info(url, download=True)
+            file_path = ydl.prepare_filename(info_dict).rsplit('.', 1)[0] + '.wav'
             
-            sample_rate, data = scipy.io.wavfile.read(file_path)
-            return file_path, "YouTube video+audio download and audio extraction successful", (sample_rate, data)
+            if os.path.exists(file_path):
+                sample_rate, data = scipy.io.wavfile.read(file_path)
+                return file_path, "YouTube audio-only download successful", (sample_rate, data)
+            else:
+                logger.warning("Audio-only download succeeded but output file missing")
+    except Exception as e:
+        logger.warning(f"Audio-only download failed: {str(e)}")
+    
+    # Strategy 3: Specific format IDs (common audio formats)
+    format_ids = [
+        '140',  # m4a 128k
+        '139',  # m4a 48k
+        '251',  # webm 160k (opus)
+        '250',  # webm 70k (opus)
+        '249',  # webm 50k (opus)
+    ]
     
-    except yt_dlp.utils.DownloadError as e:
-        if "Requested format is not available" in str(e):
-            logger.warning("Video+audio format unavailable, trying audio-only fallback")
-            # Audio-only configuration (fallback)
-            ydl_opts_audio = {
-                'format': 'bestaudio/best',
+    for fid in format_ids:
+        try:
+            logger.info(f"Attempting download with format ID: {fid}")
+            ydl_opts = base_opts.copy()
+            ydl_opts.update({
+                'format': fid,
                 'postprocessors': [{
                     'key': 'FFmpegExtractAudio',
                     'preferredcodec': 'wav',
-                    'preferredquality': '192',
                 }],
-                'outtmpl': 'ytdl/%(title)s.%(ext)s',
-                'user_agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36',
-                'geo_bypass': True,
-                'force_ipv4': True,
-                'referer': 'https://www.youtube.com/',
-                'noplaylist': True,
-                'cookiefile': cookie_path,
-                'extractor_retries': 5,
-                'ignoreerrors': False,
-                'no_check_certificate': True,
-                'verbose': True,
-            }
+            })
             
-            try:
-                logger.info("Attempting audio-only download")
-                with yt_dlp.YoutubeDL(ydl_opts_audio) as ydl:
-                    info_dict = ydl.extract_info(url, download=True)
-                    file_path = ydl.prepare_filename(info_dict).rsplit('.', 1)[0] + '.wav'
-                    
-                    if not os.path.exists(file_path):
-                        return None, "Downloaded audio file not found after audio-only processing", None
-                    
+            with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+                info_dict = ydl.extract_info(url, download=True)
+                file_path = ydl.prepare_filename(info_dict).rsplit('.', 1)[0] + '.wav'
+                
+                if os.path.exists(file_path):
                     sample_rate, data = scipy.io.wavfile.read(file_path)
-                    return file_path, "YouTube audio-only download successful", (sample_rate, data)
+                    return file_path, f"Download successful with format {fid}", (sample_rate, data)
+        except Exception as e:
+            logger.warning(f"Download with format {fid} failed: {str(e)}")
+    
+    # Strategy 4: Direct URL extraction
+    try:
+        logger.info("Attempting direct URL extraction")
+        ydl_opts = base_opts.copy()
+        ydl_opts.update({
+            'format': 'best',
+            'forceurl': True,
+            'quiet': True,
+        })
+        
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info_dict = ydl.extract_info(url, download=False)
+            direct_url = info_dict.get('url')
             
-            except Exception as fallback_e:
-                return None, f"Audio-only fallback failed: {str(fallback_e)}", None
+            if direct_url:
+                temp_path = 'ytdl/direct_audio.wav'
+                ffmpeg_command = [
+                    "ffmpeg", "-i", direct_url, "-c", "copy", temp_path
+                ]
+                subprocess.run(ffmpeg_command, check=True, capture_output=True, text=True)
                 
-        elif "Sign in to confirm you’re not a bot" in str(e):
-            return None, "Authentication error. Please upload valid YouTube cookies: https://github.com/yt-dlp/yt-dlp/wiki/Extractors#exporting-youtube-cookies", None
-        else:
-            return None, f"YouTube download error: {str(e)}", None
-            
-    except yt_dlp.utils.GeoRestrictedError:
-        return None, "Video is geo-restricted in your region", None
+                if os.path.exists(temp_path):
+                    sample_rate, data = scipy.io.wavfile.read(temp_path)
+                    return temp_path, "Direct URL download successful", (sample_rate, data)
     except Exception as e:
-        return None, f"Unexpected error during YouTube download: {str(e)}", None
+        logger.warning(f"Direct URL extraction failed: {str(e)}")
+    
+    return None, "All download strategies failed. This video may not be available in your region or requires authentication.", None
         
 def download_from_google_drive(url):
     temp_output_path = 'ytdl/gdrive_temp_audio'