From da0f0a05f8e0657770d802bc21facc5543e05ad3 Mon Sep 17 00:00:00 2001 From: ChaosNyaruko Date: Fri, 28 Apr 2023 16:28:09 +0800 Subject: [PATCH 1/2] fix issue54, a simple migration from cmdCat to cmdDelete --- main.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/main.go b/main.go index e80855f..79ac33e 100644 --- a/main.go +++ b/main.go @@ -648,25 +648,18 @@ func cmdDelete(c *cli.Context) error { return err } - if !c.Args().Present() { - return errors.New("pattern required") - } - f, err := os.Open(cfg.MemoDir) - if err != nil { - return err - } - defer f.Close() - files, err := f.Readdirnames(-1) - if err != nil { - return err + var files []string + if c.Args().Present() { + files = append(files, filepath.Join(cfg.MemoDir, c.Args().First())) + } else { + files, err = cfg.filterFiles() + if err != nil { + return err + } } - files = filterMarkdown(files) - pat := c.Args().First() + var args []string for _, file := range files { - if pat != "" && !strings.Contains(file, pat) { - continue - } fmt.Println(file) args = append(args, filepath.Join(cfg.MemoDir, file)) } From c7e647cea7ee3c769c0017ae969949764909cb9c Mon Sep 17 00:00:00 2001 From: ChaosNyaruko Date: Fri, 5 May 2023 15:23:56 +0800 Subject: [PATCH 2/2] bugfix: file prefix repeated --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 79ac33e..13955e7 100644 --- a/main.go +++ b/main.go @@ -661,7 +661,7 @@ func cmdDelete(c *cli.Context) error { var args []string for _, file := range files { fmt.Println(file) - args = append(args, filepath.Join(cfg.MemoDir, file)) + args = append(args, file) } if len(args) == 0 { color.Yellow("%s", "No matched entry")