split dump.go from main.go in cli

.gitignore

@@ -3,3 +3,4 @@ todo-server-yaml
 cmd/cmd
 cmd/cli
 cmd/pttodo/pttodo
+cmd/pttodo-cli/pttodo-cli

cmd/pttodo-cli/add.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"io/ioutil"
+	"os"
+
+	"gogs.inhome.blapointe.com/bel/pttodo/pttodo"
+	"gopkg.in/yaml.v2"
+)
+
+func add(config config) error {
+	if config.add == "" {
+		return nil
+	}
+	v := pttodo.Todo{
+		Todo:     config.add,
+		Schedule: pttodo.Schedule(config.addSchedule),
+		Tags:     config.addTags,
+	}
+	return _add(config.targets, v)
+}
+
+func _add(filepaths []string, todo pttodo.Todo) error {
+	target := filepaths[0]
+	var original pttodo.Root
+
+	r, err := filePathReader(target)
+	if err != nil {
+		return err
+	}
+	if err := yaml.NewDecoder(r).Decode(&original); err != nil {
+		return err
+	}
+
+	original.Todo = append([]pttodo.Todo{todo}, original.Todo...)
+	original.AutoMove()
+
+	c, err := yaml.Marshal(original)
+	if err != nil {
+		return err
+	} else if err := ioutil.WriteFile(target, c, os.ModePerm); err != nil {
+		return err
+	}
+
+	return nil
+}

cmd/pttodo-cli/cli.go

