Update main.py

main.py

@@ -32,23 +32,23 @@ logger = logging.getLogger(__name__)
 # Pydantic models
 class VideoInfoRequest(BaseModel):
     url: HttpUrl
-    use_cookies: bool = False
+    use_cookies: Optional[bool] = None
     
 class BatchVideoInfoRequest(BaseModel):
     urls: List[HttpUrl]
-    use_cookies: bool = False
+    use_cookies: Optional[bool] = None
     
 class DownloadRequest(BaseModel):
     url: HttpUrl
     quality: str = "best"
     audio_only: bool = False
-    use_cookies: bool = False
+    use_cookies: Optional[bool] = None
 
 class BatchDownloadRequest(BaseModel):
     urls: List[HttpUrl]
     quality: str = "best"
     audio_only: bool = False
-    use_cookies: bool = False
+    use_cookies: Optional[bool] = None
     max_concurrent: int = 2  # Limit concurrent downloads
 
 class VideoInfo(BaseModel):
@@ -281,15 +281,18 @@ class BatchYouTubeDownloader:
         
         return cmd
     
-    def get_video_info(self, url: str, use_cookies: bool = False, retry_count: int = 0) -> Optional[Dict[str, Any]]:
+    def get_video_info(self, url: str, use_cookies: Optional[bool] = None, retry_count: int = 0) -> Optional[Dict[str, Any]]:
         """Get video information with cookie support"""
         max_retries = 3
         
+        # Determine actual use_cookies value
+        actual_use_cookies = use_cookies if use_cookies is not None else self.cookie_manager.get_cookie_path() is not None
+        
         try:
-            base_cmd = ['yt-dlp', '--dump-json', '--no-download', str(url)]
-            cmd = self._build_command(base_cmd, use_cookies)
+            base_cmd = ["yt-dlp", "--dump-json", "--no-download", str(url)]
+            cmd = self._build_command(base_cmd, actual_use_cookies)
             
-            logger.info(f"Getting video info (attempt {retry_count + 1}, cookies: {use_cookies})")
+            logger.info(f"Getting video info (attempt {retry_count + 1}, cookies: {actual_use_cookies})")
             
             result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=60)
             video_info = json.loads(result.stdout)
@@ -338,31 +341,34 @@ class BatchYouTubeDownloader:
             return None
     
     def download_video(self, url: str, quality: str = "best", 
-                      audio_only: bool = False, use_cookies: bool = False, 
+                      audio_only: bool = False, use_cookies: Optional[bool] = None, 
                       retry_count: int = 0) -> Optional[str]:
         """Download video with cookie support"""
         max_retries = 2
         
+        # Determine actual use_cookies value
+        actual_use_cookies = use_cookies if use_cookies is not None else self.cookie_manager.get_cookie_path() is not None
+        
         try:
-            base_cmd = ['yt-dlp']
+            base_cmd = ["yt-dlp"]
             
             output_template = str(self.download_dir / "%(title)s.%(ext)s")
-            base_cmd.extend(['-o', output_template])
+            base_cmd.extend(["-o", output_template])
             
             if audio_only:
-                base_cmd.extend(['-f', 'bestaudio/best'])
+                base_cmd.extend(["-f", "bestaudio/best"])
             else:
                 if quality == "best":
-                    base_cmd.extend(['-f', 'best[height<=720]'])
+                    base_cmd.extend(["-f", "best[height<=720]"])
                 elif quality == "worst":
-                    base_cmd.extend(['-f', 'worst'])
+                    base_cmd.extend(["-f", "worst"])
                 else:
-                    base_cmd.extend(['-f', quality])
+                    base_cmd.extend(["-f", quality])
             
             base_cmd.append(str(url))
-            cmd = self._build_command(base_cmd, use_cookies)
+            cmd = self._build_command(base_cmd, actual_use_cookies)
             
-            logger.info(f"Downloading video (attempt {retry_count + 1}, cookies: {use_cookies})")
+            logger.info(f"Downloading video (attempt {retry_count + 1}, cookies: {actual_use_cookies})")
             
             result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=300)