Support all the new search "by" options

falconindy · Aug 10, 2024 · d52bba1 · d52bba1
1 parent b4b9050
commit d52bba1
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/extra/bash_completion b/extra/bash_completion
@@ -26,7 +26,9 @@ _auracle() {
         comps='always never auto'
         ;;
       '--searchby')
-        comps='name name-desc maintainer depends makedepends optdepends checkdepends'
+        comps='name name-desc maintainer depends makedepends optdepends
+               checkdepends submitter provides conflicts replaces
+               keywords groups maintainers'
         ;;
       '--sort'|'--rsort')
         comps="name votes popularity firstsubmitted lastmodified"

diff --git a/extra/zsh_completion b/extra/zsh_completion
@@ -8,7 +8,7 @@ _arguments -S \
   {--quiet,-q}'[Output less, when possible]' \
   {--recurse,-r}'[Recurse through dependencies on download]' \
   '--literal[Disallow regex in searches]' \
-  '--searchby=[Change search-by dimension]: :(name name-desc maintainer depends makedepends optdepends checkdepends)' \
+  '--searchby=[Change search-by dimension]: :(name name-desc maintainer depends makedepends optdepends checkdepends submitter provides conflicts replaces keywords groups comaintainers)' \
   '--color=[Control colored output]: :(auto never always)' \
   {--chdir=,-C+}'[Change directory before downloading]:directory:_files -/' \
   {--format=,-F+}'[Specify custom output for search and info]' \

diff --git a/man/auracle.1.pod b/man/auracle.1.pod
@@ -66,7 +66,9 @@ Is the same as I<depends,makedepends> or I<^checkdepends>.
 
 When used with the B<search> and B<rawsearch> commands, change the search
 dimension. I<BY> must be one of I<name>, I<name-desc>, I<maintainer>,
-I<depends>, I<makedepends>, I<optdepends>, or I<checkdepends>.
+I<depends>, I<makedepends>, I<optdepends>, I<checkdepends>, I<submitter>,
+I<provides>, I<conflicts>, I<replaces>, I<keywords>, I<groups>, or
+I<comaintainers>.
 
 This option defaults to I<name-desc>.
 

diff --git a/src/aur/request.hh b/src/aur/request.hh
@@ -122,6 +122,13 @@ class SearchRequest : public RpcRequest {
     MAKEDEPENDS,
     OPTDEPENDS,
     CHECKDEPENDS,
+    SUBMITTER,
+    PROVIDES,
+    CONFLICTS,
+    REPLACES,
+    KEYWORDS,
+    GROUPS,
+    COMAINTAINERS,
   };
 
   static SearchBy ParseSearchBy(std::string_view searchby) {
@@ -146,6 +153,27 @@ class SearchRequest : public RpcRequest {
     if (searchby == "checkdepends") {
       return SearchBy::CHECKDEPENDS;
     }
+    if (searchby == "submitter") {
+      return SearchBy::SUBMITTER;
+    }
+    if (searchby == "provides") {
+      return SearchBy::PROVIDES;
+    }
+    if (searchby == "conflicts") {
+      return SearchBy::CONFLICTS;
+    }
+    if (searchby == "replaces") {
+      return SearchBy::REPLACES;
+    }
+    if (searchby == "keywords,") {
+      return SearchBy::KEYWORDS;
+    }
+    if (searchby == "groups") {
+      return SearchBy::GROUPS;
+    }
+    if (searchby == "comaintainers") {
+      return SearchBy::COMAINTAINERS;
+    }
     return SearchBy::INVALID;
   }
 
@@ -178,6 +206,20 @@ class SearchRequest : public RpcRequest {
         return "optdepends";
       case SearchBy::CHECKDEPENDS:
         return "checkdepends";
+      case SearchBy::SUBMITTER:
+        return "submitter";
+      case SearchBy::PROVIDES:
+        return "provides";
+      case SearchBy::CONFLICTS:
+        return "conflicts";
+      case SearchBy::REPLACES:
+        return "replaces";
+      case SearchBy::KEYWORDS:
+        return "keywords";
+      case SearchBy::GROUPS:
+        return "groups";
+      case SearchBy::COMAINTAINERS:
+        return "comaintainers";
       default:
         return "";
     }