浏览代码

Add Search Print

Jguer 8 年之前
父节点
当前提交
33119d5c16
共有 4 个文件被更改,包括 16 次插入3 次删除
  1. 2 2
      actions.go
  2. 13 0
      aur/aur.go
  3. 二进制
      res/multiaurinstall.png
  4. 1 1
      yay.go

+ 2 - 2
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

+ 13 - 0
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)

二进制
res/multiaurinstall.png


+ 1 - 1
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/"