From 471b93141074222bdef537f08b6443e91fa0ea2f Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Mon, 2 May 2016 08:09:48 -0400 Subject: Create filter, by archived or unarchived --- todolist/app.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'todolist/app.go') diff --git a/todolist/app.go b/todolist/app.go index 598612c..2af3361 100644 --- a/todolist/app.go +++ b/todolist/app.go @@ -81,8 +81,8 @@ func (a *App) UnarchiveTodo(input string) { } func (a *App) ListTodos(input string) { - //filtered := NewFilter(a.TodoStore.Todos()).filter() - grouped := a.getGroups(input) + filtered := NewFilter(a.TodoStore.Todos()).Filter(input) + grouped := a.getGroups(input, filtered) formatter := NewFormatter(grouped) formatter.Print() @@ -99,7 +99,7 @@ func (a *App) getId(input string) int { } } -func (a *App) getGroups(input string) *GroupedTodos { +func (a *App) getGroups(input string, todos []Todo) *GroupedTodos { grouper := &Grouper{} contextRegex, _ := regexp.Compile(`by c.*$`) projectRegex, _ := regexp.Compile(`by p.*$`) @@ -107,11 +107,11 @@ func (a *App) getGroups(input string) *GroupedTodos { var grouped *GroupedTodos if contextRegex.MatchString(input) { - grouped = grouper.GroupByContext(a.TodoStore.Todos()) + grouped = grouper.GroupByContext(todos) } else if projectRegex.MatchString(input) { - grouped = grouper.GroupByContext(a.TodoStore.Todos()) + grouped = grouper.GroupByContext(todos) } else { - grouped = grouper.GroupByNothing(a.TodoStore.Todos()) + grouped = grouper.GroupByNothing(todos) } return grouped } -- cgit v1.3