Always show selected group (filtered by selected others)

Limit results to 1000 - still need paging to really fix this

1 files changed, 15 insertions, 11 deletions

diff --git a/gui.py b/gui.py
index fb69f83..6a5ed86 100755
--- a/gui.py
+++ b/gui.py
@@ -35,7 +35,6 @@ class PackagesUI:
             }
 
         self.activeSearchItems = []
-        self.result = set()
         self.treeItems = {}
 
         self.mainwindow = m = uic.loadUi("packages.ui")
@@ -64,6 +63,7 @@ class PackagesUI:
         self.packageProperties = m.findChild(QtGui.QTextBrowser, "packageProperties")
 
         self.allPkgs = set(self.yum.pkgSack.returnPackages())
+        self.result = self.allPkgs.copy()
         self.allPackagesByName = dict(((p.name, p) for p in self.allPkgs))
 
         # tags
@@ -107,6 +107,13 @@ class PackagesUI:
 
     def fillResults(self, pkgs):
         self.resultList.clear()
+        # XXX cheat for now
+        # use pages instead
+        if len(pkgs) > 1000:
+            l = [(p.name, p) for p in pkgs]
+            l.sort()
+            l = l[:1000]
+            pkgs = set((p for n, p in l))
         for pkg in pkgs:
             item = QtGui.QListWidgetItem("%s\n\t%s" % (pkg.summary, pkg.name),
                                          self.resultList, 0)
@@ -162,23 +169,20 @@ class PackagesUI:
         self.refreshSearchResults()
         
     def refreshSearchResults(self):
-        if self.activeSearchItems:
-            result = self.activeSearchItems[0].result.copy()
-            for s in self.activeSearchItems:
-                result &= s.result
-        else:
-            result = set()
+        result = self.allPkgs.copy()
+        for s in self.activeSearchItems:
+            result &= s.result
 
         self.result = result
         self.fillResults(result)
         self.updateSearchItems()
 
     def currentSearchItemChanged(self, current, previous):
-        if self.activeSearchItems:
-            return
         searchItem = current.data(3, 0).toPyObject()
         if searchItem:
-            self.fillResults(searchItem.result)
+            self.fillResults(searchItem.result & self.result)
+        else:
+            self.fillResults(self.result)
 
     def fillTags(self):
         for _type, name in (("search", "Searches"),
@@ -186,7 +190,7 @@ class PackagesUI:
                             ("menu", "Application Menu"),
                             ("group", "Groups")):
             if self.result:
-                items = [(len(item.result & self.result), item.pattern, len(item.result))
+                items = [(len(item.result & self.result), item.pattern, len(item.result), item)
                          for item in self.searchItems[_type]]
             else:
                 items = [(len(item.result), item.pattern, len(item.result), item)