Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

utils: fix subtask parser

Browse Source
This commit is contained in:
undefined committed 2023-10-12 11:59:34 +08:00
1 parent ed396dc529
commit 6cce9784d4
1 file changed
+3
Download Patch File Download Diff File Expand all files Collapse all files
packages/utils/lib/common.ts
+3
View File
@@ -314,6 +314,7 @@ export function readSubtasksFromFiles(files: string[], config) {
const subtask: Record<number, ParsedSubtask> = {}; const subtask: Record<number, ParsedSubtask> = {};
for (const s of config.subtasks || []) if (s.id) subtask[s.id] = s; for (const s of config.subtasks || []) if (s.id) subtask[s.id] = s;
for (const file of files) { for (const file of files) {
let match = false;
for (const rule of SubtaskMatcher) { for (const rule of SubtaskMatcher) {
const data = rule.regex.exec(file); const data = rule.regex.exec(file);
if (!data) continue; if (!data) continue;
@@ -324,6 +325,7 @@ export function readSubtasksFromFiles(files: string[], config) {
if (config.noOutputFile) c.output = '/dev/null'; if (config.noOutputFile) c.output = '/dev/null';
else c.output = func(data); else c.output = func(data);
if (c.output === '/dev/null' || files.includes(c.output)) { if (c.output === '/dev/null' || files.includes(c.output)) {
match = true;
if (!subtask[sid]) { if (!subtask[sid]) {
subtask[sid] = { subtask[sid] = {
time: config.time, time: config.time,
@@ -336,6 +338,7 @@ export function readSubtasksFromFiles(files: string[], config) {
break; break;
} }
} }
if (match) break;
} }
} }
return Object.values(subtask); return Object.values(subtask);