Merge lp:~didrocks/software-center/smarter-app-filtering-level into lp:software-center

[Didier Roche-Tolomelli]

Add as discussed the new levels of control for nonapp_visible switch in AppStore. More info in the commit message.

[lp:~didrocks/software-center/smarter-app-filtering-level]

1244. By Didier Roche-Tolomelli on 2010-10-02

fix an encoded 'always' to the constant in the test

[Mohamed Amine Ilidrissi (ilidrissi.amine)]

I didn't notice any speed improvements in searching "linux 2.6.35". Or is this only foundations for more improvements?

[Didier Roche-Tolomelli (didrocks)]

Yeah, for now, you will have nothing more in Software-Center itself as I don't activate this new mode. In OneConf, you will have access to it and the difference is already noticeable.

The change has already been discussed with Michael previous week.

[Mohamed Amine Ilidrissi (ilidrissi.amine)]

> Yeah, for now, you will have nothing more in Software-Center itself as I don't
> activate this new mode. In OneConf, you will have access to it and the
> difference is already noticeable.
>
> The change has already been discussed with Michael previous week.

Thanks for this insight! Besides, the code looks good.

review: Approve

=== modified file 'softwarecenter/view/appview.py'
--- softwarecenter/view/appview.py	2010-09-29 17:45:55 +0000
+++ softwarecenter/view/appview.py	2010-10-02 21:16:44 +0000
@@ -97,11 +97,15 @@
     # the default result size for a search
     DEFAULT_SEARCH_LIMIT = 200
 
+    (NONAPPS_ALWAYS_VISIBLE,
+     NONAPPS_MAYBE_VISIBLE,
+     NONAPPS_NEVER_VISIBLE) = range (3)
+
     def __init__(self, cache, db, icons, search_query=None, 
                  limit=DEFAULT_SEARCH_LIMIT,
                  sortmode=SORT_UNSORTED, filter=None, exact=False,
                  icon_size=ICON_SIZE, global_icon_cache=True, 
-                 nonapps_visible=False):
+                 nonapps_visible=NONAPPS_MAYBE_VISIBLE):
         """
         Initalize a AppStore.
 
@@ -117,6 +121,11 @@
         - `exact`: If true, indexes of queries without matches will be
                     maintained in the store (useful to show e.g. a row
                     with "??? not found")
+        - `nonapps_visible`: decide whether adding non apps in the model or not.
+                             Can be NONAPPS_ALWAYS_VISIBLE/NONAPPS_MAYBE_VISIBLE
+                             /NONAPPS_NEVER_VISIBLE
+                             (NONAPPS_MAYBE_VISIBLE will return non apps result
+                              if no matching apps is found)
         """
         gtk.GenericTreeModel.__init__(self)
         self._logger = logging.getLogger("softwarecenter.view.appstore")
@@ -176,7 +185,7 @@
         for q in self.search_query:
             self._logger.debug("using query: '%s'" % q)
             enquire = xapian.Enquire(self.db.xapiandb)
-            if not self.nonapps_visible:
+            if self.nonapps_visible != self.NONAPPS_ALWAYS_VISIBLE:
                 enquire.set_query(xapian.Query(xapian.Query.OP_AND_NOT, 
                                  q, xapian.Query("ATapplication")))
 
@@ -228,7 +237,7 @@
                 # FIXME: falsely assuming that apps come before nonapps
                 if not appname:
                     added = pkgname in already_added
-                    if self.nonapps_visible and not added:
+                    if self.nonapps_visible == self.NONAPPS_ALWAYS_VISIBLE and not added:
                         self.nonapp_pkgs += 1
                 if appname or not added:
                     if self.sortmode == SORT_BY_ALPHABET:
@@ -251,11 +260,12 @@
                     app = Application("", pkgname)
                     self.apps.append(app)
                 
-        # if we only have nonapps to be displayed, don't hide them
-        if (not self.nonapps_visible and
+        # if we only have nonapps to be displayed, and nonapps is set as
+        # NONAPPS_MAYBE_VISIBLE don't hide them
+        if (self.nonapps_visible == self.NONAPPS_MAYBE_VISIBLE and
             self.nonapp_pkgs > 0 and
             len(self.apps) == 0):
-            self.nonapps_visible = True
+            self.nonapps_visible = self.NONAPPS_ALWAYS_VISIBLE
             self._perform_search()
             
         # in the case where the app list is sorted, we must rebuild
 
=== modified file 'softwarecenter/view/availablepane.py'
--- softwarecenter/view/availablepane.py	2010-09-15 22:24:45 +0000
+++ softwarecenter/view/availablepane.py	2010-10-02 21:16:44 +0000
@@ -255,7 +255,7 @@
         # special case to disable hide nonapps for the "Featured Applications" category
         if (self.apps_category and 
             self.apps_category.untranslated_name) == "Featured":
-            self.nonapps_visible = True
+            self.nonapps_visible = AppStore.NONAPPS_ALWAYS_VISIBLE
         # In custom list mode, search should yield the exact package name.
         new_model = AppStore(self.cache,
                              self.db,
 
=== modified file 'softwarecenter/view/catview_gtk.py'
--- softwarecenter/view/catview_gtk.py	2010-09-15 09:09:58 +0000
+++ softwarecenter/view/catview_gtk.py	2010-10-02 21:16:44 +0000
@@ -346,7 +346,7 @@
                                      filter=self.apps_filter,
                                      icon_size=best_stock_size,
                                      global_icon_cache=False,
-                                     nonapps_visible=False)
+                                     nonapps_visible=AppStore.NONAPPS_MAYBE_VISIBLE)
 
             self.featured_carousel = CarouselView(featured_apps, _('Featured'), self.icons)
             self.featured_carousel.more_btn.connect('clicked',
@@ -368,7 +368,7 @@
                                 self.apps_filter,
                                 icon_size=best_stock_size,
                                 global_icon_cache=False,
-                                nonapps_visible=False)
+                                nonapps_visible=AppStore.NONAPPS_MAYBE_VISIBLE)
             self.newapps_carousel = CarouselView(
                 new_apps, _(u"What\u2019s New"), self.icons,
                 start_random=False)
 
