Update src/streamlit_app.py

src/streamlit_app.py

@@ -1,442 +1,232 @@
 import streamlit as st
+import yt_dlp
+import tempfile
 import os
 import threading
-from pathlib import Path
-import tempfile
 import time
-import subprocess
-import sys
-import random
-
-# 检查 yt-dlp 模块
-def check_yt_dlp():
-    try:
-        import yt_dlp
-        return True, yt_dlp
-    except ImportError:
-        return False, None
-
-yt_dlp_installed, yt_dlp = check_yt_dlp()
-
-if not yt_dlp_installed:
-    st.error("🚨 缺少必要模組 yt-dlp")
-    st.markdown("""
-    ### 請先安裝套件：
-    ```bash
-    pip install yt-dlp
-    ```
-    """)
-    
-    if st.button("🔧 自動安裝 yt-dlp"):
-        with st.spinner("正在安裝..."):
-            try:
-                result = subprocess.run([sys.executable, "-m", "pip", "install", "yt-dlp"], 
-                                      capture_output=True, text=True)
-                if result.returncode == 0:
-                    st.success("✅ 安裝成功！請重新載入頁面")
-                    st.balloons()
-                else:
-                    st.error(f"❌ 安裝失敗: {result.stderr}")
-            except Exception as e:
-                st.error(f"❌ 安裝過程出錯: {e}")
-    st.stop()
+from pathlib import Path
 
-# 页面配置
+# 頁面配置
 st.set_page_config(
-    page_title="YouTube 影片下載器",
+    page_title="🎬 YouTube 下載器",
     page_icon="🎬",
-    layout="wide"
+    layout="centered"
 )
 
-# 初始化状态
-if 'video_info' not in st.session_state:
-    st.session_state.video_info = None
-if 'download_logs' not in st.session_state:
-    st.session_state.download_logs = []
+# 初始化狀態
+if 'download_status' not in st.session_state:
+    st.session_state.download_status = ""
 if 'is_downloading' not in st.session_state:
     st.session_state.is_downloading = False
 if 'download_progress' not in st.session_state:
     st.session_state.download_progress = 0
