Update app.py

app.py

@@ -4,10 +4,23 @@ import os
 import threading
 import time
 import logging
+from contextlib import contextmanager
 
 # 配置日志
 logging.basicConfig(level=logging.INFO)
 
+# 初始化锁
+session_lock = threading.Lock()
+
+@contextmanager
+def session_guard():
+    """线程安全的session_state访问上下文管理器"""
+    with session_lock:
+        try:
+            yield
+        finally:
+            pass
+
 class TorrentSession:
     def __init__(self):
         self.ses = lt.session()
@@ -40,34 +53,49 @@ class DownloadState:
         self.status = "等待开始"
         self.info_hash = ""
 
-def init_session_state():
-    if 'download' not in st.session_state:
-        state = DownloadState()
-        st.session_state.download = {
+# 关键改进点：强化初始化机制
+def safe_init_session():
+    """线程安全的session_state初始化"""
+    with session_guard():
+        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,
+                'info_hash': state.info_hash
+            }
+            logging.info("Session state initialized")
+
+def safe_sync_session():
+    """双重保障的状态同步机制"""
+    safe_init_session()  # 同步前确保初始化
+    state = DownloadState()
+    with session_guard():
+        st.session_state.download.update({
             'progress': state.progress,
             'is_downloading': state.is_downloading,
             'complete': state.complete,
             'file_path': state.file_path,
             'status': state.status,
             'info_hash': state.info_hash
-        }
+        })
 
-def sync_session_state():
-    state = DownloadState()
-    st.session_state.download.update({
-        'progress': state.progress,
-        'is_downloading': state.is_downloading,
-        'complete': state.complete,
-        'file_path': state.file_path,
-        'status': state.status,
-        'info_hash': state.info_hash
-    })
+# 初始化session状态（主线程保障）
+safe_init_session()
 
 def download_worker(magnet_link, save_path):
     try:
         state = DownloadState()
         ts = TorrentSession()
         
+        # 重置状态
+        with session_guard():
+            state.reset()
+            safe_sync_session()
+        
         # 使用新版API添加磁力链接
         params = {
             'save_path': save_path,
@@ -77,12 +105,14 @@ def download_worker(magnet_link, save_path):
         
         handle = lt.add_magnet_uri(ts.ses, magnet_link, params)
         state.info_hash = str(handle.info_hash())
+        safe_sync_session()
         
         # 事件驱动等待元数据
         state.status = "等待元数据..."
-        logging.info("等待元数据...")
+        safe_sync_session()
         
         metadata_received = False
+        start_time = time.time()
         while not metadata_received:
             ts.process_alerts()
             for alert in ts.alerts:
@@ -90,12 +120,14 @@ def download_worker(magnet_link, save_path):
                     if alert.handle == handle:
                         metadata_received = True
                         break
+            if time.time() - start_time > 300:  # 5分钟超时
+                raise TimeoutError("获取元数据超时")
             time.sleep(0.5)
         
         # 获取文件信息
         ti = handle.get_torrent_info()
         state.status = f"开始下载 {ti.name()}"
-        logging.info(f"开始下载: {ti.name()}")
+        safe_sync_session()
         
         # 启动下载
         handle.set_sequential_download(True)
@@ -103,11 +135,13 @@ def download_worker(magnet_link, save_path):
         
         # 下载进度监控
         state.is_downloading = True
+        safe_sync_session()
+        
         while not handle.status().is_seeding:
             status = handle.status()
             state.progress = status.progress * 100
             
-            # 检查种子状态
+            # 状态更新
             if status.state == lt.torrent_status.downloading_metadata:
                 state.status = "获取元数据..."
             elif status.state == lt.torrent_status.downloading:
@@ -116,6 +150,7 @@ def download_worker(magnet_link, save_path):
                 peers = status.num_peers
                 state.status = f"下载中: {dl:.1f}kB/s ↑{up:.1f}kB/s ↔{peers} peers"
             
+            safe_sync_session()
             time.sleep(1)
         
         # 下载完成
@@ -123,17 +158,17 @@ def download_worker(magnet_link, save_path):
         state.complete = True
         state.file_path = save_path
         state.status = "下载完成"
-        logging.info("下载完成")
+        safe_sync_session()
         
     except Exception as e:
         logging.error(f"下载错误: {str(e)}")
         state.status = f"错误: {str(e)}"
         state.is_downloading = False
+        safe_sync_session()
     finally:
-        sync_session_state()
+        safe_sync_session()
 
 # Streamlit界面
-init_session_state()
 st.title("🚀 磁力链接下载器")
 
 with st.form("magnet_form"):
@@ -148,9 +183,9 @@ with st.form("magnet_form"):
             save_dir = "./downloads"
             os.makedirs(save_dir, exist_ok=True)
             
-            state = DownloadState()
-            state.reset()
-            sync_session_state()
+            # 启动前同步状态
+            DownloadState().reset()
+            safe_sync_session()
             
             threading.Thread(
                 target=download_worker,
@@ -158,8 +193,8 @@ with st.form("magnet_form"):
                 daemon=True
             ).start()
 
-# 状态显示
-sync_session_state()
+# 实时状态显示
+safe_sync_session()
 
 if st.session_state.download['is_downloading']:
     cols = st.columns([1,3])
@@ -189,7 +224,7 @@ if st.session_state.download['complete']:
 if 'monitor' not in st.session_state:
     def status_monitor():
         while True:
-            sync_session_state()
+            safe_sync_session()
             time.sleep(0.5)
     
     threading.Thread(target=status_monitor, daemon=True).start()