refactor(yay): move cfg inside of runtime (#2259)
* rework relationship between runtime and cfg * separate runtime from cfg * simplify instantiation logic * move installer to appropriate package * move operator to sync package * add tests for srcinfo service * consolidate srcinfo service in sync * add logger to srcinfo * add logger to preparer * remove unused text functions * remove remaining text.* from srcinfo * remove global logger parts * remove global org method exports * remove global logger * move text->input * add rule to prevent fmt.Print * update golangci go version * remove outdated FAQs * remove outdated FAQs
This commit is contained in:
74 files changed
+1475
-1367
No files matched your search
@@ -0,0 +1,136 @@
|
||||
package workdir
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"runtime"
|
||||
"sync"
|
||||
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/multierror"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
)
|
||||
|
||||
type ErrDownloadSource struct {
|
||||
inner error
|
||||
pkgName string
|
||||
errOut string
|
||||
}
|
||||
|
||||
func (e ErrDownloadSource) Error() string {
|
||||
return fmt.Sprintln(gotext.Get("error downloading sources: %s", text.Cyan(e.pkgName)),
|
||||
"\n\t context:", e.inner.Error(), "\n\t", e.errOut)
|
||||
}
|
||||
|
||||
func (e *ErrDownloadSource) Unwrap() error {
|
||||
return e.inner
|
||||
}
|
||||
|
||||
func downloadPKGBUILDSource(ctx context.Context,
|
||||
cmdBuilder exe.ICmdBuilder, pkgBuildDir string, installIncompatible bool,
|
||||
) error {
|
||||
args := []string{"--verifysource", "--skippgpcheck", "-Ccf"}
|
||||
|
||||
if installIncompatible {
|
||||
args = append(args, "--ignorearch")
|
||||
}
|
||||
|
||||
err := cmdBuilder.Show(
|
||||
cmdBuilder.BuildMakepkgCmd(ctx, pkgBuildDir, args...))
|
||||
if err != nil {
|
||||
return ErrDownloadSource{inner: err, pkgName: pkgBuildDir}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func downloadPKGBUILDSourceWorker(ctx context.Context, wg *sync.WaitGroup,
|
||||
dirChannel <-chan string, valOut chan<- string, errOut chan<- error,
|
||||
cmdBuilder exe.ICmdBuilder, incompatible bool,
|
||||
) {
|
||||
for pkgBuildDir := range dirChannel {
|
||||
err := downloadPKGBUILDSource(ctx, cmdBuilder, pkgBuildDir, incompatible)
|
||||
if err != nil {
|
||||
errOut <- ErrDownloadSource{inner: err, pkgName: pkgBuildDir, errOut: ""}
|
||||
} else {
|
||||
valOut <- pkgBuildDir
|
||||
}
|
||||
}
|
||||
|
||||
wg.Done()
|
||||
}
|
||||
|
||||
func downloadPKGBUILDSourceFanout(ctx context.Context, cmdBuilder exe.ICmdBuilder, pkgBuildDirs map[string]string,
|
||||
incompatible bool, maxConcurrentDownloads int,
|
||||
) error {
|
||||
if len(pkgBuildDirs) == 0 {
|
||||
return nil // no work to do
|
||||
}
|
||||
|
||||
if len(pkgBuildDirs) == 1 {
|
||||
for _, pkgBuildDir := range pkgBuildDirs {
|
||||
return downloadPKGBUILDSource(ctx, cmdBuilder, pkgBuildDir, incompatible)
|
||||
}
|
||||
}
|
||||
|
||||
var (
|
||||
numOfWorkers = runtime.NumCPU()
|
||||
wg = &sync.WaitGroup{}
|
||||
c = make(chan string)
|
||||
fanInChanValues = make(chan string)
|
||||
fanInChanErrors = make(chan error)
|
||||
)
|
||||
|
||||
if maxConcurrentDownloads != 0 {
|
||||
numOfWorkers = maxConcurrentDownloads
|
||||
}
|
||||
|
||||
dedupSet := mapset.NewThreadUnsafeSet[string]()
|
||||
|
||||
go func() {
|
||||
for _, pkgbuildDir := range pkgBuildDirs {
|
||||
if !dedupSet.Contains(pkgbuildDir) {
|
||||
c <- pkgbuildDir
|
||||
dedupSet.Add(pkgbuildDir)
|
||||
}
|
||||
}
|
||||
|
||||
close(c)
|
||||
}()
|
||||
|
||||
// Launch Workers
|
||||
wg.Add(numOfWorkers)
|
||||
|
||||
for s := 0; s < numOfWorkers; s++ {
|
||||
go downloadPKGBUILDSourceWorker(ctx, wg, c,
|
||||
fanInChanValues, fanInChanErrors, cmdBuilder, incompatible)
|
||||
}
|
||||
|
||||
go func() {
|
||||
wg.Wait()
|
||||
close(fanInChanValues)
|
||||
close(fanInChanErrors)
|
||||
}()
|
||||
|
||||
returnErr := multierror.MultiError{}
|
||||
|
||||
receiver:
|
||||
for {
|
||||
select {
|
||||
case _, ok := <-fanInChanValues:
|
||||
if !ok {
|
||||
break receiver
|
||||
}
|
||||
case err, ok := <-fanInChanErrors:
|
||||
if !ok {
|
||||
break receiver
|
||||
}
|
||||
returnErr.Add(err)
|
||||
}
|
||||
}
|
||||
|
||||
return returnErr.Return()
|
||||
}
|
||||
Reference in new issue
Block a user