Update app.py

app.py

@@ -4,8 +4,11 @@ import os
 import time
 import threading
 from pathlib import Path
+import warnings
+
+# 过滤libtorrent的弃用警告
+warnings.filterwarnings("ignore", category=DeprecationWarning, module="libtorrent")
 
-# 下载状态类
 class DownloadStatus:
     def __init__(self):
         self.progress = 0.0
@@ -17,7 +20,6 @@ class DownloadStatus:
         self.file_path = None
 
 def human_readable_size(size):
-    """转换文件大小到易读格式"""
     units = ['B', 'KB', 'MB', 'GB', 'TB']
     index = 0
     while size >= 1024 and index < 4:
@@ -26,83 +28,78 @@ def human_readable_size(size):
     return f"{size:.2f} {units[index]}"
 
 def configure_session():
-    """精确版本检测的会话配置"""
-    if hasattr(lt, 'settings_pack'):
-        # 新版本配置方式 (libtorrent 1.2.x+)
+    """无警告的会话配置"""
+    try:
+        # 新版本配置方式
         settings = lt.settings_pack()
         settings.set_str(lt.settings_pack.listen_interfaces, '0.0.0.0:6881')
         return lt.session(settings)
-    else:
-        # 旧版本配置方式 (libtorrent <1.2.x)
-        ses = lt.session()
-        if hasattr(ses, 'listen_on'):
-            ses.listen_on(6881, 6891)
-        return ses
+    except:
+        # 旧版本简化配置（不指定端口）
+        return lt.session()
 
-def add_torrent_compat(ses, magnet_uri, download_path):
-    """精确版本检测的种子添加方法"""
-    if hasattr(lt, 'parse_magnet_uri'):
-        # 新版本添加方式
+def add_torrent_safely(ses, magnet_uri, download_path):
+    """兼容的种子添加方法"""
+    try:
+        # 新版本解析方式
         params = lt.parse_magnet_uri(magnet_uri)
         params.save_path = download_path
         if hasattr(lt.storage_mode_t, 'storage_mode_sparse'):
             params.storage_mode = lt.storage_mode_t.storage_mode_sparse
         return ses.add_torrent(params)
-    else:
-        # 旧版本添加方式
+    except:
+        # 旧版本添加方式（已过滤警告）
         return lt.add_magnet_uri(ses, magnet_uri, {
             'save_path': download_path,
             'storage_mode': lt.storage_mode_t(2)
         })
 
 def download_task(magnet_uri, download_path, status):
-    """后台下载任务"""
     try:
         ses = configure_session()
         status.status = "解析磁力链接..."
         
-        # 添加种子
-        handle = add_torrent_compat(ses, magnet_uri, download_path)
+        handle = add_torrent_safely(ses, magnet_uri, download_path)
         status.status = "获取元数据..."
         
-        # 等待元数据，带超时机制
+        # 元数据等待（带进度反馈）
+        metadata_progress = st.progress(0)
         timeout = 30
         start = time.time()
         while not handle.has_metadata():
             if time.time() - start > timeout:
-                raise TimeoutError("获取元数据超时")
+                raise TimeoutError("元数据获取超时")
+            metadata_progress.progress(min((time.time() - start)/timeout, 1.0))
             time.sleep(0.5)
-            if hasattr(ses, 'post_torrent_updates'):
-                ses.post_torrent_updates()
-        
+        metadata_progress.empty()
+
         torrent_info = handle.get_torrent_info()
         status.total_size = torrent_info.total_size()
         status.status = "下载中..."
         
-        # 主下载循环
+        # 下载主循环
+        progress_bar = st.progress(0)
+        speed_chart = st.line_chart(pd.DataFrame(columns=['下载速度 (KB/s)']))
         start_time = time.time()
-        last_downloaded = 0
+        
         while not handle.is_seed():
-            if hasattr(ses, 'post_torrent_updates'):
-                ses.post_torrent_updates()
-            
             s = handle.status()
             
