Merge lp:~gary-lasker/software-center/catalog-published-date-lp803028-for-5.0 into lp:software-center/5.0

[Gary Lasker]

This branch pulls in the published_date code from Precise (and fixes conflicts) for an SRU to fix bug 803028 for Oneiric (currently in the nominated state in the bug). The corresponding test case is included.

Thanks!

[Michael Vogt (mvo)]

Thanks, looks good and works fine.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-05 18:28:46 +0000
+++ debian/changelog	2012-03-07 21:59:19 +0000
@@ -1,3 +1,12 @@
+software-center (5.0.6) UNRELEASED; urgency=low
+
+  * lp:~gary-lasker/software-center/catalog-published-date-lp803028i-for-5.0:
+    - use date_published value from the software-center-agent server
+      so that for-purchase items appear correctly and in the proper order
+      in What's New; include corresponding unit test (LP: #803028)
+
+ -- Gary Lasker <[e-mail]>  Wed, 07 Mar 2012 16:44:27 -0500
+
 software-center (5.0.5) oneiric-proposed; urgency=low
 
   [ Gary Lasker ]

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2011-10-25 18:38:08 +0000
+++ softwarecenter/db/application.py	2012-03-07 21:59:19 +0000
@@ -328,7 +328,7 @@
         from softwarecenter.db.history import get_pkg_history
         self._history = get_pkg_history()
         return self._history.get_installed_date(self.pkgname)
-        
+
     @property
     def purchase_date(self):
         if self._doc:
@@ -348,6 +348,11 @@
             return self._distro.get_license_text(self.component)
 
     @property
+    def date_published(self):
+        if self._doc:
+            return self._doc.get_value(XapianValues.DATE_PUBLISHED)
+
+    @property
     def maintenance_status(self):
         return self._distro.get_maintenance_status(
             self._cache, self.display_name, self.pkgname, self.component, 
@@ -593,6 +598,7 @@
         details.append("   installation_date: %s" % self.installation_date)
         details.append("       purchase_date: %s" % self.purchase_date)
         details.append("             license: %s" % self.license)
+        details.append("      date_published: %s" % self.date_published)
         details.append("  maintenance_status: %s" % self.maintenance_status)
         details.append("           pkg_state: %s" % self.pkg_state)
         details.append("               price: %s" % self.price)

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-01-05 01:58:46 +0000
+++ softwarecenter/db/update.py	2012-03-07 21:59:19 +0000
@@ -22,8 +22,8 @@
 import json
 import string
 import shutil
+import xapian
 import time
-import xapian
 
 from gi.repository import GObject
 
@@ -143,6 +143,7 @@
                 'Deb-Line'   : 'deb_line',
                 'Signing-Key-Id' : 'signing_key_id',
                 'License'    : 'license',
+                'Date-Published' : 'date_published',
                 'Purchased-Date' : 'purchase_date',
                 'License-Key' : 'license_key',
                 'License-Key-Path' : 'license_key_path',
@@ -617,11 +618,7 @@
         if "catalogedtime" in axi_values:
             if pkgname in cataloged_times:
                 doc.add_value(axi_values["catalogedtime"], 
-                              xapian.sortable_serialise(cataloged_times[pkgname]))
-            else:
-                # also catalog apps not found in axi (e.g. for-purchase apps)
-                doc.add_value(axi_values["catalogedtime"], 
-                              xapian.sortable_serialise(time.time()))
+                          xapian.sortable_serialise(cataloged_times[pkgname]))
         # pocket (main, restricted, ...)
         if parser.has_option_desktop("X-AppInstall-Section"):
             archive_section = parser.get_desktop("X-AppInstall-Section")
@@ -644,6 +641,23 @@
         if parser.has_option_desktop("X-AppInstall-License"):
             license = parser.get_desktop("X-AppInstall-License")
             doc.add_value(XapianValues.LICENSE, license)
+        # date published
+        if parser.has_option_desktop("X-AppInstall-Date-Published"):
+            date_published = parser.get_desktop("X-AppInstall-Date-Published")
+            # strip the subseconds from the end of the published date string
+            date_published = str(date_published).split(".")[0]
+            doc.add_value(XapianValues.DATE_PUBLISHED,
+                          date_published)
+            # we use the date published value for the cataloged time as well
+            if "catalogedtime" in axi_values:
+                LOG.debug(
+                        ("pkgname: %s, date_published cataloged time is: %s" %
+                             (pkgname, parser.get_desktop("date_published"))))
+                date_published_sec = time.mktime(
+                                        time.strptime(date_published,
+                                                      "%Y-%m-%d  %H:%M:%S"))
+                doc.add_value(axi_values["catalogedtime"], 
+                              xapian.sortable_serialise(date_published_sec))
         # purchased date
         if parser.has_option_desktop("X-AppInstall-Purchased-Date"):
             date = parser.get_desktop("X-AppInstall-Purchased-Date")

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2011-10-16 16:58:26 +0000
+++ softwarecenter/enums.py	2012-03-07 21:59:19 +0000
@@ -124,6 +124,7 @@
     LICENSE_KEY = 192
     LICENSE_KEY_PATH = 193           # no longer used
     LICENSE = 194
