瀏覽代碼

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.
morganamilo 6 年之前
父節點
當前提交
b1ee03a7d8
共有 2 個文件被更改,包括 2 次插入8 次删除
  1. 1 1
      dep.go
  2. 1 7
      vcs.go

+ 1 - 1
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)

+ 1 - 7
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)