From 7c24f39a0fc8bb07dc9db4f5fecd3468705b1e37 Mon Sep 17 00:00:00 2001 From: Quey-Liang Kao Date: Mon, 14 Aug 2017 16:34:33 +0800 Subject: Implement the "en" feature: Editting notes --- todolist/parser.go | 30 ++++++++++++++++++++++++++++-- todolist/parser_test.go | 7 +++++++ 2 files changed, 35 insertions(+), 2 deletions(-) (limited to 'todolist') diff --git a/todolist/parser.go b/todolist/parser.go index 3883454..42af133 100644 --- a/todolist/parser.go +++ b/todolist/parser.go @@ -99,9 +99,8 @@ func (p *Parser) ParseNotes(todo *Todo, input string) string { return "list" case "dn": - rmid, err := strconv.Atoi(matches[2]) + rmid, err := p.getNoteID(matches[2]) if err != nil { - fmt.Println("wrong note id") return "" } @@ -113,12 +112,39 @@ func (p *Parser) ParseNotes(todo *Todo, input string) string { } fmt.Println("Could not found note id") return "" + + case "en": + r1, _ := regexp.Compile(`(\d)+\s+(.*)?`) + tail := r1.FindStringSubmatch(matches[2]) + edid, err := p.getNoteID(tail[1]) + if err != nil { + return "" + } + + for id, _ := range todo.Notes { + if id == edid { + todo.Notes[id] = tail[2] + return "edit" + } + } + + fmt.Println("Could not found note id") + return "" } fmt.Println("Could not match command or id") return "" } +func (p *Parser) getNoteID(input string) (int, error) { + ret, err := strconv.Atoi(input) + if err != nil { + fmt.Println("wrong note id") + return -1, err + } + return ret, nil +} + func (p *Parser) hasDue(input string) bool { r1, _ := regexp.Compile(`due \w+$`) r2, _ := regexp.Compile(`due \w+ \d+$`) diff --git a/todolist/parser_test.go b/todolist/parser_test.go index e5c7007..2c4fd25 100644 --- a/todolist/parser_test.go +++ b/todolist/parser_test.go @@ -85,6 +85,13 @@ func TestParseNotes(t *testing.T) { t.Error("Expected note 1 to be 'www.google.com' but got", todo.Notes[0]) } + if parser.ParseNotes(todo, "en 1 0 www.duckduckgo.com") != "edit" { + t.Error("Expected Notes to be editted") + } + if todo.Notes[0] != "www.duckduckgo.com" { + t.Error("Expected note 1 to be 'www.duckduckgo.com' but got", todo.Notes[0]) + } + if parser.ParseNotes(todo, "dn 1 0") != "delete" { t.Error("Expected Notes to be deleted") } -- cgit v1.3