Update app.py

app.py

@@ -1,10 +1,35 @@
 import streamlit as st
-import libtorrent as lt
+import pyaria2
 import time
 import threading
 import os
+from pathlib import Path
 
-# Session状态初始化
+# Aria2 RPC 配置
+ARIA2_RPC_URL = "http://localhost:6800/rpc"
+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"
+        
+        threading.Thread(target=lambda: os.system(cmd)).start()
+        time.sleep(2)  # 等待服务启动
+        return pyaria2.Aria2(ARIA2_RPC_URL, secret=ARIA2_SECRET)
+
+# Session 状态初始化
 if 'download_progress' not in st.session_state:
     st.session_state.download_progress = 0
 if 'downloading' not in st.session_state:
@@ -15,72 +40,68 @@ 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, save_path):
+def download_torrent(magnet_link):
     try:
-        ses = lt.session()
-        ses.listen_on(6881, 6891)
-        params = {
-            'save_path': save_path,
-            'storage_mode': lt.storage_mode_t(2)
+        # 添加下载任务
+        options = {
+            "max-download-limit": "0",  # 不限速
+            "seed-time": "0",           # 下载完成后不做种
+            "bt-detach-seed-only": "true"
         }
+        gid = st.session_state.aria2.addUri(
+            [magnet_link],
+            options=options
+        )
         
-        handle = lt.add_magnet_uri(ses, magnet_link, params)
-        ses.start_dht()
-        ses.start_lsd()
-        ses.start_upnp()
-        ses.start_natpmp()
-
-        # 等待元数据
-        st.session_state.error_message = "正在获取元数据..."
-        while not handle.has_metadata():
-            time.sleep(1)
-            if not st.session_state.downloading:
-                return
-
-        # 获取文件信息
-        torinfo = handle.get_torrent_info()
-        files = torinfo.files()
-        if files.num_files() > 1:
-            st.session_state.error_message = "暂不支持多文件种子"
-            st.session_state.downloading = False
-            return
-
-        file_path = files.file_path(0)
-        st.session_state.download_filename = os.path.join(save_path, file_path)
-
         st.session_state.error_message = None
         st.session_state.downloading = True
-
-        # 更新下载进度
-        while handle.status().state != lt.torrent_status.seeding:
-            if not st.session_state.downloading:
-                handle.pause()
-                return
-            s = handle.status()
-            progress = s.progress * 100
+        
+        # 进度监控循环
+        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
-            time.sleep(0.5)
+            
+            # 完成判断
+            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.download_progress = 100
-        st.session_state.download_complete = True
         st.session_state.downloading = False
 
     except Exception as e:
-        st.session_state.error_message = f"下载出错：{str(e)}"
+        st.session_state.error_message = f"下载失败: {str(e)}"
         st.session_state.downloading = False
         st.session_state.download_complete = False
 
 def start_download_thread(magnet_link):
-    save_path = './downloads'
-    if not os.path.exists(save_path):
-        os.makedirs(save_path)
-    
-    thread = threading.Thread(target=download_torrent, args=(magnet_link, save_path))
+    thread = threading.Thread(target=download_torrent, args=(magnet_link,))
     thread.start()
 
 # 界面布局
-st.title("磁力链接下载器 🧲")
+st.title("磁力链接下载器 🧲 (Aria2版)")
 
 with st.form("magnet_form"):
     magnet_link = st.text_input("输入磁力链接：", placeholder="magnet:?xt=urn:btih:...")
@@ -118,28 +139,26 @@ if st.session_state.error_message:
 
 if st.session_state.download_complete:
     st.success("下载完成！✅")
-    if st.session_state.download_filename and os.path.exists(st.session_state.download_filename):
-        file_size = os.path.getsize(st.session_state.download_filename)
+    if st.session_state.download_filename and Path(st.session_state.download_filename).exists():
+        file_path = Path(st.session_state.download_filename)
+        file_size = file_path.stat().st_size
         st.write(f"文件大小：{file_size/1024/1024:.2f} MB")
         
-        with open(st.session_state.download_filename, "rb") as f:
+        with open(file_path, "rb") as f:
             st.download_button(
                 label="下载文件",
                 data=f,
-                file_name=os.path.basename(st.session_state.download_filename),
+                file_name=file_path.name,
                 mime="application/octet-stream"
             )
     else:
         st.error("文件不存在，可能下载失败")
 
-# 注意事项提示
+# 注意事项
 st.markdown("---")
 st.info("""
 **使用说明：**
-1. 输入有效的磁力链接（必须以'magnet:?xt='开头）
-2. 点击开始下载按钮
-3. 下载完成后会出现文件下载按钮
-4. 大文件下载可能需要较长时间，请保持页面开启
-
-**注意：** 下载速度取决于种子可用性和网络环境
+1. 确保已安装 aria2：`brew install aria2` (macOS) 或 `sudo apt install aria2` (Linux)
+2. 首次运行会自动启动 aria2 后台服务
+3. 下载文件将保存到当前目录的 downloads 文件夹
 """)