From 7f151cd6034cc1e9b4f64a82a6158ff7eeb56645 Mon Sep 17 00:00:00 2001
From: jguer <me@jguer.space>
Date: Wed, 16 Nov 2022 01:11:16 +0100
Subject: [PATCH] move addUpgradeToGraph to depgraph

---
 cmd.go              |  4 ++--
 pkg/dep/depGraph.go | 26 ++++++++++++++++++++++++++
 upgrade.go          | 33 ++++-----------------------------
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/cmd.go b/cmd.go
index 2e07379f..9781d32b 100644
--- a/cmd.go
+++ b/cmd.go
@@ -179,7 +179,7 @@ func handleCmd(ctx context.Context, cmdArgs *parser.Arguments, dbExecutor db.Exe
 		return config.Runtime.CmdBuilder.Show(config.Runtime.CmdBuilder.BuildPacmanCmd(ctx,
 			cmdArgs, config.Runtime.Mode, settings.NoConfirm))
 	case "U", "upgrade":
-		return handleUpgrade(ctx, config, dbExecutor, cmdArgs)
+		return handleUpgrade(ctx, config, cmdArgs)
 	case "B", "build":
 		return handleBuild(ctx, config, dbExecutor, cmdArgs)
 	case "G", "getpkgbuild":
@@ -330,7 +330,7 @@ func handleGetpkgbuild(ctx context.Context, cmdArgs *parser.Arguments, dbExecuto
 }
 
 func handleUpgrade(ctx context.Context,
-	config *settings.Configuration, dbExecutor db.Executor, cmdArgs *parser.Arguments,
+	config *settings.Configuration, cmdArgs *parser.Arguments,
 ) error {
 	return config.Runtime.CmdBuilder.Show(config.Runtime.CmdBuilder.BuildPacmanCmd(ctx,
 		cmdArgs, config.Runtime.Mode, settings.NoConfirm))
diff --git a/pkg/dep/depGraph.go b/pkg/dep/depGraph.go
index 69f08c3a..3982f9b7 100644
--- a/pkg/dep/depGraph.go
+++ b/pkg/dep/depGraph.go
@@ -14,6 +14,7 @@ import (
 
 	aurc "github.com/Jguer/aur"
 	"github.com/Jguer/aur/metadata"
+	alpm "github.com/Jguer/go-alpm/v2"
 	gosrc "github.com/Morganamilo/go-srcinfo"
 	"github.com/leonelquinteros/gotext"
 )
@@ -490,3 +491,28 @@ func archStringToString(alpmArches []string, archString []gosrc.ArchString) []st
 
 	return pkgs
 }
+
+func AddUpgradeToGraph(pkg *db.Upgrade, graph *topo.Graph[string, *InstallInfo]) {
+	source := Sync
+	if pkg.Repository == "aur" {
+		source = AUR
+	}
+
+	reason := Explicit
+	if pkg.Reason == alpm.PkgReasonDepend {
+		reason = Dep
+	}
+
+	graph.AddNode(pkg.Name)
+	graph.SetNodeInfo(pkg.Name, &topo.NodeInfo[*InstallInfo]{
+		Color:      colorMap[reason],
+		Background: bgColorMap[source],
+		Value: &InstallInfo{
+			Source:     source,
+			Reason:     reason,
+			Version:    pkg.RemoteVersion,
+			AURBase:    &pkg.Base,
+			SyncDBName: &pkg.Repository,
+		},
+	})
+}
diff --git a/upgrade.go b/upgrade.go
index 5731aae6..a93cf7a3 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -311,12 +311,12 @@ func sysupgradeTargetsV2(ctx context.Context,
 		}
 
 		if isInclude && !include.Get(len(repoUp.Up)-i+len(aurUp.Up)) {
-			addUpgradeToGraph(pkg, graph)
+			dep.AddUpgradeToGraph(pkg, graph)
 			continue
 		}
 
 		if !isInclude && (exclude.Get(len(repoUp.Up)-i+len(aurUp.Up)) || otherExclude.Get(pkg.Repository)) {
-			addUpgradeToGraph(pkg, graph)
+			dep.AddUpgradeToGraph(pkg, graph)
 			continue
 		}
 
@@ -330,38 +330,13 @@ func sysupgradeTargetsV2(ctx context.Context,
 		}
 
 		if isInclude && !include.Get(len(aurUp.Up)-i) {
-			addUpgradeToGraph(pkg, graph)
+			dep.AddUpgradeToGraph(pkg, graph)
 		}
 
 		if !isInclude && (exclude.Get(len(aurUp.Up)-i) || otherExclude.Get(pkg.Repository)) {
-			addUpgradeToGraph(pkg, graph)
+			dep.AddUpgradeToGraph(pkg, graph)
 		}
 	}
 
 	return graph, ignore, err
 }
-
-func addUpgradeToGraph(pkg *db.Upgrade, graph *topo.Graph[string, *dep.InstallInfo]) {
-	source := dep.Sync
-	if pkg.Repository == "aur" {
-		source = dep.AUR
-	}
-
-	reason := dep.Explicit
-	if pkg.Reason == alpm.PkgReasonDepend {
-		reason = dep.Dep
-	}
-
-	graph.AddNode(pkg.Name)
-	graph.SetNodeInfo(pkg.Name, &topo.NodeInfo[*dep.InstallInfo]{
-		Color:      "",
-		Background: "",
-		Value: &dep.InstallInfo{
-			Source:     source,
-			Reason:     reason,
-			Version:    pkg.RemoteVersion,
-			AURBase:    &pkg.Base,
-			SyncDBName: &pkg.Repository,
-		},
-	})
-}