-if 'download_status' not in st.session_state:
-    st.session_state.download_status = "準備就緒"
-if 'cookies_content' not in st.session_state:
-    st.session_state.cookies_content = ""
-
-def add_log(message):
-    """添加日志"""
-    timestamp = time.strftime("%H:%M:%S")
-    st.session_state.download_logs.append(f"[{timestamp}] {message}")
-    if len(st.session_state.download_logs) > 50:
-        st.session_state.download_logs.pop(0)
-
-def get_default_download_path():
-    """获取默认下载路径"""
-    try:
-        downloads_path = Path.home() / "Downloads"
-        if downloads_path.exists():
-            return str(downloads_path)
-        return str(Path.home())
-    except:
-        return tempfile.gettempdir()
-
-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/120.0.0.0 Safari/537.36',
-        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1',
-        'Mozilla/5.0 (Linux; Android 13; SM-G991B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36',
-    ]
-    return random.choice(user_agents)
-
-def create_cookies_file(cookies_content):
-    """创建cookies文件"""
-    if not cookies_content.strip():
-        return None
-    try:
-        with tempfile.NamedTemporaryFile(mode='w', suffix='.txt', delete=False) as f:
-            if not cookies_content.startswith('# Netscape HTTP Cookie File'):
-                f.write('# Netscape HTTP Cookie File\n')
-            f.write(cookies_content)
-            return f.name
-    except Exception as e:
-        add_log(f"❌ 無法創建 cookies 檔案: {e}")
-        return None
-
-def get_ydl_options(cookies_file=None, use_mobile=False):
-    """获取yt-dlp选项"""
-    user_agent = get_random_user_agent()
-    
-    options = {
-        'quiet': False,
-        'verbose': True,
-        'http_headers': {
-            'User-Agent': user_agent,
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-            'Accept-Language': 'en-US,en;q=0.9,zh-TW;q=0.8',
-        },
-        'geo_bypass': True,
-        'extractor_args': {
-            'youtube': {
-                'skip': ['hls'],
-                'player_client': ['android', 'web'] if use_mobile else ['web', 'android'],
-            }
-        },
-        'retries': 3,
-        'socket_timeout': 30,
-        'no_check_certificate': True,
-    }
-    
-    if cookies_file and os.path.exists(cookies_file):
-        options['cookiefile'] = cookies_file
-        add_log("📋 使用 cookies 檔案")
-    
-    return options
-
-def get_video_info(url, use_cookies=False, use_mobile=False):
-    """获取视频信息"""
-    if not url.strip():
-        st.error("請輸入影片連結！")
-        return None
-    
-    add_log("🔍 正在獲取影片資訊...")
-    
-    methods = [
-        {'name': '標準模式', 'mobile': False},
-        {'name': '行動版API', 'mobile': True},
-    ]
-    
-    for method in methods:
-        try:
-            add_log(f"🔄 嘗試 {method['name']}...")
-            
-            cookies_file = None
-            if use_cookies and st.session_state.cookies_content:
-                cookies_file = create_cookies_file(st.session_state.cookies_content)
-            
-            ydl_opts = get_ydl_options(cookies_file=cookies_file, use_mobile=method['mobile'])
-            
-            with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-                info = ydl.extract_info(url, download=False)
-                
-                if info:
-                    video_info = {
-                        'title': info.get('title', '未知標題'),
-                        'uploader': info.get('uploader', '未知上傳者'),
-                        'duration': info.get('duration', 0),
-                        'view_count': info.get('view_count', 0),
-                        'thumbnail': info.get('thumbnail', ''),
-                        'description': info.get('description', '')[:200] + '...' if info.get('description') else '',
-                        'method_used': method['name']
-                    }
-                    
-                    add_log(f"✅ {method['name']} 成功獲取影片資訊")
-                    return video_info
-            
-            if cookies_file and os.path.exists(cookies_file):
-                os.unlink(cookies_file)
-                
-        except Exception as e:
-            add_log(f"❌ {method['name']} 失敗: {str(e)[:100]}...")
-            if 'cookies_file' in locals() and cookies_file and os.path.exists(cookies_file):
-                os.unlink(cookies_file)
-            continue
-    
-    add_log("❌ 所有方法都失敗了")
-    st.error("❌ 無法獲取影片資訊，請嘗試使用 Cookies 或稍後重試")
-    return None
+if 'video_info' not in st.session_state:
+    st.session_state.video_info = None
+if 'download_path' not in st.session_state:
+    st.session_state.download_path = None
 
 def progress_hook(d):
-    """下载进度回调"""
+    """下載進度回調"""
     if d['status'] == 'downloading':
-        if 'total_bytes' in d:
-            downloaded = d.get('downloaded_bytes', 0)
-            total = d.get('total_bytes', 1)
-            percent = (downloaded / total) * 100
-            st.session_state.download_progress = percent
-            st.session_state.download_status = f"下載中... {percent:.1f}%"
+        if 'total_bytes' in d or '_total_bytes_str' in d:
+            try:
+                downloaded = d.get('downloaded_bytes', 0)
+                total = d.get('total_bytes') or d.get('_total_bytes_estimate', 1)
+                if total and total > 0:
+                    percent = min((downloaded / total) * 100, 100)
+                    st.session_state.download_progress = percent
+                    st.session_state.download_status = f"📥 下載中... {percent:.1f}%"
+                else:
+                    st.session_state.download_status = "📥 下載中..."
+            except:
+                st.session_state.download_status = "📥 下載中..."
         else:
-            st.session_state.download_status = "下載中..."
+            st.session_state.download_status = "📥 下載中..."
     elif d['status'] == 'finished':
         st.session_state.download_progress = 100
-        st.session_state.download_status = "下載完成！"
+        st.session_state.download_status = "✅ 下載完成！"
         filename = os.path.basename(d['filename'])
-        add_log(f"✅ 下載完成: {filename}")
+        st.session_state.download_path = d['filename']
+
+def get_video_info(url):
+    """獲取影片資訊"""
+    try:
+        ydl_opts = {
+            'quiet': True,
+            'no_warnings': True,
+        }
+        
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info = ydl.extract_info(url, download=False)
+            return {
+                'title': info.get('title', '未知標題'),
+                'uploader': info.get('uploader', '未知上傳者'),
+                'duration': info.get('duration', 0),
+                'thumbnail': info.get('thumbnail', ''),
+                'view_count': info.get('view_count', 0)
+            }
+    except Exception as e:
+        st.error(f"❌ 無法獲取影片資訊: {str(e)}")
+        return None
 
