From aa5050461a30d36a384edd45d20585a89d3da344 Mon Sep 17 00:00:00 2001 From: Michael Strüder Date: Sat, 29 Apr 2017 16:19:24 +0200 Subject: extract subcommand, id, and input string in Parser --- todolist/app.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 880390e..24ebe4d 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -3,7 +3,6 @@ package todolist import ( "fmt" "regexp" - "strconv" "strings" "time" ) @@ -174,19 +173,13 @@ func (a *App) UnprioritizeTodo(input string) { } func (a *App) getId(input string) (int, *Todo) { - re, _ := regexp.Compile("\\d+") - if re.MatchString(input) { - id, _ := strconv.Atoi(re.FindString(input)) - todo := a.TodoList.FindById(id) - if todo == nil { - fmt.Println("No such id.") - return -1, nil - } - return id, todo - } else { - fmt.Println("Invalid id.") + _, id, _ := Parser{input}.Parse() + todo := a.TodoList.FindById(id) + if todo == nil { + fmt.Println("No such id.") return -1, nil } + return id, todo } func (a *App) getGroups(input string, todos []*Todo) *GroupedTodos { -- cgit v1.3 From ed6ab22cbdbc475adf539637e45a67811ec0c15a Mon Sep 17 00:00:00 2001 From: Michael Strüder Date: Sat, 29 Apr 2017 16:31:31 +0200 Subject: display an error on malformed input --- todolist/app.go | 12 ++++++++++++ todolist/parser.go | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 24ebe4d..6d771ef 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -91,6 +91,18 @@ func (a *App) UnarchiveTodo(input string) { fmt.Println("Todo unarchived.") } +func (a *App) EditTodoSubject(input string) { + a.Load() + _, id, subject := Parser{input}.Parse() + id, todo := a.getId(input) + if id == -1 { + return + } + todo.Subject = subject + a.Save() + fmt.Println("Todo subject updated.") +} + func (a *App) EditTodoDue(input string) { a.Load() id, todo := a.getId(input) diff --git a/todolist/parser.go b/todolist/parser.go index d55ab3b..38bdb7f 100644 --- a/todolist/parser.go +++ b/todolist/parser.go @@ -34,10 +34,14 @@ func (p Parser) Parse() (string, int, string) { input := p.input r := regexp.MustCompile(`(\w+) (\d+) (.*)`) matches := r.FindStringSubmatch(input) + if len(matches) < 4 { + fmt.Println("Could match command, id or subject") + return "", -1, input + } id, err := strconv.Atoi(matches[2]) if err != nil { fmt.Println("Invalid id.") - id = -1 + return "", -1, input } return matches[1], id, matches[3] -- cgit v1.3 From 2c5512341a8c87dfe4d37106a1ecc02784e84da6 Mon Sep 17 00:00:00 2001 From: Michael Strüder Date: Wed, 3 May 2017 14:54:32 +0200 Subject: prevent duplicate error messages when updating subjects --- todolist/app.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 6d771ef..1e9f699 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -93,12 +93,15 @@ func (a *App) UnarchiveTodo(input string) { func (a *App) EditTodoSubject(input string) { a.Load() + _, id, subject := Parser{input}.Parse() - id, todo := a.getId(input) if id == -1 { return } + + _, todo := a.getId(input) todo.Subject = subject + a.Save() fmt.Println("Todo subject updated.") } -- cgit v1.3 From 6beb1258b010cbb29f8c296a3a1d51cae2f18aa4 Mon Sep 17 00:00:00 2001 From: Michael Strüder Date: Wed, 3 May 2017 18:13:00 +0200 Subject: error out when invalid id given --- todolist/app.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 1e9f699..77a7e44 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -100,6 +100,10 @@ func (a *App) EditTodoSubject(input string) { } _, todo := a.getId(input) + if todo == nil { + fmt.Println("Todo not found.") + return + } todo.Subject = subject a.Save() -- cgit v1.3 From 87e2fe7dbfcb2026662b50524d5d9eec766d8308 Mon Sep 17 00:00:00 2001 From: Michael Strüder Date: Wed, 3 May 2017 18:33:01 +0200 Subject: do not duplicate error messages again --- todolist/app.go | 1 - 1 file changed, 1 deletion(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 77a7e44..5f4d08f 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -101,7 +101,6 @@ func (a *App) EditTodoSubject(input string) { _, todo := a.getId(input) if todo == nil { - fmt.Println("Todo not found.") return } todo.Subject = subject -- cgit v1.3 From 54aaabdbe16986e6e6071dda1eeee6f73ae39400 Mon Sep 17 00:00:00 2001 From: Michael Strüder Date: Thu, 4 May 2017 23:55:43 +0200 Subject: parse Projects and Contexts when editing subject --- todolist/app.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 5f4d08f..12cc39d 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -94,7 +94,8 @@ func (a *App) UnarchiveTodo(input string) { func (a *App) EditTodoSubject(input string) { a.Load() - _, id, subject := Parser{input}.Parse() + p := Parser{input} + _, id, subject := p.Parse() if id == -1 { return } @@ -103,7 +104,10 @@ func (a *App) EditTodoSubject(input string) { if todo == nil { return } + todo.Subject = subject + todo.Projects = p.Projects(subject) + todo.Contexts = p.Contexts(subject) a.Save() fmt.Println("Todo subject updated.") -- cgit v1.3 From 1056fecdccbb734dc732a2f795f2591d3c63f951 Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Fri, 5 May 2017 16:51:03 -0400 Subject: WIP on a unified edit This allows a unified edit functionality that supports the following: **`t e 25 due tom`** * Edits the due date * Leaves subject, projects and contexts unchanged **`t e 25 take out the trash with @bob` * Updates the subject, projects and contexts * Leaves the due date unchanged **`t e 25 take out the trash with @bob due tom` * Updates the subject, projects and contexts * Updates the due date **What's missing** * Tests that exercise this functionality --- todo.go | 6 ++---- todolist/app.go | 53 +++++++++++++++++++++-------------------------------- todolist/parser.go | 30 ++++++++++++------------------ 3 files changed, 35 insertions(+), 54 deletions(-) (limited to 'todolist/app.go') diff --git a/todo.go b/todo.go index d091cd3..130fd55 100644 --- a/todo.go +++ b/todo.go @@ -140,10 +140,8 @@ func routeInput(command string, input string) { app.UnarchiveTodo(input) case "ac": app.ArchiveCompleted() - case "e", "edit", "ed", "edit-date": - app.EditTodoDue(input) - case "es", "edit-subject": - app.EditTodoSubject(input) + case "e", "edit": + app.EditTodo(input) case "ex", "expand": app.ExpandTodo(input) case "gc": diff --git a/todolist/app.go b/todolist/app.go index 12cc39d..9fefd8e 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -3,8 +3,8 @@ package todolist import ( "fmt" "regexp" + "strconv" "strings" - "time" ) type App struct { @@ -91,38 +91,18 @@ func (a *App) UnarchiveTodo(input string) { fmt.Println("Todo unarchived.") } -func (a *App) EditTodoSubject(input string) { +func (a *App) EditTodo(input string) { a.Load() - - p := Parser{input} - _, id, subject := p.Parse() + id, _ := a.getId(input) if id == -1 { return } + parser := &Parser{} - _, todo := a.getId(input) - if todo == nil { - return - } - - todo.Subject = subject - todo.Projects = p.Projects(subject) - todo.Contexts = p.Contexts(subject) - - a.Save() - fmt.Println("Todo subject updated.") -} - -func (a *App) EditTodoDue(input string) { - a.Load() - id, todo := a.getId(input) - if id == -1 { - return + if (parser.ParseEditTodo(a.TodoList.FindById(id), input)) { + a.Save() + fmt.Println("Todo updated.") } - parser := &Parser{} - todo.Due = parser.Due(input, time.Now()) - a.Save() - fmt.Println("Todo due date updated.") } func (a *App) ExpandTodo(input string) { @@ -195,13 +175,22 @@ func (a *App) UnprioritizeTodo(input string) { } func (a *App) getId(input string) (int, *Todo) { - _, id, _ := Parser{input}.Parse() - todo := a.TodoList.FindById(id) - if todo == nil { - fmt.Println("No such id.") + re, _ := regexp.Compile("\\d+") + if re.MatchString(input) { + id, _ := strconv.Atoi(re.FindString(input)) + todo := a.TodoList.FindById(id) + if todo == nil { + fmt.Println("No such id.") + return -1, nil + + } + return id, todo + + } else { + fmt.Println("Invalid id.") return -1, nil + } - return id, todo } func (a *App) getGroups(input string, todos []*Todo) *GroupedTodos { diff --git a/todolist/parser.go b/todolist/parser.go index 3598e12..91f9b6e 100644 --- a/todolist/parser.go +++ b/todolist/parser.go @@ -9,9 +9,7 @@ import ( "time" ) -type Parser struct { - input string -} +type Parser struct {} func (p *Parser) ParseNewTodo(input string) *Todo { r, _ := regexp.Compile(`^(add|a)(\\ |) `) @@ -30,29 +28,25 @@ func (p *Parser) ParseNewTodo(input string) *Todo { return todo } -// Parse accepts user input and splits it into subcommand, the todo id to -// work on and the subject for the subcommand function. -func (p Parser) Parse() (subcommand string, id int, subject string) { +func (p *Parser) ParseEditTodo(todo *Todo, input string) bool { r := regexp.MustCompile(`(\w+)\s+(\d+)(\s+(.*))?`) - matches := r.FindStringSubmatch(p.input) + matches := r.FindStringSubmatch(input) if len(matches) < 3 { fmt.Println("Could match command or id") - return "", -1, "" + return false } - subcommand = matches[1] + subjectOnly := matches[3] - // because of the regexp match, this can never fail - id, err := strconv.Atoi(matches[2]) - if err != nil { - panic(err) + if p.Subject(subjectOnly) != "" { + todo.Subject = p.Subject(subjectOnly) + todo.Projects = p.Projects(subjectOnly) + todo.Contexts = p.Contexts(subjectOnly) } - - if len(matches) == 5 { - subject = matches[4] + if p.hasDue(subjectOnly) { + todo.Due = p.Due(subjectOnly, time.Now()) } - - return + return true } func (p *Parser) Subject(input string) string { -- cgit v1.3 From 55af0a2d91c8e72ebe54b00f8b023d4e46686287 Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Tue, 9 May 2017 20:34:56 -0400 Subject: Minor optimization --- todolist/app.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 9fefd8e..eb2f5c2 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -93,13 +93,13 @@ func (a *App) UnarchiveTodo(input string) { func (a *App) EditTodo(input string) { a.Load() - id, _ := a.getId(input) + id, todo := a.getId(input) if id == -1 { return } parser := &Parser{} - if (parser.ParseEditTodo(a.TodoList.FindById(id), input)) { + if (parser.ParseEditTodo(todo, input)) { a.Save() fmt.Println("Todo updated.") } -- cgit v1.3 From aed8e547d1b91c607853737960bbf9df4ab6756b Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Wed, 10 May 2017 20:38:55 -0400 Subject: Remove unnecessary parens --- todolist/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index eb2f5c2..56787d3 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -99,7 +99,7 @@ func (a *App) EditTodo(input string) { } parser := &Parser{} - if (parser.ParseEditTodo(todo, input)) { + if parser.ParseEditTodo(todo, input) { a.Save() fmt.Println("Todo updated.") } -- cgit v1.3