Merge lp:~mvo/software-center/whats-new-lp1044033 into lp:software-center

[Michael Vogt]

This branch ensures that there is a fallback xapian value that can be
used if the apt-xapian-index has not been created.

This will improve the first-run experience. There will be a sorted
(by publication time) whats-new when update-software-center-agent
finished its first run. Until that run is finished the list will be
in random order.

[lp:~mvo/software-center/whats-new-lp1044033]

3206. By Michael Vogt on 2012-09-27

trivial pyflakes fix

[Gary Lasker (gary-lasker)]

This is great, thanks, Michael!

review: Approve

=== modified file 'softwarecenter/db/categories.py'
--- softwarecenter/db/categories.py	2012-09-17 10:33:16 +0000
+++ softwarecenter/db/categories.py	2012-09-27 13:18:21 +0000
@@ -502,17 +502,9 @@
         if sortmode in (SortMethods.UNSORTED,
                         SortMethods.BY_ALPHABET,
                         SortMethods.BY_TOP_RATED,
-                        SortMethods.BY_SEARCH_RANKING):
+                        SortMethods.BY_SEARCH_RANKING,
+                        SortMethods.BY_CATALOGED_TIME):
             return True
-        # only supported with a apt-xapian-index version that has the
-        # "catalogedtime" value
-        elif sortmode == SortMethods.BY_CATALOGED_TIME:
-            if self.db._axi_values and "catalogedtime" in self.db._axi_values:
-                return True
-            else:
-                LOG.warn("sort by cataloged time requested but your a-x-i "
-                             "does not seem to support that yet")
-                return False
         # we don't know this sortmode
         LOG.error("unknown sort mode '%i'" % sortmode)
         return False

=== modified file 'softwarecenter/db/enquire.py'
--- softwarecenter/db/enquire.py	2012-03-15 04:30:04 +0000
+++ softwarecenter/db/enquire.py	2012-09-27 13:18:21 +0000
@@ -179,12 +179,13 @@
 
             # cataloged time - what's new category
             if self.sortmode == SortMethods.BY_CATALOGED_TIME:
+                sorter = xapian.MultiValueKeyMaker()
                 if (self.db._axi_values and
                     "catalogedtime" in self.db._axi_values):
-                    enquire.set_sort_by_value(
-                        self.db._axi_values["catalogedtime"], reverse=True)
-                else:
-                    LOG.warning("no catelogedtime in axi")
+                    sorter.add_value(
+                        self.db._axi_values["catalogedtime"])
+                sorter.add_value(XapianValues.DB_CATALOGED_TIME)
+                enquire.set_sort_by_key(sorter, reverse=True)
             elif self.sortmode == SortMethods.BY_TOP_RATED:
                 from softwarecenter.backend.reviews import get_review_loader
                 review_loader = get_review_loader(self.cache, self.db)

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-09-17 23:50:24 +0000
+++ softwarecenter/db/update.py	2012-09-27 13:18:21 +0000
@@ -351,16 +351,21 @@
             self._set_doc_from_key(doc, field)
 
         # date published
-        date_published = self._set_doc_from_key(doc,
-                                                AppInfoFields.DATE_PUBLISHED)
+        date_published_str = self._set_doc_from_key(
+            doc, AppInfoFields.DATE_PUBLISHED)
         # we use the date published value for the cataloged time as well
-        if date_published is not None and "catalogedtime" in axi_values:
+        if date_published_str is not None:
             LOG.debug("pkgname: %s, date_published cataloged time is: %s",
-                      pkgname, date_published)
-            date_published = time.mktime(time.strptime(date_published,
+                      pkgname, date_published_str)
+            date_published = time.mktime(time.strptime(date_published_str,
                                                        "%Y-%m-%d  %H:%M:%S"))
-            doc.add_value(axi_values["catalogedtime"],
+            # a value for our own DB
+            doc.add_value(XapianValues.DB_CATALOGED_TIME,
                           xapian.sortable_serialise(date_published))
+            if "catalogedtime" in axi_values:
+                # compat with a-x-i
+                doc.add_value(axi_values["catalogedtime"],
+                              xapian.sortable_serialise(date_published))
 
         # icon (for third party)
         url = self._set_doc_from_key(doc, AppInfoFields.ICON_URL)

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-09-17 23:50:24 +0000
+++ softwarecenter/enums.py	2012-09-27 13:18:21 +0000
@@ -167,6 +167,9 @@
     SC_SUPPORTED_DISTROS = 199
     WEBSITE = 200
     CURRENCY = 201
+    # this is used to provide a cataloged time if there is no a-x-i in use
+    # or if a-x-i is not available yet
+    DB_CATALOGED_TIME = 202
 
 
 class AppInfoFields:

=== modified file 'tests/gtk3/test_catview.py'
--- tests/gtk3/test_catview.py	2012-09-24 08:22:54 +0000
+++ tests/gtk3/test_catview.py	2012-09-27 13:18:21 +0000
@@ -1,6 +1,5 @@
 import unittest
 
-from gi.repository import Gtk
 from mock import patch, Mock
 
 from tests.utils import (
@@ -76,35 +75,24 @@
         self.assertEqual(self._cat.name, 'What\xe2\x80\x99s New')
         self.assertEqual(self._cat.sortmode, SortMethods.BY_CATALOGED_TIME)
 
-    def test_new_no_sort_info_yet(self):
-        # ensure that we don't show a empty "whats new" category
-        # see LP: #865985
+    def test_no_axi_cataloged_time_info_yet(self):
+        """ ensure that we show "whats new" DB_CATALOGED_TIME data if there
+            is no x-a-i yet """
         db = get_test_db()
         cache = db._aptcache
-        # simulate a fresh install with no catalogedtime info
-        del db._axi_values["catalogedtime"]
-
         icons = get_test_gtk3_icon_cache()
-
         apps_filter = AppFilter(db, cache)
 
+        # simulate a fresh install with no catalogedtime info in a-x-i
+        if "catalogedtime" in db._axi_values:
+            del db._axi_values["catalogedtime"]
+
+        # create it
         view = lobbyview.LobbyView(cache, db, icons,
             softwarecenter.distro.get_distro(), apps_filter)
-        view.show()
-
-        # gui
-        win = Gtk.Window()
-        self.addCleanup(win.destroy)
-        win.set_size_request(800, 400)
-
-        scroll = Gtk.ScrolledWindow()
-        scroll.add(view)
-        scroll.show()
-        win.add(scroll)
-        win.show()
-        # test visibility
-        do_events()
-        self.assertFalse(view.whats_new_frame.get_property("visible"))
+        view.show_all()
+        # and ensure its visible
+        self.assertTrue(view.whats_new_frame.get_property("visible"))
 
 
 class RecommendationsTestCase(CatViewBaseTestCase):