wip

KarolosLykos · Aug 22, 2022 · b054828 · b054828
1 parent 859b7c7
commit b054828
Show file tree

Hide file tree

Showing 11 changed files with 480 additions and 36 deletions.
diff --git a/cmd.go b/cmd.go
@@ -330,7 +330,7 @@ func handleUpgrade(ctx context.Context,
 	config *settings.Configuration, dbExecutor db.Executor, cmdArgs *parser.Arguments,
 ) error {
 	if cmdArgs.ExistsArg("i", "install") {
-		return installLocalPKGBUILD(ctx, cmdArgs, dbExecutor, false)
+		return installLocalPKGBUILD(ctx, cmdArgs, dbExecutor, config.Runtime.AURClient, false)
 	}
 
 	return config.Runtime.CmdBuilder.Show(config.Runtime.CmdBuilder.BuildPacmanCmd(ctx,

diff --git a/go.mod b/go.mod
@@ -19,8 +19,9 @@ require (
 	github.com/adrg/strutil v0.3.0
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-go 1.17
+go 1.19
diff --git a/go.sum b/go.sum
@@ -23,6 +23,8 @@ github.com/leonelquinteros/gotext v1.5.0 h1:ODY7LzLpZWWSJdAHnzhreOr6cwLXTAmc914F
 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/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=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

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

diff --git a/local_install.go b/local_install.go
@@ -2,16 +2,166 @@ package main
 
 import (
 	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
 
+	"github.com/Jguer/aur"
 	"github.com/Jguer/yay/v11/pkg/db"
+	"github.com/Jguer/yay/v11/pkg/dep"
+	"github.com/Jguer/yay/v11/pkg/query"
 	"github.com/Jguer/yay/v11/pkg/settings/parser"
+	"github.com/Jguer/yay/v11/pkg/topo"
+	gosrc "github.com/Morganamilo/go-srcinfo"
+	"github.com/leonelquinteros/gotext"
+	"github.com/pkg/errors"
 )
 
+func archStringToString(alpmArches []string, archString []gosrc.ArchString) []string {
+	pkgs := make([]string, 0, len(archString))
+
+	for _, arch := range archString {
+		if alpmArchIsSupported(alpmArches, arch.Arch) {
+			pkgs = append(pkgs, arch.Value)
+		}
+	}
+
+	return pkgs
+}
+
+func makeAURPKGFromSrcinfo(dbExecutor db.Executor, srcInfo *gosrc.Srcinfo) ([]aur.Pkg, error) {
+	pkgs := make([]aur.Pkg, 0, 1)
+
+	alpmArch, err := dbExecutor.AlpmArchitectures()
+	if err != nil {
+		return nil, err
+	}
+
+	alpmArch = append(alpmArch, "") // srcinfo assumes no value as ""
+
+	for _, pkg := range srcInfo.Packages {
+		pkgs = append(pkgs, aur.Pkg{
+			ID:            0,
+			Name:          pkg.Pkgname,
+			PackageBaseID: 0,
+			PackageBase:   srcInfo.Pkgbase,
+			Version:       srcInfo.Version(),
+			Description:   pkg.Pkgdesc,
+			URL:           pkg.URL,
+			Depends:       append(archStringToString(alpmArch, pkg.Depends), archStringToString(alpmArch, srcInfo.Package.Depends)...),
+			MakeDepends:   archStringToString(alpmArch, srcInfo.PackageBase.MakeDepends),
+			CheckDepends:  archStringToString(alpmArch, srcInfo.PackageBase.CheckDepends),
+			Conflicts:     append(archStringToString(alpmArch, pkg.Conflicts), archStringToString(alpmArch, srcInfo.Package.Conflicts)...),
+			Provides:      append(archStringToString(alpmArch, pkg.Provides), archStringToString(alpmArch, srcInfo.Package.Provides)...),
+			Replaces:      append(archStringToString(alpmArch, pkg.Replaces), archStringToString(alpmArch, srcInfo.Package.Replaces)...),
+			OptDepends:    []string{},
+			Groups:        pkg.Groups,
+			License:       pkg.License,
+			Keywords:      []string{},
+		})
+	}
+
+	return pkgs, nil
+}
+
+func splitDep(dep string) (pkg, mod, ver string) {
+	split := strings.FieldsFunc(dep, func(c rune) bool {
+		match := c == '>' || c == '<' || c == '='
+
+		if match {
+			mod += string(c)
+		}
+
+		return match
+	})
+
+	if len(split) == 0 {
+		return "", "", ""
+	}
+
+	if len(split) == 1 {
+		return split[0], "", ""
+	}
+
+	return split[0], mod, split[1]
+}
+
 func installLocalPKGBUILD(
 	ctx context.Context,
 	cmdArgs *parser.Arguments,
 	dbExecutor db.Executor,
+	aurClient aur.ClientInterface,
 	ignoreProviders bool,
 ) error {
+	wd, err := os.Getwd()
+	if err != nil {
+		return errors.Wrap(err, gotext.Get("failed to retrieve working directory"))
+	}
+
+	if len(cmdArgs.Targets) > 1 {
+		return errors.New(gotext.Get("only one target is allowed"))
+	}
+
+	if len(cmdArgs.Targets) == 1 {
+		wd = cmdArgs.Targets[0]
+	}
+
+	pkgbuild, err := gosrc.ParseFile(filepath.Join(wd, ".SRCINFO"))
+	if err != nil {
+		return errors.Wrap(err, gotext.Get("failed to parse .SRCINFO"))
+	}
+
+	aurPkgs, err := makeAURPKGFromSrcinfo(dbExecutor, pkgbuild)
+	if err != nil {
+		return err
+	}
+
+	graph := topo.New[string]()
+
+	for _, pkg := range aurPkgs {
+		depSlice := dep.ComputeCombinedDepList(&pkg, false, false)
+		addNodes(dbExecutor, aurClient, pkg.Name, pkg.PackageBase, depSlice, graph)
+	}
+
+	fmt.Println(graph)
+
 	return nil
 }
+
+func addNodes(dbExecutor db.Executor, aurClient aur.ClientInterface, pkgName string, pkgBase string, deps []string, graph *topo.Graph[string]) {
+	graph.AddNode(pkgBase)
+	graph.Alias(pkgBase, pkgName)
+
+	for _, depString := range deps {
+		depName, _, _ := splitDep(depString)
+
+		if dbExecutor.LocalSatisfierExists(depString) {
+			continue
+		}
+
+		graph.DependOn(depName, pkgBase)
+
+		if alpmPkg := dbExecutor.SyncSatisfier(depString); alpmPkg != nil {
+			newDeps := alpmPkg.Depends().Slice()
+			newDepsSlice := make([]string, 0, len(newDeps))
+
+			for _, newDep := range newDeps {
+				newDepsSlice = append(newDepsSlice, newDep.Name)
+			}
+
+			addNodes(dbExecutor, aurClient, alpmPkg.Name(), alpmPkg.Base(), newDepsSlice, graph)
+		}
+
+		warnings := query.AURWarnings{}
+		if aurPkgs, _ := query.AURInfo(context.TODO(), aurClient, []string{depName}, &warnings, 1); len(aurPkgs) != 0 {
+			pkg := aurPkgs[0]
+			newDeps := dep.ComputeCombinedDepList(pkg, false, false)
+			newDepsSlice := make([]string, 0, len(newDeps))
+
+			addNodes(dbExecutor, aurClient, pkg.PackageBase, pkg.Name, newDepsSlice, graph)
+		}
+	}
+
+	return
+}
diff --git a/pkg/dep/depCheck.go b/pkg/dep/depCheck.go
@@ -230,15 +230,13 @@ func (dp *Pool) _checkMissing(dep string, stack []string, missing *missing, noDe
 		missing.Good.Set(dep)
 
 		combinedDepList := ComputeCombinedDepList(aurPkg, noDeps, noCheckDeps)
-		for _, deps := range combinedDepList {
-			for _, aurDep := range deps {
-				if dp.AlpmExecutor.LocalSatisfierExists(aurDep) {
-					missing.Good.Set(aurDep)
-					continue
-				}
-
-				dp._checkMissing(aurDep, append(stack, aurPkg.Name), missing, noDeps, noCheckDeps)
+		for _, aurDep := range combinedDepList {
+			if dp.AlpmExecutor.LocalSatisfierExists(aurDep) {
+				missing.Good.Set(aurDep)
+				continue
 			}
+
+			dp._checkMissing(aurDep, append(stack, aurPkg.Name), missing, noDeps, noCheckDeps)
 		}
 
 		return

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

diff --git a/pkg/dep/depPool.go b/pkg/dep/depPool.go
@@ -275,17 +275,17 @@ func (dp *Pool) cacheAURPackages(ctx context.Context, _pkgs stringset.StringSet,
 
 // Compute dependency lists used in Package dep searching and ordering.
 // Order sensitive TOFIX.
-func ComputeCombinedDepList(pkg *aur.Pkg, noDeps, noCheckDeps bool) [][]string {
-	combinedDepList := make([][]string, 0, 3)
+func ComputeCombinedDepList(pkg *aur.Pkg, noDeps, noCheckDeps bool) []string {
+	combinedDepList := make([]string, 0, len(pkg.Depends)+len(pkg.MakeDepends)+len(pkg.CheckDepends))
 
 	if !noDeps {
-		combinedDepList = append(combinedDepList, pkg.Depends)
+		combinedDepList = append(combinedDepList, pkg.Depends...)
 	}
 
-	combinedDepList = append(combinedDepList, pkg.MakeDepends)
+	combinedDepList = append(combinedDepList, pkg.MakeDepends...)
 
 	if !noCheckDeps {
-		combinedDepList = append(combinedDepList, pkg.CheckDepends)
+		combinedDepList = append(combinedDepList, pkg.CheckDepends...)
 	}
 
 	return combinedDepList
@@ -326,10 +326,8 @@ func (dp *Pool) resolveAURPackages(ctx context.Context,
 		dp.Aur[pkg.Name] = pkg
 
 		combinedDepList := ComputeCombinedDepList(pkg, noDeps, noCheckDeps)
-		for _, deps := range combinedDepList {
-			for _, dep := range deps {
-				newPackages.Set(dep)
-			}
+		for _, dep := range combinedDepList {
+			newPackages.Set(dep)
 		}
 	}
 

diff --git a/pkg/query/aur_info.go b/pkg/query/aur_info.go
@@ -19,7 +19,7 @@ type Pkg = aur.Pkg
 // of packages exceeds the number set in config.RequestSplitN.
 // If the number does exceed config.RequestSplitN multiple aur requests will be
 // 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))
 	seen := make(map[string]int)