Update app.py

app.py

@@ -1,198 +1,138 @@
 import streamlit as st
-from pytube import YouTube
+from pytubefix import YouTube  # Use pytubefix
 import tempfile
 import os
-from typing import Optional
-import re
+from urllib.error import HTTPError  # For error handling
 
-def setup_page_config():
-    st.set_page_config(
-        page_title="YouTube Downloader",
-        page_icon="🎥",
-        layout="wide"
-    )
+st.set_page_config(layout="wide")
 
-def create_sidebar():
-    st.sidebar.title("YouTube Downloader App")
-    st.sidebar.markdown("""
-    **Step-by-Step Guide:**
-    1. Enter a YouTube URL
-    2. Choose quality (Video/Audio)
-    3. Click download
-    4. Save to your device
-    
-    **Supported Formats:**
-    - Video: MP4 (Multiple resolutions)
-    - Audio: MP3 (Multiple bitrates)
-    """)
+# App Layout
+st.sidebar.title("YouTube Downloader")
+st.sidebar.markdown("Made with 💛 for educational use only.")
 
-def validate_youtube_url(url: str) -> bool:
-    youtube_regex = r'(https?://)?(www\.)?(youtube|youtu|youtube-nocookie)\.(com|be)/(watch\?v=|embed/|v/|.+\?v=)?([^&=%\?]{11})'
-    return bool(re.match(youtube_regex, url))
+# Disclaimer
+st.warning("Warning: Respect copyright laws and YouTube's terms of service.")
 
-def fetch_video_streams(url: str) -> Optional[YouTube]:
-    try:
-        yt = YouTube(url)
-        video_streams = yt.streams.filter(progressive=True, file_extension='mp4')
-        if not video_streams:
-            st.error("No video streams found for this URL")
-            return None
-        
-        resolutions = list({stream.resolution for stream in video_streams})
-        resolutions.sort(reverse=True, key=lambda x: int(x[:-1]) if x else 0)
-        
-        st.session_state['video_streams'] = video_streams
-        st.session_state['video_resolutions'] = resolutions
-        st.session_state['video_title'] = yt.title
-        return yt
-    except Exception as e:
-        st.error(f"Error fetching video: {str(e)}")
-        return None
+# Create tabs
+tab1, tab2 = st.tabs(["Video Downloader", "Audio Downloader"])
 
-def fetch_audio_streams(url: str) -> Optional[YouTube]:
-    try:
-        yt = YouTube(url)
-        audio_streams = yt.streams.filter(only_audio=True, file_extension='webm')
-        if not audio_streams:
-            st.error("No audio streams found for this URL")
-            return None
-            
-        bitrates = list({stream.abr for stream in audio_streams if stream.abr})
-        bitrates.sort(reverse=True, key=lambda x: int(x.split('kbps')[0]))
-        
-        st.session_state['audio_streams'] = audio_streams
-        st.session_state['audio_bitrates'] = bitrates
-        st.session_state['audio_title'] = yt.title
-        return yt
-    except Exception as e:
-        st.error(f"Error fetching audio: {str(e)}")
-        return None
-
-def handle_video_download(stream, title: str):
-    try:
-        with tempfile.TemporaryDirectory() as temp_dir:
-            filename = f"{title}.mp4"
-            filename = re.sub(r'[<>:"/\\|?*]', '_', filename)  # Remove invalid characters
-            temp_path = os.path.join(temp_dir, filename)
-            
-            with st.spinner("Preparing video for download..."):
-                stream.download(temp_dir, filename)
-                
-            with open(temp_path, 'rb') as f:
-                st.download_button(
-                    label="💾 Save Video",
-                    data=f.read(),
-                    file_name=filename,
-                    mime="video/mp4",
-                    key="video_download"
-                )
-    except Exception as e:
-        st.error(f"Download failed: {str(e)}")
-
-def handle_audio_download(stream, title: str):
-    try:
-        with tempfile.TemporaryDirectory() as temp_dir:
-            filename = f"{title}.mp3"
-            filename = re.sub(r'[<>:"/\\|?*]', '_', filename)  # Remove invalid characters
-            temp_path = os.path.join(temp_dir, filename)
-            
-            with st.spinner("Preparing audio for download..."):
-                stream.download(temp_dir, filename)
-                
-            with open(temp_path, 'rb') as f:
-                st.download_button(
-                    label="🎵 Save Audio",
-                    data=f.read(),
-                    file_name=filename,
-                    mime="audio/mpeg",
-                    key="audio_download"
-                )
-    except Exception as e:
-        st.error(f"Download failed: {str(e)}")
+# Utility function to handle YouTube object with User-Agent
+def get_youtube(url):
+    custom_user_agent = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+    }
+    return YouTube(url, headers=custom_user_agent)
 
