From 7558f8fcf872fe7a9bbccfc21b565aa1f36bff27 Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Sat, 17 Feb 2018 23:35:54 +0000
Subject: [PATCH] Use aurInfo for -S and -Su

This also improves the dependency by switching to stringSets for some
structures that previously contained duplicates.
---
 dependencies.go | 33 +++++++++++++++++----------------
 install.go      |  9 ---------
 upgrade.go      |  3 +--
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/dependencies.go b/dependencies.go
index 75aa7992..912521ad 100644
--- a/dependencies.go
+++ b/dependencies.go
@@ -2,13 +2,12 @@ package main
 
 import (
 	"strings"
-
 	alpm "github.com/jguer/go-alpm"
 	rpc "github.com/mikkeloscar/aur"
 )
 
 type depTree struct {
-	ToProcess []string
+	ToProcess stringSet
 	Repo      map[string]*alpm.Package
 	Aur       map[string]*rpc.Pkg
 	Missing   stringSet
@@ -23,7 +22,7 @@ type depCatagories struct {
 
 func makeDepTree() *depTree {
 	dt := depTree{
-		make([]string, 0),
+		make(stringSet),
 		make(map[string]*alpm.Package),
 		make(map[string]*rpc.Pkg),
 		make(stringSet),
@@ -188,12 +187,10 @@ func getDepTree(pkgs []string) (*depTree, error) {
 			continue
 		}
 
-		dt.ToProcess = append(dt.ToProcess, pkg)
+		dt.ToProcess.set(pkg)
 	}
 
-	if len(dt.ToProcess) > 0 {
-		err = depTreeRecursive(dt, localDb, syncDb, false)
-	}
+	err = depTreeRecursive(dt, localDb, syncDb, false)
 
 	return dt, err
 }
@@ -239,16 +236,20 @@ func repoTreeRecursive(pkg *alpm.Package, dt *depTree, localDb *alpm.Db, syncDb
 }
 
 func depTreeRecursive(dt *depTree, localDb *alpm.Db, syncDb alpm.DbList, isMake bool) (err error) {
-	nextProcess := make([]string, 0)
-	currentProcess := make([]string, 0, len(dt.ToProcess))
+	if len(dt.ToProcess) == 0 {
+		return
+	}
 
+	nextProcess := make(stringSet)
+	currentProcess := make(stringSet)
 	//strip version conditions
-	for _, dep := range dt.ToProcess {
-		currentProcess = append(currentProcess, getNameFromDep(dep))
+	for dep := range dt.ToProcess {
+		currentProcess.set(getNameFromDep(dep))
 	}
 
 	//assume toprocess only contains aur stuff we have not seen
-	info, err := rpc.Info(currentProcess)
+	info, err := aurInfo(currentProcess.toSlice())
+
 	if err != nil {
 		return
 	}
@@ -265,16 +266,16 @@ func depTreeRecursive(dt *depTree, localDb *alpm.Db, syncDb alpm.DbList, isMake
 	//loop through to process and check if we now have
 	//each packaged cached
 	//if its not cached we assume its missing
-	for k, pkgName := range currentProcess {
+	for pkgName := range currentProcess {
 		pkg, exists := dt.Aur[pkgName]
 
 		//did not get it in the request
 		if !exists {
-			dt.Missing.set(dt.ToProcess[k])
+			dt.Missing.set(pkgName)
 			continue
 		}
 
-		//for reach dep and makedep
+		//for each dep and makedep
 		for _, deps := range [2][]string{pkg.Depends, pkg.MakeDepends} {
 			for _, versionedDep := range deps {
 				dep := getNameFromDep(versionedDep)
@@ -311,7 +312,7 @@ func depTreeRecursive(dt *depTree, localDb *alpm.Db, syncDb alpm.DbList, isMake
 				}
 
 				//if all else fails add it to next search
-				nextProcess = append(nextProcess, versionedDep)
+				nextProcess.set(versionedDep)
 			}
 		}
 	}
diff --git a/install.go b/install.go
index 25178b41..acee44cc 100644
--- a/install.go
+++ b/install.go
@@ -59,15 +59,6 @@ func install(parser *arguments) error {
 			return err
 		}
 
-		for _, pkg := range dc.Aur {
-			if pkg.Maintainer == "" {
-				fmt.Println(boldRedFgBlackBg(arrow+" Warning:"),
-					blackBg(pkg.Name+"-"+pkg.Version+" is orphaned"))
-			}
-		}
-
-
-
 		//printDownloadsFromRepo("Repo", dc.Repo)
 		//printDownloadsFromRepo("Repo Make", dc.RepoMake)
 		//printDownloadsFromAur("AUR", dc.Aur)
diff --git a/upgrade.go b/upgrade.go
index fd2712d5..2926164f 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -10,7 +10,6 @@ import (
 	"unicode"
 
 	alpm "github.com/jguer/go-alpm"
-	rpc "github.com/mikkeloscar/aur"
 	pkgb "github.com/mikkeloscar/gopkgbuild"
 )
 
@@ -203,7 +202,7 @@ func upAUR(remote []alpm.Package, remoteNames []string) (toUpgrade upSlice, err
 
 		routines++
 		go func(local []alpm.Package, remote []string) {
-			qtemp, err := rpc.Info(remote)
+			qtemp, err := aurInfo(remote)
 			if err != nil {
 				fmt.Println(err)
 				done <- true