dnf improvements

Author: Muhammad Ibrahim

internal/packages/dnf.go

@@ -63,7 +63,7 @@ func (m *DNFManager) GetPackages() []models.Package {
 	var upgradablePackages []models.Package
 	if len(checkOutput) > 0 {
 		m.logger.Debug("Parsing DNF/yum check-update output...")
-		upgradablePackages = m.parseUpgradablePackages(string(checkOutput), packageManager)
+		upgradablePackages = m.parseUpgradablePackages(string(checkOutput), packageManager, installedPackages)
 		m.logger.WithField("count", len(upgradablePackages)).Debug("Found upgradable packages")
 	} else {
 		m.logger.Debug("No updates available")
@@ -78,7 +78,7 @@ func (m *DNFManager) GetPackages() []models.Package {
 }
 
 // parseUpgradablePackages parses dnf/yum check-update output
-func (m *DNFManager) parseUpgradablePackages(output string, packageManager string) []models.Package {
+func (m *DNFManager) parseUpgradablePackages(output string, packageManager string, installedPackages map[string]string) []models.Package {
 	var packages []models.Package
 
 	scanner := bufio.NewScanner(strings.NewReader(output))
@@ -100,31 +100,84 @@ func (m *DNFManager) parseUpgradablePackages(output string, packageManager strin
 		availableVersion := fields[1]
 		repo := fields[2]
 
-		// Get current version
-		getCurrentCmd := exec.Command(packageManager, "list", "installed", packageName)
-		getCurrentOutput, err := getCurrentCmd.Output()
-		var currentVersion string
-		if err == nil {
-			for currentLine := range strings.SplitSeq(string(getCurrentOutput), "\n") {
-				if strings.Contains(currentLine, packageName) && !strings.Contains(currentLine, "Installed") {
-					currentFields := slices.Collect(strings.FieldsSeq(currentLine))
-					if len(currentFields) >= 2 {
-						currentVersion = currentFields[1]
+		// Get current version from installed packages map (already collected)
+		// Try exact match first
+		currentVersion := installedPackages[packageName]
+		
+		// If not found, try to find by base name (handles architecture suffixes)
+		// e.g., if packageName is "package" but installed has "package.x86_64"
+		// or if packageName is "package.x86_64" but installed has "package"
+		if currentVersion == "" {
+			// Try to find by removing architecture suffix from packageName (if present)
+			basePackageName := packageName
+			if idx := strings.LastIndex(packageName, "."); idx > 0 {
+				archSuffix := packageName[idx+1:]
+				if archSuffix == "x86_64" || archSuffix == "i686" || archSuffix == "i386" || 
+					archSuffix == "noarch" || archSuffix == "aarch64" || archSuffix == "arm64" {
+					basePackageName = packageName[:idx]
+					currentVersion = installedPackages[basePackageName]
+				}
+			}
+			
+			// If still not found, search through installed packages for matching base name
+			if currentVersion == "" {
+				for installedName, version := range installedPackages {
+					// Remove architecture suffix if present (e.g., .x86_64, .noarch, .i686)
+					baseName := installedName
+					if idx := strings.LastIndex(installedName, "."); idx > 0 {
+						// Check if the part after the last dot looks like an architecture
+						archSuffix := installedName[idx+1:]
+						if archSuffix == "x86_64" || archSuffix == "i686" || archSuffix == "i386" || 
+							archSuffix == "noarch" || archSuffix == "aarch64" || archSuffix == "arm64" {
+							baseName = installedName[:idx]
+						}
+					}
+					
+					// Compare base names (handles both cases: package vs package.x86_64)
+					if baseName == basePackageName || baseName == packageName {
+						currentVersion = version
 						break
 					}
 				}
 			}
 		}
+		
+		// If still not found in installed packages, try to get it with a command as fallback
+		if currentVersion == "" {
+			getCurrentCmd := exec.Command(packageManager, "list", "installed", packageName)
+			getCurrentOutput, err := getCurrentCmd.Output()
+			if err == nil {
+				for currentLine := range strings.SplitSeq(string(getCurrentOutput), "\n") {
+					if strings.Contains(currentLine, packageName) && !strings.Contains(currentLine, "Installed") && !strings.Contains(currentLine, "Available") {
+						currentFields := slices.Collect(strings.FieldsSeq(currentLine))
+						if len(currentFields) >= 2 {
+							currentVersion = currentFields[1]
+							break
+						}
+					}
+				}
+			}
+		}
 
-		isSecurityUpdate := strings.Contains(strings.ToLower(repo), "security")
-
-		packages = append(packages, models.Package{
-			Name:             packageName,
-			CurrentVersion:   currentVersion,
-			AvailableVersion: availableVersion,
-			NeedsUpdate:      true,
-			IsSecurityUpdate: isSecurityUpdate,
-		})
+		// Only add package if we have both current and available versions
+		// This prevents empty currentVersion errors on the server
+		if packageName != "" && currentVersion != "" && availableVersion != "" {
+			isSecurityUpdate := strings.Contains(strings.ToLower(repo), "security")
+
+			packages = append(packages, models.Package{
+				Name:             packageName,
+				CurrentVersion:   currentVersion,
+				AvailableVersion: availableVersion,
+				NeedsUpdate:      true,
+				IsSecurityUpdate: isSecurityUpdate,
+			})
+		} else {
+			m.logger.WithFields(logrus.Fields{
+				"package":         packageName,
+				"currentVersion":  currentVersion,
+				"availableVersion": availableVersion,
+			}).Debug("Skipping package due to missing version information")
+		}
 	}
 
 	return packages