From c0eac580a89e602250cfa3a0945e6c2723327c9e Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Sat, 30 Dec 2017 06:01:55 +0000
Subject: [PATCH] Count from 1 instead of 0 when searching packages

I feel like starting from 1 is much better ergonomically while not using
a numpad. This could be added as a config option instead if you would
prefer.
---
 cmd.go   | 16 ++++++++--------
 print.go |  4 ++--
 query.go |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmd.go b/cmd.go
index 1884c448..2b313977 100644
--- a/cmd.go
+++ b/cmd.go
@@ -323,11 +323,11 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 	}
 
 	if config.SortMode == BottomUp {
-		aq.printSearch(numpq)
+		aq.printSearch(numpq + 1)
 		pq.printSearch()
 	} else {
 		pq.printSearch()
-		aq.printSearch(numpq)
+		aq.printSearch(numpq + 1)
 	}
 
 	fmt.Printf("\x1b[32m%s\x1b[0m\nNumbers: ", "Type numbers to install. Separate each number with a space.")
@@ -349,19 +349,19 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 		}
 
 		// Install package
-		if num > numaq+numpq-1 || num < 0 {
+		if num > numaq+numpq || num <= 0 {
 			continue
-		} else if num > numpq-1 {
+		} else if num > numpq {
 			if config.SortMode == BottomUp {
-				aurI = append(aurI, aq[numaq+numpq-num-1].Name)
+				aurI = append(aurI, aq[numaq+numpq-num].Name)
 			} else {
-				aurI = append(aurI, aq[num-numpq].Name)
+				aurI = append(aurI, aq[num-numpq-1].Name)
 			}
 		} else {
 			if config.SortMode == BottomUp {
-				repoI = append(repoI, pq[numpq-num-1].Name())
+				repoI = append(repoI, pq[numpq-num].Name())
 			} else {
-				repoI = append(repoI, pq[num].Name())
+				repoI = append(repoI, pq[num-1].Name())
 			}
 		}
 	}
diff --git a/print.go b/print.go
index 7e8cb3ce..58deb300 100644
--- a/print.go
+++ b/print.go
@@ -58,9 +58,9 @@ func (s repoQuery) printSearch() {
 		var toprint string
 		if config.SearchMode == NumberMenu {
 			if config.SortMode == BottomUp {
-				toprint += fmt.Sprintf("\x1b[33m%d\x1b[0m ", len(s)-i-1)
+				toprint += fmt.Sprintf("\x1b[33m%d\x1b[0m ", len(s)-i)
 			} else {
-				toprint += fmt.Sprintf("\x1b[33m%d\x1b[0m ", i)
+				toprint += fmt.Sprintf("\x1b[33m%d\x1b[0m ", i+1)
 			}
 		} else if config.SearchMode == Minimal {
 			fmt.Println(res.Name())
diff --git a/query.go b/query.go
index b88c0a02..63fba6e2 100644
--- a/query.go
+++ b/query.go
@@ -141,11 +141,11 @@ func syncSearch(pkgS []string) (err error) {
 	}
 
 	if config.SortMode == BottomUp {
-		aq.printSearch(0)
+		aq.printSearch(1)
 		pq.printSearch()
 	} else {
 		pq.printSearch()
-		aq.printSearch(0)
+		aq.printSearch(1)
 	}
 
 	return nil