From 263482f607b9a4ed58ecb3333a53cec2b1d32087 Mon Sep 17 00:00:00 2001 From: bel Date: Sun, 13 Jul 2025 08:51:21 -0600 Subject: [PATCH] Revert "original.yaml has just todo, merge against .original.yaml so mobile edits still get a history" This reverts commit 242ad3e1278e558783c9d32dc6cc69b990251ed8. --- cmd/config.go | 4 +--- cmd/edit.go | 13 +------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index 2327efe..4588b04 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -90,9 +90,7 @@ func (config config) targets() ([]string, error) { for i := range results { if stat, err := os.Stat(results[i]); err != nil { return nil, err - } else if stat.IsDir() { - } else if strings.HasPrefix(path.Base(results[i]), ".") && isDir { - } else { + } else if !stat.IsDir() { result = append(result, results[i]) } } diff --git a/cmd/edit.go b/cmd/edit.go index a59c78e..f5c80c8 100644 --- a/cmd/edit.go +++ b/cmd/edit.go @@ -61,10 +61,6 @@ func _edit(filepaths []string) error { original, err := pttodo.NewRootFromFile(func() string { for _, f := range filepaths { if path.Base(f) == path.Base(editedFile) { - rootF := path.Join(path.Dir(f), "."+path.Base(f)) - if _, err := os.Stat(rootF); err == nil { - f = rootF - } return f } } @@ -106,15 +102,8 @@ func _edit(filepaths []string) error { dir := "" for _, f := range filepaths { - rootF := path.Join(path.Dir(f), "."+path.Base(f)) if edited, ok := edits[path.Base(f)]; ok { - if todos, err := pttodo.NewRootFromFile(edited); err != nil { - return err - } else if b, err := yaml.Marshal(todos.Todo); err != nil { - return err - } else if err := rename(edited, rootF); err != nil { - return err - } else if err := os.WriteFile(f, b, os.ModePerm); err != nil { + if err := rename(edited, f); err != nil { return err } delete(edits, path.Base(f))