diff --git a/docs/continuous-only.md b/docs/continuous-only.md index 18dfac21..5b64ad63 100644 --- a/docs/continuous-only.md +++ b/docs/continuous-only.md @@ -2,6 +2,8 @@ dev 分支仅提供持续正式处理:保存并启动正式处理 → 扫描已有及新增一级子目录 → 校验完整性/稳定性 → 每个 Capture 独立正式 Run。暂停新数据接入不取消已有任务,也不保存未确认的配置编辑。 +默认 IMU 扫描规则兼容 `imu.csv`、`_imu.csv` 和 `_imu_part<数字>.csv`(大小写不敏感,允许放在 part 子目录)。只做明确命名匹配,不使用模糊猜测,不把标定 YAML/JSON 或备份扩展名当作 IMU;仍检查空文件及文件稳定性。此规则不改变 Capture 分组,不替代下游视频/PTS/IMU 配对与内容校验,也不修改用户自定义 `requiredPatterns`。暂停的监听不会因升级而自动恢复,历史接入记录在下次实际扫描时重新判定。 + 项目页统一使用“启动正式处理 / 处理设置 / 暂停新数据接入 / 恢复正式处理”。执行记录仅用于查看,入口为“查看接入状态”,不再提供第二个启动按钮。已启用与实际执行、等待调度、等待人工、失败和交付数量分开显示。 已退役的公共写入口:`POST /api/workflows/{id}/run`、`POST /api/workflow-releases/{id}/runs`、`POST /api/runs/{id}/rerun-subtree`、`POST /api/scan-configs/{id}/run`、`POST /api/data-collection-tasks/{id}/start`、旧 POC 手动工作流验收启动接口、API 代理中的通用 Run retry。失败处理使用 Capture 接入记录中的受控操作,保留审计原因。 diff --git a/internal/worker/capture_automation.go b/internal/worker/capture_automation.go index 0b4003ff..2eb8ff61 100644 --- a/internal/worker/capture_automation.go +++ b/internal/worker/capture_automation.go @@ -49,7 +49,7 @@ var defaultOrbbecCaptureRequirements = []captureRequirement{ {Name: "右相机视频", Pattern: `(?i)(^|/).*camera_right.*\.(mp4|mov|mkv)$`}, {Name: "左相机 PTS", Pattern: `(?i)(^|/).*camera_left.*pts\.csv$`}, {Name: "右相机 PTS", Pattern: `(?i)(^|/).*camera_right.*pts\.csv$`}, - {Name: "IMU", Pattern: `(?i)(^|/).*imu\.csv$`}, + {Name: "IMU", Pattern: `(?i)(^|/)([^/]*_)?imu(?:_part[0-9]+)?\.csv$`}, {Name: "相机标定", Pattern: `(?i)(^|/).*calibration_camera(?:\.(yaml|yml|json))?$`}, {Name: "IMU 标定", Pattern: `(?i)(^|/).*calibration_imu(?:\.(yaml|yml|json))?$`}, } diff --git a/internal/worker/capture_automation_test.go b/internal/worker/capture_automation_test.go index 53c96362..92b97037 100644 --- a/internal/worker/capture_automation_test.go +++ b/internal/worker/capture_automation_test.go @@ -37,6 +37,61 @@ func completeCaptureObjects(root, captureID string) []captureObject { } } +func TestCaptureIMURecognizesLegacyAndSegmentNames(t *testing.T) { + for _, tc := range []struct { + name string + valid bool + }{ + {"imu.csv", true}, + {"Orbbec_Ego_AZER76400EH_19700101_000046_imu.csv", true}, + {"part0001/FYLX_S03_AZEC8640166_19700101_000304_imu_part0001.csv", true}, + {"part0015/FYLX_S03_AZEC8640166_19700102_171436_imu_part0015.csv", true}, + {"part0015/CAPTURE_IMU_PART0015.CSV", true}, + {"calibration_imu.yaml", false}, + {"capture_imu_part0001.csv.bak", false}, + {"capture_imu_partabc.csv", false}, + {"capture_imu_part0001_pts.csv", false}, + {"notimu.csv", false}, + } { + t.Run(tc.name, func(t *testing.T) { + objects := completeCaptureObjects("incoming", "capture") + objects[4].Key = "incoming/capture/" + tc.name + groups, err := discoverCaptureGroups(objects, normalizedCaptureAutomation(&domain.CaptureAutomationConfig{Prefix: "incoming"})) + if err != nil || len(groups) != 1 { + t.Fatalf("groups=%v err=%v", groups, err) + } + missing := false + for _, name := range groups[0].Missing { + if name == "IMU" { + missing = true + } + } + if missing == tc.valid { + t.Fatalf("name=%s valid=%v missing=%v", tc.name, tc.valid, groups[0].Missing) + } + }) + } +} + +func TestCaptureSegmentIMUStillRejectsEmptyAndDoesNotFillOtherCapture(t *testing.T) { + objects := completeCaptureObjects("incoming", "a") + objects[4].Key = "incoming/a/part0001/a_imu_part0001.csv" + objects[4].Size = 0 + other := completeCaptureObjects("incoming", "b") + other[4].Key = "incoming/b/readme.txt" + objects = append(objects, other...) + groups, err := discoverCaptureGroups(objects, normalizedCaptureAutomation(&domain.CaptureAutomationConfig{Prefix: "incoming"})) + if err != nil || len(groups) != 2 { + t.Fatalf("groups=%v err=%v", groups, err) + } + if len(groups[0].Missing) != 1 || groups[0].Missing[0] != "空文件 part0001/a_imu_part0001.csv" { + t.Fatalf("empty IMU accepted: %v", groups[0].Missing) + } + if len(groups[1].Missing) != 1 || groups[1].Missing[0] != "IMU" { + t.Fatalf("cross-Capture IMU matched: %v", groups[1].Missing) + } +} + func TestCaptureRejectsEmptyLaterPTSSegment(t *testing.T) { objects := completeCaptureObjects("incoming", "capture") objects = append(objects, captureObject{Key: "incoming/capture/camera_right_part0004_pts.csv", Size: 0})