@@ -1,421 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"local/pt-todo-server/pttodo"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"sort"
-	"strings"
-	"syscall"
-
-	"gopkg.in/yaml.v2"
-)
-
-const (
-	DUMP_ALL       = "all"
-	DUMP_TODO      = "todo"
-	DUMP_SCHEDULED = "scheduled"
-	DUMP_DONE      = "done"
-)
-
-func main() {
-	if err := _main(); err != nil {
-		panic(err)
-	}
-}
-
-func _main() error {
-	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)")
-	root := flag.String("root", DUMP_TODO, "path to pretty print ("+fmt.Sprint([]string{DUMP_ALL, DUMP_TODO, DUMP_SCHEDULED, DUMP_DONE})+")")
-	tags := flag.String("tags", "", "csv of all tags to find, -tag to invert")
-	search := flag.String("search", "", "fts case insensitive")
-	e := flag.Bool("e", false, "edit file")
-	dry := flag.Bool("dry", false, "dry run")
-	flag.Parse()
-	if *filepathToMergeIn != "" {
-		if err := merge(*dry, *filepath, *filepathToMergeIn); err != nil {
-			return err
-		}
-	}
-	filepaths := []string{*filepath}
-	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 {
-	f, err := ioutil.TempFile(os.TempDir(), "tmp")
-	if err != nil {
-		return err
-	}
-	f.Close()
-	tempFile := f.Name()
-	b, err := yaml.Marshal(root)
-	if err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(tempFile, b, os.ModePerm); err != nil {
-		return err
-	}
-	defer os.Remove(tempFile)
-	return verifyFile(tempFile)
-}
-
-func verifyFile(path string) error {
-	if err := dump(true, io.Discard, []string{path}, nil, "", DUMP_ALL); err != nil {
-		return fmt.Errorf("failed verifying file %s: %w", path, err)
-	}
-	return nil
-}
-
-func edit(dry bool, filepaths []string) error {
-	tempDir, err := ioutil.TempDir(os.TempDir(), "edit-pttodo")
-	if err != nil {
-		return err
-	}
-	cpOne := func(filepath string) error {
-		f, err := os.Create(path.Join(tempDir, path.Base(filepath)))
-		if err != nil {
-			return err
-		}
-		if _, err := os.Stat(filepath); err == nil {
-			g, err := os.Open(filepath)
-			if err != nil {
-				return err
-			}
-			if _, err := io.Copy(f, g); err != nil {
-				return err
-			}
-			g.Close()
-		}
-		f.Close()
-		return nil
-	}
-	cp := func() error {
-		for _, filepath := range filepaths {
-			if err := cpOne(filepath); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	vi := func() 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"}
-		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 {
-			err := verifyFile(tempFile)
-			if err == nil {
-				break
-			}
-			log.Printf("%v, press <Enter> to resume editing", err)
-			b := make([]byte, 1)
-			if _, err := os.Stdin.Read(b); err != nil {
-				break
-			}
-			if err := vi(); err != nil {
-				return err
-			}
-		}
-		return verifyFile(tempFile)
-	}
-	verify := func() error {
-		for _, filepath := range filepaths {
-			tempFile := path.Join(tempDir, path.Base(filepath))
-			if err := verifyOne(tempFile); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	saveOne := func(filepath string) error {
-		tempFile := path.Join(tempDir, path.Base(filepath))
-		var rootTemp, rootOld pttodo.Root
-		if a, err := ioutil.ReadFile(tempFile); err != nil {
-			return err
-		} else if err := yaml.Unmarshal(a, &rootTemp); err != nil {
-			return err
-		} else if b, err := ioutil.ReadFile(filepath); err != nil {
-			return err
-		} else if err := yaml.Unmarshal(b, &rootOld); err != nil {
-			return err
-		} else if rootTemp.Equals(rootOld) {
-			//log.Printf("no changes to %s", filepath)
-			return nil
-		}
-		if dry {
-			log.Printf("would've saved %s as %s", tempFile, filepath)
-			return nil
-		}
-		return os.Rename(tempFile, filepath)
-	}
-	save := func() error {
-		for _, filepath := range filepaths {
-			if err := saveOne(filepath); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-
-	for _, foo := range []func() error{cp, vi, verify, save} {
-		if err := foo(); err != nil {
-			return err
-		}
-	}
-	if !dry {
-		os.RemoveAll(tempDir)
-	}
-
-	return nil
-}
-
-func merge(dry bool, filepath string, mergeTargetFilePath string) error {
-	baseReader, err := filePathReader(filepath)
-	if err != nil {
-		return err
-	}
-	baseB, err := ioutil.ReadAll(baseReader)
-	if err != nil {
-		return err
-	}
-
-	mergingReader, err := filePathReader(mergeTargetFilePath)
-	if err != nil {
-		return err
-	}
-	mergingB, err := ioutil.ReadAll(mergingReader)
-	if err != nil {
-		return err
-	}
-
-	var base, merging pttodo.Root
-	if err := yaml.Unmarshal(baseB, &base); err != nil {
-		return err
-	}
-	if err := yaml.Unmarshal(mergingB, &merging); err != nil {
-		return err
-	}
-
-	base.MergeIn(merging)
-
-	if err := verifyRoot(base); err != nil {
-		return err
-	}
-	tmppath, err := marshalRootToTempFile(base)
-	if err != nil {
-		return err
-	}
-	if dry {
-		log.Printf("would've moved %s to %s when adding %s", tmppath, filepath, mergeTargetFilePath)
-		return nil
-	}
-	return os.Rename(tmppath, filepath)
-}
-
-func marshalRootToTempFile(root pttodo.Root) (string, error) {
-	f, err := ioutil.TempFile(os.TempDir(), "tmp")
-	if err != nil {
-		return "", err
-	}
-	f.Close()
-	os.Remove(f.Name())
-	b, err := yaml.Marshal(root)
-	if err != nil {
-		return "", err
-	}
-	filepath := f.Name() + ".yaml"
-	err = ioutil.WriteFile(filepath, b, os.ModePerm)
-	return filepath, err
-}
-
-func dump(dry bool, writer io.Writer, filepaths []string, tags []string, search, rootDisplay string) error {
-	var root pttodo.Root
-
-	for _, filepath := range filepaths {
-		reader, err := filePathReader(filepath)
-		if err != nil {
-			return err
-		}
-
-		b, err := ioutil.ReadAll(reader)
-		if err != nil {
-			return err
-		}
-
-		var root2, root2post pttodo.Root
-		if err := yaml.Unmarshal(b, &root2); err != nil {
-			return err
-		}
-		if err := yaml.Unmarshal(b, &root2post); err != nil {
-			return err
-		}
-
-		root2.MoveScheduledToTodo()
-
-		if !dry {
-			if !root2.Equals(root2post) {
-				log.Printf("refreshing %s", filepath)
-				b3, err := yaml.Marshal(root2)
-				if err != nil {
-					return err
-				}
-				if err := os.WriteFile(filepath, b3, os.ModePerm); err != nil {
-					return err
-				}
-			} else {
-				//log.Printf("not refreshing %s", filepath)
-			}
-		}
-
-		root.MergeIn(root2)
-	}
-
-	root.MoveScheduledToTodo()
-
-	var v interface{} = root
-	switch rootDisplay {
-	case DUMP_ALL:
-	case DUMP_TODO:
-		v = root.Todo
-	case DUMP_SCHEDULED:
-		v = root.Scheduled
-	case DUMP_DONE:
-		v = root.Done
-	}
-	if todos, ok := v.([]pttodo.Todo); ok {
-		if len(tags) > 0 {
-			result := make([]pttodo.Todo, 0, len(todos))
-			for _, todo := range todos {
-				skip := false
-				for _, tag := range tags {
-					positiveTag := strings.TrimLeft(tag, "-")
-					hasTag := strings.Contains(todo.Tags, positiveTag)
-					wantToHaveTag := !strings.HasPrefix(tag, "-")
-					skip = skip || !(hasTag == wantToHaveTag)
-				}
-				if !skip {
-					result = append(result, todo)
-				}
-			}
-			todos = result
-		}
-		if len(search) > 0 {
-			result := make([]pttodo.Todo, 0, len(todos))
-			for _, todo := range todos {
-				if strings.Contains(strings.ToLower(fmt.Sprint(todo)), strings.ToLower(search)) {
-					result = append(result, todo)
-				}
-			}
-			todos = result
-		}
-		v = todos
-	}
-
-	b2, err := yaml.Marshal(v)
-	if err != nil {
-		return err
-	}
-	fmt.Fprintf(writer, "%s\n", b2)
-	return nil
-}
-
-func filePathReader(path string) (io.Reader, error) {
-	var reader io.Reader
-	if path == "-" {
-		reader = os.Stdin
-	} else {
-		b, err := ioutil.ReadFile(path)
-		if err != nil {
-			return nil, err
-		}
-		reader = bytes.NewReader(b)
-	}
-	return reader, nil
-}
-
-func listDir(dname string) ([]string, error) {
-	entries, err := os.ReadDir(dname)
-	if err != nil {
-		return nil, err
-	}
-	paths := make([]string, 0, len(entries))
-	for i := range entries {
-		if entries[i].IsDir() {
-			continue
-		}
-		paths = append(paths, path.Join(dname, entries[i].Name()))
-	}
-	sort.Slice(paths, func(i, j int) bool {
-		if path.Base(paths[i]) == "root.yaml" {
-			return true
-		}
-		return paths[i] < paths[j]
-	})
-	return paths, nil
-}

cmd/pttodo-cli/dump.go

@@ -0,0 +1,106 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"strings"
+
+	"gogs.inhome.blapointe.com/bel/pttodo/pttodo"
+	"gopkg.in/yaml.v2"
+)
+
+func dump(config config) error {
+	return _dump(os.Stdout, config.targets, config.tags, config.search, config.root)
+}
+
+func _dump(writer io.Writer, filepaths []string, tags []string, search, rootDisplay string) error {
+	var root pttodo.Root
+
+	for _, filepath := range filepaths {
+		reader, err := filePathReader(filepath)
+		if err != nil {
+			return err
+		}
+
+		b, err := ioutil.ReadAll(reader)
+		if err != nil {
+			return err
+		}
+
+		var root2, root2post pttodo.Root
+		if err := yaml.Unmarshal(b, &root2); err != nil {
+			return err
+		}
+		if err := yaml.Unmarshal(b, &root2post); err != nil {
+			return err
+		}
+
+		root2.MoveScheduledToTodo()
+
+		if !root2.Equals(root2post) {
+			log.Printf("refreshing %s", filepath)
+			b3, err := yaml.Marshal(root2)
+			if err != nil {
+				return err
+			}
+			if err := os.WriteFile(filepath, b3, os.ModePerm); err != nil {
+				return err
+			}
+		} else {
+			//log.Printf("not refreshing %s", filepath)
+		}
+
+		root.MergeIn(root2)
+	}
+
+	root.MoveScheduledToTodo()
+
+	var v interface{} = root
+	switch rootDisplay {
+	case DUMP_ALL:
+	case DUMP_TODO:
+		v = root.Todo
+	case DUMP_SCHEDULED:
+		v = root.Scheduled
+	case DUMP_DONE:
+		v = root.Done
+	}
+	if todos, ok := v.([]pttodo.Todo); ok {
+		if len(tags) > 0 {
+			result := make([]pttodo.Todo, 0, len(todos))
+			for _, todo := range todos {
+				skip := false
+				for _, tag := range tags {
+					positiveTag := strings.TrimLeft(tag, "-")
+					hasTag := strings.Contains(todo.Tags, positiveTag)
+					wantToHaveTag := !strings.HasPrefix(tag, "-")
+					skip = skip || !(hasTag == wantToHaveTag)
+				}
+				if !skip {
+					result = append(result, todo)
+				}
+			}
+			todos = result
+		}
+		if len(search) > 0 {
+			result := make([]pttodo.Todo, 0, len(todos))
+			for _, todo := range todos {
+				if strings.Contains(strings.ToLower(fmt.Sprint(todo)), strings.ToLower(search)) {
+					result = append(result, todo)
+				}
+			}
+			todos = result
+		}
+		v = todos
+	}
+
+	b2, err := yaml.Marshal(v)
+	if err != nil {
+		return err
+	}
+	fmt.Fprintf(writer, "%s\n", b2)
+	return nil
+}

cmd/pttodo-cli/edit.go

@@ -0,0 +1,161 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path"
+	"syscall"
+	"time"
+
+	"github.com/google/uuid"
+	"gogs.inhome.blapointe.com/bel/pttodo/pttodo"
+	"gopkg.in/yaml.v2"
+)
+
+func edit(config config) error {
+	if !config.edit {
+		return nil
+	}
+	return _edit(config.targets)
+}
+
+func _edit(filepaths []string) error {
+	tempDir, err := ioutil.TempDir(os.TempDir(), "edit-pttodo-*")
+	if err != nil {
+		return err
+	}
+	originals := map[string]pttodo.Root{}
+	lastModified := map[string]time.Time{}
+	for _, target := range filepaths {
+		var original pttodo.Root
+		if r, err := filePathReader(target); err != nil {
+			return err
+		} else if err := yaml.NewDecoder(r).Decode(&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 info, _ := os.Stat(target); info != nil {
+			lastModified[target] = info.ModTime()
+		} else {
+			lastModified[target] = time.Time{}
+		}
+	}
+	if err := vimd(tempDir); err != nil {
+		return err
+	}
+	for _, target := range filepaths {
+		for {
+			err := func() error {
+				var todos []pttodo.Todo
+				if r, err := filePathReader(path.Join(tempDir, path.Base(target))); err != nil {
+					return err
+				} else if err := yaml.NewDecoder(r).Decode(&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
+			}
+		}
+	}
+	for _, target := range filepaths {
+		r, err := filePathReader(path.Join(tempDir, path.Base(target)))
+		if err != nil {
+			return err
+		}
+		var newTodos []pttodo.Todo
+		if err := yaml.NewDecoder(r).Decode(&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])
+				}
+				original.Done = append(original.Done, original.Todo[i])
+			}
+		}
+		original.Todo = newTodos
+
+		original.AutoMove()
+
+		c, err := yaml.Marshal(original)
+		if err != nil {
+			return err
+		}
+		outputPath := target
+		if info, _ := os.Stat(target); info != nil && info.ModTime() != lastModified[target] {
+			outputPath = fmt.Sprintf("%s.%s.%s", outputPath, uuid.New().String(), path.Ext(outputPath))
+		}
+		if err := ioutil.WriteFile(outputPath, c, os.ModePerm); err != nil {
+			return err
+		}
+	}
+	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
+}

cmd/pttodo-cli/go.mod

@@ -3,10 +3,13 @@ module pttodo-cli
 go 1.17
 
 require (
+	gogs.inhome.blapointe.com/bel/pttodo v0.4.0
 	gopkg.in/yaml.v2 v2.4.0
-	local/pt-todo-server v0.0.0-00010101000000-000000000000
 )
 
-require github.com/robfig/cron/v3 v3.0.1 // indirect
+require (
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
+)
 
-replace local/pt-todo-server => ../../
+replace gogs.inhome.blapointe.com/bel/pttodo => ../..

cmd/pttodo-cli/go.sum

@@ -1,3 +1,5 @@
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

cmd/pttodo-cli/main.go

@@ -0,0 +1,198 @@
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+	"sort"
+	"strings"
+
+	"gogs.inhome.blapointe.com/bel/pttodo/pttodo"
+
+	"gopkg.in/yaml.v2"
+)
+
+const (
+	DUMP_ALL       = "all"
+	DUMP_TODO      = "todo"
+	DUMP_SCHEDULED = "scheduled"
+	DUMP_DONE      = "done"
+)
+
+type config struct {
+	targets     []string
+	root        string
+	tags        []string
+	search      string
+	edit        bool
+	add         string
+	addSchedule string
+	addTags     string
+}
+
+func main() {
+	if err := _main(); err != nil {
+		panic(err)
+	}
+}
+
+func _main() error {
+	config := getConfig()
+	if err := add(config); err != nil {
+		return err
+	}
+	if err := edit(config); err != nil {
+		return err
+	}
+	return dump(config)
+}
+
+func getConfig() config {
+	defaultFilepath := os.Getenv("PTTODO_FILE")
+	if defaultFilepath == "" {
+		defaultFilepath = "./todo.yaml"
+	}
+
+	var config config
+	var target string
+	flag.StringVar(&target, "f", defaultFilepath, "($PTTODO_FILE) path to yaml file or dir (starting with root then alphabetical for dir)")
+	flag.StringVar(&config.root, "root", DUMP_TODO, "path to pretty print ("+fmt.Sprint([]string{DUMP_ALL, DUMP_TODO, DUMP_SCHEDULED, DUMP_DONE})+")")
+	var tagss string
+	flag.StringVar(&tagss, "tags", "", "csv of all tags to find, -x to invert")
+	flag.StringVar(&config.search, "search", "", "fts case insensitive")
+	flag.BoolVar(&config.edit, "e", false, "edit file")
+	flag.StringVar(&config.add, "add", "", "todo to add")
+	flag.StringVar(&config.addSchedule, "add-schedule", "", "todo to add schedule")
+	flag.StringVar(&config.addTags, "add-tags", "", "todo to add csv tags")
+	flag.Parse()
+
+	config.tags = strings.Split(tagss, ",")
+	config.targets = []string{target}
+	if stat, err := os.Stat(target); err == nil && stat.IsDir() {
+		config.targets, _ = listDir(target)
+	}
+
+	return config
+}
+
+func verifyRoot(root pttodo.Root) error {
+	f, err := ioutil.TempFile(os.TempDir(), "tmp")
+	if err != nil {
+		return err
+	}
+	f.Close()
+	tempFile := f.Name()
+	b, err := yaml.Marshal(root)
+	if err != nil {
+		return err
+	}
+	if err := ioutil.WriteFile(tempFile, b, os.ModePerm); err != nil {
+		return err
+	}
+	defer os.Remove(tempFile)
+	return verifyFile(tempFile)
+}
+
+func verifyFile(path string) error {
+	if err := _dump(io.Discard, []string{path}, nil, "", DUMP_ALL); err != nil {
+		return fmt.Errorf("failed verifying file %s: %w", path, err)
+	}
+	return nil
+}
+
+func merge(filepath string, mergeTargetFilePath string) error {
+	baseReader, err := filePathReader(filepath)
+	if err != nil {
+		return err
+	}
+	baseB, err := ioutil.ReadAll(baseReader)
+	if err != nil {
+		return err
+	}
+
+	mergingReader, err := filePathReader(mergeTargetFilePath)
+	if err != nil {
+		return err
+	}
+	mergingB, err := ioutil.ReadAll(mergingReader)
+	if err != nil {
+		return err
+	}
+
+	var base, merging pttodo.Root
+	if err := yaml.Unmarshal(baseB, &base); err != nil {
+		return err
+	}
+	if err := yaml.Unmarshal(mergingB, &merging); err != nil {
+		return err
+	}
+
+	base.MergeIn(merging)
+
+	if err := verifyRoot(base); err != nil {
+		return err
+	}
+	tmppath, err := marshalRootToTempFile(base)
+	if err != nil {
+		return err
+	}
+	return os.Rename(tmppath, filepath)
+}
+
+func marshalRootToTempFile(root pttodo.Root) (string, error) {
+	f, err := ioutil.TempFile(os.TempDir(), "tmp")
+	if err != nil {
+		return "", err
+	}
+	f.Close()
+	os.Remove(f.Name())
+	b, err := yaml.Marshal(root)
+	if err != nil {
+		return "", err
+	}
+	filepath := f.Name() + ".yaml"
+	err = ioutil.WriteFile(filepath, b, os.ModePerm)
+	return filepath, err
+}
+
+func filePathReader(path string) (io.Reader, error) {
+	if path == "-" {
+		return os.Stdin, nil
+	}
+	b, err := ioutil.ReadFile(path)
+	if os.IsNotExist(err) {
+		return bytes.NewReader([]byte("{}")), nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	return bytes.NewReader(b), nil
+}
+
+func listDir(dname string) ([]string, error) {
+	entries, err := os.ReadDir(dname)
+	if err != nil {
+		return nil, err
+	}
+	paths := make([]string, 0, len(entries))
+	for i := range entries {
+		if entries[i].IsDir() {
+			continue
+		}
+		if strings.HasPrefix(path.Base(entries[i].Name()), ".") {
+			continue
+		}
+		paths = append(paths, path.Join(dname, entries[i].Name()))
+	}
+	sort.Slice(paths, func(i, j int) bool {
+		if path.Base(paths[i]) == "root.yaml" {
+			return true
+		}
+		return paths[i] < paths[j]
+	})
+	return paths, nil
+}

cmd/pttodo-cli/testdata/test.yaml

@@ -0,0 +1,10 @@
+todo:
+- hi20890
+- hi
+- b
+- todo: loop
+  schedule: 10s
+- todo: past
+  schedule: "2000-01-02"
+scheduled: []
+done: []

go.mod

@@ -1,4 +1,4 @@
-module pttodo
+module gogs.inhome.blapointe.com/bel/pttodo
 
 go 1.17
 

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
-   `) {
-		t.Fatal(string(got))
+  ts: Wed Dec 31 17:00:03 MST 1969
+   `)
+	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")
+			}
+		})
+	}
+}