From 5995e55ddb083cdb211a32844b22c9a0027f2e8f Mon Sep 17 00:00:00 2001 From: Jo Date: Sun, 23 Jul 2023 22:20:05 +0200 Subject: [PATCH] chore(topo): move topo to where it's used (#2250) move topo into dep --- local_install.go | 3 +-- pkg/dep/dep_graph.go | 18 +++++++++++------- pkg/{ => dep}/topo/dep.go | 0 pkg/{ => dep}/topo/errors.go | 0 pkg/upgrade/service.go | 4 ++-- pkg/upgrade/service_test.go | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) rename pkg/{ => dep}/topo/dep.go (100%) rename pkg/{ => dep}/topo/errors.go (100%) diff --git a/local_install.go b/local_install.go index 54b94c0b..31d94fd3 100644 --- a/local_install.go +++ b/local_install.go @@ -15,7 +15,6 @@ import ( "github.com/Jguer/yay/v12/pkg/settings" "github.com/Jguer/yay/v12/pkg/settings/exe" "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/topo" gosrc "github.com/Morganamilo/go-srcinfo" "github.com/leonelquinteros/gotext" @@ -85,7 +84,7 @@ func installLocalPKGBUILD( grapher := dep.NewGrapher(dbExecutor, aurCache, false, settings.NoConfirm, cmdArgs.ExistsDouble("d", "nodeps"), noCheck, cmdArgs.ExistsArg("needed"), config.Runtime.Logger.Child("grapher")) - graph := topo.New[string, *dep.InstallInfo]() + graph := dep.NewGraph() graph, err := grapher.GraphFromSrcInfos(ctx, graph, srcInfos) if err != nil { return err diff --git a/pkg/dep/dep_graph.go b/pkg/dep/dep_graph.go index daf7e43d..913d257c 100644 --- a/pkg/dep/dep_graph.go +++ b/pkg/dep/dep_graph.go @@ -12,10 +12,10 @@ import ( "github.com/leonelquinteros/gotext" "github.com/Jguer/yay/v12/pkg/db" + "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/text" - "github.com/Jguer/yay/v12/pkg/topo" ) type InstallInfo struct { @@ -123,11 +123,15 @@ func NewGrapher(dbExecutor db.Executor, aurCache aurc.QueryClient, } } +func NewGraph() *topo.Graph[string, *InstallInfo] { + return topo.New[string, *InstallInfo]() +} + func (g *Grapher) GraphFromTargets(ctx context.Context, graph *topo.Graph[string, *InstallInfo], targets []string, ) (*topo.Graph[string, *InstallInfo], error) { if graph == nil { - graph = topo.New[string, *InstallInfo]() + graph = NewGraph() } aurTargets := make([]string, 0, len(targets)) @@ -236,7 +240,7 @@ func (g *Grapher) GraphFromSrcInfos(ctx context.Context, graph *topo.Graph[strin srcInfos map[string]*gosrc.Srcinfo, ) (*topo.Graph[string, *InstallInfo], error) { if graph == nil { - graph = topo.New[string, *InstallInfo]() + graph = NewGraph() } aurPkgsAdded := []*aurc.Pkg{} @@ -314,7 +318,7 @@ func (g *Grapher) GraphSyncPkg(ctx context.Context, pkg alpm.IPackage, upgradeInfo *db.SyncUpgrade, ) *topo.Graph[string, *InstallInfo] { if graph == nil { - graph = topo.New[string, *InstallInfo]() + graph = NewGraph() } graph.AddNode(pkg.Name()) @@ -356,7 +360,7 @@ func (g *Grapher) GraphSyncGroup(ctx context.Context, groupName, dbName string, ) *topo.Graph[string, *InstallInfo] { if graph == nil { - graph = topo.New[string, *InstallInfo]() + graph = NewGraph() } graph.AddNode(groupName) @@ -381,7 +385,7 @@ func (g *Grapher) GraphAURTarget(ctx context.Context, pkg *aurc.Pkg, instalInfo *InstallInfo, ) *topo.Graph[string, *InstallInfo] { if graph == nil { - graph = topo.New[string, *InstallInfo]() + graph = NewGraph() } graph.AddNode(pkg.Name) @@ -402,7 +406,7 @@ func (g *Grapher) GraphFromAUR(ctx context.Context, targets []string, ) (*topo.Graph[string, *InstallInfo], error) { if graph == nil { - graph = topo.New[string, *InstallInfo]() + graph = NewGraph() } if len(targets) == 0 { diff --git a/pkg/topo/dep.go b/pkg/dep/topo/dep.go similarity index 100% rename from pkg/topo/dep.go rename to pkg/dep/topo/dep.go diff --git a/pkg/topo/errors.go b/pkg/dep/topo/errors.go similarity index 100% rename from pkg/topo/errors.go rename to pkg/dep/topo/errors.go diff --git a/pkg/upgrade/service.go b/pkg/upgrade/service.go index 95c8c686..f2905708 100644 --- a/pkg/upgrade/service.go +++ b/pkg/upgrade/service.go @@ -14,12 +14,12 @@ import ( "github.com/Jguer/yay/v12/pkg/db" "github.com/Jguer/yay/v12/pkg/dep" + "github.com/Jguer/yay/v12/pkg/dep/topo" "github.com/Jguer/yay/v12/pkg/intrange" "github.com/Jguer/yay/v12/pkg/multierror" "github.com/Jguer/yay/v12/pkg/query" "github.com/Jguer/yay/v12/pkg/settings" "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/topo" "github.com/Jguer/yay/v12/pkg/vcs" ) @@ -238,7 +238,7 @@ func (u *UpgradeService) GraphUpgrades(ctx context.Context, enableDowngrade bool, filter Filter, ) (*topo.Graph[string, *dep.InstallInfo], error) { if graph == nil { - graph = topo.New[string, *dep.InstallInfo]() + graph = dep.NewGraph() } err := u.upGraph(ctx, graph, enableDowngrade, filter) diff --git a/pkg/upgrade/service_test.go b/pkg/upgrade/service_test.go index e70168bf..78828e0b 100644 --- a/pkg/upgrade/service_test.go +++ b/pkg/upgrade/service_test.go @@ -18,11 +18,11 @@ import ( "github.com/Jguer/yay/v12/pkg/db" "github.com/Jguer/yay/v12/pkg/db/mock" "github.com/Jguer/yay/v12/pkg/dep" + "github.com/Jguer/yay/v12/pkg/dep/topo" "github.com/Jguer/yay/v12/pkg/query" "github.com/Jguer/yay/v12/pkg/settings" "github.com/Jguer/yay/v12/pkg/settings/parser" "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/topo" "github.com/Jguer/yay/v12/pkg/vcs" mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"