From 1056fecdccbb734dc732a2f795f2591d3c63f951 Mon Sep 17 00:00:00 2001
From: Grant Ammons <gammons@gmail.com>
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
---
 todolist/parser.go | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'todolist/parser.go')

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