add validation to sort field option

This commit is contained in:
Bradley Cicenas 2017-03-14 22:49:11 +00:00
parent 2a709577bd
commit 1285288b9e

23
main.go
View File

@ -47,13 +47,6 @@ func main() {
os.Exit(0) os.Exit(0)
} }
// init ui
ui.ColorMap = ColorMap // override default colormap
if err := ui.Init(); err != nil {
panic(err)
}
defer ui.Close()
// override default config values with command line flags // override default config values with command line flags
if *filterFlag != "" { if *filterFlag != "" {
config.Update("filterStr", *filterFlag) config.Update("filterStr", *filterFlag)
@ -64,6 +57,7 @@ func main() {
} }
if *sortFieldFlag != "" { if *sortFieldFlag != "" {
validSort(*sortFieldFlag)
config.Update("sortField", *sortFieldFlag) config.Update("sortField", *sortFieldFlag)
} }
@ -77,6 +71,13 @@ func main() {
logging.StartServer() logging.StartServer()
} }
// init ui
ui.ColorMap = ColorMap // override default colormap
if err := ui.Init(); err != nil {
panic(err)
}
defer ui.Close()
// init grid, cursor, header // init grid, cursor, header
cursor = NewGridCursor() cursor = NewGridCursor()
cGrid = compact.NewCompactGrid() cGrid = compact.NewCompactGrid()
@ -92,6 +93,14 @@ func main() {
} }
} }
// ensure a given sort field is valid
func validSort(s string) {
if _, ok := Sorters[s]; !ok {
fmt.Printf("invalid sort field: %s\n", s)
os.Exit(1)
}
}
func panicExit() { func panicExit() {
if r := recover(); r != nil { if r := recover(); r != nil {
ui.Clear() ui.Clear()