Fix dnf search parsing and distro-aware suggestions

Author: AdmGenSameer

archpkg/cli.py

@@ -337,7 +337,25 @@ def github_fallback(query: str, unavailable_sources: Optional[List[str]] = None)
         unavailable_sources: List of package managers that failed to search
     """
     logger.info(f"No packages found for query '{query}', providing GitHub fallback")
-    
+
+    # Determine distro-aware install commands
+    detected_distro = detect_distro()
+    install_snap_cmd = "Check your distro docs for snapd"
+    install_flatpak_cmd = "Check your distro docs for flatpak"
+
+    if detected_distro in {"ubuntu", "debian"}:
+        install_snap_cmd = "sudo apt install snapd"
+        install_flatpak_cmd = "sudo apt install flatpak"
+    elif detected_distro == "fedora":
+        install_snap_cmd = "sudo dnf install snapd"
+        install_flatpak_cmd = "sudo dnf install flatpak"
+    elif detected_distro == "suse":
+        install_snap_cmd = "sudo zypper install snapd"
+        install_flatpak_cmd = "sudo zypper install flatpak"
+    elif detected_distro in {"arch", "manjaro"}:
+        install_snap_cmd = "sudo pacman -S snapd"
+        install_flatpak_cmd = "sudo pacman -S flatpak"
+
     # Build alternative options message
     alt_options = [
         "- Install from GitHub repository (source code)",
@@ -349,9 +367,9 @@ def github_fallback(query: str, unavailable_sources: Optional[List[str]] = None)
     # If Snap or Flatpak were unavailable, offer them as options
     if unavailable_sources:
         if "Snap" in unavailable_sources:
-            alt_options.insert(0, "- [yellow]Install Snap[/yellow]: [cyan]sudo apt install snapd[/cyan] (then retry search)")
+            alt_options.insert(0, f"- [yellow]Install Snap[/yellow]: [cyan]{install_snap_cmd}[/cyan] (then retry search)")
         if "Flatpak" in unavailable_sources:
-            alt_options.insert(0, "- [yellow]Install Flatpak[/yellow]: [cyan]sudo apt install flatpak[/cyan] (then retry search)")
+            alt_options.insert(0, f"- [yellow]Install Flatpak[/yellow]: [cyan]{install_flatpak_cmd}[/cyan] (then retry search)")
 
     panel_content = f"[yellow]No packages found for '{query}' in available repositories.[/yellow]\n\n"
     panel_content += "[bold cyan]Alternative options:[/bold cyan]\n"

archpkg/search_dnf.py

@@ -108,39 +108,52 @@ def search_dnf(query: str, cache_manager: Optional[object] = None) -> List[Tuple
             return []
 
         logger.debug("Parsing DNF search results")
-        # Parse DNF output
+        # Parse DNF/DNF5 output. DNF5 may not emit explicit headers and can use tabs or
+        # multiple spaces between package name and description. We avoid relying on a
+        # header toggle and instead parse any reasonable package line.
         packages = []
-        in_results = False
         lines_processed = 0
 
+        arch_pattern = r"\.(x86_64|i686|armv7hl|aarch64|ppc64le|s390x|noarch)$"
+
         for line in output.split("\n"):
             line = line.strip()
             lines_processed += 1
-            
+
             if not line:
                 continue
 
-            # Detect start of results section
-            if "====" in line or ("Name" in line and "Matched" in line):
-                logger.debug("Found DNF results section header")
-                in_results = True
+            # Skip meta/info lines
+            lower_line = line.lower()
+            if lower_line.startswith((
+                "last metadata",
+                "updating",
+                "repositories",
+                "matched fields",
+                "error:",
+                "warning:"
+            )):
+                continue
+
+            # DNF classic format: "name : description"
+            match = re.match(r"^(\S+)\s*:\s*(.+)$", line)
+
+            # DNF5 format often uses tabs or multiple spaces: "name<TAB>description"
+            if not match:
+                match = re.match(r"^(\S+)\s{2,}(.+)$", line) or re.match(r"^(\S+)\t+(.+)$", line)
+
+            if match:
+                name_version = match.group(1).strip()
+                desc = match.group(2).strip()
+
+                # Remove architecture suffix (e.g., .x86_64, .noarch) if present
+                name = re.sub(arch_pattern, "", name_version)
+
+                packages.append((name, desc, "dnf"))
+                logger.debug(f"Found DNF package: {name}")
                 continue
 
-            # Process package lines
-            if in_results and line and not line.startswith("Last metadata"):
-                if " : " in line:  # standard DNF format: "package : description"
-                    parts = line.split(" : ", 1)
-                    if len(parts) == 2:
-                        name_version = parts[0].strip()
-                        desc = parts[1].strip()
-
-                        # Remove architecture suffix (e.g., .x86_64, .noarch) if present
-                        arch_pattern = r"\.(x86_64|i686|armv7hl|aarch64|ppc64le|s390x|noarch)$"
-                        name = re.sub(arch_pattern, "", name_version)
-
-                        # IMPROVED: Standardized source name to lowercase
-                        packages.append((name, desc, "dnf"))
-                        logger.debug(f"Found DNF package: {name}")
+        logger.info(f"DNF search completed: {len(packages)} packages found from {lines_processed} lines")
 
         logger.info(f"DNF search completed: {len(packages)} packages found from {lines_processed} lines")