Update app.py

app.py

@@ -378,7 +378,7 @@ class SessionManager:
         return session
 
 def get_download_options(session_headers=None):
-    """Enhanced download options with anti-bot measures"""
+    """Enhanced download options with stronger anti-bot measures"""
     options = {
         'format': 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best',
         'outtmpl': str(Config.OUTPUT_DIR / '%(title)s.%(ext)s'),
@@ -387,16 +387,24 @@ def get_download_options(session_headers=None):
         'no_warnings': True,
         'extract_flat': False,
         'nocheckcertificate': True,
-        'http_chunk_size': random.randint(10000000, 15000000),  # Random chunk size
+        'http_chunk_size': random.randint(10000000, 15000000),
         'retries': Config.MAX_RETRIES,
         'file_access_retries': 3,
         'fragment_retries': 3,
         'skip_unavailable_fragments': True,
         'abort_on_unavailable_fragment': False,
+        # 추가된 옵션들
+        'sleep_interval': random.randint(1, 3),  # 요청 사이의 랜덤 대기 시간
+        'max_sleep_interval': 5,
+        'sleep_interval_requests': 1,
+        'socket_timeout': 30,
+        'geo_bypass': True,  # 지역 제한 우회 시도
+        'geo_bypass_country': 'US',  # 미국 서버 사용
     }
     
     if os.path.exists(Config.COOKIES_FILE):
         options['cookiefile'] = Config.COOKIES_FILE
+        options['cookiesfrombrowser'] = ('chrome',)  # 크롬 브라우저 쿠키 사용
     
     if session_headers:
         options['headers'] = session_headers
@@ -404,10 +412,15 @@ def get_download_options(session_headers=None):
     return options
 
 def download_with_retry(url, progress_callback):
-    """Enhanced download function with multiple retry strategies"""
+    """Enhanced download function with improved retry logic"""
+    session = None
     for attempt in range(Config.MAX_RETRIES):
         try:
-            session = SessionManager.get_session()
+            if not session:
+                session = SessionManager.get_session()
+                
+            # 매 시도마다 새로운 헤더 사용
+            session.headers.update(SessionManager.get_random_headers())
             ydl_opts = get_download_options(session.headers)
             
             def progress_hook(d):
@@ -422,30 +435,41 @@ def download_with_retry(url, progress_callback):
             
             ydl_opts['progress_hooks'] = [progress_hook]
             
-            # Actual download
+            # 비디오 정보 먼저 확인
             with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-                info = ydl.extract_info(url, download=True)
-                filename = ydl.prepare_filename(info)
-                return filename, None
+                try:
+                    info = ydl.extract_info(url, download=False)
+                    if not info:
+                        return None, "Failed to extract video information"
+                    
+                    # 실제 다운로드 진행
+                    info = ydl.extract_info(url, download=True)
+                    filename = ydl.prepare_filename(info)
+                    return filename, None
+                    
+                except yt_dlp.utils.ExtractorError as e:
+                    if "Sign in to confirm you're not a bot" in str(e):
+                        # 봇 감지시 더 긴 대기 시간 적용
+                        delay = Config.RETRY_DELAYS[min(attempt, len(Config.RETRY_DELAYS)-1)] * 2
+                        progress_callback(-1, f"Bot detection... Waiting {delay}s (Attempt {attempt + 1}/{Config.MAX_RETRIES})")
+                        time.sleep(delay)
+                        
+                        # 세션 리셋
+                        session = None
+                        continue
+                    
+                    if "Video unavailable" in str(e):
+                        # 다른 지역에서 시도
+                        ydl_opts['geo_bypass_country'] = random.choice(['US', 'GB', 'JP', 'KR', 'DE'])
+                        continue
+                        
+                    raise e
                 
-        except yt_dlp.utils.ExtractorError as e:
-            error_msg = str(e)
-            if "Sign in to confirm you're not a bot" in error_msg:
-                delay = Config.RETRY_DELAYS[min(attempt, len(Config.RETRY_DELAYS)-1)]
-                progress_callback(-1, f"Bot detection encountered. Waiting {delay}s before retry...")
-                time.sleep(delay)
-                continue
-            
-            if "Video unavailable" in error_msg:
-                return None, "The video is unavailable or may be region-locked."
-            
-            return None, f"Video extraction failed: {error_msg}"
-            
         except Exception as e:
             error_msg = str(e)
             if attempt < Config.MAX_RETRIES - 1:
                 delay = Config.RETRY_DELAYS[attempt]
-                progress_callback(-1, f"Download failed. Retrying in {delay}s... ({attempt + 1}/{Config.MAX_RETRIES})")
+                progress_callback(-1, f"Error: {error_msg}\nRetrying in {delay}s... ({attempt + 1}/{Config.MAX_RETRIES})")
                 time.sleep(delay)
                 continue
             return None, f"Download failed after {Config.MAX_RETRIES} attempts: {error_msg}"