From 0247fe085991145fb3cab761570df495e098bd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=A6=E3=82=B9?= Date: Mon, 5 Jul 2021 19:43:31 -0500 Subject: [PATCH] Implemented appendProjectIDToTask flag --- z/listCmd.go | 165 +++++++++++++++++++++++++++------------------------ 1 file changed, 86 insertions(+), 79 deletions(-) diff --git a/z/listCmd.go b/z/listCmd.go index ed218d5..f7421fc 100644 --- a/z/listCmd.go +++ b/z/listCmd.go @@ -1,107 +1,114 @@ package z import ( - "os" - "fmt" - "time" - "github.com/spf13/cobra" - "github.com/shopspring/decimal" + "fmt" + "os" + "time" + + "github.com/shopspring/decimal" + "github.com/spf13/cobra" ) var listTotalTime bool var listOnlyProjectsAndTasks bool +var appendProjectIDToTask bool var listCmd = &cobra.Command{ - Use: "list", - Short: "List activities", - Long: "List all tracked activities.", - Run: func(cmd *cobra.Command, args []string) { - user := GetCurrentUser() + Use: "list", + Short: "List activities", + Long: "List all tracked activities.", + Run: func(cmd *cobra.Command, args []string) { + user := GetCurrentUser() - entries, err := database.ListEntries(user) - if err != nil { - fmt.Printf("%s %+v\n", CharError, err) - os.Exit(1) - } + entries, err := database.ListEntries(user) + if err != nil { + fmt.Printf("%s %+v\n", CharError, err) + os.Exit(1) + } - var sinceTime time.Time - var untilTime time.Time + var sinceTime time.Time + var untilTime time.Time - if since != "" { - sinceTime, err = time.Parse(time.RFC3339, since) - if err != nil { - fmt.Printf("%s %+v\n", CharError, err) - os.Exit(1) - } - } + if since != "" { + sinceTime, err = time.Parse(time.RFC3339, since) + if err != nil { + fmt.Printf("%s %+v\n", CharError, err) + os.Exit(1) + } + } - if until != "" { - untilTime, err = time.Parse(time.RFC3339, until) - if err != nil { - fmt.Printf("%s %+v\n", CharError, err) - os.Exit(1) - } - } + if until != "" { + untilTime, err = time.Parse(time.RFC3339, until) + if err != nil { + fmt.Printf("%s %+v\n", CharError, err) + os.Exit(1) + } + } - var filteredEntries []Entry - filteredEntries, err = GetFilteredEntries(entries, project, task, sinceTime, untilTime) - if err != nil { - fmt.Printf("%s %+v\n", CharError, err) - os.Exit(1) - } + var filteredEntries []Entry + filteredEntries, err = GetFilteredEntries(entries, project, task, sinceTime, untilTime) + if err != nil { + fmt.Printf("%s %+v\n", CharError, err) + os.Exit(1) + } - if listOnlyProjectsAndTasks == true { - var projectsAndTasks = make(map[string]map[string]bool) + if listOnlyProjectsAndTasks == true { + var projectsAndTasks = make(map[string]map[string]bool) - for _, filteredEntry := range filteredEntries { - taskMap, ok := projectsAndTasks[filteredEntry.Project] + for _, filteredEntry := range filteredEntries { + taskMap, ok := projectsAndTasks[filteredEntry.Project] - if !ok { - taskMap = make(map[string]bool) - projectsAndTasks[filteredEntry.Project] = taskMap - } + if !ok { + taskMap = make(map[string]bool) + projectsAndTasks[filteredEntry.Project] = taskMap + } - taskMap[filteredEntry.Task] = true - projectsAndTasks[filteredEntry.Project] = taskMap - } + taskMap[filteredEntry.Task] = true + projectsAndTasks[filteredEntry.Project] = taskMap + } - for project, _ := range projectsAndTasks { - fmt.Printf("%s %s\n", CharMore, project) + for project, _ := range projectsAndTasks { + fmt.Printf("%s %s\n", CharMore, project) - for task, _ := range projectsAndTasks[project] { - fmt.Printf("%*s└── %s\n", 1, " ", task) - } - } + for task, _ := range projectsAndTasks[project] { + if appendProjectIDToTask == true { + fmt.Printf("%*s└── %s [%s]\n", 1, " ", task, project) + } else { + fmt.Printf("%*s└── %s\n", 1, " ", task) + } + } + } - return - } + return + } - totalHours := decimal.NewFromInt(0); - for _, entry := range filteredEntries { - totalHours = totalHours.Add(entry.GetDuration()) - fmt.Printf("%s\n", entry.GetOutput(false)) - } + totalHours := decimal.NewFromInt(0) + for _, entry := range filteredEntries { + totalHours = totalHours.Add(entry.GetDuration()) + fmt.Printf("%s\n", entry.GetOutput(false)) + } - if listTotalTime == true { - fmt.Printf("\nTOTAL: %s H\n\n", totalHours.StringFixed(2)) - } - return - }, + if listTotalTime == true { + fmt.Printf("\nTOTAL: %s H\n\n", totalHours.StringFixed(2)) + } + return + }, } func init() { - rootCmd.AddCommand(listCmd) - listCmd.Flags().StringVar(&since, "since", "", "Date/time to start the list from") - listCmd.Flags().StringVar(&until, "until", "", "Date/time to list until") - listCmd.Flags().StringVarP(&project, "project", "p", "", "Project to be listed") - listCmd.Flags().StringVarP(&task, "task", "t", "", "Task to be listed") - listCmd.Flags().BoolVar(&listTotalTime, "total", false, "Show total time of hours for listed activities") - listCmd.Flags().BoolVar(&listOnlyProjectsAndTasks, "only-projects-and-tasks", false, "Only list projects and their tasks, no entries") + rootCmd.AddCommand(listCmd) + listCmd.Flags().StringVar(&since, "since", "", "Date/time to start the list from") + listCmd.Flags().StringVar(&until, "until", "", "Date/time to list until") + listCmd.Flags().StringVarP(&project, "project", "p", "", "Project to be listed") + listCmd.Flags().StringVarP(&task, "task", "t", "", "Task to be listed") + listCmd.Flags().BoolVar(&listTotalTime, "total", false, "Show total time of hours for listed activities") + listCmd.Flags().BoolVar(&listOnlyProjectsAndTasks, "only-projects-and-tasks", false, "Only list projects and their tasks, no entries") + listCmd.Flags().BoolVar(&appendProjectIDToTask, "append-project-id-to-task", false, "Append project ID to tasks in the list") - var err error - database, err = InitDatabase() - if err != nil { - fmt.Printf("%s %+v\n", CharError, err) - os.Exit(1) - } + var err error + database, err = InitDatabase() + if err != nil { + fmt.Printf("%s %+v\n", CharError, err) + os.Exit(1) + } }