=== modified file 'softwarecenter/view/channelpane.py'
--- softwarecenter/view/channelpane.py	2010-09-23 01:34:43 +0000
+++ softwarecenter/view/channelpane.py	2010-10-02 21:16:44 +0000
@@ -190,10 +190,10 @@
         # always show all packages in the partner repository
         # FIXME:  remove this special case code in favor of a more general solution
         if channel.get_channel_component() == "partner":
-            self.nonapps_visible = True
+            self.nonapps_visible = AppStore.NONAPPS_ALWAYS_VISIBLE
             self.disable_show_hide_nonapps = True
         else:
-            self.nonapps_visible = False
+            self.nonapps_visible = AppStore.NONAPPS_MAYBE_VISIBLE
             self.disable_show_hide_nonapps = False
         self.apps_filter = None
         if self.channel.only_packages_without_applications:
 
=== modified file 'softwarecenter/view/softwarepane.py'
--- softwarecenter/view/softwarepane.py	2010-09-27 15:12:40 +0000
+++ softwarecenter/view/softwarepane.py	2010-10-02 21:16:44 +0000
@@ -151,7 +151,7 @@
         self.icons = icons
         self.datadir = datadir
         self.backend = get_install_backend()
-        self.nonapps_visible = False
+        self.nonapps_visible = AppStore.NONAPPS_MAYBE_VISIBLE
         self.disable_show_hide_nonapps = False
         # refreshes can happen out-of-bound so we need to be sure
         # that we only set the new model (when its available) if
@@ -326,7 +326,7 @@
         pkgs = 0
         apps = 0
         if appstore.active:
-            if appstore.nonapps_visible:
+            if appstore.nonapps_visible == AppStore.NONAPPS_ALWAYS_VISIBLE:
                 pkgs = appstore.nonapp_pkgs
                 apps = len(appstore) - pkgs
             else:
@@ -353,7 +353,7 @@
             pkgs > 0 and 
             apps > 0 and
             not self.disable_show_hide_nonapps):
-            if appstore.nonapps_visible:
+            if appstore.nonapps_visible == AppStore.NONAPPS_ALWAYS_VISIBLE:
                 # TRANSLATORS: the text inbetween the underscores acts as a link
                 # In most/all languages you will want the whole string as a link
                 label = gettext.ngettext("_Hide %i technical item_",
@@ -367,11 +367,11 @@
                 self.action_bar.set_label(label, self._show_nonapp_pkgs)
             
     def _show_nonapp_pkgs(self):
-        self.nonapps_visible = True
+        self.nonapps_visible = AppStore.NONAPPS_ALWAYS_VISIBLE
         self.refresh_apps()
 
     def _hide_nonapp_pkgs(self):
-        self.nonapps_visible = False
+        self.nonapps_visible = AppStore.NONAPPS_MAYBE_VISIBLE
         self.refresh_apps()
 
     def get_status_text(self):
 
=== modified file 'test/test_appview.py'
--- test/test_appview.py	2010-09-08 03:13:07 +0000
+++ test/test_appview.py	2010-10-02 21:16:44 +0000
@@ -96,7 +96,7 @@
         store = AppStore(self.cache, self.db, self.mock_icons, 
                          sortmode=SORT_BY_CATALOGED_TIME,
                          limit=20, search_query=query,
-                         nonapps_visible=True)
+                         nonapps_visible=AppStore.NONAPPS_ALWAYS_VISIBLE)
         for item in store:
             sorted_by_appstore.append(item[AppStore.COL_PKGNAME])
         self.assertEqual(sorted_by_axi, sorted_by_appstore)
@@ -157,12 +157,12 @@
         store = AppStore(
             self.cache, self.db, self.mock_icons,
             search_query = xapian.Query(""),             
-            nonapps_visible = False)
+            nonapps_visible = AppStore.NONAPPS_MAYBE_VISIBLE)
         not_visible = store.nonapp_pkgs
         store = AppStore(
             self.cache, self.db, self.mock_icons,
             search_query = xapian.Query(""),
-            nonapps_visible = True)
+            nonapps_visible = AppStore.NONAPPS_ALWAYS_VISIBLE)
         visible = store.nonapp_pkgs
         self.assertTrue(visible < not_visible)