Update app.py

app.py

@@ -1,35 +1,53 @@
 import streamlit as st
-import pyaria2
+import aria2p  # 改用更稳定的 aria2p 库
 import time
 import threading
 import os
 from pathlib import Path
 
-# Aria2 RPC 配置
-ARIA2_RPC_URL = "http://localhost:6800/rpc"
-ARIA2_SECRET = "SECRET_KEY"  # 建议修改为随机字符串
+# Aria2 配置
+ARIA2_RPC_HOST = "http://localhost"
+ARIA2_RPC_PORT = 6800
+ARIA2_SECRET = "SECRET_KEY"
 
 # 初始化 aria2 连接
 def init_aria2():
     try:
-        aria2 = pyaria2.Aria2(ARIA2_RPC_URL, secret=ARIA2_SECRET)
-        aria2.getVersion()  # 测试连接
-        return aria2
-    except:
-        # 自动启动 aria2 进程（后台模式）
-        aria2_dir = os.path.expanduser("~/.aria2")
-        os.makedirs(aria2_dir, exist_ok=True)
-        
-        cmd = f"aria2c --enable-rpc --rpc-listen-all=true --rpc-secret={ARIA2_SECRET} "
-        cmd += f"--dir={os.path.abspath('./downloads')} --daemon=true "
-        cmd += "--max-concurrent-downloads=3 --max-connection-per-server=16 "
-        cmd += "--split=16 --min-split-size=1M --file-allocation=none"
+        # 自动启动 aria2 后台进程
+        if not os.popen("pgrep aria2c").read():
+            download_dir = os.path.abspath("./downloads")
+            os.makedirs(download_dir, exist_ok=True)
+            
+            cmd = [
+                "aria2c",
+                "--enable-rpc",
+                f"--rpc-listen-port={ARIA2_RPC_PORT}",
+                f"--rpc-secret={ARIA2_SECRET}",
+                f"--dir={download_dir}",
+                "--daemon=true",
+                "--max-concurrent-downloads=5",
+                "--split=16",
+                "--max-connection-per-server=16",
+                "--file-allocation=prealloc"
+            ]
+            threading.Thread(target=lambda: os.system(" ".join(cmd))).start()
+            time.sleep(2)
         
-        threading.Thread(target=lambda: os.system(cmd)).start()
-        time.sleep(2)  # 等待服务启动
-        return pyaria2.Aria2(ARIA2_RPC_URL, secret=ARIA2_SECRET)
+        # 初始化 API 客户端
+        return aria2p.Client(
+            host=ARIA2_RPC_HOST,
+            port=ARIA2_RPC_PORT,
+            secret=ARIA2_SECRET
+        )
+    except Exception as e:
+        st.error(f"初始化失败: {str(e)}")
+        raise
 
 # Session 状态初始化
+if 'aria_client' not in st.session_state:
+    st.session_state.aria_client = init_aria2()
+if 'aria_api' not in st.session_state:
+    st.session_state.aria_api = aria2p.API(st.session_state.aria_client)
 if 'download_progress' not in st.session_state:
     st.session_state.download_progress = 0
 if 'downloading' not in st.session_state:
@@ -40,65 +58,41 @@ if 'download_filename' not in st.session_state:
     st.session_state.download_filename = None
 if 'error_message' not in st.session_state:
     st.session_state.error_message = None
-if 'aria2' not in st.session_state:
-    st.session_state.aria2 = init_aria2()
 
 def download_torrent(magnet_link):
     try:
         # 添加下载任务
-        options = {
-            "max-download-limit": "0",  # 不限速
-            "seed-time": "0",           # 下载完成后不做种
-            "bt-detach-seed-only": "true"
-        }
-        gid = st.session_state.aria2.addUri(
-            [magnet_link],
-            options=options
+        download = st.session_state.aria_api.add_magnet(
+            magnet_link,
+            options={
+                "max-download-limit": "0",
+                "seed-time": "0",
+                "bt-detach-seed-only": "true"
+            }
         )
         
         st.session_state.error_message = None
         st.session_state.downloading = True
         
-        # 进度监控循环
-        while True:
-            status = st.session_state.aria2.tellStatus(gid)
-            total = int(status['totalLength'])
-            downloaded = int(status['completedLength'])
-            
-            if total > 0:
-                progress = (downloaded / total) * 100
-            else:
-                progress = 0
-                
-            st.session_state.download_progress = progress
+        # 进度监控
+        while download.is_active:
+            download.update()
+            st.session_state.download_progress = download.progress * 100
             
-            # 完成判断
-            if status['status'] == 'complete':
-                st.session_state.download_complete = True
-                st.session_state.download_filename = status['files'][0]['path']
-                break
-                
-            # 超时处理（10分钟无进度）
-            if time.time() - int(status['updateTime']) > 600:
-                raise TimeoutError("下载超时")
-                
-            # 用户取消
-            if not st.session_state.downloading:
-                st.session_state.aria2.remove(gid)
-                break
-                
+            # 自动刷新间隔
             time.sleep(1)
-
-        st.session_state.downloading = False
+            
+        if download.is_complete:
+            st.session_state.download_complete = True
+            st.session_state.download_filename = download.files[0].path
+        else:
+            raise Exception(download.error_message)
 
     except Exception as e:
         st.session_state.error_message = f"下载失败: {str(e)}"
+    finally:
         st.session_state.downloading = False
-        st.session_state.download_complete = False
 
-def start_download_thread(magnet_link):
-    thread = threading.Thread(target=download_torrent, args=(magnet_link,))
-    thread.start()
 
 # 界面布局
 st.title("磁力链接下载器 🧲 (Aria2版)")