michael/lf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sanity checks to ratios option

Browse Source 
Mentioned in #77.
This commit is contained in:
Gokcehan 2017-11-22 17:30:09 +03:00
parent 946de57f26
commit d16fcbea71
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eval.go
View File

@ -109,7 +109,7 @@ func (e *setExpr) eval(app *app, args []string) {
gOpts.shell = e.val gOpts.shell = e.val
case "sortby": case "sortby":
if e.val != "natural" && e.val != "name" && e.val != "size" && e.val != "time" { if e.val != "natural" && e.val != "name" && e.val != "size" && e.val != "time" {
app.ui.print("sortby should either be 'natural', 'name', 'size' or 'time'") app.ui.print("sortby: value should either be 'natural', 'name', 'size' or 'time'")
return return
} }
gOpts.sortby = e.val gOpts.sortby = e.val
@ -120,12 +120,20 @@ func (e *setExpr) eval(app *app, args []string) {
toks := strings.Split(e.val, ":") toks := strings.Split(e.val, ":")
var rats []int var rats []int
for _, s := range toks { for _, s := range toks {
i, err := strconv.Atoi(s) n, err := strconv.Atoi(s)
if err != nil { if err != nil {
app.ui.printf("ratios: %s", err) app.ui.printf("ratios: %s", err)
return return
} }
rats = append(rats, i) if n <= 0 {
app.ui.print("ratios: value should be a positive number")
return
}
rats = append(rats, n)
}
if gOpts.preview && len(rats) < 2 {
app.ui.print("ratios: should consist of at least two numbers when 'preview' is enabled")
return
} }
gOpts.ratios = rats gOpts.ratios = rats
app.ui.wins = getWins() app.ui.wins = getWins()
@ -134,7 +142,7 @@ func (e *setExpr) eval(app *app, args []string) {
toks := strings.Split(e.val, ":") toks := strings.Split(e.val, ":")
for _, s := range toks { for _, s := range toks {
if s != "" && s != "size" && s != "time" { if s != "" && s != "size" && s != "time" {
app.ui.print("info should consist of 'size' or 'time' separated with colon") app.ui.print("info: should consist of 'size' or 'time' separated with colon")
return return
} }
} }