From 70be91c1caf2f6d28a30c7e47f073e0c58ea794c Mon Sep 17 00:00:00 2001 From: Andrew Haynes Date: Mon, 9 Nov 2026 14:38:41 -0500 Subject: [PATCH] chore(list): fixed and optimized to actually work --- main.go | 136 ++++++++++++++++++++++++++++++++--------------------- tasks.json | 2 +- 2 files changed, 83 insertions(+), 55 deletions(-) diff --git a/main.go b/main.go index 635bf81..a89c558 100644 --- a/main.go +++ b/main.go @@ -27,6 +27,7 @@ import ( "errors" "fmt" "os" + "strconv" "time" ) @@ -42,6 +43,7 @@ const ( StatusTodo string = "todo" StatusInProgress string = "in-progress" StatusDone string = "done" + StatusAny string = "any" ) func loadTasks(fileName string) ([]Task, error) { @@ -122,50 +124,73 @@ func addTask(fileName string, opts []string) (Task, error) { return task, err } -func listTasks(fileName string, status string) error { +func listTasks(fileName string, status string, verbose bool) error { tasks, err := loadTasks(fileName) if err != nil { return err } + for i := range tasks { + cy, cm, cd := tasks[i].CreatedAt.Date() + uy, um, ud := tasks[i].UpdatedAt.Date() + if status == StatusTodo && tasks[i].Status == StatusTodo { + if verbose { + fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) + } else { + fmt.Printf("(ID: %d, %s): %s\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc) + } + continue + } + if status == StatusDone && tasks[i].Status == StatusDone { + if verbose { + fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) + } else { + fmt.Printf("(ID: %d, %s): %s\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc) + } + continue + } + if status == StatusInProgress && tasks[i].Status == StatusInProgress { + if verbose { + fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) + } else { + fmt.Printf("(ID: %d, %s): %s\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc) + } + continue + } + if status == StatusAny { + if verbose { + fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) + } else { + fmt.Printf("(ID: %d, %s): %s\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc) + } + continue + } - switch status { - case "all": - for i := range tasks { - cy, cm, cd := tasks[i].CreatedAt.Date() - uy, um, ud := tasks[i].UpdatedAt.Date() - fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) - } - case "todo": - for i := range tasks { - if tasks[i].Status == StatusTodo { - cy, cm, cd := tasks[i].CreatedAt.Date() - uy, um, ud := tasks[i].UpdatedAt.Date() - fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) - } - } - case "done": - for i := range tasks { - if tasks[i].Status == StatusDone { - cy, cm, cd := tasks[i].CreatedAt.Date() - uy, um, ud := tasks[i].UpdatedAt.Date() - fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) - } - } - case "in-progress": - for i := range tasks { - if tasks[i].Status == StatusInProgress { - cy, cm, cd := tasks[i].CreatedAt.Date() - uy, um, ud := tasks[i].UpdatedAt.Date() - fmt.Printf("(ID: %d, %s): %s, created (%d %s, %d) and modified (%d %s, %d)\n", tasks[i].ID, tasks[i].Status, tasks[i].Desc, cd, cm, cy, ud, um, uy) - } - } } + + return nil +} + +func mark(fileName string, idx int, status string) error { + tasks, err := loadTasks(fileName) + if err != nil { + panic(err) + } + + tasks[idx].Status = status + + saveAllTasks(fileName, tasks) + return nil } func main() { args := os.Args[1:] fileName := "tasks.json" + var verbose bool + + if len(args) == 3 && args[2] == "-v" { + verbose = true + } if args[0] == "add" { task, err := addTask(fileName, args[1:]) @@ -173,32 +198,35 @@ func main() { panic(err) } appendToTasks(fileName, task) - } else if args[0] == "list" && args[1] == "todo" { - err := listTasks(fileName, StatusTodo) - if err != nil { - panic(err) - } - } else if args[0] == "list" && args[1] == "done" { - err := listTasks(fileName, StatusDone) - if err != nil { - panic(err) - } - } else if args[0] == "list" && args[1] == "in-progress" { - err := listTasks(fileName, StatusInProgress) - if err != nil { - panic(err) + } + if len(args) > 1 && args[0] == "list" { + switch args[1] { + case "todo": + err := listTasks(fileName, StatusTodo, verbose) + if err != nil { + panic(err) + } + case "done": + err := listTasks(fileName, StatusDone, verbose) + if err != nil { + panic(err) + } + case "in-progress": + err := listTasks(fileName, StatusInProgress, verbose) + if err != nil { + panic(err) + } } } else if args[0] == "list" { - err := listTasks(fileName, "all") + err := listTasks(fileName, StatusAny, verbose) if err != nil { panic(err) } + } else if args[0] == "mark-progress" { + str, err := strconv.Atoi(args[1]) + if err != nil { + panic(err) + } + err = mark(fileName, str, StatusInProgress) } - // - // tasks, _ := loadTasks(fileName) - // addTask(fileName, ) - // addTask(fileName, task2) - // for i := range tasks { - // fmt.Println(tasks[i].ID) - // } } diff --git a/tasks.json b/tasks.json index e197e97..37be6df 100644 --- a/tasks.json +++ b/tasks.json @@ -44,7 +44,7 @@ { "id": 6, "description": "test_2", - "status": "todo", + "status": "in-progress", "createdAt": "2026-11-09T13:25:02.880597-05:00", "updatedAt": "2026-11-09T13:25:02.880597-05:00" },