mirror of
https://github.com/Jguer/yay
synced 2024-09-14 13:51:12 +00:00
Prettify repository download messages
This commit is contained in:
parent
d2db36ac7a
commit
3df03c3291
|
@ -186,7 +186,7 @@ func continueTask(s string, def string) (cont bool) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var response string
|
var response string
|
||||||
fmt.Print(boldGreenFg(arrow+" "+s), boldWhiteFg(postFix))
|
fmt.Print(boldGreenFg(arrow+" "+s+" "), boldWhiteFg(postFix))
|
||||||
|
|
||||||
n, err := fmt.Scanln(&response)
|
n, err := fmt.Scanln(&response)
|
||||||
if err != nil || n == 0 {
|
if err != nil || n == 0 {
|
||||||
|
|
37
install.go
37
install.go
|
@ -4,9 +4,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strconv"
|
|
||||||
|
|
||||||
alpm "github.com/jguer/go-alpm"
|
|
||||||
rpc "github.com/mikkeloscar/aur"
|
rpc "github.com/mikkeloscar/aur"
|
||||||
gopkg "github.com/mikkeloscar/gopkgbuild"
|
gopkg "github.com/mikkeloscar/gopkgbuild"
|
||||||
)
|
)
|
||||||
|
@ -70,37 +68,10 @@ func install(parser *arguments) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println()
|
printDownloadsFromRepo("Repo", dc.Repo)
|
||||||
|
printDownloadsFromRepo("Repo Make", dc.RepoMake)
|
||||||
p1 := func(a []*alpm.Package) {
|
printDownloadsFromAur("AUR", dc.Aur)
|
||||||
for _, v := range a {
|
printDownloadsFromAur("AUR Make", dc.AurMake)
|
||||||
fmt.Print(" ", v.Name())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
p2 := func(a []*rpc.Pkg) {
|
|
||||||
for _, v := range a {
|
|
||||||
fmt.Print(" ", v.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Print("Repo (" + strconv.Itoa(len(dc.Repo)) + "):")
|
|
||||||
p1(dc.Repo)
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
fmt.Print("Repo Make (" + strconv.Itoa(len(dc.RepoMake)) + "):")
|
|
||||||
p1(dc.RepoMake)
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
fmt.Print("Aur (" + strconv.Itoa(len(dc.Aur)) + "):")
|
|
||||||
p2(dc.Aur)
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
fmt.Print("Aur Make (" + strconv.Itoa(len(dc.AurMake)) + "):")
|
|
||||||
p2(dc.AurMake)
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
askCleanBuilds(dc.AurMake)
|
askCleanBuilds(dc.AurMake)
|
||||||
askCleanBuilds(dc.Aur)
|
askCleanBuilds(dc.Aur)
|
||||||
|
|
28
print.go
28
print.go
|
@ -94,6 +94,34 @@ func (s repoQuery) printSearch() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// printDownloadsFromRepo prints repository packages to be downloaded
|
||||||
|
func printDownloadsFromRepo(repoType string, repo []*alpm.Package) {
|
||||||
|
var packages string
|
||||||
|
for _, v := range repo {
|
||||||
|
packages += v.Name() + " "
|
||||||
|
}
|
||||||
|
if len(repo) > 0 {
|
||||||
|
printDownloads(repoType, packages, len(repo))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// printDownloadsFromAur prints AUR packages to be downloaded
|
||||||
|
func printDownloadsFromAur(repoType string, repo []*rpc.Pkg) {
|
||||||
|
var packages string
|
||||||
|
for _, v := range repo {
|
||||||
|
packages += v.Name + " "
|
||||||
|
}
|
||||||
|
if len(repo) > 0 {
|
||||||
|
printDownloads(repoType, packages, len(repo))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func printDownloads(repoType, packages string, numPackages int) {
|
||||||
|
fmt.Println(
|
||||||
|
redFg("["+repoType+", "+strconv.Itoa(numPackages)+" packages] ") +
|
||||||
|
yellowFg(packages))
|
||||||
|
}
|
||||||
|
|
||||||
func printDeps(repoDeps []string, aurDeps []string) {
|
func printDeps(repoDeps []string, aurDeps []string) {
|
||||||
if len(repoDeps) != 0 {
|
if len(repoDeps) != 0 {
|
||||||
fmt.Print(boldGreenFg(arrow + " Repository dependencies: "))
|
fmt.Print(boldGreenFg(arrow + " Repository dependencies: "))
|
||||||
|
|
Loading…
Reference in a new issue