From b1ee03a7d8c9a8a7fb135c7db1d9c07302ddb62e Mon Sep 17 00:00:00 2001 From: morganamilo Date: Sat, 11 Aug 2018 05:46:20 +0100 Subject: [PATCH] getBases now wants a slice instead of a map The one place this function is used, the caller converts its data to a map just to getBases will accept it. Instead just allow it to take the slice to begin with. --- dep.go | 2 +- vcs.go | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dep.go b/dep.go index 8accb678..b3fae560 100644 --- a/dep.go +++ b/dep.go @@ -149,7 +149,7 @@ func splitDbFromName(pkg string) (string, string) { return "", split[0] } -func getBases(pkgs map[string]*rpc.Pkg) []Base { +func getBases(pkgs []*rpc.Pkg) []Base { basesMap := make(map[string]Base) for _, pkg := range pkgs { basesMap[pkg.PackageBase] = append(basesMap[pkg.PackageBase], pkg) diff --git a/vcs.go b/vcs.go index 230b3fe2..53d949e2 100644 --- a/vcs.go +++ b/vcs.go @@ -10,7 +10,6 @@ import ( "time" gosrc "github.com/Morganamilo/go-srcinfo" - rpc "github.com/mikkeloscar/aur" ) // Info contains the last commit sha of a repo @@ -26,7 +25,6 @@ type shaInfo struct { func createDevelDB() error { var mux sync.Mutex var wg sync.WaitGroup - infoMap := make(map[string]*rpc.Pkg) _, _, _, remoteNames, err := filterPackages() if err != nil { @@ -38,11 +36,7 @@ func createDevelDB() error { return err } - for _, pkg := range info { - infoMap[pkg.Name] = pkg - } - - bases := getBases(infoMap) + bases := getBases(info) toSkip := pkgbuildsToSkip(bases, sliceToStringSet(remoteNames)) downloadPkgbuilds(bases, toSkip) srcinfos, _ := parseSrcinfoFiles(bases, false)