Filtering on tags, Rounding on 'time'

cmd/list.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2022 Brian Buller <brian@bullercodeworks.com>
-
 */
 package cmd
 
@@ -74,6 +73,7 @@ func opListTimers(cmd *cobra.Command, args []string) error {
 	}
 	filter := util.BuildFilterFromArgs(args)
 	list = list.Filter(filter)
+	list.Sort(timertxt.SortFinishDateAsc)
 
 	dayTotals := make(map[string]time.Duration)
 	for _, v := range list.GetTimerSlice() {

cmd/time.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2022 Brian Buller <brian@bullercodeworks.com>
-
 */
 package cmd
 
@@ -10,6 +9,7 @@ import (
 
 	"git.bullercodeworks.com/brian/gime/cli"
 	"git.bullercodeworks.com/brian/gime/util"
+	"git.bullercodeworks.com/brian/go-timertxt"
 	"github.com/spf13/cobra"
 )
 
@@ -22,25 +22,58 @@ var timeCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(timeCmd)
+
+	// Local Flags
+	timeCmd.Flags().BoolP("all", "a", false, "Include done.txt timers")
+	timeCmd.Flags().BoolP("done", "d", false, "Only done.txt timers")
 }
 
 func opShowTimers(cmd *cobra.Command, args []string) error {
 	var err error
+	var includeArchive bool
+	var onlyArchive bool
+	if onlyArchive, err = cmd.Flags().GetBool("done"); err != nil {
+		return err
+	} else if includeArchive, err = cmd.Flags().GetBool("all"); err != nil {
+		return err
+	}
+
 	p := cli.Program{}
 	err = p.Initialize()
 	if err != nil {
 		return err
 	}
-	if err := p.LoadTimerList(); err != nil {
-		return err
+	if !onlyArchive {
+		if err := p.LoadTimerList(); err != nil {
+			return err
+		}
 	}
-	list := p.GetFilteredTimerList(args)
+	if includeArchive || onlyArchive {
+		if err := p.LoadDoneList(); err != nil {
+			return err
+		}
+	}
+	list := timertxt.NewTimerList()
+	if !onlyArchive {
+		list = p.TimerList
+		if includeArchive {
+			for _, tmr := range p.DoneList.GetTimerSlice() {
+				list.AddTimer(tmr)
+			}
+		}
+	} else {
+		list = p.DoneList
+	}
+	filter := util.BuildFilterFromArgs(args)
+	list = list.Filter(filter)
+	list.Sort(timertxt.SortFinishDateAsc)
+
 	var isActive bool
 	var total time.Duration
 	for _, v := range list.GetTimerSlice() {
-		dur := v.FinishDate.Sub(v.StartDate)
+		dur := util.Round(v.FinishDate.Sub(v.StartDate))
 		if v.FinishDate.IsZero() {
-			dur = time.Now().Sub(v.StartDate)
+			dur = util.Round(time.Now().Sub(v.StartDate))
 			isActive = true
 		}
 		total += dur