system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-31 04:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore(download): unify filtering logic between commands

Browse source
This commit is contained in:
jguer 2021-08-02 20:48:21 +02:00 committed by J Guerreiro
parent 98378642bc
commit 2ed099a263
1 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
pkg/download/unified.go
View file

@ -83,19 +83,9 @@ func GetPkgbuilds(dbExecutor DBSearcher, httpClient *http.Client, targets []stri
sem := make(chan uint8, MaxConcurrentFetch) sem := make(chan uint8, MaxConcurrentFetch)
for _, target := range targets { for _, target := range targets {
aur := true // Probably replaceable by something in query.
dbName, name, aur, toSkip := getPackageUsableName(dbExecutor, target, mode)
dbName, name := text.SplitDBFromName(target) if toSkip {
if dbName != "aur" && (mode == settings.ModeAny || mode == settings.ModeRepo) {
if pkg := dbExecutor.SyncPackage(name); pkg != nil {
aur = false
name = getURLName(pkg)
dbName = pkg.DB().Name()
}
}
if aur && mode == settings.ModeRepo {
// Mode does not allow AUR packages
continue continue
} }
@ -148,31 +138,9 @@ func PKGBUILDRepos(dbExecutor DBSearcher,
sem := make(chan uint8, MaxConcurrentFetch) sem := make(chan uint8, MaxConcurrentFetch)
for _, target := range targets { for _, target := range targets {
aur := true // Probably replaceable by something in query.
dbName, name, aur, toSkip := getPackageUsableName(dbExecutor, target, mode)
dbName, name := text.SplitDBFromName(target) if toSkip {
if dbName != "aur" && (mode == settings.ModeAny || mode == settings.ModeRepo) {
var pkg alpm.IPackage
if dbName != "" {
pkg = dbExecutor.SatisfierFromDB(name, dbName)
if pkg == nil {
// if the user precised a db but the package is not in the db
// then it is missing
continue
}
} else {
pkg = dbExecutor.SyncPackage(name)
}
if pkg != nil {
aur = false
name = getURLName(pkg)
dbName = pkg.DB().Name()
}
}
if aur && mode == settings.ModeRepo {
// Mode does not allow AUR packages
continue continue
} }
@ -220,3 +188,35 @@ func PKGBUILDRepos(dbExecutor DBSearcher,
return cloned, errs.Return() return cloned, errs.Return()
} }
func getPackageUsableName(dbExecutor DBSearcher, target string, mode settings.TargetMode) (dbname, pkgname string, aur, toSkip bool) {
aur = true
dbName, name := text.SplitDBFromName(target)
if dbName != "aur" && (mode == settings.ModeAny || mode == settings.ModeRepo) {
var pkg alpm.IPackage
if dbName != "" {
pkg = dbExecutor.SatisfierFromDB(name, dbName)
if pkg == nil {
// if the user precised a db but the package is not in the db
// then it is missing
// Mode does not allow AUR packages
return dbName, name, aur, true
}
} else {
pkg = dbExecutor.SyncPackage(name)
}
if pkg != nil {
aur = false
name = getURLName(pkg)
dbName = pkg.DB().Name()
}
}
if aur && mode == settings.ModeRepo {
return dbName, name, aur, true
}
return dbName, name, aur, false
}