diff --git a/actions.go b/actions.go index 3d6d2b71..85613f35 100644 --- a/actions.go +++ b/actions.go @@ -25,7 +25,7 @@ func searchAndInstall(pkgName string, conf alpm.PacmanConfig, flags ...string) ( return errors.New("No Packages match search") } repoRes.printSearch(0) - // err = aurRes.printSearch(repoRes.Resultcount) + aurRes.PrintSearch(repoRes.Resultcount) fmt.Printf("\x1B[32m%s\033[0m\nNumbers:", "Type numbers to install. Separate each number with a space.") reader := bufio.NewReader(os.Stdin) @@ -71,7 +71,7 @@ func searchMode(pkg string, conf alpm.PacmanConfig) (err error) { return err } - // aur.printSearch(SearchMode) + aur.printSearch(SearchMode) repo.printSearch(SearchMode) return nil diff --git a/aur/aur.go b/aur/aur.go index 9804df3c..99d27b3c 100644 --- a/aur/aur.go +++ b/aur/aur.go @@ -76,6 +76,19 @@ func (r Query) Swap(i, j int) { r.Results[i], r.Results[j] = r.Results[j], r.Results[i] } +// PrintSearch handles printing search results in a given format +func (r Query) PrintSearch(searchFormat bool) { + for i, result := range r.Results { + if searchFormat { + fmt.Printf("\033[1m%s/\x1B[33m%s \x1B[36m%s\033[0m\n%s\n", + "aur", result.Name, result.Version, result.Description) + } else { + fmt.Printf("%d \033[1m%s/\x1B[33m%s \x1B[36m%s\033[0m\n%s\n", + + } + } +} + func downloadFile(filepath string, url string) (err error) { // Create the file out, err := os.Create(filepath) diff --git a/res/multiaurinstall.png b/res/multiaurinstall.png new file mode 100644 index 00000000..cd58e3f8 Binary files /dev/null and b/res/multiaurinstall.png differ diff --git a/yay.go b/yay.go index d8f0cfa0..6f81bb0c 100644 --- a/yay.go +++ b/yay.go @@ -13,7 +13,7 @@ const PacmanBin string = "/usr/bin/pacman" const PacmanConf string = "/etc/pacman.conf" // SearchMode is search without numbers -const SearchMode int = -1 +const SearchMode bool = true // BuildDir is the root for package building const BuildDir string = "/tmp/yaytmp/"