cli on delete todo, write in Done identified by entire struct so dupes wouldnt but thats ok

.gitignore

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

cmd/pttodo-cli/cli.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"local/pt-todo-server/pttodo"
 	"log"
 	"os"
 	"os/exec"
@@ -13,11 +14,6 @@ import (
 	"sort"
 	"strings"
 	"syscall"
-	"time"
-
-	"github.com/google/uuid"
-
-	"gogs.inhome.blapointe.com/bel/pttodo/pttodo"
 
 	"gopkg.in/yaml.v2"
 )
@@ -30,16 +26,13 @@ const (
 )
 
 type config struct {
-	targets     []string
-	mergeme     string
-	root        string
-	tags        []string
-	search      string
-	edit        bool
-	dry         bool
-	add         string
-	addSchedule string
-	addTags     string
+	targets []string
+	mergeme string
+	root    string
+	tags    []string
+	search  string
+	edit    bool
+	dry     bool
 }
 
 func main() {
@@ -55,16 +48,6 @@ func _main() error {
 			return err
 		}
 	}
-	if config.add != "" {
-		v := pttodo.Todo{
-			Todo:     config.add,
-			Schedule: pttodo.Schedule(config.addSchedule),
-			Tags:     config.addTags,
-		}
-		if err := add(config.dry, config.targets, v); err != nil {
-			return err
-		}
-	}
 	if config.edit {
 		if err := edit(config.dry, config.targets); err != nil {
 			return err
@@ -74,8 +57,8 @@ func _main() error {
 }
 
 func getConfig() config {
-	defaultFilepath := os.Getenv("PTTODO_FILE")
-	if defaultFilepath == "" {
+	defaultFilepath, ok := os.LookupEnv("PTTODO_FILE")
+	if !ok {
 		defaultFilepath = "./todo.yaml"
 	}
 
@@ -85,13 +68,10 @@ func getConfig() config {
 	flag.StringVar(&config.mergeme, "g", "", "path to yaml file to merge into -f (modifies f)")
 	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(&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.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, ",")
@@ -128,46 +108,17 @@ 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 {
 		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 {
+		if b, err := ioutil.ReadFile(target); err != nil && !os.IsNotExist(err) {
 			return err
-		} else if err := yaml.NewDecoder(r).Decode(&original); err != nil {
+		} else if err := yaml.Unmarshal(b, &original); err != nil {
 			return err
 		} else if c, err := yaml.Marshal(original.Todo); err != nil {
 			return err
@@ -175,11 +126,6 @@ func edit(dry bool, filepaths []string) error {
 			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
@@ -188,9 +134,9 @@ func edit(dry bool, filepaths []string) error {
 		for {
 			err := func() error {
 				var todos []pttodo.Todo
-				if r, err := filePathReader(path.Join(tempDir, path.Base(target))); err != nil {
+				if b, err := ioutil.ReadFile(path.Join(tempDir, path.Base(target))); err != nil {
 					return err
-				} else if err := yaml.NewDecoder(r).Decode(&todos); err != nil {
+				} else if err := yaml.Unmarshal(b, &todos); err != nil {
 					return err
 				}
 				return nil
@@ -212,12 +158,12 @@ func edit(dry bool, filepaths []string) error {
 		return nil
 	}
 	for _, target := range filepaths {
-		r, err := filePathReader(path.Join(tempDir, path.Base(target)))
+		b, err := ioutil.ReadFile(path.Join(tempDir, path.Base(target)))
 		if err != nil {
 			return err
 		}
 		var newTodos []pttodo.Todo
-		if err := yaml.NewDecoder(r).Decode(&newTodos); err != nil {
+		if err := yaml.Unmarshal(b, &newTodos); err != nil {
 			return err
 		}
 		original := originals[target]
@@ -226,29 +172,19 @@ 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.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 {
+		if err := ioutil.WriteFile(target, c, os.ModePerm); err != nil {
 			return err
 		}
 	}
@@ -318,13 +254,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 := filePathReader(tempFile); err != nil {
+		if a, err := ioutil.ReadFile(tempFile); err != nil {
 			return err
-		} else if err := yaml.NewDecoder(a).Decode(&rootTemp); err != nil {
+		} else if err := yaml.Unmarshal(a, &rootTemp); err != nil {
 			return err
-		} else if b, err := filePathReader(filepath); err != nil {
+		} else if b, err := ioutil.ReadFile(filepath); err != nil {
 			return err
-		} else if err := yaml.NewDecoder(b).Decode(&rootOld); err != nil {
+		} else if err := yaml.Unmarshal(b, &rootOld); err != nil {
 			return err
 		} else if rootTemp.Equals(rootOld) {
 			//log.Printf("no changes to %s", filepath)
@@ -550,17 +486,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 == "-" {
-		return os.Stdin, nil
+		reader = os.Stdin
+	} else {
+		b, err := ioutil.ReadFile(path)
+		if err != nil {
+			return nil, err
+		}
+		reader = bytes.NewReader(b)
 	}
-	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
+	return reader, nil
 }
 
 func listDir(dname string) ([]string, error) {
@@ -573,9 +509,6 @@ func listDir(dname string) ([]string, error) {
 		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 {

cmd/pttodo-cli/go.mod

@@ -3,13 +3,10 @@ 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/google/uuid v1.3.0 // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
-)
+require github.com/robfig/cron/v3 v3.0.1 // indirect
 
-replace gogs.inhome.blapointe.com/bel/pttodo => ../..
+replace local/pt-todo-server => ../../

cmd/pttodo-cli/go.sum

@@ -1,5 +1,3 @@
-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/testdata/test.yaml

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

go.mod

@@ -1,4 +1,4 @@
-module gogs.inhome.blapointe.com/bel/pttodo
+module pttodo
 
 go 1.17
 
@@ -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

@@ -27,14 +27,13 @@ func (root *Root) AutoMove() {
 
 func (root *Root) MoveTodoToScheduled() {
 	for i := len(root.Todo) - 1; i >= 0; i-- {
-		if !root.Todo[i].Schedule.isFixedFuture() {
-			continue
+		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]
 		}
-		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,42 +25,6 @@ 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,60 +130,3 @@ 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)
-			}
-		})
-	}
-}