-def download_video(url, quality, audio_only, download_path, use_cookies=False, use_mobile=False):
-    """下载视频"""
+def download_video(url, quality, audio_only):
+    """下載影片"""
     try:
-        os.makedirs(download_path, exist_ok=True)
+        # 創建臨時目錄
+        temp_dir = tempfile.mkdtemp()
+        
+        # 設定下載選項
+        if audio_only:
+            format_selector = 'bestaudio/best'
+            filename = '%(title)s.%(ext)s'
+            postprocessors = [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': 'mp3',
+                'preferredquality': '192',
+            }]
+        else:
+            height = quality.replace('p', '')
+            format_selector = f'best[height<={height}]/best'
+            filename = '%(title)s.%(ext)s'
+            postprocessors = []
         
-        add_log("🚀 開始下載...")
-        add_log(f"🎯 類型: {'音訊 (MP3)' if audio_only else f'影片 ({quality})'}")
+        ydl_opts = {
+            'format': format_selector,
+            'outtmpl': os.path.join(temp_dir, filename),
+            'progress_hooks': [progress_hook],
+            'quiet': True,
+            'no_warnings': True,
+            'postprocessors': postprocessors,
+        }
         
-        methods = [
-            {'name': '標準下載', 'mobile': False},
-            {'name': '行動版下載', 'mobile': True},
-        ]
+        st.session_state.download_status = "🚀 開始下載..."
         
-        for method in methods:
-            try:
-                add_log(f"🔄 嘗試 {method['name']}...")
-                
-                cookies_file = None
-                if use_cookies and st.session_state.cookies_content:
-                    cookies_file = create_cookies_file(st.session_state.cookies_content)
-                
-                # 设置格式
-                if audio_only:
-                    format_selector = 'bestaudio/best'
-                    filename = '%(title)s.%(ext)s'
-                else:
-                    height = quality.replace('p', '')
-                    format_selector = f'best[height<={height}]/best'
-                    filename = '%(title)s.%(ext)s'
-                
-                ydl_opts = get_ydl_options(cookies_file=cookies_file, use_mobile=method['mobile'])
-                ydl_opts.update({
-                    'format': format_selector,
-                    'outtmpl': os.path.join(download_path, filename),
-                    'progress_hooks': [progress_hook],
-                    'noplaylist': True,
-                })
-                
-                # 音频转换
-                if audio_only:
-                    ydl_opts['postprocessors'] = [{
-                        'key': 'FFmpegExtractAudio',
-                        'preferredcodec': 'mp3',
-                        'preferredquality': '192',
-                    }]
-                
-                with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-                    ydl.download([url])
-                
-                add_log(f"🎉 {method['name']} 下載成功完成！")
-                st.session_state.is_downloading = False
-                st.success("下載完成！")
-                return
-                
-            except Exception as e:
-                add_log(f"❌ {method['name']} 失敗: {str(e)[:100]}...")
-                if cookies_file and os.path.exists(cookies_file):
-                    os.unlink(cookies_file)
-                continue
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            ydl.download([url])
         
-        # 所有方法失败
-        st.session_state.download_status = "下載失敗"
-        add_log("❌ 所有下載方法都失敗")
         st.session_state.is_downloading = False
-        st.error("下載失敗，請檢查網路連線或嘗試使用 Cookies")
         
     except Exception as e:
-        st.session_state.download_status = "下載失敗"
-        error_msg = f"下載過程出錯: {str(e)}"
-        add_log(f"❌ {error_msg}")
+        st.session_state.download_status = f"❌ 下載失敗: {str(e)}"
         st.session_state.is_downloading = False
-        st.error(error_msg)
 
-# 主界面
-st.title("🎬 YouTube 影片下載器")
-st.markdown("---")
+# 主介面
+st.title("🎬 YouTube 下載器")
+st.markdown("簡單快速的YouTube影片下載工具")
 
-# 侧边栏设置
-with st.sidebar:
-    st.header("⚙️ 下載設定")
-    
-    # 下载类型
-    download_type = st.radio("下載類型", ["影片", "音訊 (MP3)"])
-    
-    # 质量选择
+# URL 輸入
+url = st.text_input("🔗 請輸入 YouTube 影片連結", placeholder="https://www.youtube.com/watch?v=...")
+
+# 下載設定
+col1, col2 = st.columns(2)
+
+with col1:
+    download_type = st.selectbox("📱 下載類型", ["影片", "音訊 (MP3)"])
+
+with col2:
     if download_type == "影片":
