From 17aa795b3e2d4c07a45bf4026df0684154ea1751 Mon Sep 17 00:00:00 2001 From: PKC278 <52959804+PKC278@users.noreply.github.com> Date: Fri, 20 Mar 2026 11:47:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20add=5Fdownload=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=20torren?= =?UTF-8?q?t=5Furl=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86=E5=92=8C=E5=8F=8D=E9=A6=88=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/agent/tools/impl/add_download.py | 240 ++++++++++++++----- app/agent/tools/impl/query_download_tasks.py | 14 +- app/chain/download.py | 13 +- skills/moviepilot-cli/SKILL.md | 7 +- 4 files changed, 203 insertions(+), 71 deletions(-) diff --git a/app/agent/tools/impl/add_download.py b/app/agent/tools/impl/add_download.py index 8347c30d..37ad56eb 100644 --- a/app/agent/tools/impl/add_download.py +++ b/app/agent/tools/impl/add_download.py @@ -1,7 +1,8 @@ """添加下载工具""" import re -from typing import Optional, Type +from pathlib import Path +from typing import List, Optional, Type from pydantic import BaseModel, Field @@ -12,17 +13,18 @@ from app.core.config import settings from app.core.context import Context from app.core.metainfo import MetaInfo from app.db.site_oper import SiteOper +from app.helper.directory import DirectoryHelper from app.log import logger -from app.schemas import TorrentInfo +from app.schemas import TorrentInfo, FileURI from app.utils.crypto import HashUtils class AddDownloadInput(BaseModel): """添加下载工具的输入参数模型""" explanation: str = Field(..., description="Clear explanation of why this tool is being used in the current context") - torrent_url: str = Field( + torrent_url: List[str] = Field( ..., - description="torrent_url in hash:id format (obtainable from get_search_results tool per-item results)" + description="One or more torrent_url values. Values matching the hash:id pattern from get_search_results are treated as internal references; other values must be direct torrent URLs or magnet links." ) downloader: Optional[str] = Field(None, description="Name of the downloader to use (optional, uses default if not specified)") @@ -34,18 +36,27 @@ class AddDownloadInput(BaseModel): class AddDownloadTool(MoviePilotTool): name: str = "add_download" - description: str = "Add torrent download task to the configured downloader (qBittorrent, Transmission, etc.) using torrent_url reference from get_search_results results." + description: str = "Add torrent download task to the configured downloader (qBittorrent, Transmission, etc.) using hash:id references from get_search_results or direct torrent URLs / magnet links." args_schema: Type[BaseModel] = AddDownloadInput def get_tool_message(self, **kwargs) -> Optional[str]: """根据下载参数生成友好的提示消息""" - torrent_url = kwargs.get("torrent_url") + torrent_urls = self._normalize_torrent_urls(kwargs.get("torrent_url")) downloader = kwargs.get("downloader") - - message = f"正在添加下载任务: 资源 {torrent_url}" + + if torrent_urls: + if len(torrent_urls) == 1: + if self._is_torrent_ref(torrent_urls[0]): + message = f"正在添加下载任务: 资源 {torrent_urls[0]}" + else: + message = "正在添加下载任务: 直链或磁力链接" + else: + message = f"正在批量添加下载任务: 共 {len(torrent_urls)} 个资源" + else: + message = "正在添加下载任务" if downloader: message += f" [下载器: {downloader}]" - + return message @staticmethod @@ -62,6 +73,14 @@ class AddDownloadTool(MoviePilotTool): return False return bool(re.fullmatch(r"[0-9a-f]{7}:\d+", str(torrent_ref).strip())) + @staticmethod + def _is_direct_download_url(torrent_url: Optional[str]) -> bool: + """判断是否为允许直传下载器的下载内容""" + if not torrent_url: + return False + value = str(torrent_url).strip() + return value.startswith("http://") or value.startswith("https://") or value.startswith("magnet:") + @classmethod def _resolve_cached_context(cls, torrent_ref: str) -> Optional[Context]: """从最近一次搜索缓存中解析种子上下文，仅支持 hash:id 格式""" @@ -96,72 +115,163 @@ class AddDownloadTool(MoviePilotTool): return ",".join(user_labels) if user_labels else None - async def run(self, torrent_url: Optional[str] = None, + @staticmethod + def _format_failed_result(failed_messages: List[str]) -> str: + """统一格式化失败结果""" + return ", ".join([message for message in failed_messages if message]) + + @staticmethod + def _build_failure_message(torrent_ref: str, error_msg: Optional[str] = None) -> str: + """构造失败提示""" + normalized_error = (error_msg or "").strip() + prefix = "添加种子任务失败：" + if normalized_error.startswith(prefix): + normalized_error = normalized_error[len(prefix):].lstrip() + if AddDownloadTool._is_direct_download_url(normalized_error): + normalized_error = "" + if normalized_error: + return f"{torrent_ref} {normalized_error}" + if AddDownloadTool._is_torrent_ref(torrent_ref): + return torrent_ref + return "" + + @classmethod + def _normalize_torrent_urls(cls, torrent_url: Optional[List[str] | str]) -> List[str]: + """统一规范 torrent_url 输入，保留所有非空值""" + if torrent_url is None: + return [] + + if isinstance(torrent_url, str): + candidates = torrent_url.split(",") + else: + candidates = torrent_url + + return [str(item).strip() for item in candidates if item and str(item).strip()] + + @staticmethod + def _resolve_direct_download_dir(save_path: Optional[str]) -> Optional[Path]: + """解析直接下载使用的目录，优先使用 save_path，其次使用默认下载目录""" + if save_path: + return Path(save_path) + + download_dirs = DirectoryHelper().get_download_dirs() + if not download_dirs: + return None + + dir_conf = download_dirs[0] + if not dir_conf.download_path: + return None + + return Path(FileURI(storage=dir_conf.storage or "local", path=dir_conf.download_path).uri) + + async def run(self, torrent_url: Optional[List[str]] = None, downloader: Optional[str] = None, save_path: Optional[str] = None, labels: Optional[str] = None, **kwargs) -> str: logger.info( f"执行工具: {self.name}, 参数: torrent_url={torrent_url}, downloader={downloader}, save_path={save_path}, labels={labels}") try: - if not torrent_url or not self._is_torrent_ref(torrent_url): - return "错误：torrent_url 必须是 get_search_results 返回的 hash:id 引用，请先使用 search_torrents 搜索，再通过 get_search_results 筛选后选择。" + torrent_inputs = self._normalize_torrent_urls(torrent_url) + if not torrent_inputs: + return "错误：torrent_url 不能为空。" - cached_context = self._resolve_cached_context(torrent_url) - if not cached_context or not cached_context.torrent_info: - return "错误：torrent_url 无效，请重新使用 search_torrents 搜索" - - cached_torrent = cached_context.torrent_info - site_name = cached_torrent.site_name - torrent_title = cached_torrent.title - torrent_description = cached_torrent.description - torrent_url = cached_torrent.enclosure - - # 使用DownloadChain添加下载 download_chain = DownloadChain() - - # 根据站点名称查询站点cookie - if not site_name: - return "错误：必须提供站点名称，请从搜索资源结果信息中获取" - siteinfo = await SiteOper().async_get_by_name(site_name) - if not siteinfo: - return f"错误：未找到站点信息：{site_name}" - - # 创建下载上下文 - torrent_info = TorrentInfo( - title=torrent_title, - description=torrent_description, - enclosure=torrent_url, - site_name=site_name, - site_ua=siteinfo.ua, - site_cookie=siteinfo.cookie, - site_proxy=siteinfo.proxy, - site_order=siteinfo.pri, - site_downloader=siteinfo.downloader - ) - meta_info = MetaInfo(title=torrent_title, subtitle=torrent_description) - media_info = cached_context.media_info if cached_context and cached_context.media_info else None - if not media_info: - media_info = await ToolChain().async_recognize_media(meta=meta_info) - if not media_info: - return "错误：无法识别媒体信息，无法添加下载任务" - context = Context( - torrent_info=torrent_info, - meta_info=meta_info, - media_info=media_info - ) - merged_labels = self._merge_labels_with_system_tag(labels) + success_count = 0 + failed_messages = [] - did = download_chain.download_single( - context=context, - downloader=downloader, - save_path=save_path, - label=merged_labels - ) - if did: - return f"成功添加下载任务：{torrent_title}" - else: - return "添加下载任务失败" + for torrent_input in torrent_inputs: + if self._is_torrent_ref(torrent_input): + cached_context = self._resolve_cached_context(torrent_input) + if not cached_context or not cached_context.torrent_info: + failed_messages.append(f"{torrent_input} 引用无效，请重新使用 get_search_results 查看搜索结果") + continue + + cached_torrent = cached_context.torrent_info + site_name = cached_torrent.site_name + torrent_title = cached_torrent.title or torrent_input + torrent_description = cached_torrent.description + enclosure = cached_torrent.enclosure + + if not site_name: + failed_messages.append(f"{torrent_input} 缺少站点名称") + continue + + siteinfo = await SiteOper().async_get_by_name(site_name) + if not siteinfo: + failed_messages.append(f"{torrent_input} 未找到站点信息 {site_name}") + continue + + torrent_info = TorrentInfo( + title=torrent_title, + description=torrent_description, + enclosure=enclosure, + site_name=site_name, + site_ua=siteinfo.ua, + site_cookie=siteinfo.cookie, + site_proxy=siteinfo.proxy, + site_order=siteinfo.pri, + site_downloader=siteinfo.downloader + ) + meta_info = MetaInfo(title=torrent_title, subtitle=torrent_description) + media_info = cached_context.media_info if cached_context.media_info else None + if not media_info: + media_info = await ToolChain().async_recognize_media(meta=meta_info) + if not media_info: + failed_messages.append(f"{torrent_input} 无法识别媒体信息") + continue + + context = Context( + torrent_info=torrent_info, + meta_info=meta_info, + media_info=media_info + ) + else: + if not self._is_direct_download_url(torrent_input): + failed_messages.append( + f"{torrent_input} 不是有效的下载内容，非 hash:id 时仅支持 http://、https:// 或 magnet: 开头" + ) + continue + download_dir = self._resolve_direct_download_dir(save_path) + if not download_dir: + failed_messages.append(f"{torrent_input} 缺少保存路径，且系统未配置可用下载目录") + continue + result = download_chain.download( + content=torrent_input, + download_dir=download_dir, + cookie=None, + label=merged_labels, + downloader=downloader + ) + if result: + _, did, _, error_msg = result + else: + did, error_msg = None, "未找到下载器" + if did: + success_count += 1 + else: + failed_messages.append(self._build_failure_message(torrent_input, error_msg)) + continue + + did, error_msg = download_chain.download_single( + context=context, + downloader=downloader, + save_path=save_path, + label=merged_labels, + return_detail=True + ) + if did: + success_count += 1 + else: + failed_messages.append(self._build_failure_message(torrent_input, error_msg)) + + if success_count and not failed_messages: + return "任务添加成功" + + if success_count: + return f"部分任务添加失败：{self._format_failed_result(failed_messages)}" + + return f"任务添加失败：{self._format_failed_result(failed_messages)}" except Exception as e: logger.error(f"添加下载任务失败: {e}", exc_info=True) return f"添加下载任务时发生错误: {str(e)}" diff --git a/app/agent/tools/impl/query_download_tasks.py b/app/agent/tools/impl/query_download_tasks.py index 4d7c85e5..c0e87544 100644 --- a/app/agent/tools/impl/query_download_tasks.py +++ b/app/agent/tools/impl/query_download_tasks.py @@ -51,6 +51,18 @@ class QueryDownloadTasksTool(MoviePilotTool): return all_torrents + @staticmethod + def _format_progress(progress: Optional[float]) -> Optional[str]: + """ + 将下载进度格式化为保留一位小数的百分比字符串 + """ + try: + if progress is None: + return None + return f"{float(progress):.1f}%" + except (TypeError, ValueError): + return None + def get_tool_message(self, **kwargs) -> Optional[str]: """根据查询参数生成友好的提示消息""" downloader = kwargs.get("downloader") @@ -198,7 +210,7 @@ class QueryDownloadTasksTool(MoviePilotTool): "year": d.year, "season_episode": d.season_episode, "size": d.size, - "progress": d.progress, + "progress": self._format_progress(d.progress), "state": d.state, "upspeed": d.upspeed, "dlspeed": d.dlspeed, diff --git a/app/chain/download.py b/app/chain/download.py index 4bc4c4dd..51e2498a 100644 --- a/app/chain/download.py +++ b/app/chain/download.py @@ -152,7 +152,8 @@ class DownloadChain(ChainBase): save_path: Optional[str] = None, userid: Union[str, int] = None, username: Optional[str] = None, - label: Optional[str] = None) -> Optional[str]: + label: Optional[str] = None, + return_detail: bool = False) -> Union[Optional[str], Tuple[Optional[str], Optional[str]]]: """ 下载及发送通知 :param context: 资源上下文 @@ -166,6 +167,8 @@ class DownloadChain(ChainBase): :param userid: 用户ID :param username: 调用下载的用户名/插件名 :param label: 自定义标签 + :param return_detail: 是否返回详细结果；False 时返回下载任务 hash 或 None，True 时返回 (hash, error_msg) + :return: return_detail=False 时返回下载任务 hash 或 None；return_detail=True 时返回 (hash, error_msg) """ _torrent = context.torrent_info _media = context.media_info @@ -195,7 +198,7 @@ class DownloadChain(ChainBase): logger.debug( f"Resource download canceled by event: {event_data.source}," f"Reason: {event_data.reason}") - return None + return (None, "下载被事件取消") if return_detail else None # 如果事件修改了下载路径，使用新路径 if event_data.options and event_data.options.get("save_path"): save_path = event_data.options.get("save_path") @@ -227,7 +230,7 @@ class DownloadChain(ChainBase): torrent_content = cache_backend.get(torrent_file.as_posix(), region="torrents") if not torrent_content: - return None + return (None, "下载种子内容为空") if return_detail else None # 获取种子文件的文件夹名和文件清单 _folder_name, _file_list = TorrentHelper().get_fileinfo_from_torrent_content(torrent_content) @@ -259,7 +262,7 @@ class DownloadChain(ChainBase): logger.error(f"未找到下载目录：{_media.type.value} {_media.title_year}") self.messagehelper.put(f"{_media.type.value} {_media.title_year} 未找到下载目录！", title="下载失败", role="system") - return None + return (None, "未找到下载目录") if return_detail else None fileURI = FileURI(storage=storage, path=download_dir.as_posix()) download_dir = Path(fileURI.uri) @@ -388,6 +391,8 @@ class DownloadChain(ChainBase): f"错误信息：{error_msg}", image=_media.get_message_image(), userid=userid)) + if return_detail: + return _hash, error_msg return _hash def batch_download(self, diff --git a/skills/moviepilot-cli/SKILL.md b/skills/moviepilot-cli/SKILL.md index b098c338..4730a194 100644 --- a/skills/moviepilot-cli/SKILL.md +++ b/skills/moviepilot-cli/SKILL.md @@ -5,6 +5,8 @@ description: Use this skill when the user wants to find, download, or subscribe # MoviePilot CLI +> **Path note:** All script paths in this skill are relative to this skill file. + Use `scripts/mp-cli.js` to interact with the MoviePilot backend. ## Discover Commands @@ -78,7 +80,10 @@ node scripts/mp-cli.js query_subscribes tmdb_id=123456 # If already in library or subscribed, warn the user and ask for confirmation to proceed # 7. Add download -node scripts/mp-cli.js add_download torrent_url="..." +# Single item: +node scripts/mp-cli.js add_download torrent_url="abc1234:1" +# Multiple items: +node scripts/mp-cli.js add_download torrent_url="abc1234:1,def5678:2" ``` ### Add Subscription