Skip to content

Commit 98be3f8

Browse files
committed
Improves sorting
1 parent 303d632 commit 98be3f8

15 files changed

+71
-38
lines changed

code_gen/templates/generators/types/app_data+type.go.tmpl

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
{{ $embedType := .EmbedType }}
77
{{ $members := .Members }}
88

9-
{{ $hasSorts := .HasSorts }}
109
{{ $hasEmbed := and (gt (len .EmbedName) 0) true }}
1110

1211
{{ $isHistory := eq $class "History" }}
@@ -26,14 +25,6 @@
2625
{{ $appData = $routeLower }}
2726
{{ end }}
2827

29-
{{ $sorts := "" }}
30-
{{ if $hasSorts }}
31-
{{ $sorts = print ` if err := sdk.Sort` $routeName `(` $appData `.Items, ` $appData `.Sorts); err != nil {
32-
a.emitErrorMsg(err, nil)
33-
}
34-
`}}
35-
{{ end }}
36-
3728
{{ $param1 := ""}}
3829
{{ if $isHistory }}
3930
{{ $param1 = "address" }}
@@ -130,7 +121,7 @@ func (a *App) load{{$routeName}}(wg *sync.WaitGroup, errorChan chan error) error
130121
if err := {{$appData}}.Sort(); err != nil {
131122
a.emitErrorMsg(err, nil)
132123
}
133-
{{ $sorts }} a.emitLoadingMsg(messages.Loaded, "{{$routeLower}}")
124+
a.emitLoadingMsg(messages.Loaded, "{{$routeLower}}")
134125
}
135126

136127
return nil

code_gen/templates/generators/types/pkg_types_types+containertype.go.tmpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,11 @@ func (s *{{$class}}Container) ForEveryItem(process Every{{$itemName}}Fn, data an
194194
return true
195195
}
196196

197+
func (s *{{$class}}Container) Sort() (err error) {
198+
// EXISTING_CODE
199+
// EXISTING_CODE
200+
return
201+
}
202+
197203
// EXISTING_CODE
198204
// EXISTING_CODE

pkg/types/types_containerabi.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,11 @@ func (s *AbiContainer) ForEveryItem(process EveryAbiFn, data any) bool {
185185
return true
186186
}
187187

188-
func (s *AbiContainer) Sort() error {
189-
return sdk.SortAbis(s.Items, s.Sorts)
188+
func (s *AbiContainer) Sort() (err error) {
189+
// EXISTING_CODE
190+
err = sdk.SortAbis(s.Items, s.Sorts)
191+
// EXISTING_CODE
192+
return
190193
}
191194

192195
// EXISTING_CODE

pkg/types/types_containerconfig.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,11 @@ func (s *ConfigContainer) ForEveryItem(process EveryChainFn, data any) bool {
178178
return true
179179
}
180180

181-
func (s *ConfigContainer) Sort() error {
182-
return sdk.SortChains(s.Items, s.Sorts)
181+
func (s *ConfigContainer) Sort() (err error) {
182+
// EXISTING_CODE
183+
err = sdk.SortChains(s.Items, s.Sorts)
184+
// EXISTING_CODE
185+
return
183186
}
184187

185188
// EXISTING_CODE

pkg/types/types_containerdaemon.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,11 @@ func (s *DaemonContainer) ForEveryItem(process EveryNothingFn, data any) bool {
162162
return true
163163
}
164164

165-
func (s *DaemonContainer) Sort() error {
165+
func (s *DaemonContainer) Sort() (err error) {
166+
// EXISTING_CODE
166167
// TODO: Is there anything to sort for daemons?
167-
return nil
168+
// EXISTING_CODE
169+
return
168170
}
169171

170172
// EXISTING_CODE

pkg/types/types_containerhistory.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ func (s *HistoryContainer) ForEveryItem(process EveryTransactionFn, data any) bo
186186
return true
187187
}
188188

189-
func (s *HistoryContainer) Sort() error {
189+
func (s *HistoryContainer) Sort() (err error) {
190+
// EXISTING_CODE
190191
// TODO: Is there anything to sort for history?
191-
return nil
192+
// EXISTING_CODE
193+
return
192194
}
193195

194196
// EXISTING_CODE

pkg/types/types_containerindex.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,11 @@ func (s *IndexContainer) ForEveryItem(process EveryChunkStatsFn, data any) bool
181181
return true
182182
}
183183

184-
func (s *IndexContainer) Sort() error {
185-
return sdk.SortChunkStats(s.Items, s.Sorts)
184+
func (s *IndexContainer) Sort() (err error) {
185+
// EXISTING_CODE
186+
err = sdk.SortChunkStats(s.Items, s.Sorts)
187+
// EXISTING_CODE
188+
return
186189
}
187190

188191
// EXISTING_CODE

pkg/types/types_containermanifest.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,11 @@ func (s *ManifestContainer) ForEveryItem(process EveryChunkRecordFn, data any) b
175175
return true
176176
}
177177

178-
func (s *ManifestContainer) Sort() error {
179-
return sdk.SortChunkRecords(s.Items, s.Sorts)
178+
func (s *ManifestContainer) Sort() (err error) {
179+
// EXISTING_CODE
180+
err = sdk.SortChunkRecords(s.Items, s.Sorts)
181+
// EXISTING_CODE
182+
return
180183
}
181184

182185
// EXISTING_CODE

pkg/types/types_containermonitor.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,11 @@ func (s *MonitorContainer) ForEveryItem(process EveryMonitorFn, data any) bool {
196196
return true
197197
}
198198

199-
func (s *MonitorContainer) Sort() error {
200-
return sdk.SortMonitors(s.Items, s.Sorts)
199+
func (s *MonitorContainer) Sort() (err error) {
200+
// EXISTING_CODE
201+
err = sdk.SortMonitors(s.Items, s.Sorts)
202+
// EXISTING_CODE
203+
return
201204
}
202205

203206
// EXISTING_CODE

pkg/types/types_containername.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,15 @@ func (s *NameContainer) ForEveryItem(process EveryNameFn, data any) bool {
225225
return true
226226
}
227227

228-
func (s *NameContainer) Sort() error {
228+
func (s *NameContainer) Sort() (err error) {
229+
// EXISTING_CODE
229230
sort.Slice(s.Items, func(i, j int) bool {
230231
return compare(s.Items[i], s.Items[j])
231232
})
233+
// TODO: Sorting?
232234
// return sdk.SortNames(s.Items, s.Sorts)
233-
return nil
235+
// EXISTING_CODE
236+
return
234237
}
235238

236239
// EXISTING_CODE

0 commit comments

Comments
 (0)