Update app.py

app.py

@@ -3,8 +3,24 @@ import libtorrent as lt
 import os
 import threading
 import time
+import logging
+
+# 配置日志
+logging.basicConfig(level=logging.INFO)
+
+class TorrentSession:
+    def __init__(self):
+        self.ses = lt.session()
+        self.ses.listen_on(6881, 6891)
+        self.alerts = []
+        self.last_alert_time = time.time()
+
+    def process_alerts(self):
+        self.alerts = []
+        while (alert := self.ses.wait_for_alert(1000)):
+            self.alerts.append(alert)
+            self.ses.pop_alert()
 
-# 线程安全的下载状态管理
 class DownloadState:
     _instance = None
     _lock = threading.Lock()
@@ -13,138 +29,168 @@ class DownloadState:
         with cls._lock:
             if cls._instance is None:
                 cls._instance = super().__new__(cls)
-                cls._instance.progress = 0
-                cls._instance.is_downloading = False
-                cls._instance.complete = False
-                cls._instance.file_path = None
-                cls._instance.status = ""
+                cls._instance.reset()
             return cls._instance
+    
+    def reset(self):
+        self.progress = 0.0
+        self.is_downloading = False
+        self.complete = False
+        self.file_path = None
+        self.status = "等待开始"
+        self.info_hash = ""
 
 def init_session_state():
-    """初始化session_state"""
-    if 'download_initialized' not in st.session_state:
+    if 'download' not in st.session_state:
         state = DownloadState()
         st.session_state.download = {
             'progress': state.progress,
             'is_downloading': state.is_downloading,
             'complete': state.complete,
             'file_path': state.file_path,
-            'status': state.status
+            'status': state.status,
+            'info_hash': state.info_hash
         }
-        st.session_state.download_initialized = True
 
 def sync_session_state():
-    """同步状态到session_state"""
     state = DownloadState()
-    st.session_state.download = {
+    st.session_state.download.update({
         'progress': state.progress,
         'is_downloading': state.is_downloading,
         'complete': state.complete,
         'file_path': state.file_path,
-        'status': state.status
-    }
+        'status': state.status,
+        'info_hash': state.info_hash
+    })
 
-def download_torrent(magnet_link, save_path):
+def download_worker(magnet_link, save_path):
     try:
         state = DownloadState()
+        ts = TorrentSession()
         
-        # 初始化下载状态
-        with threading.Lock():
-            state.progress = 0
-            state.is_downloading = True
-            state.complete = False
-            state.file_path = None
-            state.status = "正在初始化..."
-        
-        ses = lt.session()
+        # 使用新版API添加磁力链接
         params = {
             'save_path': save_path,
-            'storage_mode': lt.storage_mode_t(2)
+            'storage_mode': lt.storage_mode_t.storage_mode_sparse,
+            'flags': lt.torrent_flags.duplicate_is_error | lt.torrent_flags.auto_managed
         }
         
-        handle = lt.add_magnet_uri(ses, magnet_link, params)
+        handle = lt.add_magnet_uri(ts.ses, magnet_link, params)
+        state.info_hash = str(handle.info_hash())
         
-        # 获取元数据
-        with threading.Lock():
-            state.status = "正在获取元数据..."
-        while not handle.has_metadata():
-            time.sleep(1)
+        # 事件驱动等待元数据
+        state.status = "等待元数据..."
+        logging.info("等待元数据...")
+        
+        metadata_received = False
+        while not metadata_received:
+            ts.process_alerts()
+            for alert in ts.alerts:
+                if isinstance(alert, lt.metadata_received_alert):
+                    if alert.handle == handle:
+                        metadata_received = True
+                        break
+            time.sleep(0.5)
         
         # 获取文件信息
-        torrent_info = handle.get_torrent_info()
-        files = [torrent_info.file_at(i).path for i in range(torrent_info.num_files())]
+        ti = handle.get_torrent_info()
+        state.status = f"开始下载 {ti.name()}"
+        logging.info(f"开始下载: {ti.name()}")
         
-        # 开始下载
-        with threading.Lock():
-            state.status = "开始下载..."
+        # 启动下载
+        handle.set_sequential_download(True)
+        handle.resume()
         
-        while handle.status().state != lt.torrent_status.seeding:
+        # 下载进度监控
+        state.is_downloading = True
+        while not handle.status().is_seeding:
             status = handle.status()
