From 9536d3f9b5d0c008e95a161f9ae3caaba8a5def6 Mon Sep 17 00:00:00 2001 From: yan Date: Sun, 18 Jan 2026 13:17:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(FullyAutoAndSemiAutoTools):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=B7=AF=E5=BE=84=E6=89=A7=E8=A1=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在runList函数中增加了current_name和parent_name参数用于日志记录 - 修改了日志输出格式以显示正确的父名称和当前名称 - 更新了runList调用以传递必要的参数 - 清理了排序相关的todo注释 --- repo/js/FullyAutoAndSemiAutoTools/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo/js/FullyAutoAndSemiAutoTools/main.js b/repo/js/FullyAutoAndSemiAutoTools/main.js index fdc1d04e5..e7d6521bc 100644 --- a/repo/js/FullyAutoAndSemiAutoTools/main.js +++ b/repo/js/FullyAutoAndSemiAutoTools/main.js @@ -611,7 +611,7 @@ async function initRun(config_run) { let groups = groupByParentAndName(matchedPaths); // 支持多条规则,例如: "parentName->name1=1,parentName->name2=2" const orderStr = settings.order_rules ||"parentName->name=1" - // todo: 排序 + // 排序 const orderMap = new Map() orderStr.split(",").forEach(item => { const [key, order] = item.split("="); @@ -1459,7 +1459,7 @@ async function runPath(path) { * @param {Array} list - 要执行的路径列表,默认为空数组 * @returns {Promise} */ -async function runList(list = [], key = "") { +async function runList(list = [], key = "", current_name="", parent_name="") { // 参数验证 if (!Array.isArray(list)) { log.warn('无效的路径列表参数: {list}', list); @@ -1476,7 +1476,7 @@ async function runList(list = [], key = "") { const onePath = list[i]; const path = onePath.path; if (i === 0) { - log.info(`[{mode}] 开始执行[{1}-{2}]列表`, settings.mode, onePath.parent_name, onePath.current_name); + log.info(`[{mode}] 开始执行[{1}-{2}]列表`, settings.mode, parent_name, current_name); } log.info('正在执行第{index}/{total}个路径: {path}', i + 1, list.length, path); if (auto.semi && auto.skip) { @@ -1529,7 +1529,7 @@ async function runMap(map = new Map()) { log.debug(`[{0}] {1}组 开始执行...`, settings.mode, key); // 执行当前任务关联的路径列表 - await runList(one.paths, key); + await runList(one.paths, key,one.current_name,one.parent_name); Record.groupPaths.add({ name: key, paths: new Set(one.paths)