Flatten now compiles

cmd.go

@@ -9,8 +9,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	pac "github.com/jguer/yay/pacman"
 )
 
 func usage() {
@@ -259,7 +257,7 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 		fmt.Println("Error during AUR search:", err)
 	}
 	numaq := len(aq)
-	pq, numpq, err := searchRepo(pkgS)
+	pq, numpq, err := queryRepo(pkgS)
 	if err != nil {
 		return
 	}
@@ -270,7 +268,7 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 
 	if config.SortMode == BottomUp {
 		aq.printSearch(numpq)
-		pq.PrintSearch()
+		pq.printSearch()
 	} else {
 		pq.printSearch()
 		aq.printSearch(numpq)
@@ -285,8 +283,8 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 	}
 
 	numberString := string(numberBuf)
-	var aurInstall []string
-	var repoInstall []string
+	var aurI []string
+	var repoI []string
 	result := strings.Fields(numberString)
 	for _, numS := range result {
 		num, err = strconv.Atoi(numS)
@@ -299,25 +297,25 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 			continue
 		} else if num > numpq-1 {
 			if config.SortMode == BottomUp {
-				aurInstall = append(aurInstall, aq[numaq+numpq-num-1].Name)
+				aurI = append(aurI, aq[numaq+numpq-num-1].Name)
 			} else {
-				aurInstall = append(aurInstall, aq[num-numpq].Name)
+				aurI = append(aurI, aq[num-numpq].Name)
 			}
 		} else {
 			if config.SortMode == BottomUp {
-				repoInstall = append(repoInstall, pq[numpq-num-1].Name())
+				repoI = append(repoI, pq[numpq-num-1].Name())
 			} else {
-				repoInstall = append(repoInstall, pq[num].Name())
+				repoI = append(repoI, pq[num].Name())
 			}
 		}
 	}
 