-def main():
-    setup_page_config()
-    create_sidebar()
+# Video Downloader Tab
+with tab1:
+    st.write("Download YouTube videos in MP4 format.")
     
-    st.title("YouTube Downloader App")
-    st.warning("⚠️ Please ensure you have the right to download content. Respect copyright laws.")
-    
-    tab1, tab2 = st.tabs(["📺 Video Downloader", "🎵 Audio Downloader"])
-    
-    # Video Downloader Tab
-    with tab1:
-        st.markdown("### Download YouTube Videos")
-        with st.form("video_form", clear_on_submit=False):
+    # State management for video streams
+    if not st.session_state.get('video_streams', None):
+        with st.form("video_form"):
             url = st.text_input("Enter YouTube URL:", key="video_url")
-            fetch_btn = st.form_submit_button("🔍 Fetch Video Details")
+            fetch_btn = st.form_submit_button("Fetch Video Qualities")
             
-            if fetch_btn:
-                if not url:
-                    st.error("Please enter a URL")
-                elif not validate_youtube_url(url):
-                    st.error("Invalid YouTube URL")
-                else:
-                    yt = fetch_video_streams(url)
-                    if yt:
-                        st.success("Video details fetched successfully!")
+            if fetch_btn and url:
+                with st.spinner("Fetching video qualities..."):
+                    try:
+                        yt = get_youtube(url)
+                        video_streams = yt.streams.filter(progressive=True, file_extension='mp4')
+                        resolutions = sorted(list({stream.resolution for stream in video_streams}), reverse=True)
+                        st.session_state['video_streams'] = video_streams
+                        st.session_state['video_resolutions'] = resolutions
+                        st.session_state['video_title'] = yt.title
+                        st.experimental_rerun()
+                    except HTTPError as e:
+                        st.error(f"HTTP Error {e.code}: {e.reason}")
+                    except Exception as e:
+                        st.error(f"Error: {str(e)}")
+    else:
+        st.subheader(f"Title: {st.session_state.get('video_title', 'Untitled')}")
+        selected_resolution = st.selectbox(
+            "Select Resolution:",
+            st.session_state.get('video_resolutions', []),
+            key="video_resolution"
+        )
         
-        if 'video_streams' in st.session_state:
-            st.subheader(f"🎥 {st.session_state.get('video_title', 'Untitled')}")
-            selected_resolution = st.selectbox(
-                "Select Resolution:",
-                st.session_state.get('video_resolutions', []),
-                key="video_resolution"
-            )
-            
-            selected_stream = next(
-                (s for s in st.session_state['video_streams'] 
-                 if s.resolution == selected_resolution),
-                None
-            )
+        selected_stream = next(
+            (s for s in st.session_state['video_streams'] if s.resolution == selected_resolution),
+            None
+        )
+        
+        if selected_stream:
+            download_btn = st.button("Download Video")
             
-            if selected_stream:
-                st.info(f"File size: {selected_stream.filesize / 1024 / 1024:.1f} MB")
-                if st.button("⬇️ Prepare Video Download"):
-                    handle_video_download(selected_stream, st.session_state['video_title'])
+            if download_btn:
+                with tempfile.TemporaryDirectory() as temp_dir:
+                    filename = f"{st.session_state['video_title']}.mp4".replace(" ", "_")
+                    temp_path = os.path.join(temp_dir, filename)
+                    selected_stream.download(temp_dir, filename)
+                    with open(temp_path, 'rb') as f:
+                        st.download_button(
+                            label="Click here to download",
+                            data=f.read(),
+                            file_name=filename,
+                            mime="video/mp4"
+                        )
+        else:
+            st.warning("Selected resolution unavailable. Try another.")
+
+# Audio Downloader Tab
+with tab2:
+    st.write("Download YouTube audio in MP3 format.")
     
