Update app.py

app.py

@@ -29,11 +29,13 @@ format_option = st.selectbox(
 )
 
 def get_format_options(selection):
+    base_options = {
+        'format': 'best',
+        'merge_output_format': 'mp4',
+    }
+    
     if selection == "Best Quality (Video + Audio)":
-        return {
-            'format': 'best',  # Changed from bestvideo+bestaudio to best
-            'merge_output_format': 'mp4'
-        }
+        return base_options
     elif selection == "Audio Only (Best Quality)":
         return {
             'format': 'bestaudio/best',
@@ -43,22 +45,27 @@ def get_format_options(selection):
             }]
         }
     elif selection == "720p":
-        return {
-            'format': 'best[height<=720]',  # Simplified format selection
-            'merge_output_format': 'mp4'
-        }
+        base_options['format'] = 'best[height<=720]'
+        return base_options
     elif selection == "480p":
-        return {
-            'format': 'best[height<=480]',
-            'merge_output_format': 'mp4'
-        }
+        base_options['format'] = 'best[height<=480]'
+        return base_options
     elif selection == "360p":
-        return {
-            'format': 'best[height<=360]',
-            'merge_output_format': 'mp4'
-        }
+        base_options['format'] = 'best[height<=360]'
+        return base_options
+    
+    return base_options
+
+def validate_url(url):
+    if not url:
+        return False
+    return 'youtube.com' in url or 'youtu.be' in url
 
 def download_video(url, format_selection):
+    if not validate_url(url):
+        st.error("Please enter a valid YouTube URL")
+        return None
+        
     try:
         format_opts = get_format_options(format_selection)
         
@@ -66,20 +73,20 @@ def download_video(url, format_selection):
             'outtmpl': str(output_dir / '%(title)s.%(ext)s'),
             'quiet': True,
             'no_warnings': True,
-            # Enhanced options to bypass restrictions
             'nocheckcertificate': True,
-            'ignoreerrors': True,
+            'ignoreerrors': False,  # Changed to False to catch errors
             'no_color': True,
             'noprogress': True,
             'user_agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
             'referer': 'https://www.youtube.com/',
-            'http-chunk-size': '10485760',  # 10MB chunks for better reliability
+            'http-chunk-size': '10485760',
+            'extract_flat': True,  # Only extract video metadata first
         }
         
         # Update options with format-specific settings
         ydl_opts.update(format_opts)
 
-        # Progress placeholder
+        # Progress elements
         progress_bar = st.progress(0)
         status_text = st.empty()
         
@@ -97,15 +104,36 @@ def download_video(url, format_selection):
 
         ydl_opts['progress_hooks'] = [progress_hook]
         
+        # First, try to extract info without downloading
         with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-            info = ydl.extract_info(url, download=False)
-            filename = ydl.prepare_filename(info)
-            ydl.download([url])
-            
-            return filename
+            try:
+                info = ydl.extract_info(url, download=False)
+                if info is None:
+                    st.error("Could not fetch video information. The video might be private or age-restricted.")
+                    return None
+                
+                # If info extraction successful, proceed with download
+                ydl_opts['extract_flat'] = False  # Now enable full extraction
+                with yt_dlp.YoutubeDL(ydl_opts) as ydl_download:
+                    filename = ydl_download.prepare_filename(info)
+                    ydl_download.download([url])
+                    
+                    # Check if file exists and has size > 0
+                    if os.path.exists(filename) and os.path.getsize(filename) > 0:
+                        return filename
+                    else:
+                        st.error("Download completed but file appears to be empty or missing.")
+                        return None
+                        
+            except yt_dlp.utils.DownloadError as e:
+                st.error(f"Download Error: {str(e)}")
+                return None
+            except Exception as e:
+                st.error(f"An unexpected error occurred: {str(e)}")
+                return None
 
     except Exception as e:
-        st.error(f"An error occurred: {str(e)}")
+        st.error(f"An error occurred during setup: {str(e)}")
         return None
 
 # Download button
@@ -116,18 +144,25 @@ if st.button("Download"):
                 downloaded_file_path = download_video(video_url, format_option)
                 
             if downloaded_file_path and os.path.exists(downloaded_file_path):
-                with open(downloaded_file_path, 'rb') as file:
-                    st.download_button(
-                        label="Click here to download",
-                        data=file,
-                        file_name=os.path.basename(downloaded_file_path),
-                        mime="application/octet-stream"
-                    )
-                st.success("✅ Download ready!")
+                try:
+                    with open(downloaded_file_path, 'rb') as file:
+                        file_data = file.read()
+                        if len(file_data) > 0:
+                            st.download_button(
+                                label="Click here to download",
+                                data=file_data,
+                                file_name=os.path.basename(downloaded_file_path),
+                                mime="application/octet-stream"
+                            )
+                            st.success("✅ Download ready!")
+                        else:
+                            st.error("❌ Downloaded file is empty.")
+                except IOError as e:
+                    st.error(f"❌ Error reading file: {str(e)}")
             else:
-                st.error("❌ Download failed. Please try again.")
+                st.error("❌ Download failed. Please try again with a different video or format.")
         except Exception as e:
-            st.error(f"❌ An error occurred: {str(e)}")
+            st.error(f"❌ An unexpected error occurred: {str(e)}")
     else:
         st.warning("⚠️ Please enter a valid YouTube URL.")
 
@@ -141,5 +176,20 @@ with st.expander("ℹ️ Help"):
     4. Wait for the download to complete
     5. Click the download button that appears
     
-    **Note:** Some videos might be restricted due to YouTube's policies.
-    """)
+    **Troubleshooting:**
+    - If download fails, try a different format
+    - Some videos might be restricted or private
+    - Make sure the URL is from YouTube
+    """)
+
+# Clean up old files
+def cleanup_old_files():
+    try:
+        for file in output_dir.glob('*'):
+            if file.is_file():
+                file.unlink()
+    except Exception as e:
+        st.warning(f"Could not clean up old files: {str(e)}")
+
+# Run cleanup when the app starts
+cleanup_old_files()