oop

.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

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"local/pt-todo-server/pttodo"
 	"log"
 	"os"
 	"os/exec"
@@ -16,6 +15,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/google/uuid"
+
+	"gogs.inhome.blapointe.com/bel/pttodo/pttodo"
+
 	"gopkg.in/yaml.v2"
 )
 
@@ -36,6 +39,7 @@ type config struct {
 	dry         bool
 	add         string
 	addSchedule string
+	addTags     string
 }
 
 func main() {
@@ -52,10 +56,12 @@ func _main() error {
 		}
 	}
 	if config.add != "" {
-		if err := add(config.dry, config.targets, pttodo.Todo{
+		v := pttodo.Todo{
 			Todo:     config.add,
 			Schedule: pttodo.Schedule(config.addSchedule),
-		}); err != nil {
+			Tags:     config.addTags,
+		}
+		if err := add(config.dry, config.targets, v); err != nil {
 			return err
 		}
 	}
@@ -68,8 +74,8 @@ func _main() error {
 }
 
 func getConfig() config {
-	defaultFilepath, ok := os.LookupEnv("PTTODO_FILE")
-	if !ok {
+	defaultFilepath := os.Getenv("PTTODO_FILE")
+	if defaultFilepath == "" {
 		defaultFilepath = "./todo.yaml"
 	}
 
@@ -79,12 +85,13 @@ 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, -tag to invert")
+	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.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, ",")
@@ -125,11 +132,11 @@ func add(dry bool, filepaths []string, todo pttodo.Todo) error {
 	target := filepaths[0]
 	var original pttodo.Root
 
-	b, err := ioutil.ReadFile(target)
-	if err != nil && !os.IsNotExist(err) {
+	r, err := filePathReader(target)
+	if err != nil {
 		return err
 	}
-	if err := yaml.Unmarshal(b, &original); err != nil {
+	if err := yaml.NewDecoder(r).Decode(&original); err != nil {
 		return err
 	}
 
@@ -155,11 +162,12 @@ func edit(dry bool, filepaths []string) error {
 		return err
 	}
 	originals := map[string]pttodo.Root{}
+	lastModified := map[string]time.Time{}
 	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
@@ -167,6 +175,11 @@ 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
@@ -175,9 +188,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
@@ -199,12 +212,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]
@@ -219,9 +232,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
@@ -232,7 +244,11 @@ func edit(dry bool, filepaths []string) error {
 		if err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(target, c, os.ModePerm); err != nil {
+		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
 		}
 	}
@@ -302,13 +318,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)
@@ -534,17 +550,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) {
@@ -557,6 +573,9 @@ 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,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=

go.mod

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