-    # Audio Downloader Tab
-    with tab2:
-        st.markdown("### Download YouTube Audio")
-        with st.form("audio_form", clear_on_submit=False):
+    # State management for audio streams
+    if not st.session_state.get('audio_streams', None):
+        with st.form("audio_form"):
             url = st.text_input("Enter YouTube URL:", key="audio_url")
-            fetch_btn = st.form_submit_button("🔍 Fetch Audio Details")
+            fetch_btn = st.form_submit_button("Fetch Audio Qualities")
             
-            if fetch_btn:
-                if not url:
-                    st.error("Please enter a URL")
-                elif not validate_youtube_url(url):
-                    st.error("Invalid YouTube URL")
-                else:
-                    yt = fetch_audio_streams(url)
-                    if yt:
-                        st.success("Audio details fetched successfully!")
+            if fetch_btn and url:
+                with st.spinner("Fetching audio qualities..."):
+                    try:
+                        yt = get_youtube(url)
+                        audio_streams = yt.streams.filter(only_audio=True)
+                        bitrates = sorted(list({f"{stream.abr}kbps" for stream in audio_streams if stream.abr}), reverse=True)
+                        st.session_state['audio_streams'] = audio_streams
+                        st.session_state['audio_bitrates'] = bitrates
+                        st.session_state['audio_title'] = yt.title
+                        st.experimental_rerun()
+                    except HTTPError as e:
+                        st.error(f"HTTP Error {e.code}: {e.reason}")
+                    except Exception as e:
+                        st.error(f"Error: {str(e)}")
+    else:
+        st.subheader(f"Title: {st.session_state.get('audio_title', 'Untitled')}")
+        selected_bitrate = st.selectbox(
+            "Select Bitrate:",
+            st.session_state.get('audio_bitrates', []),
+            key="audio_bitrate"
+        )
         
-        if 'audio_streams' in st.session_state:
-            st.subheader(f"🎵 {st.session_state.get('audio_title', 'Untitled')}")
-            selected_bitrate = st.selectbox(
-                "Select Audio Quality:",
-                st.session_state.get('audio_bitrates', []),
-                key="audio_bitrate"
-            )
-            
-            selected_stream = next(
-                (s for s in st.session_state['audio_streams'] 
-                 if s.abr == selected_bitrate),
-                None
-            )
+        selected_stream = next(
+            (s for s in st.session_state['audio_streams'] if f"{s.abr}kbps" == selected_bitrate),
+            None
+        )
+        
+        if selected_stream:
+            download_btn = st.button("Download Audio")
             
-            if selected_stream:
-                st.info(f"File size: {selected_stream.filesize / 1024 / 1024:.1f} MB")
-                if st.button("⬇️ Prepare Audio Download"):
-                    handle_audio_download(selected_stream, st.session_state['audio_title'])
-    
-    st.markdown("---")
-    st.caption("Made with ❤️ by Marcos")
+            if download_btn:
+                with tempfile.TemporaryDirectory() as temp_dir:
+                    filename = f"{st.session_state['audio_title']}.mp3".replace(" ", "_")
+                    temp_path = os.path.join(temp_dir, filename)
+                    selected_stream.download(temp_dir, filename)
+                    with open(temp_path, 'rb') as f:
+                        st.download_button(
+                            label="Click here to download",
+                            data=f.read(),
+                            file_name=filename,
+                            mime="audio/mpeg"
+                        )
+        else:
+            st.warning("Selected bitrate unavailable. Try another.")
 
-if __name__ == "__main__":
-    main()
+# Footer
+st.markdown("---")
+st.warning("⚠️ Use this app responsibly. Downloads may be restricted by terms of service ⚠️")