brian/gime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Find Active or Most Recent Timer

Browse Source
This commit is contained in:
Brian Buller 2023-04-14 11:02:16 -05:00
parent 2378c9e617
commit 3165c0254d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/cli.go
View File

@ -165,6 +165,13 @@ func (p *Program) GetFilteredTimerList(args []string) *timertxt.TimerList {
return list.Filter(doFilters) return list.Filter(doFilters)
} }
func (p *Program) GetActiveOrMostRecent() (*timertxt.Timer, error) {
work, wErr := p.TimerList.GetActiveOrMostRecent()
if wErr == nil {
return work, nil
}
return p.GetMostRecentTimer()
}
func (p *Program) GetMostRecentTimer() (*timertxt.Timer, error) { func (p *Program) GetMostRecentTimer() (*timertxt.Timer, error) {
work, wErr := p.TimerList.GetMostRecentTimer() work, wErr := p.TimerList.GetMostRecentTimer()
if wErr == nil && work.FinishDate.IsZero() { if wErr == nil && work.FinishDate.IsZero() {

2
cmd/i3status.go
View File

@ -46,7 +46,7 @@ func opI3Status(cmd *cobra.Command, args []string) error {
return nil return nil
} }
state := "Idle" state := "Idle"
wrk, err := p.GetMostRecentTimer() wrk, err := p.GetActiveOrMostRecent()
if err != nil { if err != nil {
fmt.Print("{\"icon\":\"time\",\"state\":\"Critical\", \"text\": \"Error loading timer entry\"}") fmt.Print("{\"icon\":\"time\",\"state\":\"Critical\", \"text\": \"Error loading timer entry\"}")
return nil return nil