gitignore bin

.gitignore

@@ -4,3 +4,4 @@ cmd/cmd
 cmd/cli
 cmd/pttodo/pttodo
 cmd/pttodo-cli/pttodo-cli
+cmd/pttodo-cli

cmd/add.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"io/ioutil"
+	"os"
+
+	"github.com/google/uuid"
+	"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,
+	}
+	newTarget, err := _add(config.targets, v)
+	if err != nil {
+		return err
+	}
+	config.targets = append(config.targets, newTarget)
+	return nil
+}
+
+func _add(filepaths []string, todo pttodo.Todo) (string, error) {
+	target := filepaths[0] + ".todo." + uuid.New().String()
+
+	c, err := yaml.Marshal([]pttodo.Todo{todo})
+	if err != nil {
+		return "", err
+	} else if err := ioutil.WriteFile(target, c, os.ModePerm); err != nil {
+		return "", err
+	}
+
+	return target, nil
+}

cmd/go.mod

@@ -12,4 +12,4 @@ require (
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 )
 
-replace gogs.inhome.blapointe.com/bel/pttodo => ../..
+replace gogs.inhome.blapointe.com/bel/pttodo => ./..

cmd/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
@@ -30,7 +29,7 @@ func main() {
 
 func _main() error {
 	config := getConfig()
-	if err := add(config); err != nil {
+	if err := add(&config); err != nil {
 		return err
 	}
 	if err := edit(config); err != nil {
@@ -39,31 +38,6 @@ func _main() error {
 	return dump(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 {
@@ -93,9 +67,6 @@ func merge(filepath string, mergeTargetFilePath string) error {
 
 	base.MergeIn(merging)
 
-	if err := verifyRoot(base); err != nil {
-		return err
-	}
 	tmppath, err := marshalRootToTempFile(base)
 	if err != nil {
 		return err

cmd/pttodo-cli/add.go

@@ -1,46 +0,0 @@
-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/xfer/all_from_todo_server_to_pttodo.sh

@@ -1,21 +0,0 @@
-#! /bin/bash
-
-main() {
-   cd "$(dirname "$BASH_SOURCE")"
-   source ./from_todo_server_to_pttodo.sh
-   type from_todo_server_to_pttodo_main
-   list_lists | jq .list[] | jq -c . | while read -r line; do
-      local name="$(echo "$line" | jq -r .name | sed 's/^Today$/todo/g' | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g')"
-      local id="$(echo "$line" | jq -r .id)"
-      echo $name, $id
-      TODO_SERVER_LIST="$id" from_todo_server_to_pttodo_main > ./$name.yaml
-   done
-}
-
-list_lists() {
-	todo_server_curl "$TODO_SERVER_URL/ajax.php?loadLists=&rnd=0.9900282499544026"
-}
-
-if [ "$0" == "$BASH_SOURCE" ]; then
-   main "$@"
-fi

cmd/xfer/from_todo_server_to_pttodo.sh

@@ -1,55 +0,0 @@
-#! /bin/bash
-
-export TODO_SERVER_URL="${TODO_SERVER_URL:-"https://todo-server.remote.blapointe.com"}"
-export TODO_SERVER_HEADERS="${TODO_SERVER_HEADERS:-"Cookie: BOAuthZ=$TODO_SERVER_BOAUTHZ"}"
-export TODO_SERVER_LIST="${TODO_SERVER_LIST:-"2548023766"}"
-
-main() {
-   from_todo_server_to_pttodo_main "$@"
-}
-
-from_todo_server_to_pttodo_main() {
-   set -e
-   set -o pipefail
-   local tasks_in_todo="$(fetch_tasks_in_list | format_tasks_in_list)"
-   local schedule_tasks_in_flight="$(COMPL=1 LOOPING=1 fetch_tasks_in_list | format_tasks_in_list)"
-   echo "{\"todo\": $tasks_in_todo, \"scheduled\": $schedule_tasks_in_flight, \"done\": []}" | yq -P eval -
-}
-
-format_tasks_in_list() {
-   jq -c .list[] | while read -r line; do
-      echo "$line" \
-         | jq '{
-            todo: .title,
-            details:.note,
-            ts: (if .compl == 1 then (.dateCompleted | strptime("%d %b %Y %I:%M %p") | mktime) else .dateEditedInt end),
-            subtasks: [],
-            tags: .tags,
-            schedule: (if (.cron != "") then (.cron) else (.loop) end)
-         }' \
-         | jq -c .
-   done | jq -sc | yq -P eval - | grep -v -E ' (""|\[]|0s)$' | yq -j eval - | jq -c .
-}
-
-fetch_tasks_in_list() {
-   todo_server_curl "$TODO_SERVER_URL/ajax.php?loadTasks=&list=$TODO_SERVER_LIST&compl=${COMPL:-0}&looping=${LOOPING:-0}"
-}
-
-todo_server_curl() {
-   local csv_headers="$TODO_SERVER_HEADERS"
-   local headers=()
-   while [ "$csv_headers" != "" ]; do
-      header="${csv_headers%%,*}"
-      headers+=("-H" "${header%%:*}: ${header#*:}")
-      if echo "$csv_headers" | grep -q ,; then
-         csv_headers="${csv_headers#*,}"
-      else
-         csv_headers=""
-      fi
-   done
-   curl -sS "${headers[@]}" "$@"
-}
-
-if [ "$0" == "$BASH_SOURCE" ]; then
-   main "$@"
-fi

pttodo/root.go

@@ -1,11 +1,36 @@
 package pttodo
 
+import (
+	"os"
+
+	yaml "gopkg.in/yaml.v2"
+)
+
 type Root struct {
 	Todo      []Todo
 	Scheduled []Todo
 	Done      []Todo
 }
 
+func NewRootFromFile(p string) (Root, error) {
+	f, err := os.Open(p)
+	if os.IsNotExist(err) {
+		return Root{}, nil
+	}
+	if err != nil {
+		return Root{}, err
+	}
+	defer f.Close()
+
+	var result Root
+	if err := yaml.NewDecoder(f).Decode(&result); err != nil {
+		return Root{}, err
+	}
+
+	result.AutoMove()
+	return result, nil
+}
+
 func (root Root) Equals(other Root) bool {
 	for i, slice := range [][2][]Todo{
 		[2][]Todo{root.Todo, other.Todo},

pttodo/todo.go

@@ -4,7 +4,10 @@ import (
 	"encoding/base64"
 	"fmt"
 	"hash/crc32"
+	"os"
 	"time"
+
+	yaml "gopkg.in/yaml.v2"
 )
 
 type Todo struct {
@@ -17,6 +20,24 @@ type Todo struct {
 	writeTS  bool
 }
 
+func NewTodosFromFile(p string) ([]Todo, error) {
+	f, err := os.Open(p)
+	if os.IsNotExist(err) {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	var result []Todo
+	if err := yaml.NewDecoder(f).Decode(&result); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
 func (todo Todo) ID() string {
 	hash := crc32.NewIEEE()
 	fmt.Fprintf(hash, "%d:%s", 0, todo.Todo)