+    DATE_PUBLISHED = 196
 
 # fake channels
 PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME = "for-pay-needs-reinstall"

=== modified file 'test/test_database.py'
--- test/test_database.py	2012-01-09 17:14:21 +0000
+++ test/test_database.py	2012-03-07 21:59:19 +0000
@@ -15,7 +15,10 @@
 from softwarecenter.db.enquire import AppEnquire
 from softwarecenter.db.database import parse_axi_values_file
 from softwarecenter.db.pkginfo import get_pkg_info
-from softwarecenter.db.update import update_from_app_install_data, update_from_var_lib_apt_lists, update_from_appstream_xml
+from softwarecenter.db.update import (update_from_app_install_data,
+                                      update_from_var_lib_apt_lists,
+                                      update_from_appstream_xml,
+                                      update_from_software_center_agent)
 from softwarecenter.enums import (
     XapianValues,
     PkgStates,
@@ -94,7 +97,6 @@
         self.assertEqual(db.get_doccount(), 1)
 
     def test_build_from_software_center_agent(self):
-        from softwarecenter.db.update import update_from_software_center_agent
         db = xapian.WritableDatabase("./data/test.db", 
                                      xapian.DB_CREATE_OR_OVERWRITE)
         cache = apt.Cache()
@@ -120,7 +122,6 @@
                 "-icon-" in doc.get_value(XapianValues.ICON))
 
     def test_license_string_data_from_software_center_agent(self):
-        from softwarecenter.db.update import update_from_software_center_agent
         from softwarecenter.testutils import get_test_pkg_info
         #os.environ["SOFTWARE_CENTER_DEBUG_HTTP"] = "1"
         os.environ["SOFTWARE_CENTER_BUY_HOST"] = "http://sc.staging.ubuntu.com/"
@@ -279,24 +280,25 @@
             doc.get_value(value_time) >= last_time
             last_time = doc.get_value(value_time)
             
-    def test_non_axi_apps_cataloged_time(self):
+    def test_for_purchase_apps_date_published(self):
+        from softwarecenter.testutils import get_test_pkg_info
+        #os.environ["SOFTWARE_CENTER_DEBUG_HTTP"] = "1"
+        os.environ["SOFTWARE_CENTER_BUY_HOST"] = "http://sc.staging.ubuntu.com/"
+        # staging does not have a valid cert
+        os.environ["PISTON_MINI_CLIENT_DISABLE_SSL_VALIDATION"] = "1"
+        cache = get_test_pkg_info()
         db = xapian.WritableDatabase("./data/test.db", 
                                      xapian.DB_CREATE_OR_OVERWRITE)
-        res = update_from_app_install_data(db, self.cache, datadir="./data/desktop")
+        res = update_from_software_center_agent(db, cache, ignore_cache=True)
         self.assertTrue(res)
-        db = StoreDatabase("./data/test.db", self.cache)
-        db.open(use_axi=True)
-
-        axi_value_time = db._axi_values["catalogedtime"]
-        sc_app = Application("Ubuntu Software Center Test", "software-center")
-        sc_doc = db.get_xapian_document(sc_app.appname, sc_app.pkgname)
-        sc_cataloged_time = sc_doc.get_value(axi_value_time)
-        so_app = Application("Scintillant Orange", "scintillant-orange")
-        so_doc = db.get_xapian_document(so_app.appname, so_app.pkgname)
-        so_cataloged_time = so_doc.get_value(axi_value_time)
-        # the test package Scintillant Orange should be cataloged at a
-        # later time than axi package Ubuntu Software Center
-        self.assertTrue(so_cataloged_time > sc_cataloged_time)
+        
+        for p in db.postlist(""):
+            doc = db.get_document(p.docid)
+            date_published = doc.get_value(XapianValues.DATE_PUBLISHED)
+            # make sure that a date_published value is provided
+            self.assertNotEqual(date_published, "")
+            self.assertNotEqual(date_published, None)
+        del os.environ["SOFTWARE_CENTER_BUY_HOST"]
 
     def test_parse_axi_values_file(self):
         s = """