From 2e1f641127bfa7984dafa1ba6a174968d78d566c Mon Sep 17 00:00:00 2001
From: Angelo Naselli <anaselli@linux.it>
Date: Sat, 11 Jan 2025 18:16:55 +0100
Subject: [PATCH] Restored show only new packages option on search, now it
 works on RE search too

---
 dnfdragora/dialogs.py  |  2 +-
 dnfdragora/helpinfo.py |  2 +-
 dnfdragora/ui.py       | 27 +++++++++++++++++++++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dnfdragora/dialogs.py b/dnfdragora/dialogs.py
index 55a16db..95ac60c 100644
--- a/dnfdragora/dialogs.py
+++ b/dnfdragora/dialogs.py
@@ -1248,7 +1248,7 @@ def onShowUpdates(self, obj):
 
   def onFuzzySearch(self, obj):
     '''
-    Newest Only Changing
+    Fuzzy Search Changing
     '''
     if isinstance(obj, yui.YCheckBox):
       try:
diff --git a/dnfdragora/helpinfo.py b/dnfdragora/helpinfo.py
index 39d1be5..08f7238 100644
--- a/dnfdragora/helpinfo.py
+++ b/dnfdragora/helpinfo.py
@@ -130,7 +130,7 @@ def __init__(self):
           _('<li><b>Do not show groups view</b>: filtering by groups could require CPU if using comps, if this option is checked dnfdragora starts showing all packages.</li></ul>') + \
           _('<b>NOTE</b> that the above options require dnfdragora to be restarted.') + \
         _('<h2>Search options</h2>') + \
-          _('<ul><li><b>Show newest packages only</b>: if checked dnfdragora shows only newest packages on search. <i>Note that is valid if searches are not performed by using regular expressions</i></li>') + \
+          _('<ul><li><b>Show newest packages only</b>: if checked dnfdragora shows only newest packages on search.</li>') + \
           _('<li><b>Fuzzy search (legacy mode)</b>: if checked a search without using regular expressions will add "*" to the given words, restoring the behavior dnfdragora had usnig dnffdaemon 4.</li></ul>') + \
         _('<h2>Logging options</h2>') + \
           _('Enable these options to let dnfdragora log on file called <i>dnfdragora.log</i>.') + \
diff --git a/dnfdragora/ui.py b/dnfdragora/ui.py
index ec07855..ff424b6 100644
--- a/dnfdragora/ui.py
+++ b/dnfdragora/ui.py
@@ -2647,14 +2647,37 @@ def _manageDnfDaemonEvent(self):
 
           elif (event == 'RESearch'):
             if not info['error']:
-              packages = info['result']
+              pkgs = None
+              packages = None
+              if self.newest_only:
+                pkgs = sorted(info['result'], key=lambda p: p.full_nevra, reverse=True)
+                name = None
+                packages = []
+                for p in pkgs:
+                  if p.name != name:
+                    packages.append(p)
+                    name = p.name
+              else:
+                 packages = info['result']
               self._showSearchResult(packages, createTreeItem=True)
             else:
               self._showErrorAndContinue(_("Search error using regular expression"), info['error'])
               logger.error("Search error: %s", info['error'])
+
           elif (event == 'Search'):
             if not info['error']:
-              packages = self.backend.make_pkg_object_with_attr(info['result'])
+              pkgs = None
+              packages = None
+              if self.newest_only:
+                pkgs = sorted(self.backend.make_pkg_object_with_attr(info['result']), key=lambda p: p.full_nevra, reverse=True)
+                name = None
+                packages = []
+                for p in pkgs:
+                  if p.name != name:
+                    packages.append(p)
+                    name = p.name
+              else:
+                packages = self.backend.make_pkg_object_with_attr(info['result'])
               self._showSearchResult(packages, createTreeItem=True)
             else:
               logger.error("Search error: %s", info['error'])