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

Updated TimerList struct

Browse Source
This commit is contained in:
Brian Buller
2023-01-12 06:04:17 -06:00
parent c98a4dea0c
commit c412f54294
10 changed files with 260 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli/cli.go
View File

@@ -33,13 +33,13 @@ func (p *Program) GetTimerFilePath() string {
func (p *Program) LoadTimerList() error {
var err error
var tl timertxt.TimerList
var tl *timertxt.TimerList
tl, err = timertxt.LoadFromFilename(p.timerPath)
if err != nil {
return err
}
tl.Sort(timertxt.SORT_UNFINISHED_START)
p.TimerList = &tl
p.TimerList = tl
return nil
}
@@ -53,12 +53,12 @@ func (p *Program) GetDoneFilePath() string {
func (p *Program) LoadDoneList() error {
var err error
var tl timertxt.TimerList
var tl *timertxt.TimerList
tl, err = timertxt.LoadFromFilename(p.donePath)
if err != nil {
return err
}
p.DoneList = &tl
p.DoneList = tl
return nil
}
@@ -110,14 +110,14 @@ func (p *Program) GetFilteredTimerList(args []string) *timertxt.TimerList {
}
}
list := p.TimerList.GetTimersInRange(start, end)
if includeArchive {
if err = p.LoadDoneList(); err != nil {
fmt.Println("Error loading done.txt entries")
fmt.Println(err.Error())
return nil
}
*list = append(*list, (*p.DoneList.GetTimersInRange(start, end))...)
doneList := p.DoneList.GetTimersInRange(start, end)
list.Combine(doneList)
}
if len(contextFilters) > 0 {
allFilters = append(allFilters, func(t timertxt.Timer) bool {