Merge lp:~gary-lasker/software-center/previous-purchase-sorting-lp873104 into lp:software-center/5.2

[Gary Lasker]

* lp:~gary-lasker/software-center/previous-purchase-sorting-lp873104:
   - return correct results when sorting the list of previous
     purchases (LP: #873104)
   - fix bug that caused a search of the list of previous purchases to
     return too many items (LP: #969273)

This branch fixes bug 873104 and bug 969273 by replacing the "special case" code for the previous purchases view with in an implementation using a SoftwareChannel. This allows us to use the view state in the way that we do for the other available pane views, and thereby fixes the two issues described by these bug reports.

Please also note that I removed the unused 'previous_purchases_query' from the DisplayState class.

All unit tests pass.

Many thanks for your review!

[Michael Vogt (mvo)]

Thanks for your branch.

This is great work and a nice improvement, especially that the special case got removed is great.

The change:
29 + self.state.search_term = ""
make me a little bit nervous as the _clear_search() is called in various places, but I could not
think of (or find one by playing around) any regression this might cause so I think its fine.

Unfortunately bug #969273 is only fixed inside the "Previous purchases" subcategory (which is nice),
but its not fixed in the "All software" case which Michael Terry was referring to in the bugreport.
I updated the description there to make the testcase clearer. For me it still returns
three items with this branch. But that is not a regression or anything like this, so I'm happy to
merge the branch as #873104 is fixed.

review: Approve

[Michael Vogt (mvo)]

While testing I noticed bug #1011522, but its not a regression in this branch, so this is just a FYI :)

=== modified file 'softwarecenter/backend/channel.py'
--- softwarecenter/backend/channel.py	2012-05-21 20:10:39 +0000
+++ softwarecenter/backend/channel.py	2012-06-08 23:52:19 +0000
@@ -237,6 +237,8 @@
             channel_display_name = self.distro.get_distro_channel_description()
         elif channel_name == "For Purchase":
             channel_display_name = _("For Purchase")
+        elif channel_name == "Previous Purchases":
+            channel_display_name = _("Previous Purchases")
         elif channel_name == "Application Review Board PPA":
             channel_display_name = _("Independent")
         elif channel_name == "notdownloadable":
 
=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-05-30 12:34:44 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-06-08 23:52:19 +0000
@@ -48,6 +48,7 @@
 from softwarepane import SoftwarePane
 from softwarecenter.ui.gtk3.session.viewmanager import get_viewmanager
 from softwarecenter.ui.gtk3.session.appmanager import get_appmanager
+from softwarecenter.backend.channel import SoftwareChannel
 from softwarecenter.backend.unitylauncher import (UnityLauncher,
                                                   UnityLauncherInfo,
                                                   TransactionDetails)
@@ -537,6 +538,7 @@
         self.searchentry.clear_with_no_signal()
         self.apps_limit = 0
         self.apps_search_term = ""
+        self.state.search_term = ""
 
     def _is_custom_list_search(self, search_term):
         return (search_term and
@@ -697,15 +699,15 @@
 
     def display_previous_purchases(self, page, view_state):
         self.nonapps_visible = NonAppVisibility.ALWAYS_VISIBLE
-        self.app_view.set_header_labels(_("Previous Purchases"), None)
+        header_strings = self._get_header_for_view_state(view_state)
+        self.app_view.set_header_labels(*header_strings)
         self.notebook.set_current_page(AvailablePane.Pages.LIST)
         # clear any search terms
         self._clear_search()
-        # do not emit app-list-changed here, this is done async when
-        # the new model is ready
-        self.refresh_apps(query=self.previous_purchases_query)
+        self.refresh_apps()
         self.action_bar.clear()
         self.cat_view.stop_carousels()
+        return True
 
     def on_subcategory_activated(self, subcat_view, category):
         LOG.debug("on_subcategory_activated: %s %s" % (
@@ -761,7 +763,9 @@
         """ called to activate the previous purchases view """
         #print cat_view, name, query
         LOG.debug("on_previous_purchases_activated with query: %s" % query)
-        self.previous_purchases_query = query
+        self.state.channel = SoftwareChannel("Previous Purchases",
+                                             "software-center-agent",
+                                             None, channel_query=query)
         vm = get_viewmanager()
         vm.display_page(self, AvailablePane.Pages.LIST, self.state,
                         self.display_previous_purchases)
 
=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
--- softwarecenter/ui/gtk3/panes/softwarepane.py	2012-05-17 13:57:45 +0000
+++ softwarecenter/ui/gtk3/panes/softwarepane.py	2012-06-08 23:52:19 +0000
@@ -66,7 +66,6 @@
               'application': (type(None), Application),
               'limit': (int,),
               'filter': (type(None), AppFilter),
-              'previous_purchases_query': (type(None), xapian.Query),
               'vadjustment': (float, ),
             }
 
@@ -78,7 +77,6 @@
         self.application = None
         self.limit = 0
         self.filter = None
-        self.previous_purchases_query = None
         self.vadjustment = 0.0
 
     def __setattr__(self, name, val):