Skip to content

Commit f58fdc8

Browse files
author
Wu Feiteng
committed
fix issue54, a simple migration from cmdCat to cmdDelete
1 parent 7bfe25e commit f58fdc8

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

main.go

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -648,25 +648,18 @@ func cmdDelete(c *cli.Context) error {
648648
return err
649649
}
650650

651-
if !c.Args().Present() {
652-
return errors.New("pattern required")
653-
}
654-
f, err := os.Open(cfg.MemoDir)
655-
if err != nil {
656-
return err
657-
}
658-
defer f.Close()
659-
files, err := f.Readdirnames(-1)
660-
if err != nil {
661-
return err
651+
var files []string
652+
if c.Args().Present() {
653+
files = append(files, filepath.Join(cfg.MemoDir, c.Args().First()))
654+
} else {
655+
files, err = cfg.filterFiles()
656+
if err != nil {
657+
return err
658+
}
662659
}
663-
files = filterMarkdown(files)
664-
pat := c.Args().First()
660+
665661
var args []string
666662
for _, file := range files {
667-
if pat != "" && !strings.Contains(file, pat) {
668-
continue
669-
}
670663
fmt.Println(file)
671664
args = append(args, filepath.Join(cfg.MemoDir, file))
672665
}

0 commit comments

Comments
 (0)