From f372494d74bea9fd10e3492f89c661ff96ce4d4f Mon Sep 17 00:00:00 2001
From: Jo <me@jguer.space>
Date: Fri, 30 Dec 2022 19:02:32 +0000
Subject: [PATCH] feat(search): add new bys and misc fixes (#1870)

* use default bin entry of gpg

* fix(dep): fix displayed information in chosen provide

* add new rpc bys to searchby

* man document
---
 doc/yay.8              |  2 +-
 pkg/dep/dep_graph.go   |  1 +
 pkg/query/types.go     | 14 ++++++++++++++
 pkg/settings/config.go |  2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/yay.8 b/doc/yay.8
index 27276cb1..fa8c2df0 100644
--- a/doc/yay.8
+++ b/doc/yay.8
@@ -239,7 +239,7 @@ cache to never be refreshed.
 Sort AUR results by a specific field during search.
 
 .TP
-.B \-\-searchby <name|name-desc|maintainer|depends|checkdepends|makedepends|optdepends>
+.B \-\-searchby <name|name-desc|maintainer|depends|checkdepends|makedepends|optdepends|provides|conflicts|replaces|groups|keywords|comaintainers>
 Search for AUR packages by querying the specified field.
 
 .TP
diff --git a/pkg/dep/dep_graph.go b/pkg/dep/dep_graph.go
index 2f2d7c07..c146c9e7 100644
--- a/pkg/dep/dep_graph.go
+++ b/pkg/dep/dep_graph.go
@@ -379,6 +379,7 @@ func (g *Grapher) addNodes(
 			if len(aurPkgs) > 1 {
 				chosen := provideMenu(g.w, depName, aurPkgs, g.noConfirm)
 				g.providerCache[depName] = chosen
+				pkg = *chosen
 			}
 
 			if err := graph.DependOn(pkg.Name, parentPkgName); err != nil {
diff --git a/pkg/query/types.go b/pkg/query/types.go
index 90488038..63fa62be 100644
--- a/pkg/query/types.go
+++ b/pkg/query/types.go
@@ -77,6 +77,8 @@ func getSearchBy(value string) aur.By {
 		return aur.Name
 	case "maintainer":
 		return aur.Maintainer
+	case "submitter":
+		return aur.Submitter
 	case "depends":
 		return aur.Depends
 	case "makedepends":
@@ -85,6 +87,18 @@ func getSearchBy(value string) aur.By {
 		return aur.OptDepends
 	case "checkdepends":
 		return aur.CheckDepends
+	case "provides":
+		return aur.Provides
+	case "conflicts":
+		return aur.Conflicts
+	case "replaces":
+		return aur.Replaces
+	case "groups":
+		return aur.Groups
+	case "keywords":
+		return aur.Keywords
+	case "comaintainers":
+		return aur.CoMaintainers
 	default:
 		return aur.NameDesc
 	}
diff --git a/pkg/settings/config.go b/pkg/settings/config.go
index 24a466d1..ec665406 100644
--- a/pkg/settings/config.go
+++ b/pkg/settings/config.go
@@ -350,6 +350,8 @@ func (c *Configuration) CmdBuilder(runner exe.Runner) exe.ICmdBuilder {
 	return &exe.CmdBuilder{
 		GitBin:           c.GitBin,
 		GitFlags:         strings.Fields(c.GitFlags),
+		GPGBin:           c.GpgBin,
+		GPGFlags:         strings.Fields(c.GpgFlags),
 		MakepkgFlags:     strings.Fields(c.MFlags),
 		MakepkgConfPath:  c.MakepkgConf,
 		MakepkgBin:       c.MakepkgBin,