gitignore

.gitignore

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

cmd/pttodo-cli/cli.go

@@ -27,13 +27,15 @@ const (
 )
 
 type config struct {
-	targets []string
-	mergeme string
-	root    string
-	tags    []string
-	search  string
-	edit    bool
-	dry     bool
+	targets     []string
+	mergeme     string
+	root        string
+	tags        []string
+	search      string
+	edit        bool
+	dry         bool
+	add         string
+	addSchedule string
 }
 
 func main() {
@@ -49,6 +51,14 @@ func _main() error {
 			return err
 		}
 	}
+	if config.add != "" {
+		if err := add(config.dry, config.targets, pttodo.Todo{
+			Todo:     config.add,
+			Schedule: pttodo.Schedule(config.addSchedule),
+		}); err != nil {
+			return err
+		}
+	}
 	if config.edit {
 		if err := edit(config.dry, config.targets); err != nil {
 			return err
@@ -73,6 +83,8 @@ func getConfig() config {
 	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.StringVar(&config.add, "add", "", "todo to add")
+	flag.StringVar(&config.addSchedule, "add-schedule", "", "todo to add schedule")
 	flag.Parse()
 
 	config.tags = strings.Split(tagss, ",")
@@ -109,6 +121,34 @@ func verifyFile(path string) error {
 	return nil
 }
 
+func add(dry bool, 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 dry {
+		log.Printf("wouldve written...\n%s", c)
+		return nil
+	} else 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 {
@@ -117,9 +157,9 @@ func edit(dry bool, filepaths []string) error {
 	originals := map[string]pttodo.Root{}
 	for _, target := range filepaths {
 		var original pttodo.Root
-		if b, err := ioutil.ReadFile(target); err != nil && !os.IsNotExist(err) {
+		if r, err := filePathReader(target); err != nil {
 			return err
-		} else if err := yaml.Unmarshal(b, &original); err != nil {
+		} else if err := yaml.NewDecoder(r).Decode(&original); err != nil {
 			return err
 		} else if c, err := yaml.Marshal(original.Todo); err != nil {
 			return err
@@ -135,9 +175,9 @@ func edit(dry bool, filepaths []string) error {
 		for {
 			err := func() error {
 				var todos []pttodo.Todo
-				if b, err := ioutil.ReadFile(path.Join(tempDir, path.Base(target))); err != nil {
+				if r, err := filePathReader(path.Join(tempDir, path.Base(target))); err != nil {
 					return err
-				} else if err := yaml.Unmarshal(b, &todos); err != nil {
+				} else if err := yaml.NewDecoder(r).Decode(&todos); err != nil {
 					return err
 				}
 				return nil
@@ -159,12 +199,12 @@ func edit(dry bool, filepaths []string) error {
 		return nil
 	}
 	for _, target := range filepaths {
-		b, err := ioutil.ReadFile(path.Join(tempDir, path.Base(target)))
+		r, err := filePathReader(path.Join(tempDir, path.Base(target)))
 		if err != nil {
 			return err
 		}
 		var newTodos []pttodo.Todo
-		if err := yaml.Unmarshal(b, &newTodos); err != nil {
+		if err := yaml.NewDecoder(r).Decode(&newTodos); err != nil {
 			return err
 		}
 		original := originals[target]
@@ -179,9 +219,8 @@ func edit(dry bool, filepaths []string) error {
 				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.Done = append(original.Done, original.Todo[i])
 			}
 		}
 		original.Todo = newTodos
@@ -262,13 +301,13 @@ func _edit(dry bool, filepaths []string) error {
 	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 {
+		if a, err := filePathReader(tempFile); err != nil {
 			return err
-		} else if err := yaml.Unmarshal(a, &rootTemp); err != nil {
+		} else if err := yaml.NewDecoder(a).Decode(&rootTemp); err != nil {
 			return err
-		} else if b, err := ioutil.ReadFile(filepath); err != nil {
+		} else if b, err := filePathReader(filepath); err != nil {
 			return err
-		} else if err := yaml.Unmarshal(b, &rootOld); err != nil {
+		} else if err := yaml.NewDecoder(b).Decode(&rootOld); err != nil {
 			return err
 		} else if rootTemp.Equals(rootOld) {
 			//log.Printf("no changes to %s", filepath)
@@ -494,17 +533,17 @@ func dump(dry bool, writer io.Writer, filepaths []string, tags []string, search,
 }
 
 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 os.Stdin, nil
 	}
-	return reader, 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) {

cmd/pttodo-cli/testdata/test.yaml

@@ -1,45 +1,10 @@
 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
+- hi20890
+- hi
+- b
 - 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
+- todo: past
+  schedule: "2000-01-02"
+scheduled: []
+done: []