-	if len(repoInstall) != 0 {
-		err = config.PassToPacman("-S", repoInstall, flags)
+	if len(repoI) != 0 {
+		err = passToPacman("-S", repoI, flags)
 	}
 
-	if len(aurInstall) != 0 {
-		err = Install(aurInstall, flags)
+	if len(aurI) != 0 {
+		err = aurInstall(aurI, flags)
 	}
 
 	return err
@@ -338,7 +336,7 @@ func complete() (err error) {
 		if createAURList(out) != nil {
 			defer os.Remove(path)
 		}
-		err = pac.CreatePackageList(out)
+		err = createRepoList(out)
 
 		out.Close()
 		return err

completions.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+
+	alpm "github.com/jguer/go-alpm"
 )
 
 //CreateAURList creates a new completion file
@@ -33,9 +35,8 @@ func createAURList(out *os.File) (err error) {
 	return nil
 }
 
-
 //CreatePackageList appends Repo packages to completion cache
-func CreatePackageList(out *os.File) (err error) {
+func createRepoList(out *os.File) (err error) {
 	dbList, err := AlpmHandle.SyncDbs()
 	if err != nil {
 		return

config.go

@@ -42,8 +42,8 @@ type Configuration struct {
 
 var version = "2.116"
 
-// BaseURL givers the AUR default address.
-const BaseURL string = "https://aur.archlinux.org"
+// baseURL givers the AUR default address.
+const baseURL string = "https://aur.archlinux.org"
 
 var specialDBsauce = false
 
@@ -110,8 +110,8 @@ func defaultSettings(config *Configuration) {
 // Editor returns the preferred system editor.
 func editor() string {
 	switch {
-	case YayConf.Editor != "":
-		editor, err := exec.LookPath(YayConf.Editor)
+	case config.Editor != "":
+		editor, err := exec.LookPath(config.Editor)
 		if err != nil {
 			fmt.Println(err)
 		} else {
@@ -158,7 +158,7 @@ func editor() string {
 // ContinueTask prompts if user wants to continue task.
 //If NoConfirm is set the action will continue without user input.
 func continueTask(s string, def string) (cont bool) {
-	if YayConf.NoConfirm {
+	if config.NoConfirm {
 		return true
 	}
 	var postFix string
@@ -199,9 +199,9 @@ func passToPacman(op string, pkgs []string, flags []string) error {
 	}
 
 	if strings.Contains(op, "-Q") || op == "Si" {
-		cmd = exec.Command(YayConf.PacmanBin, args...)
+		cmd = exec.Command(config.PacmanBin, args...)
 	} else {
-		args = append([]string{YayConf.PacmanBin}, args...)
+		args = append([]string{config.PacmanBin}, args...)
 		cmd = exec.Command("sudo", args...)
 	}
 

depencies.go

@@ -1,8 +1,10 @@
 package main
 
+import "strings"
+
 // BuildDependencies finds packages, on the second run
 // compares with a baselist and avoids searching those
-func BuildDependencies(baselist []string) func(toCheck []string, isBaseList bool, last bool) (repo []string, notFound []string) {
+func buildDependencies(baselist []string) func(toCheck []string, isBaseList bool, last bool) (repo []string, notFound []string) {
 	localDb, err := AlpmHandle.LocalDb()
 	if err != nil {
 		panic(err)
@@ -46,7 +48,7 @@ func BuildDependencies(baselist []string) func(toCheck []string, isBaseList bool
 
 // DepSatisfier receives a string slice, returns a slice of packages found in
 // repos and one of packages not found in repos. Leaves out installed packages.
-func DepSatisfier(toCheck []string) (repo []string, notFound []string, err error) {
+func depSatisfier(toCheck []string) (repo []string, notFound []string, err error) {
 	localDb, err := AlpmHandle.LocalDb()
 	if err != nil {
 		return

download.go

@@ -51,10 +51,10 @@ func downloadAndUnpack(url string, path string, trim bool) (err error) {
 
 	if trim {
 		err = exec.Command("/bin/sh", "-c",
-			YayConf.TarBin+" --strip-components 2 --include='*/"+fileName[:len(fileName)-7]+"/trunk/' -xf "+tarLocation+" -C "+path).Run()
+			config.TarBin+" --strip-components 2 --include='*/"+fileName[:len(fileName)-7]+"/trunk/' -xf "+tarLocation+" -C "+path).Run()
 		os.Rename(path+"trunk", path+fileName[:len(fileName)-7]) // kurwa
 	} else {
-		err = exec.Command(YayConf.TarBin, "-xf", tarLocation, "-C", path).Run()
+		err = exec.Command(config.TarBin, "-xf", tarLocation, "-C", path).Run()
 	}
 	if err != nil {
 		return
@@ -75,7 +75,7 @@ func getPkgbuild(pkg string) (err error) {
 		return
 	}
 
-	err = GetPkgbuildfromAUR(pkg, wd)
+	err = getPkgbuildfromAUR(pkg, wd)
 	return
 }
 
@@ -98,7 +98,7 @@ func getPkgbuildfromABS(pkgN string, path string) (err error) {
 				return fmt.Errorf("Not in standard repositories")
 			}
 			fmt.Printf("\x1b[1;32m==>\x1b[1;33m %s \x1b[1;32mfound in ABS.\x1b[0m\n", pkgN)
-			errD := DownloadAndUnpack(url, path, true)
+			errD := downloadAndUnpack(url, path, true)
 			return errD
 		}
 	}
@@ -117,6 +117,6 @@ func getPkgbuildfromAUR(pkgN string, dir string) (err error) {
 	}
 
 	fmt.Printf("\x1b[1;32m==>\x1b[1;33m %s \x1b[1;32mfound in AUR.\x1b[0m\n", pkgN)
-	DownloadAndUnpack(BaseURL+aq[0].URLPath, dir, false)
+	downloadAndUnpack(baseURL+aq[0].URLPath, dir, false)
 	return
 }

install.go

@@ -5,23 +5,23 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/jguer/yay/pacman"
 	rpc "github.com/mikkeloscar/aur"
+	gopkg "github.com/mikkeloscar/gopkgbuild"
 )
 
 // Install handles package installs
 func install(pkgs []string, flags []string) error {
-	aurs, repos, _ := pac.PackageSlices(pkgs)
+	aurs, repos, _ := packageSlices(pkgs)
 
 	if len(repos) != 0 {
-		err := PassToPacman("-S", repos, flags)
+		err := passToPacman("-S", repos, flags)
 		if err != nil {
 			fmt.Println("Error installing repo packages.")
 		}
 	}
 
 	if len(aurs) != 0 {
-		err := Install(aurs, flags)
+		err := aurInstall(aurs, flags)
 		if err != nil {
 			fmt.Println("Error installing aur packages.")
 		}
@@ -30,7 +30,7 @@ func install(pkgs []string, flags []string) error {
 }
 
 // Install sends system commands to make and install a package from pkgName
-func Install(pkgName []string, flags []string) (err error) {
+func aurInstall(pkgName []string, flags []string) (err error) {
 	q, err := rpc.Info(pkgName)
 	if err != nil {
 		return
@@ -56,22 +56,21 @@ func Install(pkgName []string, flags []string) (err error) {
 	return err
 }
 
-
 func setupPackageSpace(a *rpc.Pkg) (pkgbuild *gopkg.PKGBUILD, err error) {
 	dir := config.BuildDir + a.PackageBase + "/"
 
 	if _, err = os.Stat(dir); !os.IsNotExist(err) {
-		if !ContinueTask("Directory exists. Clean Build?", "yY") {
+		if !continueTask("Directory exists. Clean Build?", "yY") {
 			_ = os.RemoveAll(config.BuildDir + a.PackageBase)
 		}
 	}
 
-	if err = DownloadAndUnpack(BaseURL+a.URLPath, config.BuildDir, false); err != nil {
+	if err = downloadAndUnpack(baseURL+a.URLPath, config.BuildDir, false); err != nil {
 		return
 	}
 
-	if !ContinueTask("Edit PKGBUILD?", "yY") {
-		editcmd := exec.Command(Editor(), dir+"PKGBUILD")
+	if !continueTask("Edit PKGBUILD?", "yY") {
+		editcmd := exec.Command(editor(), dir+"PKGBUILD")
 		editcmd.Stdin, editcmd.Stdout, editcmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 		editcmd.Run()
 	}
@@ -79,9 +78,9 @@ func setupPackageSpace(a *rpc.Pkg) (pkgbuild *gopkg.PKGBUILD, err error) {
 	pkgbuild, err = gopkg.ParseSRCINFO(dir + ".SRCINFO")
 	if err == nil {
 		for _, pkgsource := range pkgbuild.Source {
-			owner, repo := vcs.ParseSource(pkgsource)
+			owner, repo := parseSource(pkgsource)
 			if owner != "" && repo != "" {
-				err = vcs.BranchInfo(a.Name, owner, repo)
+				err = branchInfo(a.Name, owner, repo)
 				if err != nil {
 					fmt.Println(err)
 				}
@@ -113,7 +112,7 @@ func PkgInstall(a *rpc.Pkg, flags []string) (finalmdeps []string, err error) {
 		return
 	}
 
-	runDeps, makeDeps, err := PkgDependencies(a)
+	runDeps, makeDeps, err := pkgDependencies(a)
 	if err != nil {
 		return
 	}
@@ -124,15 +123,15 @@ func PkgInstall(a *rpc.Pkg, flags []string) (finalmdeps []string, err error) {
 	finalmdeps = append(finalmdeps, makeDeps[1]...)
 
 	if len(aurDeps) != 0 || len(repoDeps) != 0 {
-		if !ContinueTask("Continue?", "nN") {
+		if !continueTask("Continue?", "nN") {
 			return finalmdeps, fmt.Errorf("user did not like the dependencies")
 		}
 	}
 
 	aurQ, _ := rpc.Info(aurDeps)
 	if len(aurQ) != len(aurDeps) {
-		(Query)(aurQ).MissingPackage(aurDeps)
-		if !ContinueTask("Continue?", "nN") {
+		(aurQuery)(aurQ).missingPackage(aurDeps)
+		if !continueTask("Continue?", "nN") {
 			return finalmdeps, fmt.Errorf("unable to install dependencies")
 		}
 	}
@@ -145,7 +144,7 @@ func PkgInstall(a *rpc.Pkg, flags []string) (finalmdeps []string, err error) {
 	}
 	// Repo dependencies
 	if len(repoDeps) != 0 {
-		errR := PassToPacman("-S", repoDeps, depArgs)
+		errR := passToPacman("-S", repoDeps, depArgs)
 		if errR != nil {
 			return finalmdeps, errR
 		}
@@ -157,8 +156,8 @@ func PkgInstall(a *rpc.Pkg, flags []string) (finalmdeps []string, err error) {
 		finalmdeps = append(finalmdeps, finalmdepsR...)
 
 		if errA != nil {
-			pacman.CleanRemove(repoDeps)
-			pacman.CleanRemove(aurDeps)
+			cleanRemove(repoDeps)
+			cleanRemove(aurDeps)
 			return finalmdeps, errA
 		}
 	}
@@ -169,7 +168,7 @@ func PkgInstall(a *rpc.Pkg, flags []string) (finalmdeps []string, err error) {
 	makepkgcmd.Stdin, makepkgcmd.Stdout, makepkgcmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	err = makepkgcmd.Run()
 	if err == nil {
-		_ = vcs.SaveBranchInfo()
+		_ = saveVCSInfo()
 	}
 	return
 }

print.go

@@ -21,17 +21,17 @@ func human(size int64) string {
 
 // PrintSearch handles printing search results in a given format
 func (q aurQuery) printSearch(start int) {
-	localDb, _ := config.AlpmHandle.LocalDb()
+	localDb, _ := AlpmHandle.LocalDb()
 
 	for i, res := range q {
 		var toprint string
-		if config.YayConf.SearchMode == config.NumberMenu {
-			if config.YayConf.SortMode == config.BottomUp {
+		if config.SearchMode == NumberMenu {
+			if config.SortMode == BottomUp {
 				toprint += fmt.Sprintf("\x1b[33m%d\x1b[0m ", len(q)+start-i-1)
 			} else {
 				toprint += fmt.Sprintf("\x1b[33m%d\x1b[0m ", start+i)
 			}
-		} else if config.YayConf.SearchMode == config.Minimal {
+		} else if config.SearchMode == Minimal {
 			fmt.Println(res.Name)
 			continue
 		}
@@ -177,7 +177,7 @@ func biggestPackages() {
 	}
 
 	for i := 0; i < 10; i++ {
-		fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", pkgS[i].Name(), Human(pkgS[i].ISize()))
+		fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", pkgS[i].Name(), human(pkgS[i].ISize()))
 	}
 	// Could implement size here as well, but we just want the general idea
 }

query.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	alpm "github.com/jguer/go-alpm"
-	pac "github.com/jguer/yay/pacman"
 	rpc "github.com/mikkeloscar/aur"
 )
 
@@ -62,7 +61,7 @@ func narrowSearch(pkgS []string, sortS bool) (aurQuery, error) {
 
 	if len(pkgS) == 1 {
 		if sortS {
-			sort.Sort(Query(r))
+			sort.Sort(aurQuery(r))
 		}
 		return r, err
 	}
@@ -98,17 +97,17 @@ func syncSearch(pkgS []string) (err error) {
 	if err != nil {
 		return err
 	}
-	pq, _, err := pac.Search(pkgS)
+	pq, _, err := queryRepo(pkgS)
 	if err != nil {
 		return err
 	}
 
 	if config.SortMode == BottomUp {
-		aq.printAURSearch(0)
-		pq.PrintSearch()
+		aq.printSearch(0)
+		pq.printSearch()
 	} else {
-		pq.PrintSearch()
-		aq.printAURSearch(0)
+		pq.printSearch()
+		aq.printSearch(0)
 	}
 
 	return nil
@@ -116,7 +115,7 @@ func syncSearch(pkgS []string) (err error) {
 
 // SyncInfo serves as a pacman -Si for repo packages and AUR packages.
 func syncInfo(pkgS []string, flags []string) (err error) {
-	aurS, repoS, err := pac.PackageSlices(pkgS)
+	aurS, repoS, err := packageSlices(pkgS)
 	if err != nil {
 		return
 	}
@@ -132,7 +131,7 @@ func syncInfo(pkgS []string, flags []string) (err error) {
 	}
 
 	if len(repoS) != 0 {
-		err = PassToPacman("-Si", repoS, flags)
+		err = passToPacman("-Si", repoS, flags)
 	}
 
 	return
@@ -140,12 +139,12 @@ func syncInfo(pkgS []string, flags []string) (err error) {
 
 // LocalStatistics returns installed packages statistics.
 func localStatistics(version string) error {
-	info, err := pac.Statistics()
+	info, err := statistics()
 	if err != nil {
 		return err
 	}
 
-	foreignS, err := pac.ForeignPackages()
+	foreignS, err := foreignPackages()
 	if err != nil {
 		return err
 	}
@@ -155,10 +154,10 @@ func localStatistics(version string) error {
 	fmt.Printf("\x1B[1;32mTotal installed packages: \x1B[0;33m%d\x1B[0m\n", info.Totaln)
 	fmt.Printf("\x1B[1;32mTotal foreign installed packages: \x1B[0;33m%d\x1B[0m\n", len(foreignS))
 	fmt.Printf("\x1B[1;32mExplicitly installed packages: \x1B[0;33m%d\x1B[0m\n", info.Expln)
-	fmt.Printf("\x1B[1;32mTotal Size occupied by packages: \x1B[0;33m%s\x1B[0m\n", Human(info.TotalSize))
+	fmt.Printf("\x1B[1;32mTotal Size occupied by packages: \x1B[0;33m%s\x1B[0m\n", human(info.TotalSize))
 	fmt.Println("\x1B[1;34m===========================================\x1B[0m")
 	fmt.Println("\x1B[1;32mTen biggest packages\x1B[0m")
-	pac.BiggestPackages()
+	biggestPackages()
 	fmt.Println("\x1B[1;34m===========================================\x1B[0m")
 
 	keys := make([]string, len(foreignS))
@@ -280,7 +279,7 @@ func pkgDependencies(a *rpc.Pkg) (runDeps [2][]string, makeDeps [2][]string, err
 		q = append(q, *a)
 	}
 
-	depSearch := pacman.BuildDependencies(a.Depends)
+	depSearch := buildDependencies(a.Depends)
 	if len(a.Depends) != 0 {
 		runDeps[0], runDeps[1] = depSearch(q[0].Depends, true, false)
 		if len(runDeps[0]) != 0 || len(runDeps[1]) != 0 {
@@ -389,7 +388,7 @@ func hangingPackages() (hanging []string, err error) {
 		requiredby := pkg.ComputeRequiredBy()
 		if len(requiredby) == 0 {
 			hanging = append(hanging, pkg.Name())
-			fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", pkg.Name(), Human(pkg.ISize()))
+			fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", pkg.Name(), human(pkg.ISize()))
 
 		}
 		return nil
@@ -458,7 +457,7 @@ big:
 			requiredby := pkg.ComputeRequiredBy()
 			if len(requiredby) == 0 {
 				hanging = append(hanging, pkgName)
-				fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", pkg.Name(), Human(pkg.ISize()))
+				fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", pkg.Name(), human(pkg.ISize()))
 			}
 		}
 	}

upgrade.go

@@ -334,7 +334,7 @@ func upgradePkgs(flags []string) error {
 			repoNames = append(repoNames, k.Name)
 		}
 
-		err := PassToPacman("-S", repoNames, flags)
+		err := passToPacman("-S", repoNames, flags)
 		if err != nil {
 			fmt.Println("Error upgrading repo packages.")
 		}
@@ -351,24 +351,24 @@ func upgradePkgs(flags []string) error {
 			}
 			aurNames = append(aurNames, k.Name)
 		}
-		Install(aurNames, flags)
+		aurInstall(aurNames, flags)
 	}
 	return nil
 }
 
 func develUpgrade(foreign map[string]alpm.Package, flags []string) error {
 	fmt.Println(" Checking development packages...")
-	develUpdates := vcs.CheckUpdates(foreign)
+	develUpdates := checkUpdates(foreign)
 	if len(develUpdates) != 0 {
 		for _, q := range develUpdates {
 			fmt.Printf("\x1b[1m\x1b[32m==>\x1b[33;1m %s\x1b[0m\n", q)
 		}
 		// Install updated packages
-		if !ContinueTask("Proceed with upgrade?", "nN") {
+		if !continueTask("Proceed with upgrade?", "nN") {
 			return nil
 		}
 
-		err := Install(develUpdates, flags)
+		err := aurInstall(develUpdates, flags)
 		if err != nil {
 			fmt.Println(err)
 		}

vcs.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	alpm "github.com/jguer/go-alpm"
-	"github.com/jguer/yay/pacman"
 )
 
 // branch contains the information of a repository branch
@@ -33,7 +32,7 @@ type infos []Info
 
 // CreateDevelDB forces yay to create a DB of the existing development packages
 func createDevelDB() error {
-	foreign, err := pacman.ForeignPackages()
+	foreign, err := foreignPackages()
 	if err != nil {
 		return err
 	}
@@ -47,7 +46,7 @@ func createDevelDB() error {
 
 	config.NoConfirm = true
 	specialDBsauce = true
-	err = Install(keys, nil)
+	err = aurInstall(keys, nil)
 	return err
 }
 
@@ -105,7 +104,7 @@ func checkUpdates(foreign map[string]alpm.Package) (toUpdate []string) {
 			if _, ok := foreign[e.Package]; ok {
 				toUpdate = append(toUpdate, e.Package)
 			} else {
-				RemovePackage([]string{e.Package})
+				removeVCSPackage([]string{e.Package})
 			}
 		}
 	}
@@ -123,7 +122,7 @@ func inStore(pkgName string) *Info {
 
 // BranchInfo updates saved information
 func branchInfo(pkgName string, owner string, repo string) (err error) {
-	Updated = true
+	updated = true
 	var newRepo branches
 	url := "https://api.github.com/repos/" + owner + "/" + repo + "/branches"
 	r, err := http.Get(url)
@@ -152,7 +151,7 @@ func branchInfo(pkgName string, owner string, repo string) (err error) {
 }
 
 func saveVCSInfo() error {
-	marshalledinfo, err := json.MarshalIndent(savedInfo)
+	marshalledinfo, err := json.MarshalIndent(savedInfo, "", "\t")
 	if err != nil || string(marshalledinfo) == "null" {
 		return err
 	}