Rework package counting

length

config/config.yml

@@ -5,7 +5,7 @@ modules:
   - name: kernel
   - name: packages
   - name: shell
-  - name: init
+  - name: init_system
   - name: motherboard
   - name: cpus
   - name: gpus

src/main.go

@@ -107,7 +107,7 @@ func run() {
 		}
 
 		// Continue if text length is 0
-		if len(textNoColor) == 0 {
+		if len(textNoColor)-len(colorMap[0]) == 0 {
 			continue
 		}
 

src/modules.go

@@ -100,10 +100,12 @@ func initializeModuleMap() {
 
 	// Packages module
 	packagesModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "packages", Format: "%3Packages: %4$PACKAGES"}, Execute: func(sm StormfetchModule) string {
+		packages := GetInstalledPackages()
+
 		return os.Expand(sm.Format, func(s string) string {
 			switch s {
 			case "PACKAGES":
-				return GetInstalledPackages()
+				return packages
 			default:
 				return ""
 			}
@@ -113,10 +115,12 @@ func initializeModuleMap() {
 
 	// Shell module
 	shellModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "shell", Format: "%3Shell: %4$SHELL"}, Execute: func(sm StormfetchModule) string {
+		shell := GetShell()
+
 		return os.Expand(sm.Format, func(s string) string {
 			switch s {
 			case "SHELL":
-				return GetShell()
+				return shell
 			default:
 				return ""
 			}
@@ -126,10 +130,16 @@ func initializeModuleMap() {
 
 	// Init system module
 	initSystemModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "init_system", Format: "%3Init: %4$INIT"}, Execute: func(sm StormfetchModule) string {
+		initSystem := GetInitSystem()
+
+		if initSystem == "" {
+			return ""
+		}
+
 		return os.Expand(sm.Format, func(s string) string {
 			switch s {
 			case "INIT":
-				return GetInitSystem()
+				return initSystem
 			default:
 				return ""
 			}
@@ -139,10 +149,12 @@ func initializeModuleMap() {
 
 	// Libc module
 	libcModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "libc", Format: "%3Libc: %4$LIBC"}, Execute: func(sm StormfetchModule) string {
+		libc := GetLibc()
+
 		return os.Expand(sm.Format, func(s string) string {
 			switch s {
 			case "LIBC":
-				return GetLibc()
+				return libc
 			default:
 				return ""
 			}
@@ -244,6 +256,10 @@ func initializeModuleMap() {
 	memoryModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "memory", Format: "%3Memory: %4$MEM_USED MiB / $MEM_TOTAL MiB"}, Execute: func(sm StormfetchModule) string {
 		memoryInfo := GetMemoryInfo()
 
+		if memoryInfo == nil {
+			return ""
+		}
+
 		return os.Expand(sm.Format, func(s string) string {
 			switch s {
 			case "MEM_TOTAL":
@@ -330,10 +346,12 @@ func initializeModuleMap() {
 
 	// Local IP module
 	localIpModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "local_ip", Format: "%3Local IP: %4$LOCAL_IP"}, Execute: func(sm StormfetchModule) string {
+		localIP := GetLocalIP()
+
 		return os.Expand(sm.Format, func(s string) string {
 			switch s {
 			case "LOCAL_IP":
-				return GetLocalIP()
+				return localIP
 			default:
 				return ""
 			}
@@ -349,6 +367,7 @@ func initializeModuleMap() {
 		}
 
 		dewm := GetDEWM()
+		displayProtocol := GetDisplayProtocol()
 
 		// Return empty string if can't detect DE/WM
 		if dewm.Name == "Unknown" {
@@ -364,7 +383,7 @@ func initializeModuleMap() {
 			case "DEWM_VERSION":
 				return dewm.Version
 			case "DISPLAY_PROTOCOL":
-				return GetDisplayProtocol()
+				return displayProtocol
 			default:
 				return ""
 			}

src/pms.go

@@ -2,25 +2,29 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
+	"path"
+	"strconv"
 	"strings"
 )
 
 type PackageManager struct {
-	Name               string
-	ExecutableName     string
-	PackageListCommand string
+	Name           string
+	ExecutableName string
+	GetPackages    func(...any) int
+	FunctionInput  []any
 }
 
 var PackageManagers = []PackageManager{
-	{Name: "dpkg", ExecutableName: "dpkg", PackageListCommand: "dpkg-query -f '${Package}\\n' -W"},
-	{Name: "pacman", ExecutableName: "pacman", PackageListCommand: "pacman -Q"},
-	{Name: "rpm", ExecutableName: "rpm", PackageListCommand: "rpm -qa"},
-	{Name: "xbps", ExecutableName: "xbps-query", PackageListCommand: "xbps-query -l"},
-	{Name: "bpm", ExecutableName: "bpm", PackageListCommand: "ls /var/lib/bpm/installed/"},
-	{Name: "portage", ExecutableName: "emerge", PackageListCommand: "find /var/db/pkg/*/ -mindepth 1 -maxdepth 1"},
-	{Name: "flatpak", ExecutableName: "flatpak", PackageListCommand: "flatpak list"},
-	{Name: "snap", ExecutableName: "snap", PackageListCommand: "snap list | tail +2"},
+	{Name: "dpkg", ExecutableName: "dpkg", GetPackages: pmFileLines, FunctionInput: []any{"/var/lib/dpkg/status", "Status: install ok installed"}},
+	{Name: "pacman", ExecutableName: "pacman", GetPackages: pmDirectoryElements, FunctionInput: []any{"/var/lib/pacman/local/", true}},
+	{Name: "rpm", ExecutableName: "rpm", GetPackages: pmShellCommandLines, FunctionInput: []any{"rpm -qa"}},
+	{Name: "xbps", ExecutableName: "xbps-query", GetPackages: pmFileLines, FunctionInput: []any{"/var/db/xbps/pkgdb-0.38.plist", "<string>installed</string>"}},
+	{Name: "bpm", ExecutableName: "bpm", GetPackages: pmDirectoryElements, FunctionInput: []any{"/var/lib/bpm/installed/"}},
+	{Name: "portage", ExecutableName: "emerge", GetPackages: pmPortage},
+	{Name: "flatpak", ExecutableName: "flatpak", GetPackages: pmFlatpak},
+	{Name: "snap", ExecutableName: "snap", GetPackages: pmSnap},
 }
 
 func (pm *PackageManager) CountPackages() int {
@@ -29,12 +33,7 @@ func (pm *PackageManager) CountPackages() int {
 		return 0
 	}
 
-	output, err := exec.Command("/bin/sh", "-c", pm.PackageListCommand).Output()
-	if err != nil {
-		return 0
-	}
-
-	return strings.Count(string(output), "\n")
+	return pm.GetPackages(pm.FunctionInput...)
 }
 
 func GetInstalledPackages() (ret string) {
@@ -51,3 +50,128 @@ func GetInstalledPackages() (ret string) {
 
 	return ret
 }
+
+func pmDirectoryElements(args ...any) int {
+	directory := args[0].(string)
+	dirsOnly := false
+	if len(args) >= 2 {
+		dirsOnly = args[1].(bool)
+	}
+	total := 0
+
+	dirEntries, _ := os.ReadDir(directory)
+	for _, entry := range dirEntries {
+		if !entry.IsDir() && dirsOnly {
+			continue
+		}
+		total++
+	}
+
+	return total
+}
+
+func pmFileLines(args ...any) int {
+	filepath := args[0].(string)
+	mustContain := ""
+	if len(args) >= 2 {
+		mustContain = args[1].(string)
+	}
+	total := 0
+
+	content, err := os.ReadFile(filepath)
+	if err == nil {
+		for _, line := range strings.Split(strings.TrimSpace(string(content)), "\n") {
+			if mustContain != "" && !strings.Contains(line, mustContain) {
+				continue
+			}
+
+			total++
+		}
+	}
+
+	return total
+}
+
+func pmShellCommandLines(args ...any) int {
+	command := args[0].(string)
+
+	output := runCommand(command, "/bin/sh")
+
+	return len(strings.Split(output, "\n"))
+}
+
+func pmShellCommandOutput(args ...any) int {
+	command := args[0].(string)
+
+	output := runCommand(command, "/bin/sh")
+
+	packageCount, _ := strconv.Atoi(output)
+	return packageCount
+}
+
+func pmPortage(args ...any) int {
+	portageDir := "/var/db/pkg"
+	total := 0
+
+	dirEntries, _ := os.ReadDir(portageDir)
+	for _, repo := range dirEntries {
+		if !repo.IsDir() {
+			continue
+		}
+
+		packages, _ := os.ReadDir(path.Join(portageDir, repo.Name()))
+		total += len(packages)
+	}
+
+	return total
+}
+
+func pmFlatpak(args ...any) int {
+	arch := GetArch()
+	flatpakDir := "/var/lib/flatpak"
+	total := 0
+
+	// Count applications
+	apps, err := os.ReadDir(path.Join(flatpakDir, "app"))
+	if err == nil {
+		for _, app := range apps {
+			if strings.HasSuffix(app.Name(), ".Locale") || strings.HasSuffix(app.Name(), ".Debug") {
+				continue
+			}
+
+			dirEntries, _ := os.ReadDir(path.Join(flatpakDir, "app", app.Name(), arch))
+
+			total += len(dirEntries)
+		}
+	}
+
+	// Count runtimes
+	runtimes, err := os.ReadDir(path.Join(flatpakDir, "runtime"))
+	if err == nil {
+		for _, runtime := range runtimes {
+			if strings.HasSuffix(runtime.Name(), ".Locale") || strings.HasSuffix(runtime.Name(), ".Debug") {
+				continue
+			}
+
+			dirEntries, _ := os.ReadDir(path.Join(flatpakDir, "runtime", runtime.Name(), arch))
+
+			total += len(dirEntries)
+		}
+	}
+
+	return total
+}
+
+func pmSnap(args ...any) int {
+	total := pmDirectoryElements("/snap", true)
+	if total > 0 {
+		return total - 1
+	}
+
+	total = pmDirectoryElements("/var/lib/snapd/snap", true)
+	if total > 0 {
+		return total - 1
+	}
+
+	return 0
+}

src/system.go

@@ -138,6 +138,11 @@ func GetInitSystem() string {
 		return ""
 	}
 
+	// Return if init system can't be found
+	if process == nil {
+		return ""
+	}
+
 	// Special cases
 	// OpenRC check
 	if _, err := os.Stat("/usr/sbin/openrc"); err == nil {