Fix #919, require explicit sort mode defined

Jguer · Apr 4, 2019 · cf12fc6 · cf12fc6
1 parent f21a5a7
commit cf12fc6
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 24 deletions.
diff --git a/cmd.go b/cmd.go
@@ -312,20 +312,23 @@ func displayNumberMenu(pkgS []string) (err error) {
 		return fmt.Errorf("No packages match search")
 	}
 
-	if config.SortMode == bottomUp {
-		if mode == modeAUR || mode == modeAny {
-			aq.printSearch(lenpq + 1)
-		}
+	switch config.SortMode {
+	case topDown:
 		if mode == modeRepo || mode == modeAny {
 			pq.printSearch()
 		}
-	} else {
-		if mode == modeRepo || mode == modeAny {
-			pq.printSearch()
+		if mode == modeAUR || mode == modeAny {
+			aq.printSearch(lenpq + 1)
 		}
+	case bottomUp:
 		if mode == modeAUR || mode == modeAny {
 			aq.printSearch(lenpq + 1)
 		}
+		if mode == modeRepo || mode == modeAny {
+			pq.printSearch()
+		}
+	default:
+		return fmt.Errorf("Invalid Sort Mode. Fix with yay -Y --bottomup --save")
 	}
 
 	if aurErr != nil {
@@ -352,9 +355,14 @@ func displayNumberMenu(pkgS []string) (err error) {
 	isInclude := len(exclude) == 0 && len(otherExclude) == 0
 
 	for i, pkg := range pq {
-		target := len(pq) - i
-		if config.SortMode == topDown {
+		var target int
+		switch config.SortMode {
+		case topDown:
 			target = i + 1
+		case bottomUp:
+			target = len(pq) - i
+		default:
+			return fmt.Errorf("Invalid Sort Mode. Fix with yay -Y --bottomup --save")
 		}
 
 		if (isInclude && include.get(target)) || (!isInclude && !exclude.get(target)) {
@@ -363,9 +371,15 @@ func displayNumberMenu(pkgS []string) (err error) {
 	}
 
 	for i, pkg := range aq {
-		target := len(aq) - i + len(pq)
-		if config.SortMode == topDown {
+		var target int
+
+		switch config.SortMode {
+		case topDown:
 			target = i + 1 + len(pq)
+		case bottomUp:
+			target = len(aq) - i + len(pq)
+		default:
+			return fmt.Errorf("Invalid Sort Mode. Fix with yay -Y --bottomup --save")
 		}
 
 		if (isInclude && include.get(target)) || (!isInclude && !exclude.get(target)) {

diff --git a/print.go b/print.go
@@ -65,10 +65,13 @@ func (q aurQuery) printSearch(start int) {
 	for i, res := range q {
 		var toprint string
 		if config.SearchMode == numberMenu {
-			if config.SortMode == bottomUp {
-				toprint += magenta(strconv.Itoa(len(q)+start-i-1) + " ")
-			} else {
+			switch config.SortMode {
+			case topDown:
 				toprint += magenta(strconv.Itoa(start+i) + " ")
+			case bottomUp:
+				toprint += magenta(strconv.Itoa(len(q)+start-i-1) + " ")
+			default:
+				fmt.Println("Invalid Sort Mode. Fix with yay -Y --bottomup --save")
 			}
 		} else if config.SearchMode == minimal {
 			fmt.Println(res.Name)
@@ -105,10 +108,13 @@ func (s repoQuery) printSearch() {
 	for i, res := range s {
 		var toprint string
 		if config.SearchMode == numberMenu {
-			if config.SortMode == bottomUp {
-				toprint += magenta(strconv.Itoa(len(s)-i) + " ")
-			} else {
+			switch config.SortMode {
+			case topDown:
 				toprint += magenta(strconv.Itoa(i+1) + " ")
+			case bottomUp:
+				toprint += magenta(strconv.Itoa(len(s)-i) + " ")
+			default:
+				fmt.Println("Invalid Sort Mode. Fix with yay -Y --bottomup --save")
 			}
 		} else if config.SearchMode == minimal {
 			fmt.Println(res.Name())

diff --git a/query.go b/query.go
@@ -176,20 +176,23 @@ func syncSearch(pkgS []string) (err error) {
 		}
 	}
 
-	if config.SortMode == bottomUp {
-		if mode == modeAUR || mode == modeAny {
-			aq.printSearch(1)
-		}
+	switch config.SortMode {
+	case topDown:
 		if mode == modeRepo || mode == modeAny {
 			pq.printSearch()
 		}
-	} else {
-		if mode == modeRepo || mode == modeAny {
-			pq.printSearch()
+		if mode == modeAUR || mode == modeAny {
+			aq.printSearch(1)
 		}
+	case bottomUp:
 		if mode == modeAUR || mode == modeAny {
 			aq.printSearch(1)
 		}
+		if mode == modeRepo || mode == modeAny {
+			pq.printSearch()
+		}
+	default:
+		return fmt.Errorf("Invalid Sort Mode. Fix with yay -Y --bottomup --save")
 	}
 
 	if aurErr != nil {