root moves fixed future schedules to shceduled on automove

cmd/pttodo-cli/cli.go

@@ -14,6 +14,7 @@ import (
 	"sort"
 	"strings"
 	"syscall"
+	"time"
 
 	"gopkg.in/yaml.v2"
 )
@@ -172,14 +173,21 @@ func edit(dry bool, filepaths []string) error {
 		for i := range newTodos {
 			newTodoIDs[newTodos[i].ID()] = struct{}{}
 		}
+
 		for i := range original.Todo {
 			if _, ok := newTodoIDs[original.Todo[i].ID()]; !ok {
-				original.Done = append(original.Done, original.Todo[i])
+				original.Todo[i].TS = pttodo.TS(time.Now().Unix())
+				if string(original.Todo[i].Schedule) != "" && !original.Todo[i].Triggered() {
+					original.Scheduled = append(original.Scheduled, original.Todo[i])
+				} else {
+					original.Done = append(original.Done, original.Todo[i])
+				}
 			}
 		}
 		original.Todo = newTodos
 
 		original.AutoMove()
+
 		c, err := yaml.Marshal(original)
 		if err != nil {
 			return err

cmd/pttodo-cli/testdata/test.yaml

@@ -1,13 +1,20 @@
 todo:
-- b
+- todo: b
+  ts: Thu Mar 24 09:03:24 MDT 2022
 scheduled:
+- todo: due
+  schedule: "2022-05-01"
+  ts: Thu Mar 24 09:16:21 MDT 2022
+- todo: loop
+  schedule: 10s
+  ts: Thu Mar 24 09:17:11 MDT 2022
+done:
 - todo: abc
   schedule: "2022-05-01"
   ts: Wed Mar 23 08:03:45 MDT 2022
 - todo: def
   schedule: "2022-05-01"
   ts: Wed Mar 23 08:04:05 MDT 2022
-done:
 - todo: other
   ts: Wed Mar 23 09:44:57 MDT 2022
 - todo: b
@@ -18,3 +25,21 @@ done:
   ts: Wed Mar 23 09:45:24 MDT 2022
 - todo: a
   ts: Wed Mar 23 09:45:31 MDT 2022
+- todo: looper
+  schedule: 15s
+  ts: Thu Mar 24 09:01:41 MDT 2022
+- todo: looper
+  schedule: 15s
+  ts: Thu Mar 24 09:04:51 MDT 2022
+- todo: loop
+  schedule: 10s
+  ts: Thu Mar 24 09:06:59 MDT 2022
+- todo: due
+  schedule: "2022-02-01"
+  ts: Thu Mar 24 09:15:42 MDT 2022
+- todo: due
+  schedule: "2022-02-01"
+  ts: Thu Mar 24 09:16:53 MDT 2022
+- todo: due
+  schedule: "2022-03-01"
+  ts: Thu Mar 24 09:17:07 MDT 2022

pttodo/root.go

@@ -27,13 +27,14 @@ func (root *Root) AutoMove() {
 
 func (root *Root) MoveTodoToScheduled() {
 	for i := len(root.Todo) - 1; i >= 0; i-- {
-		if root.Todo[i].Schedule != "" && !root.Todo[i].Triggered() {
-			root.Scheduled = append(root.Scheduled, root.Todo[i])
-			for j := i; j < len(root.Todo)-1; j++ {
-				root.Todo[j] = root.Todo[j+1]
-			}
-			root.Todo = root.Todo[:len(root.Todo)-1]
+		if !root.Todo[i].Schedule.isFixedFuture() {
+			continue
 		}
+		root.Scheduled = append(root.Scheduled, root.Todo[i])
+		for j := i; j < len(root.Todo)-1; j++ {
+			root.Todo[j] = root.Todo[j+1]
+		}
+		root.Todo = root.Todo[:len(root.Todo)-1]
 	}
 }
 

pttodo/schedule.go

@@ -25,6 +25,42 @@ func (schedule Schedule) Next(t time.Time) (time.Time, error) {
 	return scheduler.next(t)
 }
 
+func (schedule Schedule) isFixedFuture() bool {
+	if !schedule.isFixed() {
+		return false
+	}
+	return schedule.isFuture()
+}
+
+func (schedule Schedule) isFixed() bool {
+	if schedule.empty() {
+		return false
+	}
+	scheduler := schedulerFactory(string(schedule))
+	switch scheduler.(type) {
+	case scheduleEZDate, scheduleDue:
+	default:
+		return false
+	}
+	return true
+}
+
+func (schedule Schedule) isFuture() bool {
+	if schedule.empty() {
+		return false
+	}
+	scheduler := schedulerFactory(string(schedule))
+	t, err := scheduler.next(time.Now())
+	if err != nil {
+		return false
+	}
+	return time.Now().Before(t)
+}
+
+func (schedule Schedule) empty() bool {
+	return string(schedule) == ""
+}
+
 type scheduler interface {
 	next(time.Time) (time.Time, error)
 }

pttodo/schedule_test.go

@@ -130,3 +130,60 @@ func TestSchedulerFactory(t *testing.T) {
 		}
 	})
 }
+
+func TestScheduleIsFixedFuture(t *testing.T) {
+	cases := map[string]struct {
+		input string
+		want  bool
+	}{
+		"empty": {
+			input: "",
+			want:  false,
+		},
+		"cron": {
+			input: "* * * * *",
+			want:  false,
+		},
+		"duration": {
+			input: "1m",
+			want:  false,
+		},
+		"due past": {
+			input: "123",
+			want:  false,
+		},
+		"due future": {
+			input: "9648154541",
+			want:  true,
+		},
+		"ez date short past": {
+			input: "2000-01-02",
+			want:  false,
+		},
+		"ez date short future": {
+			input: "2100-01-02",
+			want:  true,
+		},
+		"ez date long past": {
+			input: "2000-01-02T01",
+			want:  false,
+		},
+		"ez date long future": {
+			input: "2100-01-02T02",
+			want:  true,
+		},
+	}
+
+	for name, d := range cases {
+		c := d
+		t.Run(name, func(t *testing.T) {
+			schedule := Schedule(c.input)
+			got := schedule.isFixedFuture()
+			if got != c.want {
+				gotFuture := schedule.isFuture()
+				gotFixed := schedule.isFixed()
+				t.Errorf("want %v, got %v = %v && %v", c.want, got, gotFuture, gotFixed)
+			}
+		})
+	}
+}