-        quality = st.selectbox("影片品質", ["1080p", "720p", "480p", "360p"], index=1)
+        quality = st.selectbox("🎯 影片品質", ["1080p", "720p", "480p", "360p"], index=1)
     else:
         quality = None
-        st.info("音訊將以 192kbps MP3 格式下載")
-    
-    # 下载路径
-    st.subheader("📁 下載路徑")
-    default_path = get_default_download_path()
-    download_path = st.text_input("路徑", value=default_path)
-    
-    if not os.path.exists(download_path):
-        st.warning("⚠️ 路徑不存在")
-    else:
-        st.success("✅ 路徑有效")
-    
-    st.markdown("---")
-    
-    # 高级设置
-    st.subheader("🔧 進階設定")
-    use_cookies = st.checkbox("使用 Cookies（推薦）", value=True)
-    
-    if use_cookies:
-        st.info("輸入 YouTube cookies 可解決認證問題")
-        cookies_input = st.text_area(
-            "貼上 cookies（Netscape 格式）",
-            placeholder="# Netscape HTTP Cookie File\n.youtube.com\tTRUE\t/\tFALSE\t...",
-            height=100
-        )
-        if cookies_input != st.session_state.cookies_content:
-            st.session_state.cookies_content = cookies_input
-    
-    use_mobile = st.checkbox("使用行動版 API")
+        st.info("音訊品質: 192kbps MP3")
 
-# 主内容
-col1, col2 = st.columns([2, 1])
+# 按鈕區域
+btn_col1, btn_col2 = st.columns(2)
 
-with col1:
-    # URL输入
-    st.subheader("🔗 影片連結")
-    url = st.text_input("請輸入 YouTube 影片連結", placeholder="https://www.youtube.com/watch?v=...")
-    
-    col_btn1, col_btn2, col_btn3 = st.columns(3)
-    
-    with col_btn1:
-        if st.button("🔍 獲取影片資訊", type="primary"):
-            if url:
-                with st.spinner("正在獲取影片資訊..."):
-                    result = get_video_info(url, use_cookies, use_mobile)
-                    if result:
-                        st.session_state.video_info = result
-            else:
-                st.error("請先輸入影片連結！")
-    
-    with col_btn2:
-        if st.button("🚀 開始下載", disabled=st.session_state.is_downloading):
-            if not url:
-                st.error("請輸入影片連結！")
-            else:
-                st.session_state.is_downloading = True
-                st.session_state.download_progress = 0
-                st.session_state.download_status = "準備下載..."
-                
-                audio_only = download_type == "音訊 (MP3)"
-                thread = threading.Thread(
-                    target=download_video,
-                    args=(url, quality, audio_only, download_path, use_cookies, use_mobile),
-                    daemon=True
-                )
-                thread.start()
-    
-    with col_btn3:
-        if st.button("🔄 更新 yt-dlp"):
-            with st.spinner("正在更新..."):
-                try:
-                    result = subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "yt-dlp"], 
-                                          capture_output=True, text=True)
-                    if result.returncode == 0:
-                        st.success("✅ 更新成功！")
-                        add_log("✅ yt-dlp 已更新到最新版本")
-                    else:
-                        st.error(f"❌ 更新失敗")
-                except Exception as e:
-                    st.error(f"❌ 更新失敗: {e}")
+with btn_col1:
+    if st.button("🔍 預覽影片資訊", use_container_width=True):
+        if url:
+            with st.spinner("正在獲取影片資訊..."):
+                info = get_video_info(url)
+                if info:
+                    st.session_state.video_info = info
+        else:
+            st.error("請先輸入影片連結！")
 
-# 视频信息显示
+with btn_col2:
+    if st.button("⬇️ 開始下載", use_container_width=True, disabled=st.session_state.is_downloading):
+        if not url:
+            st.error("請輸入影片連結！")
+        else:
+            st.session_state.is_downloading = True
+            st.session_state.download_progress = 0
+            st.session_state.download_status = "準備下載..."
+            st.session_state.download_path = None
+            
+            audio_only = download_type == "音訊 (MP3)"
+            thread = threading.Thread(
+                target=download_video,
+                args=(url, quality, audio_only),
+                daemon=True
+            )
+            thread.start()
+
+# 顯示影片資訊
 if st.session_state.video_info:
+    st.markdown("---")
     st.subheader("📹 影片資訊")
+    
     info = st.session_state.video_info
     
-    info_col1, info_col2 = st.columns([3, 1])
+    # 創建兩欄布局
+    info_col1, info_col2 = st.columns([2, 1])
     
     with info_col1:
-        st.write(f"**標題:** {info['title']}")
-        st.write(f"**上傳者:** {info['uploader']}")
+        st.write(f"**📝 標題:** {info['title']}")
+        st.write(f"**👤 上傳者:** {info['uploader']}")
+        
         if info['duration']:
-            st.write(f"**長度:** {info['duration']//60}:{info['duration']%60:02d}")
-        if info['view_count']:
-            st.write(f"**觀看次數:** {info['view_count']:,}")
-        st.success(f"**使用方法:** {info['method_used']}")
+            minutes = info['duration'] // 60
+            seconds = info['duration'] % 60
+            st.write(f"**⏱️ 長度:** {minutes}:{seconds:02d}")
         
-        if info['description']:
-            with st.expander("📝 影片描述"):
-                st.write(info['description'])
+        if info['view_count']:
+            st.write(f"**👁️ 觀看次數:** {info['view_count']:,}")
     
     with info_col2:
         if info['thumbnail']:
-            st.image(info['thumbnail'], caption="影片縮圖")
+            st.image(info['thumbnail'], caption="影片縮圖", width=200)
 
-# 下��进度
+# 顯示下載進度
 if st.session_state.is_downloading or st.session_state.download_progress > 0:
+    st.markdown("---")
     st.subheader("📊 下載進度")
-    progress_bar = st.progress(st.session_state.download_progress / 100)
-    st.write(f"狀態: {st.session_state.download_status}")
-
-with col2:
-    # 下载日志
-    st.subheader("📋 下載日誌")
     
-    if st.button("🗑️ 清除日誌"):
-        st.session_state.download_logs = []
-        st.rerun()
+    if st.session_state.download_progress > 0:
+        progress_bar = st.progress(st.session_state.download_progress / 100)
     
-    if st.session_state.download_logs:
-        log_text = "\n".join(st.session_state.download_logs[-15:])
-        st.text_area("", value=log_text, height=250, disabled=True)
-    else:
-        st.info("暫無日誌")
+    if st.session_state.download_status:
+        st.write(st.session_state.download_status)
+
+# 下載完成後提供下載連結
+if st.session_state.download_path and os.path.exists(st.session_state.download_path):
+    st.markdown("---")
+    st.success("🎉 下載完成！")
+    
+    try:
+        with open(st.session_state.download_path, 'rb') as file:
+            file_data = file.read()
+            filename = os.path.basename(st.session_state.download_path)
+            
+            st.download_button(
+                label="📁 下載檔案",
+                data=file_data,
+                file_name=filename,
+                mime="application/octet-stream",
+                use_container_width=True
+            )
+    except Exception as e:
+        st.error(f"檔案讀取失敗: {e}")
 
-# 自动刷新
+# 自動刷新進度
 if st.session_state.is_downloading:
-    time.sleep(1)
+    time.sleep(0.5)
     st.rerun()
 
-# 故障排除指南
+# 頁腳資訊
 st.markdown("---")
-with st.expander("🔧 故障排除指南"):
-    st.markdown("""
-    ### 針對認證錯誤的解決方案：
-    
-    **推薦方法：使用 Cookies**
-    1. 在瀏覽器中登入 YouTube
-    2. 安裝 "Get cookies.txt" 擴展
-    3. 在 YouTube 頁面點擊擴展
-    4. 複製 cookies 內容到左側設定區
-    5. 勾選"使用 Cookies"並重試下載
-    
-    **其他方法：**
-    - 嘗試行動版 API
-    - 等待幾分鐘後重試
-    - 檢查網路連線
-    - 更新 yt-dlp 到最新版本
-    """)
+st.markdown("""
+<div style="text-align: center; color: #666;">
+    <small>⚠️ 請確保您有權下載所選內容，並遵守相關版權法規</small>
+</div>
+""", unsafe_allow_html=True)