-            with threading.Lock():
-                state.progress = status.progress * 100
+            state.progress = status.progress * 100
+            
+            # 检查种子状态
+            if status.state == lt.torrent_status.downloading_metadata:
+                state.status = "获取元数据..."
+            elif status.state == lt.torrent_status.downloading:
+                dl = status.download_rate / 1000
+                up = status.upload_rate / 1000
+                peers = status.num_peers
+                state.status = f"下载中: {dl:.1f}kB/s ↑{up:.1f}kB/s ↔{peers} peers"
+            
             time.sleep(1)
         
         # 下载完成
-        with threading.Lock():
-            state.is_downloading = False
-            state.complete = True
-            state.file_path = save_path
-            state.status = f"下载完成！保存路径：{save_path}"
+        state.is_downloading = False
+        state.complete = True
+        state.file_path = save_path
+        state.status = "下载完成"
+        logging.info("下载完成")
         
     except Exception as e:
-        with threading.Lock():
-            state.status = f"错误：{str(e)}"
-            state.is_downloading = False
+        logging.error(f"下载错误: {str(e)}")
+        state.status = f"错误: {str(e)}"
+        state.is_downloading = False
     finally:
         sync_session_state()
 
-# 初始化session状态
+# Streamlit界面
 init_session_state()
+st.title("🚀 磁力链接下载器")
 
-# 界面布局
-st.title("🎯 磁力链接下载器")
-st.write("输入磁力链接开始下载（仅支持单个文件）")
-
-magnet_link = st.text_input("磁力链接：", placeholder="magnet:?xt=urn:btih:...")
-
-if st.button("🚀 开始下载", disabled=st.session_state.download['is_downloading']):
-    if not magnet_link.startswith("magnet:"):
-        st.error("请输入有效的磁力链接！")
-    else:
-        save_dir = "./downloads"
-        os.makedirs(save_dir, exist_ok=True)
-        threading.Thread(
-            target=download_torrent,
-            args=(magnet_link, save_dir),
-            daemon=True
-        ).start()
+with st.form("magnet_form"):
+    magnet = st.text_input("磁力链接", placeholder="magnet:?xt=urn:btih:...")
+    submitted = st.form_submit_button("开始下载", 
+                    disabled=st.session_state.download['is_downloading'])
+    
+    if submitted:
+        if not magnet.startswith("magnet:"):
+            st.error("无效的磁力链接格式")
+        else:
+            save_dir = "./downloads"
+            os.makedirs(save_dir, exist_ok=True)
+            
+            state = DownloadState()
+            state.reset()
+            sync_session_state()
+            
+            threading.Thread(
+                target=download_worker,
+                args=(magnet, save_dir),
+                daemon=True
+            ).start()
 
-# 实时更新状态
+# 状态显示
 sync_session_state()
 
-# 显示下载状态
 if st.session_state.download['is_downloading']:
-    st.progress(int(st.session_state.download['progress']))
-    st.write(f"🔍 进度：{st.session_state.download['progress']:.1f}%")
+    cols = st.columns([1,3])
+    with cols[0]:
+        st.metric("进度", f"{st.session_state.download['progress']:.1f}%")
+    with cols[1]:
+        st.progress(st.session_state.download['progress']/100)
     st.info(st.session_state.download['status'])
 
 if st.session_state.download['complete']:
-    st.success("✅ 下载完成！")
-    
-    # 文件下载部分
-    download_dir = st.session_state.download['file_path']
-    files = [f for f in os.listdir(download_dir) if os.path.isfile(os.path.join(download_dir, f))]
+    st.success("下载完成！")
+    files = [f for f in os.listdir(st.session_state.download['file_path']) 
+            if os.path.isfile(os.path.join(st.session_state.download['file_path'], f))]
     
     if files:
-        selected_file = st.selectbox("选择要下载的文件：", files)
-        file_path = os.path.join(download_dir, selected_file)
-        
-        with open(file_path, "rb") as f:
-            st.download_button(
-                "⬇️ 下载文件",
-                f,
-                file_name=selected_file,
-                mime="application/octet-stream"
-            )
-    else:
-        st.warning("未找到下载文件")
+        with st.expander("下载文件"):
+            selected = st.selectbox("选择文件", files)
+            with open(os.path.join(st.session_state.download['file_path'], selected), "rb") as f:
+                st.download_button(
+                    "下载文件",
+                    f,
+                    file_name=selected,
+                    mime="application/octet-stream"
+                )
+
+# 状态监控线程
+if 'monitor' not in st.session_state:
+    def status_monitor():
+        while True:
+            sync_session_state()
+            time.sleep(0.5)
+    
+    threading.Thread(target=status_monitor, daemon=True).start()
+    st.session_state.monitor = True