More Work

cmd/gime/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"os"
+	"strconv"
+	"strings"
 	"time"
 
 	"git.bullercodeworks.com/brian/gime"
@@ -14,7 +16,7 @@ const (
 )
 
 var validOperations map[string][]string
-var activeTimeEntry *gime.TimeEntry
+var activeTimeEntries *gime.TimeEntryCollection
 var gdb *gime.GimeDB
 
 func main() {
@@ -48,6 +50,7 @@ func main() {
 
 func printHelp() int {
 	fmt.Println("gime - A simple timekeeping application\n")
+	fmt.Println("Usage: gime [@timerID] [operation] [tags...]")
 	for _, v := range validOperations {
 		for vi := range v {
 			fmt.Println("  ", v[vi])
@@ -57,31 +60,56 @@ func printHelp() int {
 	return 0
 }
 
+func loadActiveTimeEntries() {
+	activeTimeEntries = gdb.LoadTimeEntryCollection(gime.TypeCurrent)
+}
+
 func printStatus() int {
-	if activeTimeEntry == nil {
+	loadActiveTimeEntries()
+	curr := time.Now()
+	fmt.Println("Current Time:", curr.Format(time.Stamp))
+	if activeTimeEntries.Length() == 0 {
 		fmt.Println("No timer running")
 	} else {
-		fmt.Print("Timer started at ")
-		curr := time.Now()
-		if activeTimeEntry.GetStart().Day() == curr.Day() {
-			fmt.Println(activeTimeEntry.GetStart().Format("15:04"))
-		} else {
-			fmt.Println(activeTimeEntry.GetStart().Format(time.Stamp))
+		fmt.Print("Currently Active Timers\n")
+		for i := 0; i < activeTimeEntries.Length(); i++ {
+			v := activeTimeEntries.Get(i)
+			if v.GetStart().Day() == curr.Day() {
+				fmt.Print("@"+strconv.Itoa(i)+" ", v.GetStart().Format("15:04"), " ")
+			} else {
+				fmt.Print("@"+strconv.Itoa(i)+" ", v.GetStart().Format(time.Stamp), " ")
+			}
+			since := time.Since(v.GetStart()).String()
+			since = strings.Split(since, ".")[0]
+			fmt.Print("(" + since + "s) ")
+			fmt.Print(v.GetTags().Length())
+			if v.GetTags().Length() > 0 {
+				fmt.Print(" [ ")
+				for j := 0; j < v.GetTags().Length(); j++ {
+					fmt.Print(v.GetTags().Get(j))
+					if j < v.GetTags().Length()-1 {
+						fmt.Print(", ")
+					}
+				}
+				fmt.Print(" ] ")
+			}
+			fmt.Println("")
 		}
-		fmt.Println(time.Since(activeTimeEntry.GetStart()).String())
 	}
 	return 0
 }
 
+// switchTimer performs a stop on any currently running timers
+// and starts a new timer with the given arguments
+func switchTimer(args []string) int {
+	return 0
+}
+
 // startTimer takes a list of arguments and returns the return code
 // to be passed along to os.Exit
 func startTimer(args []string) int {
 	var err error
 	tm := time.Now()
-	curr := gdb.LoadTimeEntryCollection(gime.TypeCurrent)
-	if curr.Length() > 0 {
-		// TODO: Stop all Timers in curr
-	}
 	tagStart := 0
 	if len(args) > 0 {
 		// Check if the first argument looks like a date/time
@@ -103,7 +131,11 @@ func startTimer(args []string) int {
 		timerArgs = args[tagStart:]
 	}
 	fmt.Println(tm)
-	if entry, err = gime.CreateTimeEntry(tm, time.Time{}, timerArgs); err != nil {
+	tc := new(gime.TagCollection)
+	for i := range timerArgs {
+		tc.Push(timerArgs[i])
+	}
+	if entry, err = gime.CreateTimeEntry(tm, time.Time{}, tc); err != nil {
 		fmt.Println(err)
 		return 1
 	}
@@ -124,7 +156,6 @@ func stopTimer(args []string) int {
 		if err != nil {
 			tm, err = time.Parse(time.Kitchen, args[0])
 		}
-
 	}
 	_, _ = tm, st
 	return 0