Update app.py

app.py

@@ -235,15 +235,14 @@ def get_random_user_agent():
     """랜덤 User-Agent 생성"""
     user_agents = [
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36',
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36',
-        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36',
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0'
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0'
     ]
     return random.choice(user_agents)
 
 def validate_cookies():
-    """쿠키 파일 유효성 검사 및 갱신"""
+    """쿠키 파일 유효성 검사"""
     if not os.path.exists(COOKIES_FILE):
         return False, "Cookie file not found"
     
@@ -256,6 +255,8 @@ def validate_cookies():
 
 def download_with_retry(url, ydl_opts, max_retries=3, delay=5):
     """재시도 로직이 포함된 다운로드 함수"""
+    last_error = None
+    
     for attempt in range(max_retries):
         try:
             # 매 시도마다 새로운 User-Agent 사용
@@ -267,19 +268,27 @@ def download_with_retry(url, ydl_opts, max_retries=3, delay=5):
                 return filename, info
                 
         except yt_dlp.utils.DownloadError as e:
+            last_error = e
             if "Sign in to confirm you're not a bot" in str(e):
                 if attempt < max_retries - 1:
                     st.warning(f"Bot detection encountered. Retrying in {delay} seconds... (Attempt {attempt + 1}/{max_retries})")
                     time.sleep(delay)
                     delay *= 2  # 지수 백오프
                     continue
-            raise e
+            elif "HTTP Error 429" in str(e):
+                if attempt < max_retries - 1:
+                    st.warning(f"Rate limit detected. Waiting {delay} seconds... (Attempt {attempt + 1}/{max_retries})")
+                    time.sleep(delay * 2)  # 레이트 리밋의 경우 더 긴 대기 시간
+                    continue
         except Exception as e:
+            last_error = e
             if attempt < max_retries - 1:
                 st.warning(f"Error occurred. Retrying... (Attempt {attempt + 1}/{max_retries})")
                 time.sleep(delay)
                 continue
-            raise e
+    
+    # 모든 재시도 실패 후
+    raise last_error or Exception("Download failed after all retries")
 
 def download_video(url):
     try:
@@ -288,9 +297,8 @@ def download_video(url):
             'outtmpl': str(OUTPUT_DIR / '%(title)s.%(ext)s'),
             'merge_output_format': 'mp4',
             
-            # 쿠키 및 인증 설정
+            # 쿠키 설정
             'cookiefile': COOKIES_FILE,
-            'cookiesfrombrowser': ('chrome',),
             
             # 향상된 옵션
             'quiet': True,
@@ -303,7 +311,7 @@ def download_video(url):
             # 향상된 헤더
             'headers': {
                 'User-Agent': get_random_user_agent(),
-                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
                 'Accept-Language': 'en-US,en;q=0.5',
                 'Accept-Encoding': 'gzip, deflate, br',
                 'Connection': 'keep-alive',
@@ -312,14 +320,17 @@ def download_video(url):
                 'Sec-Fetch-Mode': 'navigate',
                 'Sec-Fetch-Site': 'none',
                 'Sec-Fetch-User': '?1',
-                'Cache-Control': 'max-age=0',
+                'DNT': '1',
+                'Sec-GPC': '1',
+                'Pragma': 'no-cache',
+                'Cache-Control': 'no-cache',
             },
             
             # 추가 옵션
             'age_limit': None,
             'geo_bypass': True,
             'geo_bypass_country': 'US',
-            'sleep_interval': 2,  # 요청 사이 대기 시간
+            'sleep_interval': 2,
             'max_sleep_interval': 5,
         }
         
@@ -337,7 +348,7 @@ def download_video(url):
                     status_text.text(f"Downloading... Speed: {d.get('speed_str', 'N/A')}")
             elif d['status'] == 'finished':
                 progress_bar.progress(1.0)
-                status_text.text("Processing...")
+                status_text.text("Processing downloaded files...")
                 
         ydl_opts['progress_hooks'] = [progress_hook]
         
@@ -389,21 +400,23 @@ if st.button("Download Video"):
 
 # Help 섹션
 with st.expander("ℹ️ Troubleshooting Guide"):
-    st.markdown("""
-    **If you encounter 'Sign in to confirm you're not a bot' error:**
+    st.markdown(f"""
+    **Current Status:**
+    - Cookie File: {'✅ Found' if os.path.exists(COOKIES_FILE) else '❌ Not Found'}
+    - Cookie Validity: {'✅ Valid' if cookie_valid else '❌ Invalid'}
     
-    1. Cookie Solution:
-       - Make sure you're logged into YouTube in your browser
-       - Install 'Get cookies.txt' or similar extension
-       - Export fresh cookies and replace the existing cookie file
+    **Common Issues:**
+    1. Bot Detection:
+       - The app will automatically retry with different settings
+       - Each retry uses a random User-Agent and headers
        
-    2. General Tips:
-       - Wait a few minutes between download attempts
-       - Try using a different video URL
-       - Clear your browser cache before exporting cookies
+    2. Cookie Problems:
+       - Current cookie file: {COOKIES_FILE}
+       - Make sure the cookie file is up to date
+       - Export fresh cookies when issues persist
        
-    3. Advanced Tips:
-       - The app automatically retries downloads with different settings
-       - Each retry uses a different User-Agent to avoid detection
-       - Built-in delays help avoid triggering YouTube's protection
+    3. Download Fails:
+       - Try again after a few minutes
+       - Check if the video is available in your region
+       - Verify that the video is public
     """)