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"
 )
@@ -25,6 +26,16 @@ const (
 	DUMP_DONE      = "done"
 )
 
+type config struct {
+	targets []string
+	mergeme string
+	root    string
+	tags    []string
+	search  string
+	edit    bool
+	dry     bool
+}
+
 func main() {
 	if err := _main(); err != nil {
 		panic(err)
@@ -32,42 +43,45 @@ func main() {
 }
 
 func _main() error {
+	config := getConfig()
+	if config.mergeme != "" {
+		if err := merge(config.dry, config.targets[0], config.mergeme); err != nil {
+			return err
+		}
+	}
+	if config.edit {
+		if err := edit(config.dry, config.targets); err != nil {
+			return err
+		}
+	}
+	return dump(config.dry, os.Stdout, config.targets, config.tags, config.search, config.root)
+}
+
+func getConfig() config {
 	defaultFilepath, ok := os.LookupEnv("PTTODO_FILE")
 	if !ok {
 		defaultFilepath = "./todo.yaml"
 	}
-	filepath := flag.String("f", defaultFilepath, "($PTTODO_FILE) path to yaml file or dir (starting with root then alphabetical for dir)")
+
-	filepathToMergeIn := flag.String("g", "", "path to yaml file to merge into -f (modifies f)")
+	var config config
-	root := flag.String("root", DUMP_TODO, "path to pretty print ("+fmt.Sprint([]string{DUMP_ALL, DUMP_TODO, DUMP_SCHEDULED, DUMP_DONE})+")")
+	var target string
-	tags := flag.String("tags", "", "csv of all tags to find, -tag to invert")
+	flag.StringVar(&target, "f", defaultFilepath, "($PTTODO_FILE) path to yaml file or dir (starting with root then alphabetical for dir)")
-	search := flag.String("search", "", "fts case insensitive")
+	flag.StringVar(&config.mergeme, "g", "", "path to yaml file to merge into -f (modifies f)")
-	e := flag.Bool("e", false, "edit file")
+	flag.StringVar(&config.root, "root", DUMP_TODO, "path to pretty print ("+fmt.Sprint([]string{DUMP_ALL, DUMP_TODO, DUMP_SCHEDULED, DUMP_DONE})+")")
-	dry := flag.Bool("dry", false, "dry run")
+	var tagss string
+	flag.StringVar(&tagss, "tags", "", "csv of all tags to find, -tag to invert")
+	flag.StringVar(&config.search, "search", "", "fts case insensitive")
+	flag.BoolVar(&config.edit, "e", false, "edit file")
+	flag.BoolVar(&config.dry, "dry", false, "dry run")
 	flag.Parse()
-	if *filepathToMergeIn != "" {
+
-		if err := merge(*dry, *filepath, *filepathToMergeIn); err != nil {
+	config.tags = strings.Split(tagss, ",")
-			return err
+	config.targets = []string{target}
+	if stat, err := os.Stat(target); err == nil && stat.IsDir() {
+		config.targets, _ = listDir(target)
 	}
-	}
+
-	filepaths := []string{*filepath}
+	return config
-	if stat, err := os.Stat(*filepath); err != nil && !os.IsNotExist(err) {
-		return err
-	} else if err == nil && stat.IsDir() {
-		filepaths, err = listDir(*filepath)
-		if err != nil {
-			return err
-		}
-	}
-	if *e {
-		if err := edit(*dry, filepaths); err != nil {
-			return err
-		}
-	}
-	var tagslist []string
-	if *tags != "" {
-		tagslist = strings.Split(*tags, ",")
-	}
-	return dump(*dry, os.Stdout, filepaths, tagslist, *search, *root)
 }
 
 func verifyRoot(root pttodo.Root) error {
@@ -96,6 +110,96 @@ func verifyFile(path string) error {
 }
 
 func edit(dry bool, filepaths []string) error {
+	tempDir, err := ioutil.TempDir(os.TempDir(), "edit-pttodo-*")
+	if err != nil {
+		return err
+	}
+	originals := map[string]pttodo.Root{}
+	for _, target := range filepaths {
+		var original pttodo.Root
+		if b, err := ioutil.ReadFile(target); err != nil && !os.IsNotExist(err) {
+			return err
+		} else if err := yaml.Unmarshal(b, &original); err != nil {
+			return err
+		} else if c, err := yaml.Marshal(original.Todo); err != nil {
+			return err
+		} else if err := ioutil.WriteFile(path.Join(tempDir, path.Base(target)), c, os.ModePerm); err != nil {
+			return err
+		}
+		originals[target] = original
+	}
+	if err := vimd(tempDir); err != nil {
+		return err
+	}
+	for _, target := range filepaths {
+		for {
+			err := func() error {
+				var todos []pttodo.Todo
+				if b, err := ioutil.ReadFile(path.Join(tempDir, path.Base(target))); err != nil {
+					return err
+				} else if err := yaml.Unmarshal(b, &todos); err != nil {
+					return err
+				}
+				return nil
+			}()
+			if err == nil {
+				break
+			}
+			log.Printf("%s, press <Enter> to resume editing", err)
+			b := make([]byte, 1)
+			if _, err := os.Stdin.Read(b); err != nil {
+				return err
+			}
+			if err := vimd(tempDir); err != nil {
+				return err
+			}
+		}
+	}
+	if dry {
+		return nil
+	}
+	for _, target := range filepaths {
+		b, err := ioutil.ReadFile(path.Join(tempDir, path.Base(target)))
+		if err != nil {
+			return err
+		}
+		var newTodos []pttodo.Todo
+		if err := yaml.Unmarshal(b, &newTodos); err != nil {
+			return err
+		}
+		original := originals[target]
+
+		newTodoIDs := map[string]struct{}{}
+		for i := range newTodos {
+			newTodoIDs[newTodos[i].ID()] = struct{}{}
+		}
+
+		for i := range original.Todo {
+			if _, ok := newTodoIDs[original.Todo[i].ID()]; !ok {
+				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
+		}
+		if err := ioutil.WriteFile(target, c, os.ModePerm); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func _edit(dry bool, filepaths []string) error {
 	tempDir, err := ioutil.TempDir(os.TempDir(), "edit-pttodo")
 	if err != nil {
 		return err
@@ -127,45 +231,7 @@ func edit(dry bool, filepaths []string) error {
 		return nil
 	}
 	vi := func() error {
-		bin := "vim"
+		return vimd(tempDir)
-		editorbin, err := exec.LookPath(bin)
-		if err != nil {
-			editorbin, err = exec.LookPath("vi")
-		}
-		if err != nil {
-			return err
-		}
-		args := []string{editorbin, "-p"}
-		tempfiles, err := listDir(tempDir)
-		if err != nil {
-			return err
-		}
-		args = append(args, tempfiles...)
-		cpid, err := syscall.ForkExec(
-			editorbin,
-			args,
-			&syscall.ProcAttr{
-				Dir:   tempDir,
-				Env:   os.Environ(),
-				Files: []uintptr{os.Stdin.Fd(), os.Stdout.Fd(), os.Stderr.Fd()},
-				Sys:   nil,
-			},
-		)
-		if err != nil {
-			return err
-		}
-		proc, err := os.FindProcess(cpid)
-		if err != nil {
-			return err
-		}
-		state, err := proc.Wait()
-		if err != nil {
-			return err
-		}
-		if exitCode := state.ExitCode(); exitCode != 0 {
-			return fmt.Errorf("bad exit code on vim: %d, state: %+v", exitCode, state)
-		}
-		return nil
 	}
 	verifyOne := func(tempFile string) error {
 		for {
@@ -235,6 +301,48 @@ func edit(dry bool, filepaths []string) error {
 	return nil
 }
 
+func vimd(d string) error {
+	bin := "vim"
+	editorbin, err := exec.LookPath(bin)
+	if err != nil {
+		editorbin, err = exec.LookPath("vi")
+	}
+	if err != nil {
+		return err
+	}
+	args := []string{editorbin, "-p"}
+	files, err := listDir(d)
+	if err != nil {
+		return err
+	}
+	args = append(args, files...)
+	cpid, err := syscall.ForkExec(
+		editorbin,
+		args,
+		&syscall.ProcAttr{
+			Dir:   d,
+			Env:   os.Environ(),
+			Files: []uintptr{os.Stdin.Fd(), os.Stdout.Fd(), os.Stderr.Fd()},
+			Sys:   nil,
+		},
+	)
+	if err != nil {
+		return err
+	}
+	proc, err := os.FindProcess(cpid)
+	if err != nil {
+		return err
+	}
+	state, err := proc.Wait()
+	if err != nil {
+		return err
+	}
+	if exitCode := state.ExitCode(); exitCode != 0 {
+		return fmt.Errorf("bad exit code on vim: %d, state: %+v", exitCode, state)
+	}
+	return nil
+}
+
 func merge(dry bool, filepath string, mergeTargetFilePath string) error {
 	baseReader, err := filePathReader(filepath)
 	if err != nil {

cmd/pttodo-cli/testdata/test.yaml

@@ -0,0 +1,45 @@
+todo:
+- 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
+- todo: other
+  ts: Wed Mar 23 09:44:57 MDT 2022
+- todo: b
+  ts: Wed Mar 23 09:45:13 MDT 2022
+- todo: a
+  ts: Wed Mar 23 09:45:15 MDT 2022
+- todo: a
+  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

go.mod

@@ -6,3 +6,11 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	gopkg.in/yaml.v2 v2.4.0
 )
+
+require (
+	github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e // indirect
+	github.com/emersion/go-imap v1.2.0 // indirect
+	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 // indirect
+	golang.org/x/text v0.3.7 // indirect
+)
+

go.sum

@@ -1,5 +1,17 @@
+github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e h1:mQTN05gz0rDZSABqKMzAPMb5ATWcvvdMljRzEh0LjBo=
+github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e/go.mod h1:alXX+s7a4cKaIprgjeEboqi4Tm7XR/HXEwUTxUV/ywU=
+github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA=
+github.com/emersion/go-imap v1.2.0/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
+github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

pttodo/root.go

@@ -20,6 +20,24 @@ func (root Root) Equals(other Root) bool {
 	return true
 }
 
+func (root *Root) AutoMove() {
+	root.MoveScheduledToTodo()
+	root.MoveTodoToScheduled()
+}
+
+func (root *Root) MoveTodoToScheduled() {
+	for i := len(root.Todo) - 1; i >= 0; i-- {
+		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]
+	}
+}
+
 func (root *Root) MoveScheduledToTodo() {
 	for i := len(root.Scheduled) - 1; i >= 0; i-- {
 		if root.Scheduled[i].Triggered() {

pttodo/root_test.go

@@ -1,6 +1,7 @@
 package pttodo
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -163,17 +164,19 @@ func TestRootMarshalYAMLWriteTS(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if strings.TrimSpace(string(got)) != strings.TrimSpace(`
+	got = bytes.TrimSpace(got)
+	want := strings.TrimSpace(`
 todo:
 - todo
 scheduled:
 - todo: sched
   schedule: "2099-01-01"
-  ts: Wed Dec 31 19:00:02 EST 1969
+  ts: Wed Dec 31 17:00:02 MST 1969
 done:
 - todo: done
-  ts: Wed Dec 31 19:00:03 EST 1969
+  ts: Wed Dec 31 17:00:03 MST 1969
-   `) {
+   `)
-		t.Fatal(string(got))
+	if string(got) != want {
+		t.Fatalf("want\n\t%q, got\n\t%q", want, string(got))
 	}
 }

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)
+			}
+		})
+	}
+}

pttodo/todo.go

@@ -1,7 +1,9 @@
 package pttodo
 
 import (
+	"encoding/base64"
 	"fmt"
+	"hash/crc32"
 	"time"
 )
 
@@ -15,6 +17,18 @@ type Todo struct {
 	writeTS  bool
 }
 
+func (todo Todo) ID() string {
+	hash := crc32.NewIEEE()
+	fmt.Fprintf(hash, "%d:%s", 0, todo.Todo)
+	fmt.Fprintf(hash, "%d:%s", 1, todo.Details)
+	fmt.Fprintf(hash, "%d:%s", 2, todo.Schedule)
+	fmt.Fprintf(hash, "%d:%s", 3, todo.Tags)
+	for i := range todo.Subtasks {
+		fmt.Fprintf(hash, "%d:%s", 4, todo.Subtasks[i].ID())
+	}
+	return base64.StdEncoding.EncodeToString(hash.Sum(nil))
+}
+
 func (todo Todo) Triggered() bool {
 	last := todo.TS
 	next, err := todo.Schedule.Next(last.time())

pttodo/todo_test.go

@@ -125,3 +125,33 @@ func TestMarshalTodo(t *testing.T) {
 		}
 	})
 }
+
+func TestTodoID(t *testing.T) {
+	cases := map[string]Todo{
+		"empty":        Todo{},
+		"todo":         Todo{Todo: "abc"},
+		"details":      Todo{Details: "abc"},
+		"todo,details": Todo{Todo: "abc", Details: "abc"},
+	}
+
+	got := map[string]bool{}
+	for name, todod := range cases {
+		todo := todod
+		t.Run(name, func(t *testing.T) {
+			if _, ok := got[todo.ID()]; ok {
+				t.Error("dupe", todo.ID())
+			}
+			got[todo.ID()] = true
+			t.Logf("%s: %+v", todo.ID(), todo)
+			todo2 := todo
+			todo2.TS = 1
+			if todo.ID() != todo2.ID() {
+				t.Error("ts changed")
+			}
+			todo2.writeTS = true
+			if todo.ID() != todo2.ID() {
+				t.Error("writets changed")
+			}
+		})
+	}
+}