sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-10-06 00:05:37 -04:00
Code Issues Projects Releases Wiki Activity

Chore: Cleanup (#1800)

Browse Source
This commit is contained in:
Jo 2022-08-23 00:20:09 +02:00 committed by GitHub
parent b6b1888e89
commit 714fee0b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install.go
View File

@ -634,14 +634,12 @@ func buildInstallPkgbuilds(
satisfied := true satisfied := true
all: all:
for _, pkg := range base { for _, pkg := range base {
for _, deps := range dep.ComputeCombinedDepList(pkg, noDeps, noCheck) { for _, dep := range dep.ComputeCombinedDepList(pkg, noDeps, noCheck) {
for _, dep := range deps { if !dp.AlpmExecutor.LocalSatisfierExists(dep) {
if !dp.AlpmExecutor.LocalSatisfierExists(dep) { satisfied = false
satisfied = false text.Warnln(gotext.Get("%s not satisfied, flushing install queue", dep))
text.Warnln(gotext.Get("%s not satisfied, flushing install queue", dep))
break all break all
}
} }
} }
} }

14
pkg/dep/depCheck.go
View File

@ -230,15 +230,13 @@ func (dp *Pool) _checkMissing(dep string, stack []string, missing *missing, noDe
missing.Good.Set(dep) missing.Good.Set(dep)
combinedDepList := ComputeCombinedDepList(aurPkg, noDeps, noCheckDeps) combinedDepList := ComputeCombinedDepList(aurPkg, noDeps, noCheckDeps)
for _, deps := range combinedDepList { for _, aurDep := range combinedDepList {
for _, aurDep := range deps { if dp.AlpmExecutor.LocalSatisfierExists(aurDep) {
if dp.AlpmExecutor.LocalSatisfierExists(aurDep) { missing.Good.Set(aurDep)
missing.Good.Set(aurDep) continue
continue
}
dp._checkMissing(aurDep, append(stack, aurPkg.Name), missing, noDeps, noCheckDeps)
} }
dp._checkMissing(aurDep, append(stack, aurPkg.Name), missing, noDeps, noCheckDeps)
} }
return return

14
pkg/dep/depOrder.go
View File

@ -48,15 +48,13 @@ func (do *Order) orderPkgAur(pkg *aur.Pkg, dp *Pool, runtime, noDeps, noCheckDep
delete(dp.Aur, pkg.Name) delete(dp.Aur, pkg.Name)
for i, deps := range ComputeCombinedDepList(pkg, noDeps, noCheckDeps) { for i, dep := range ComputeCombinedDepList(pkg, noDeps, noCheckDeps) {
for _, dep := range deps { if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil { do.orderPkgAur(aurPkg, dp, runtime && i == 0, noDeps, noCheckDeps)
do.orderPkgAur(aurPkg, dp, runtime && i == 0, noDeps, noCheckDeps) }
}
if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil { if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
do.orderPkgRepo(repoPkg, dp, runtime && i == 0) do.orderPkgRepo(repoPkg, dp, runtime && i == 0)
}
} }
} }

22
pkg/dep/depPool.go
View File

@ -61,10 +61,10 @@ type Pool struct {
Groups []string Groups []string
AlpmExecutor db.Executor AlpmExecutor db.Executor
Warnings *query.AURWarnings Warnings *query.AURWarnings
aurClient *aur.Client aurClient aur.ClientInterface
} }
func newPool(dbExecutor db.Executor, aurClient *aur.Client) *Pool { func newPool(dbExecutor db.Executor, aurClient aur.ClientInterface) *Pool {
dp := &Pool{ dp := &Pool{
Targets: []Target{}, Targets: []Target{},
Explicit: map[string]struct{}{}, Explicit: map[string]struct{}{},
@ -275,17 +275,17 @@ func (dp *Pool) cacheAURPackages(ctx context.Context, _pkgs stringset.StringSet,
// Compute dependency lists used in Package dep searching and ordering. // Compute dependency lists used in Package dep searching and ordering.
// Order sensitive TOFIX. // Order sensitive TOFIX.
func ComputeCombinedDepList(pkg *aur.Pkg, noDeps, noCheckDeps bool) [][]string { func ComputeCombinedDepList(pkg *aur.Pkg, noDeps, noCheckDeps bool) []string {
combinedDepList := make([][]string, 0, 3) combinedDepList := make([]string, 0, len(pkg.Depends)+len(pkg.MakeDepends)+len(pkg.CheckDepends))
if !noDeps { if !noDeps {
combinedDepList = append(combinedDepList, pkg.Depends) combinedDepList = append(combinedDepList, pkg.Depends...)
} }
combinedDepList = append(combinedDepList, pkg.MakeDepends) combinedDepList = append(combinedDepList, pkg.MakeDepends...)
if !noCheckDeps { if !noCheckDeps {
combinedDepList = append(combinedDepList, pkg.CheckDepends) combinedDepList = append(combinedDepList, pkg.CheckDepends...)
} }
return combinedDepList return combinedDepList
@ -326,10 +326,8 @@ func (dp *Pool) resolveAURPackages(ctx context.Context,
dp.Aur[pkg.Name] = pkg dp.Aur[pkg.Name] = pkg
combinedDepList := ComputeCombinedDepList(pkg, noDeps, noCheckDeps) combinedDepList := ComputeCombinedDepList(pkg, noDeps, noCheckDeps)
for _, deps := range combinedDepList { for _, dep := range combinedDepList {
for _, dep := range deps { newPackages.Set(dep)
newPackages.Set(dep)
}
} }
} }
@ -391,7 +389,7 @@ func (dp *Pool) ResolveRepoDependency(pkg db.IPackage, noDeps bool) {
func GetPool(ctx context.Context, pkgs []string, func GetPool(ctx context.Context, pkgs []string,
warnings *query.AURWarnings, warnings *query.AURWarnings,
dbExecutor db.Executor, dbExecutor db.Executor,
aurClient *aur.Client, aurClient aur.ClientInterface,
mode parser.TargetMode, mode parser.TargetMode,
ignoreProviders, noConfirm, provides bool, ignoreProviders, noConfirm, provides bool,
rebuild string, splitN int, noDeps bool, noCheckDeps bool, assumeInstalled []string, rebuild string, splitN int, noDeps bool, noCheckDeps bool, assumeInstalled []string,

4
pkg/query/aur_info.go
View File

@ -19,7 +19,7 @@ type Pkg = aur.Pkg
// of packages exceeds the number set in config.RequestSplitN. // of packages exceeds the number set in config.RequestSplitN.
// If the number does exceed config.RequestSplitN multiple aur requests will be // If the number does exceed config.RequestSplitN multiple aur requests will be
// performed concurrently. // performed concurrently.
func AURInfo(ctx context.Context, aurClient *aur.Client, names []string, warnings *AURWarnings, splitN int) ([]*Pkg, error) { func AURInfo(ctx context.Context, aurClient aur.ClientInterface, names []string, warnings *AURWarnings, splitN int) ([]*Pkg, error) {
info := make([]*Pkg, 0, len(names)) info := make([]*Pkg, 0, len(names))
seen := make(map[string]int) seen := make(map[string]int)
@ -84,7 +84,7 @@ func AURInfo(ctx context.Context, aurClient *aur.Client, names []string, warning
return info, nil return info, nil
} }
func AURInfoPrint(ctx context.Context, aurClient *aur.Client, names []string, splitN int) ([]*Pkg, error) { func AURInfoPrint(ctx context.Context, aurClient aur.ClientInterface, names []string, splitN int) ([]*Pkg, error) {
text.OperationInfoln(gotext.Get("Querying AUR...")) text.OperationInfoln(gotext.Get("Querying AUR..."))
warnings := &AURWarnings{} warnings := &AURWarnings{}

4
pkg/query/mixed_sources.go
View File

@ -25,7 +25,7 @@ const sourceAUR = "aur"
type Builder interface { type Builder interface {
Len() int Len() int
Execute(ctx context.Context, dbExecutor db.Executor, aurClient *aur.Client, pkgS []string) Execute(ctx context.Context, dbExecutor db.Executor, aurClient aur.ClientInterface, pkgS []string)
Results(w io.Writer, dbExecutor db.Executor, verboseSearch SearchVerbosity) error Results(w io.Writer, dbExecutor db.Executor, verboseSearch SearchVerbosity) error
GetTargets(include, exclude intrange.IntRanges, otherExclude stringset.StringSet) ([]string, error) GetTargets(include, exclude intrange.IntRanges, otherExclude stringset.StringSet) ([]string, error)
} }
@ -122,7 +122,7 @@ func (a *abstractResults) Less(i, j int) bool {
return simA > simB return simA > simB
} }
func (s *MixedSourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient *aur.Client, pkgS []string) { func (s *MixedSourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient aur.ClientInterface, pkgS []string) {
var aurErr error var aurErr error
pkgS = RemoveInvalidTargets(pkgS, s.targetMode) pkgS = RemoveInvalidTargets(pkgS, s.targetMode)

4
pkg/query/source.go
View File

@ -54,7 +54,7 @@ func NewSourceQueryBuilder(
} }
} }
func (s *SourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient *aur.Client, pkgS []string) { func (s *SourceQueryBuilder) Execute(ctx context.Context, dbExecutor db.Executor, aurClient aur.ClientInterface, pkgS []string) {
var aurErr error var aurErr error
pkgS = RemoveInvalidTargets(pkgS, s.targetMode) pkgS = RemoveInvalidTargets(pkgS, s.targetMode)
@ -176,7 +176,7 @@ func filterAURResults(pkgS []string, results []aur.Pkg) []aur.Pkg {
} }
// queryAUR searches AUR and narrows based on subarguments. // queryAUR searches AUR and narrows based on subarguments.
func queryAUR(ctx context.Context, aurClient *aur.Client, pkgS []string, searchBy string) ([]aur.Pkg, error) { func queryAUR(ctx context.Context, aurClient aur.ClientInterface, pkgS []string, searchBy string) ([]aur.Pkg, error) {
var ( var (
err error err error
by = getSearchBy(searchBy) by = getSearchBy(searchBy)

2
query.go
View File

@ -19,7 +19,7 @@ import (
) )
// SyncSearch presents a query to the local repos and to the AUR. // SyncSearch presents a query to the local repos and to the AUR.
func syncSearch(ctx context.Context, pkgS []string, aurClient *aur.Client, func syncSearch(ctx context.Context, pkgS []string, aurClient aur.ClientInterface,
dbExecutor db.Executor, queryBuilder query.Builder, verbose bool, dbExecutor db.Executor, queryBuilder query.Builder, verbose bool,
) error { ) error {
queryBuilder.Execute(ctx, dbExecutor, aurClient, pkgS) queryBuilder.Execute(ctx, dbExecutor, aurClient, pkgS)

2
vote.go
View File

@ -22,7 +22,7 @@ func (e *ErrAURVote) Error() string {
} }
func handlePackageVote(ctx context.Context, func handlePackageVote(ctx context.Context,
targets []string, aurClient *aur.Client, targets []string, aurClient aur.ClientInterface,
voteClient *vote.Client, splitN int, upvote bool, voteClient *vote.Client, splitN int, upvote bool,
) error { ) error {
infos, err := query.AURInfoPrint(ctx, aurClient, targets, splitN) infos, err := query.AURInfoPrint(ctx, aurClient, targets, splitN)