From 4a3e365fc529219265e2b4e2c7d46c49248d3b6c Mon Sep 17 00:00:00 2001 From: Jo Date: Sun, 18 Dec 2022 01:36:49 +0000 Subject: [PATCH] AUR provides search rpc (#1856) * add support for provides search in AUR RPC client * return provides search to default true --- go.mod | 14 +++++++------- go.sum | 30 ++++++++++++++---------------- pkg/dep/depPool.go | 17 +++-------------- pkg/settings/config.go | 2 +- 4 files changed, 25 insertions(+), 38 deletions(-) diff --git a/go.mod b/go.mod index defa7327..a057d7f5 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/Jguer/yay/v11 require ( - github.com/Jguer/aur v1.1.1 + github.com/Jguer/aur v1.1.2 github.com/Jguer/go-alpm/v2 v2.1.2 github.com/Jguer/votar v1.0.0 github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5 @@ -9,9 +9,9 @@ require ( github.com/bradleyjkemp/cupaloy v2.3.0+incompatible github.com/leonelquinteros/gotext v1.5.0 github.com/stretchr/testify v1.8.1 - golang.org/x/sys v0.2.0 - golang.org/x/term v0.2.0 - golang.org/x/text v0.4.0 // indirect + golang.org/x/sys v0.3.0 + golang.org/x/term v0.3.0 + golang.org/x/text v0.5.0 // indirect gopkg.in/h2non/gock.v1 v1.1.2 ) @@ -26,9 +26,9 @@ require ( require ( github.com/deckarep/golang-set/v2 v2.1.0 - github.com/itchyny/gojq v0.12.9 // indirect - github.com/itchyny/timefmt-go v0.1.4 // indirect - github.com/ohler55/ojg v1.14.5 // indirect + github.com/itchyny/gojq v0.12.10 // indirect + github.com/itchyny/timefmt-go v0.1.5 // indirect + github.com/ohler55/ojg v1.15.0 // indirect ) go 1.19 diff --git a/go.sum b/go.sum index f8c3704a..7d6b05cf 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ -github.com/Jguer/aur v1.1.0 h1:dXWozXMnNH0JciixDjvAZ32luVnxGdSnrSoJfd8YeYw= -github.com/Jguer/aur v1.1.0/go.mod h1:JRMEdcTsAqsytKUNEEczeXjz+k0r7xigUZ3zx45Y6BY= -github.com/Jguer/aur v1.1.1 h1:EP/yHE9opw6odpTe4ZQll/rHjal/XiTt1PuZ7Fkm/ks= -github.com/Jguer/aur v1.1.1/go.mod h1:JRMEdcTsAqsytKUNEEczeXjz+k0r7xigUZ3zx45Y6BY= +github.com/Jguer/aur v1.1.2 h1:PCfYLWoFRyvV3inuF/STy2Y+lU8ihxPX6tmpn64von0= +github.com/Jguer/aur v1.1.2/go.mod h1:JRMEdcTsAqsytKUNEEczeXjz+k0r7xigUZ3zx45Y6BY= github.com/Jguer/go-alpm/v2 v2.1.2 h1:CGTIxzuEpT9Q3a7IBrx0E6acoYoaHX2Z93UOApPDhgU= github.com/Jguer/go-alpm/v2 v2.1.2/go.mod h1:uLQcTMNM904dRiGU+/JDtDdd7Nd8mVbEVaHjhmziT7w= github.com/Jguer/votar v1.0.0 h1:drPYpV5Py5BeAQS8xezmT6uCEfLzotNjLf5yfmlHKTg= @@ -23,16 +21,16 @@ github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6 github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= -github.com/itchyny/gojq v0.12.9 h1:biKpbKwMxVYhCU1d6mR7qMr3f0Hn9F5k5YykCVb3gmM= -github.com/itchyny/gojq v0.12.9/go.mod h1:T4Ip7AETUXeGpD+436m+UEl3m3tokRgajd5pRfsR5oE= -github.com/itchyny/timefmt-go v0.1.4 h1:hFEfWVdwsEi+CY8xY2FtgWHGQaBaC3JeHd+cve0ynVM= -github.com/itchyny/timefmt-go v0.1.4/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8= +github.com/itchyny/gojq v0.12.10 h1:6TcS0VYWS6wgntpF/4tnrzwdCMjiTxRAxIqZWfDsDQU= +github.com/itchyny/gojq v0.12.10/go.mod h1:o3FT8Gkbg/geT4pLI0tF3hvip5F3Y/uskjRz9OYa38g= +github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE= +github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8= github.com/leonelquinteros/gotext v1.5.0 h1:ODY7LzLpZWWSJdAHnzhreOr6cwLXTAmc914FOauSkBM= github.com/leonelquinteros/gotext v1.5.0/go.mod h1:OCiUVHuhP9LGFBQ1oAmdtNCHJCiHiQA8lf4nAifHkr0= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/ohler55/ojg v1.14.5 h1:xCX2oyh/ZaoesbLH6fwVHStSJpk4o4eJs8ttXutzdg0= -github.com/ohler55/ojg v1.14.5/go.mod h1:7Ghirupn8NC8hSSDpI0gcjorPxj+vSVIONDWfliHR1k= +github.com/ohler55/ojg v1.15.0 h1:Z95FvBiMsMOOGP9Nzv5OVV4ND2KnEMxk0GOS8Kvcahg= +github.com/ohler55/ojg v1.15.0/go.mod h1:7Ghirupn8NC8hSSDpI0gcjorPxj+vSVIONDWfliHR1k= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -56,13 +54,13 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20200221224223-e1da425f72fd/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/pkg/dep/depPool.go b/pkg/dep/depPool.go index 748a752b..23e6af95 100644 --- a/pkg/dep/depPool.go +++ b/pkg/dep/depPool.go @@ -6,7 +6,6 @@ import ( "os" "sort" "strconv" - "strings" "sync" "github.com/Jguer/aur" @@ -156,19 +155,7 @@ func (dp *Pool) findProvides(ctx context.Context, pkgs stringset.StringSet) erro results []query.Pkg ) - // Hack for a bigger search result, if the user wants - // java-envronment we can search for just java instead and get - // more hits. - pkg, _, _ = splitDep(pkg) // openimagedenoise-git > ispc-git #1234 - words := strings.Split(pkg, "-") - - for i := range words { - results, err = dp.aurClient.Search(ctx, strings.Join(words[:i+1], "-"), aur.None) - if err == nil { - break - } - } - + results, err = dp.aurClient.Search(ctx, pkg, aur.Provides) if err != nil { return } @@ -189,6 +176,8 @@ func (dp *Pool) findProvides(ctx context.Context, pkgs stringset.StringSet) erro wg.Add(1) + text.Debugln("AUR RPC Search:", pkg) + go doSearch(pkg) } diff --git a/pkg/settings/config.go b/pkg/settings/config.go index 264da291..24a466d1 100644 --- a/pkg/settings/config.go +++ b/pkg/settings/config.go @@ -218,7 +218,7 @@ func DefaultConfig(version string) *Configuration { AnswerEdit: "", AnswerUpgrade: "", RemoveMake: "ask", - Provides: false, + Provides: true, UpgradeMenu: true, CleanMenu: true, DiffMenu: true,