浏览代码

Foreign package statistics. Oh, and group installing

Jguer 8 年之前
父节点
当前提交
a8b6b7ecb3
共有 2 个文件被更改,包括 9 次插入2 次删除
  1. 4 0
      actions.go
  2. 5 2
      pacman/pacman.go

+ 4 - 0
actions.go

@@ -179,13 +179,17 @@ func LocalStatistics(version string) error {
 		return err
 	}
 
+	_, foreign, _ := pac.ForeignPackages()
+
 	fmt.Printf("\n Yay version r%s\n", version)
 	fmt.Println("\x1B[1;34m===========================================\x1B[0m")
 	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", foreign)
 	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", size(info.TotalSize))
 	fmt.Println("\x1B[1;34m===========================================\x1B[0m")
 	fmt.Println("\x1B[1;32mTen biggest packages\x1B[0m")
+
 	for name, psize := range pkgmap {
 		fmt.Printf("%s: \x1B[0;33m%s\x1B[0m\n", name, size(psize))
 	}

+ 5 - 2
pacman/pacman.go

@@ -218,7 +218,6 @@ func PackageSlices(toCheck []string) (aur []string, repo []string, err error) {
 	}
 
 	for _, pkg := range toCheck {
-		// Check if dep is installed
 		found := false
 		for _, db := range dbList.Slice() {
 			_, err = db.PkgByName(pkg)
@@ -230,7 +229,11 @@ func PackageSlices(toCheck []string) (aur []string, repo []string, err error) {
 		}
 
 		if !found {
-			aur = append(aur, pkg)
+			if _, err := dbList.PkgCachebyGroup(pkg); err == nil {
+				repo = append(repo, pkg)
+			} else {
+				aur = append(aur, pkg)
+			}
 		}
 	}