June 2018 - Aur-dev - lists.archlinux.org

[PATCH] feat(rpc): return "providers" packages when querying by `name` or `name-desc`
by morganamilo 18 Feb '19

18 Feb '19

From: actionless <actionless.loveless(a)gmail.com> --- doc/rpc.txt | 4 ++-- web/lib/aurjson.class.php | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/rpc.txt b/doc/rpc.txt index f353ff0..83cdae3 100644 --- a/doc/rpc.txt +++ b/doc/rpc.txt @@ -8,8 +8,8 @@ Package searches can be performed by issuing HTTP GET requests of the form +/rpc/?v=5&type=search&by=_field_&arg=_keywords_+ where _keywords_ is the search argument and _field_ is one of the following values: -* `name` (search by package name only) -* `name-desc` (search by package name and description) +* `name` (search by package name or packages which provide that name) +* `name-desc` (the same as `name` and search by description) * `maintainer` (search by package maintainer) The _by_ parameter can be skipped and defaults to `name-desc`. diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 9eeaafd..6e580a9 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -392,12 +392,26 @@ class AurJSON { if (strlen($keyword_string) < 2) { return $this->json_error('Query arg too small.'); } + + //packages which provide the package we are looking for: + $providers = pkg_providers(addcslashes($keyword_string, '%_')); + $provided_names = array(); + foreach ($providers as $provider) { + if ($provider[0] != 0) { // if package is not from repo + $name = $this->dbh->quote($provider[1]); + array_push($provided_names, $name); + } + } + $provided_query = "(" . join(", ", $provided_names) . ")"; + $keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%"); if ($search_by === 'name') { - $where_condition = "(Packages.Name LIKE $keyword_string)"; + $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Packages.Name IN $provided_query )"; } else if ($search_by === 'name-desc') { $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Packages.Name IN $provided_query OR "; $where_condition .= "Description LIKE $keyword_string)"; } } else if ($search_by === 'maintainer') { -- 2.16.2

6 25

[PATCH 1/1] This patch implements FS#54906. Ability to query by pkgver via RPC or web request (url)
by nodivbyzero 11 Jun '18

11 Jun '18

--- web/lib/aurjson.class.php | 5 +++++ web/lib/pkgfuncs.inc.php | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index c51e9c2..30ce63f 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -486,6 +486,11 @@ class AurJSON { if ($search_by === 'name') { $where_condition = "(Packages.Name LIKE $keyword_string)"; + if (isset($http_data['pkgver'])) { + $pkgver = $http_data['pkgver']; + $pkgver_string = $this->dbh->quote($pkgver . "%"); + $where_condition .= " AND (Packages.Version LIKE $pkgver_string)"; + } } else if ($search_by === 'name-desc') { $where_condition = "(Packages.Name LIKE $keyword_string OR "; $where_condition .= "Description LIKE $keyword_string)"; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index ad25474..660e3f5 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -727,6 +727,10 @@ function pkg_search_page($params, $show_headers=true, $SID="") { /* Search by name. */ $K = "%" . addcslashes($params['K'], '%_') . "%"; $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($K) . ") "; + if (isset($params["pkgver"])) { + $pkgver = $params["pkgver"]; + $q_where .= "AND (Packages.Version LIKE " . $dbh->quote($pkgver . "%") . ") "; + } } elseif (isset($params["SeB"]) && $params["SeB"] == "b") { /* Search by package base name. */ -- 2.17.0

3 3

[PATCH 1/1] Highlighting row on hover in the search results. FS#53612
by nodivbyzero 10 Jun '18

10 Jun '18

--- web/html/css/archweb.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index d8c66aa..54779eb 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -708,12 +708,20 @@ table.results { padding: .3em 1em .3em 3px; } - .results tr.odd { + .results tr.odd:hover { background: #fff; } + .results tr.odd { + background: #f5f5f5; + } + + .results tr.even:hover { + background: #b3cfff; + } + .results tr.even { - background: #e4eeff; + background: #ccdfff; } .results .flagged { -- 2.17.0

3 2