+            # 更新进度
+            status.progress = s.progress
+            progress_bar.progress(status.progress)
+            
             # 计算下载速度
-            now = time.time()
-            dt = now - start_time
-            status.downloaded_size = s.total_done
-            status.download_rate = (s.total_done - last_downloaded) / dt if dt > 0 else 0
-            last_downloaded = s.total_done
-            start_time = now
+            current_time = time.time()
+            status.download_rate = s.download_rate / 1000  # KB/s
+            speed_chart.add_rows({'下载速度 (KB/s)': status.download_rate})
             
-            # 计算进度和剩余时间
-            status.progress = s.progress
+            # 更新剩余时间
             if status.download_rate > 0:
-                status.remaining_time = (status.total_size - s.total_done) / status.download_rate
+                status.remaining_time = (status.total_size - s.total_done) / (status.download_rate * 1000)
             else:
                 status.remaining_time = 0
-            
+                
             time.sleep(1)
         
         status.status = "下载完成"
@@ -112,55 +109,53 @@ def download_task(magnet_uri, download_path, status):
         status.status = f"错误: {str(e)}"
 
 def main():
-    st.title("🕹️ 磁力链接下载器")
+    st.title("🛠️ 磁力链接下载工具")
     
     if 'download_status' not in st.session_state:
         st.session_state.download_status = DownloadStatus()
     
     with st.form("magnet_form"):
-        magnet_uri = st.text_input("磁力链接：", placeholder="magnet:?xt=urn:...")
-        submitted = st.form_submit_button("开始下载")
+        magnet_uri = st.text_input("输入磁力链接：", placeholder="magnet:?xt=urn:...")
+        submitted = st.form_submit_button("🚀 开始下载")
     
     download_path = Path("downloads")
     download_path.mkdir(exist_ok=True)
     
     if submitted and magnet_uri:
         if not magnet_uri.startswith("magnet:?"):
-            st.error("无效的磁力链接格式")
+            st.error("❌ 无效的磁力链接格式")
             return
         
         st.session_state.download_status = DownloadStatus()
-        thread = threading.Thread(
+        threading.Thread(
             target=download_task,
             args=(magnet_uri, download_path, st.session_state.download_status)
-        )
-        thread.start()
+        ).start()
     
     status = st.session_state.download_status
     status_container = st.empty()
     
     while status.status not in ["下载完成", "错误"] and status.status != "等待中":
         with status_container.container():
-            st.progress(status.progress, text=f"进度: {status.progress*100:.1f}%")
+            st.subheader("实时下载状态")
             
-            cols = st.columns(4)
-            cols[0].metric("总大小", human_readable_size(status.total_size) if status.total_size > 0 else "--")
-            cols[1].metric("已下载", human_readable_size(status.downloaded_size))
-            speed_display = (f"{status.download_rate/1024:.2f} MB/s" if status.download_rate > 1024 
-                            else f"{status.download_rate:.2f} KB/s") if status.download_rate > 0 else "--"
-            cols[2].metric("速度", speed_display)
-            time_display = f"{status.remaining_time:.1f}秒" if status.remaining_time > 0 else "--"
-            cols[3].metric("剩余时间", time_display)
+            # 进度展示
+            cols = st.columns([2, 1, 1])
+            cols[0].metric("总体进度", f"{status.progress*100:.1f}%")
+            cols[1].metric("传输速度", f"{status.download_rate:.2f} KB/s")
+            cols[2].metric("剩余时间", 
+                f"{status.remaining_time:.1f}s" if status.remaining_time > 0 else "未知")
             
-            st.caption(f"状态: {status.status}")
-        
-        time.sleep(0.5)
+            # 可视化图表
+            st.progress(status.progress)
+            
+            time.sleep(1)
     
     if status.status == "下载完成":
-        st.success("🎉 下载完成！")
+        st.balloons()
         with open(status.file_path, "rb") as f:
             st.download_button(
-                label="保存文件",
+                "💾 保存文件",
                 data=f,
                 file_name=os.path.basename(status.file_path),
                 mime="application/octet-stream"