add support for rebuilding local packages using srcinfo/ prefix

local_install.go

@@ -26,7 +26,7 @@ func installLocalPKGBUILD(
 	dbExecutor db.Executor,
 ) error {
 	noCheck := strings.Contains(run.Cfg.MFlags, "--nocheck")
-	grapher := dep.NewGrapher(dbExecutor, run.AURClient, run.CmdBuilder, false, settings.NoConfirm,
+	grapher := dep.NewGrapher(dbExecutor, run.Cfg, run.AURClient, run.CmdBuilder, false, settings.NoConfirm,
 		cmdArgs.ExistsDouble("d", "nodeps"), noCheck, cmdArgs.ExistsArg("needed"),
 		run.Logger.Child("grapher"))
 

pkg/cmd/graph/main.go

@@ -46,7 +46,7 @@ func handleCmd(logger *text.Logger) error {
 		return errors.Wrap(err, gotext.Get("failed to retrieve aur Cache"))
 	}
 
-	grapher := dep.NewGrapher(dbExecutor, aurCache, run.CmdBuilder, true, settings.NoConfirm,
+	grapher := dep.NewGrapher(dbExecutor, cfg, aurCache, run.CmdBuilder, true, settings.NoConfirm,
 		cmdArgs.ExistsDouble("d", "nodeps"), false, false,
 		run.Logger.Child("grapher"))
 

pkg/dep/dep_graph.go

@@ -3,6 +3,7 @@ package dep
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 	"strconv"
 
 	aurc "github.com/Jguer/aur"
@@ -15,6 +16,7 @@ import (
 	"github.com/Jguer/yay/v12/pkg/dep/topo"
 	"github.com/Jguer/yay/v12/pkg/intrange"
 	aur "github.com/Jguer/yay/v12/pkg/query"
+	"github.com/Jguer/yay/v12/pkg/settings"
 	"github.com/Jguer/yay/v12/pkg/settings/exe"
 	"github.com/Jguer/yay/v12/pkg/text"
 )
@@ -107,6 +109,7 @@ type SourceHandler interface {
 type Grapher struct {
 	logger        *text.Logger
 	providerCache map[string][]aur.Pkg
+	cfg           *settings.Configuration
 
 	dbExecutor  db.Executor
 	aurClient   aurc.QueryClient
@@ -119,12 +122,13 @@ type Grapher struct {
 	handlers    map[string][]SourceHandler
 }
 
-func NewGrapher(dbExecutor db.Executor, aurCache aurc.QueryClient, cmdBuilder exe.ICmdBuilder,
+func NewGrapher(dbExecutor db.Executor, cfg *settings.Configuration, aurCache aurc.QueryClient, cmdBuilder exe.ICmdBuilder,
 	fullGraph, noConfirm, noDeps, noCheckDeps, needed bool,
 	logger *text.Logger,
 ) *Grapher {
 	return &Grapher{
 		dbExecutor:    dbExecutor,
+		cfg:           cfg,
 		aurClient:     aurCache,
 		cmdBuilder:    cmdBuilder,
 		fullGraph:     fullGraph,
@@ -179,7 +183,7 @@ func (g *Grapher) GraphFromTargets(ctx context.Context,
 		case sourceAUR:
 			aurTargets = append(aurTargets, target.Name)
 		case sourceCacheSRCINFO:
-			srcinfoTargets = append(srcinfoTargets, target.Name)
+			srcinfoTargets = append(srcinfoTargets, filepath.Join(g.cfg.BuildDir, target.Name))
 		default:
 			pkg, err := g.dbExecutor.SatisfierFromDB(target.Name, target.DB)
 			if err != nil {

pkg/dep/dep_graph_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/Jguer/yay/v12/pkg/db/mock"
 	mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
 	aur "github.com/Jguer/yay/v12/pkg/query"
+	"github.com/Jguer/yay/v12/pkg/settings"
 	"github.com/Jguer/yay/v12/pkg/settings/exe"
 	"github.com/Jguer/yay/v12/pkg/text"
 )
@@ -200,7 +201,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			g := NewGrapher(tt.fields.dbExecutor,
+			g := NewGrapher(tt.fields.dbExecutor, &settings.Configuration{},
 				tt.fields.aurCache, &exe.MockBuilder{Runner: &exe.MockRunner{}}, false, true,
 				tt.fields.noDeps, tt.fields.noCheckDeps, false,
 				text.NewLogger(io.Discard, io.Discard, &os.File{}, true, "test"))
@@ -314,7 +315,7 @@ func TestGrapher_GraphProvides_androidsdk(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			g := NewGrapher(tt.fields.dbExecutor,
+			g := NewGrapher(tt.fields.dbExecutor, &settings.Configuration{},
 				tt.fields.aurCache, &exe.MockBuilder{Runner: &exe.MockRunner{}}, false, true,
 				tt.fields.noDeps, tt.fields.noCheckDeps, false,
 				text.NewLogger(io.Discard, io.Discard, &os.File{}, true, "test"))
@@ -517,7 +518,7 @@ func TestGrapher_GraphFromAUR_Deps_ceph_bin(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			g := NewGrapher(mockDB, mockAUR,
+			g := NewGrapher(mockDB, &settings.Configuration{}, mockAUR,
 				&exe.MockBuilder{Runner: &exe.MockRunner{}}, false, true, false, false, false,
 				text.NewLogger(io.Discard, io.Discard, &os.File{}, true, "test"))
 			got, err := g.GraphFromTargets(context.Background(), nil, tt.targets)
@@ -662,7 +663,7 @@ func TestGrapher_GraphFromAUR_Deps_gourou(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			g := NewGrapher(mockDB, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+			g := NewGrapher(mockDB, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 				false, true, false, false, false,
 				text.NewLogger(io.Discard, io.Discard, &os.File{}, true, "test"))
 			got, err := g.GraphFromTargets(context.Background(), nil, tt.targets)
@@ -800,7 +801,7 @@ func TestGrapher_GraphFromTargets_ReinstalledDeps(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			g := NewGrapher(mockDB, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+			g := NewGrapher(mockDB, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 				false, true, false, false, false,
 				text.NewLogger(io.Discard, io.Discard, &os.File{}, true, "test"))
 			got, err := g.GraphFromTargets(context.Background(), nil, tt.targets)

pkg/upgrade/service_test.go

@@ -339,7 +339,7 @@ func TestUpgradeService_GraphUpgrades(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			grapher := dep.NewGrapher(dbExe, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+			grapher := dep.NewGrapher(dbExe, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 				false, true, false, false, false, text.NewLogger(tt.fields.output, os.Stderr,
 					tt.fields.input, true, "test"))
 
@@ -521,7 +521,7 @@ func TestUpgradeService_GraphUpgradesMissingDep(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			grapher := dep.NewGrapher(dbExe, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+			grapher := dep.NewGrapher(dbExe, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 				false, true, false, false, false, text.NewLogger(tt.fields.output, os.Stderr,
 					tt.fields.input, true, "test"))
 
@@ -642,7 +642,7 @@ func TestUpgradeService_GraphUpgradesNoUpdates(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			grapher := dep.NewGrapher(dbExe, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+			grapher := dep.NewGrapher(dbExe, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 				false, true, false, false, false, text.NewLogger(tt.fields.output, os.Stderr,
 					tt.fields.input, true, "test"))
 
@@ -757,7 +757,7 @@ func TestUpgradeService_Warnings(t *testing.T) {
 
 	logger := text.NewLogger(io.Discard, os.Stderr,
 		strings.NewReader("\n"), true, "test")
-	grapher := dep.NewGrapher(dbExe, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+	grapher := dep.NewGrapher(dbExe, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 		false, true, false, false, false, logger)
 
 	cfg := &settings.Configuration{
@@ -927,7 +927,7 @@ func TestUpgradeService_GraphUpgrades_zfs_dkms(t *testing.T) {
 
 			logger := text.NewLogger(io.Discard, os.Stderr,
 				tt.fields.input, true, "test")
-			grapher := dep.NewGrapher(dbExe, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
+			grapher := dep.NewGrapher(dbExe, &settings.Configuration{}, mockAUR, &exe.MockBuilder{Runner: &exe.MockRunner{}},
 				false, true, false, false, false, logger)
 
 			cfg := &settings.Configuration{

print.go

@@ -133,7 +133,7 @@ func printUpdateList(ctx context.Context, run *runtime.Runtime, cmdArgs *parser.
 	defer func() { settings.NoConfirm = oldNoConfirm }()
 
 	targets := mapset.NewThreadUnsafeSet(cmdArgs.Targets...)
-	grapher := dep.NewGrapher(dbExecutor, run.AURClient, run.CmdBuilder, false, true,
+	grapher := dep.NewGrapher(dbExecutor, run.Cfg, run.AURClient, run.CmdBuilder, false, true,
 		false, false, cmdArgs.ExistsArg("needed"), logger.Child("grapher"))
 
 	upService := upgrade.NewUpgradeService(

sync.go

@@ -43,7 +43,7 @@ func syncInstall(ctx context.Context,
 		}
 	}
 
-	grapher := dep.NewGrapher(dbExecutor, aurCache, run.CmdBuilder, false, settings.NoConfirm,
+	grapher := dep.NewGrapher(dbExecutor, run.Cfg, aurCache, run.CmdBuilder, false, settings.NoConfirm,
 		noDeps, noCheck, cmdArgs.ExistsArg("needed"), run.Logger.Child("grapher"))
 
 	graph, err := grapher.GraphFromTargets(ctx, nil, cmdArgs.Targets)