Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

refactor(cronexpr): 用字段规格表合并 Parse 中五段重复的解析与错误包装 (#251)

fx-kurumib79dcb8ca04a
diff --git a/internal/cronexpr/cron.go b/internal/cronexpr/cron.go
index 5697559a..758f2942 100644
--- a/internal/cronexpr/cron.go
+++ b/internal/cronexpr/cron.go
@@ -22,36 +22,38 @@ type Schedule struct {
dayStar, dowStar bool
}
+// fieldSpecs lists the five cron fields in expression order with their
+// display name (used to prefix parse errors) and inclusive value range.
+var fieldSpecs = [5]struct {
+ name string
+ min, max int
+}{
+ {"分钟", 0, 59},
+ {"小时", 0, 23},
+ {"日", 1, 31},
+ {"月", 1, 12},
+ {"周", 0, 7},
+}
+
func Parse(expr string) (Schedule, error) {
fields := strings.Fields(strings.TrimSpace(expr))
- if len(fields) != 5 {
+ if len(fields) != len(fieldSpecs) {
return Schedule{}, fmt.Errorf("cron 需为 5 段(分 时 日 月 周),例如 0 * * * *")
}
- min, err := parseField(fields[0], 0, 59)
- if err != nil {
- return Schedule{}, fmt.Errorf("分钟: %w", err)
- }
- hour, err := parseField(fields[1], 0, 23)
- if err != nil {
- return Schedule{}, fmt.Errorf("小时: %w", err)
- }
- day, err := parseField(fields[2], 1, 31)
- if err != nil {
- return Schedule{}, fmt.Errorf("日: %w", err)
- }
- month, err := parseField(fields[3], 1, 12)
- if err != nil {
- return Schedule{}, fmt.Errorf("月: %w", err)
- }
- dow, err := parseField(fields[4], 0, 7)
- if err != nil {
- return Schedule{}, fmt.Errorf("周: %w", err)
+ var bits [len(fieldSpecs)]uint64
+ for i, spec := range fieldSpecs {
+ b, err := parseField(fields[i], spec.min, spec.max)
+ if err != nil {
+ return Schedule{}, fmt.Errorf("%s: %w", spec.name, err)
+ }
+ bits[i] = b
}
+ dow := bits[4]
if dow&(1<<7) != 0 {
dow |= 1 << 0
}
return Schedule{
- min: min, hour: hour, day: day, month: month, dow: dow,
+ min: bits[0], hour: bits[1], day: bits[2], month: bits[3], dow: dow,
dayStar: strings.HasPrefix(fields[2], "*"),
dowStar: strings.HasPrefix(fields[4], "*"),
}, nil
diff --git a/internal/cronexpr/cron_test.go b/internal/cronexpr/cron_test.go
index 606da1d9..3423c260 100644
--- a/internal/cronexpr/cron_test.go
+++ b/internal/cronexpr/cron_test.go
@@ -131,3 +131,37 @@ func TestNextReportsImpossibleSchedules(t *testing.T) {
t.Fatal("parse errors should propagate")
}
}
+
+func TestParseErrorNamesTheFailingField(t *testing.T) {
+ cases := []struct {
+ expr string
+ want string
+ }{
+ {"60 * * * *", "分钟: 超出 0-59"},
+ {"* 24 * * *", "小时: 超出 0-23"},
+ {"* * 0 * *", "日: 超出 1-31"},
+ {"* * * 13 *", "月: 超出 1-12"},
+ {"* * * * 8", "周: 超出 0-7"},
+ {"*/0 * * * *", "分钟: 步长无效"},
+ {"* x * * *", "小时: 不是数字"},
+ {"* * 1-2-3 * *", "日: 范围无效"},
+ {"* * * 1,,2 *", "月: 无效分段"},
+ }
+ for _, tc := range cases {
+ _, err := Parse(tc.expr)
+ if err == nil || err.Error() != tc.want {
+ t.Errorf("Parse(%q) error = %v, want %q", tc.expr, err, tc.want)
+ }
+ }
+}
+
+func TestParseSetsEveryFieldInOrder(t *testing.T) {
+ sched, err := Parse("5 6 7 8 2")
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := Schedule{min: 1 << 5, hour: 1 << 6, day: 1 << 7, month: 1 << 8, dow: 1 << 2}
+ if sched != want {
+ t.Fatalf("Parse = %+v, want %+v", sched, want)
+ }
+}