@@ -2,17 +2,18 @@ package sncli
22
33import (
44 "fmt"
5+ "slices"
6+ "time"
7+
58 "github.com/alexeyco/simpletable"
69 "github.com/gookit/color"
710 "github.com/jonhadfield/gosn-v2/cache"
811 "github.com/jonhadfield/gosn-v2/items"
9- "slices"
10- "time"
1112)
1213
13- func conflictedWarning ([]items.Checklist ) string {
14- if len (items.Checklists {}) > 0 {
15- return color .Yellow .Sprintf ("%d conflicted versions" , len (items.Checklists {}))
14+ func conflictedWarning ([]items.Tasklist ) string {
15+ if len (items.Tasklists {}) > 0 {
16+ return color .Yellow .Sprintf ("%d conflicted versions" , len (items.Tasklists {}))
1617 }
1718
1819 return "-"
@@ -52,17 +53,17 @@ func (ci *ListChecklistsInput) Run() (err error) {
5253 return nil
5354}
5455
55- // construct a map of duplicates
56- func getChecklistsDuplicatesMap (checklistNotes items.Notes ) (map [string ][]items.Checklist , error ) {
57- duplicates := make (map [string ][]items.Checklist )
56+ // construct a map of duplicates.
57+ func getChecklistsDuplicatesMap (checklistNotes items.Notes ) (map [string ][]items.Tasklist , error ) {
58+ duplicates := make (map [string ][]items.Tasklist )
5859
5960 for x := range checklistNotes {
6061 if checklistNotes [x ].DuplicateOf != "" {
6162 // checklist is a duplicate
6263 // get the checklist content
63- cl , err := checklistNotes [x ].Content .ToCheckList ()
64+ cl , err := checklistNotes [x ].Content .ToTaskList ()
6465 if err != nil {
65- return map [string ][]items.Checklist {}, err
66+ return map [string ][]items.Tasklist {}, err
6667 }
6768
6869 // skip trashed content
@@ -73,7 +74,7 @@ func getChecklistsDuplicatesMap(checklistNotes items.Notes) (map[string][]items.
7374 cl .UUID = checklistNotes [x ].UUID
7475 cl .UpdatedAt , err = time .Parse (timeLayout , checklistNotes [x ].UpdatedAt )
7576 if err != nil {
76- return map [string ][]items.Checklist {}, err
77+ return map [string ][]items.Tasklist {}, err
7778 }
7879
7980 duplicates [checklistNotes [x ].DuplicateOf ] = append (duplicates [checklistNotes [x ].DuplicateOf ], cl )
@@ -83,28 +84,28 @@ func getChecklistsDuplicatesMap(checklistNotes items.Notes) (map[string][]items.
8384 return duplicates , nil
8485}
8586
86- func getChecklists (sess * cache.Session ) (items.Checklists , error ) {
87+ func getChecklists (sess * cache.Session ) (items.Tasklists , error ) {
8788 var so cache.SyncOutput
8889
8990 so , err := Sync (cache.SyncInput {
9091 Session : sess ,
9192 }, true )
9293 if err != nil {
93- return items.Checklists {}, err
94+ return items.Tasklists {}, err
9495 }
9596
9697 var allPersistedItems cache.Items
9798
9899 if err = so .DB .All (& allPersistedItems ); err != nil {
99- return items.Checklists {}, err
100+ return items.Tasklists {}, err
100101 }
101102
102103 allItemUUIDs := allPersistedItems .UUIDs ()
103104
104105 var gitems items.Items
105106 gitems , err = allPersistedItems .ToItems (sess )
106107 if err != nil {
107- return items.Checklists {}, err
108+ return items.Tasklists {}, err
108109 }
109110
110111 gitems .Filter (items.ItemFilters {
@@ -118,7 +119,7 @@ func getChecklists(sess *cache.Session) (items.Checklists, error) {
118119 },
119120 })
120121
121- var checklists items.Checklists
122+ var checklists items.Tasklists
122123 checklistNotes := gitems .Notes ()
123124
124125 duplicatesMap , err := getChecklistsDuplicatesMap (checklistNotes )
@@ -136,16 +137,16 @@ func getChecklists(sess *cache.Session) (items.Checklists, error) {
136137 continue
137138 }
138139
139- var cl items.Checklist
140- cl , err = checklistNotes [x ].Content .ToCheckList ()
140+ var cl items.Tasklist
141+ cl , err = checklistNotes [x ].Content .ToTaskList ()
141142 if err != nil {
142- return items.Checklists {}, err
143+ return items.Tasklists {}, err
143144 }
144145
145146 cl .UUID = checklistNotes [x ].UUID
146147 cl .UpdatedAt , err = time .Parse (timeLayout , checklistNotes [x ].UpdatedAt )
147148 if err != nil {
148- return items.Checklists {}, err
149+ return items.Tasklists {}, err
149150 }
150151
151152 cl .Duplicates = duplicatesMap [checklistNotes [x ].UUID ]
0 commit comments