sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-10-05 00:08:30 -04:00
Code Issues Projects Releases Wiki Activity

Clean up unused code

Browse Source
This commit is contained in:
morganamilo 2018-05-08 19:53:03 +01:00
parent 671f836ec5
commit 8c77ad061e
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
3 changed files with 3 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
depOrder.go
View File

@ -1,14 +1,8 @@
package main
import (
// "fmt"
"strconv"
// "strings"
// "sync"
alpm "github.com/jguer/go-alpm"
rpc "github.com/mikkeloscar/aur"
//gopkg "github.com/mikkeloscar/gopkgbuild"
)
type depOrder struct {
@ -18,47 +12,12 @@ type depOrder struct {
Bases map[string][]*rpc.Pkg
}
func (do *depOrder) String() string {
str := ""
str += "\n" + red("Repo") + " (" + strconv.Itoa(len(do.Repo)) + ") :"
for _, pkg := range do.Repo {
if do.Runtime.get(pkg.Name()) {
str += " " + pkg.Name()
}
}
str += "\n" + red("Aur") + " (" + strconv.Itoa(len(do.Aur)) + ") :"
for _, pkg := range do.Aur {
if do.Runtime.get(pkg.Name) {
str += " " + pkg.Name
}
}
str += "\n" + red("Repo Make") + " (" + strconv.Itoa(len(do.Repo)) + ") :"
for _, pkg := range do.Repo {
if !do.Runtime.get(pkg.Name()) {
str += " " + pkg.Name()
}
}
str += "\n" + red("Aur Make") + " (" + strconv.Itoa(len(do.Aur)) + ") :"
for _, pkg := range do.Aur {
if !do.Runtime.get(pkg.Name) {
str += " " + pkg.Name
}
}
return str
}
func makeDepOrder() *depOrder {
return &depOrder{
make([]*rpc.Pkg, 0),
make([]*alpm.Package, 0),
make(stringSet),
make(map[string][]*rpc.Pkg, 0),
make(map[string][]*rpc.Pkg),
}
}
@ -78,8 +37,6 @@ func getDepOrder(dp *depPool) *depOrder {
}
}
//do.getBases()
return do
}
@ -127,16 +84,6 @@ func (do *depOrder) orderPkgRepo(pkg *alpm.Package, dp *depPool, runtime bool) {
})
}
func (do *depOrder) getBases() {
for _, pkg := range do.Aur {
if _, ok := do.Bases[pkg.PackageBase]; !ok {
do.Bases[pkg.PackageBase] = make([]*rpc.Pkg, 0)
}
do.Bases[pkg.PackageBase] = append(do.Bases[pkg.PackageBase], pkg)
}
}
func (do *depOrder) HasMake() bool {
lenAur := 0
for _, base := range do.Bases {

45
depPool.go
View File

@ -2,13 +2,11 @@ package main
import (
"fmt"
"strconv"
"strings"
"sync"
alpm "github.com/jguer/go-alpm"
rpc "github.com/mikkeloscar/aur"
//gopkg "github.com/mikkeloscar/gopkgbuild"
)
const PROVIDES = false
@ -79,36 +77,6 @@ func makeDepPool() (*depPool, error) {
return dp, nil
}
func (dp *depPool) String() string {
str := ""
str += "\n" + red("Targets") + " (" + strconv.Itoa(len(dp.Targets)) + ") :"
for _, pkg := range dp.Targets {
str += " " + pkg.String()
}
str += "\n" + red("Repo") + " (" + strconv.Itoa(len(dp.Repo)) + ") :"
for pkg := range dp.Repo {
str += " " + pkg
}
str += "\n" + red("Aur") + " (" + strconv.Itoa(len(dp.Aur)) + ") :"
for pkg := range dp.Aur {
str += " " + pkg
}
str += "\n" + red("Aur Cache") + " (" + strconv.Itoa(len(dp.AurCache)) + ") :"
for pkg := range dp.AurCache {
str += " " + pkg
}
str += "\n" + red("Groups") + " (" + strconv.Itoa(len(dp.Groups)) + ") :"
for _, pkg := range dp.Groups {
str += " " + pkg
}
return str
}
// Includes db/ prefixes and group installs
func (dp *depPool) ResolveTargets(pkgs []string) error {
for _, pkg := range pkgs {
@ -185,7 +153,7 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
err = dp.resolveAURPackages(aurTargets)
}
return nil
return err
}
// Pseudo provides finder.
@ -375,16 +343,6 @@ func (dp *depPool) ResolveRepoDependency(pkg *alpm.Package) {
return nil
})
}
func (dp *depPool) queryAUR(pkgs []string) error {
_, err := aurInfo(pkgs, dp.Warnings)
if err != nil {
return err
}
return nil
}
func getDepPool(pkgs []string) (*depPool, error) {
@ -475,3 +433,4 @@ func (dp *depPool) hasPackage(name string) bool {
return false
}

9
utils.go
View File

@ -7,7 +7,6 @@ import (
"unicode"
)
type mapStringSlice map[string][]string
type mapStringSet map[string]stringSet
type intRange struct {
@ -60,14 +59,6 @@ func (mss mapStringSet) Add(n string, v string) {
mss[n].set(v)
}
func (mss mapStringSlice) Add(n string, v string) {
_, ok := mss[n]
if !ok {
mss[n] = make([]string, 0, 1)
}
mss[n] = append(mss[n], v)
}
func completeFileName(dir, name string) (string, error) {
files, err := ioutil.ReadDir(dir)
if err != nil {