Merge lp:~gary-lasker/software-center/metadata-fixes into lp:software-center

[Michael Vogt]

[Michael Vogt (mvo)]

This
             index_name(document, name, self.indexer)
+ document.add_value(XAPIAN_VALUE_APPNAME, name)

should not be needed, index_name() is doing this already.

[Michael Vogt (mvo)]

I removed that single line and now it appears to be fine

review: Approve

[Michael Vogt (mvo)]

Eh, sorry. I mean "Now its fine and merged"

=== modified file 'apt-xapian-index-plugin/software-center.py'
--- apt-xapian-index-plugin/software-center.py	2010-08-05 14:44:36 +0000
+++ apt-xapian-index-plugin/software-center.py	2010-09-10 09:06:51 +0000
@@ -91,8 +91,11 @@
             name = ver.record[CUSTOM_KEY_APPNAME]
             self.indexer.set_document(document)
             index_name(document, name, self.indexer)
+            document.add_value(XAPIAN_VALUE_APPNAME, name)
             # we pretend to be an application
             document.add_term("AT"+"application")
+            # and we inject a custom component value to indicate "independent"
+            document.add_value(XAPIAN_VALUE_ARCHIVE_SECTION, "independent")
         if CUSTOM_KEY_ICON in ver.record:
             icon = ver.record[CUSTOM_KEY_ICON]
             document.add_value(XAPIAN_VALUE_ICON, icon)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-10 08:47:35 +0000
+++ debian/changelog	2010-09-10 09:06:51 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 software-center (2.1.17.3) UNRELEASED; urgency=low
 
   [ Michael Vogt ]
@@ -16,6 +17,28 @@
 
  -- Michael Vogt <[e-mail]>  Thu, 09 Sep 2010 19:15:18 +0200
 
+=======
+software-center (2.1.17.3) UNRELEASED; urgency=low
+
+  * apt-xapian-index-plugin/softwarecenter.py,
+    softwarecenter/db/application.py,
+    softwarecenter/db/database.py,
+    softwarecenter/db/update.py,
+    softwarecenter/distro/Ubuntu.py,
+    softwarecenter/view/appdetailsview_gtk.py,
+    test/test_database.py:
+   - improved support for the display of metadata in the
+     details view for new-apps and apps for purchase
+     (LP: #625254)
+   - fix incorrect display of the app name and summary
+     text for new-apps in the details view (LP: #634678)
+   - add tests for get_appname, get_pkgname    
+  * softwarecenter/view/appview.py:
+    - fix up downloadable icon handling
+
+ -- Gary Lasker <[e-mail]>  Fri, 10 Sep 2010 00:57:36 -0400
+
+>>>>>>> MERGE-SOURCE
 software-center (2.1.17.2) maverick; urgency=low
 
   * softwarecenter/backend/aptd.py:

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2010-09-09 15:02:04 +0000
+++ softwarecenter/db/application.py	2010-09-10 09:06:51 +0000
@@ -464,7 +464,8 @@
             source_to_enable = None
             if self.channelname and self._unavailable_channel():
                 source_to_enable = self.channelname
-            elif self.component:
+            elif (self.component and 
+                  self.component not in ("independent", "commercial")):
                 source_to_enable = self.component
             if source_to_enable:
                 sources = source_to_enable.split('&')
@@ -534,6 +535,7 @@
         details = []
         details.append("* AppDetails")
         details.append("                name: %s" % self.name)
+        details.append("        display_name: %s" % self.display_name)
         details.append("                 pkg: %s" % self.pkg)
         details.append("             pkgname: %s" % self.pkgname)
         details.append("        architecture: %s" % self.architecture)
@@ -543,6 +545,7 @@
         details.append("           component: %s" % self.component)
         details.append("        desktop_file: %s" % self.desktop_file)
         details.append("         description: %s" % self.description)
+        details.append("               error: %s" % self.error)
         details.append("                icon: %s" % self.icon)
         details.append("      icon_file_name: %s" % self.icon_file_name)
         details.append(" icon_needs_download: %s" % self.icon_needs_download)
@@ -555,6 +558,7 @@
         details.append("               price: %s" % self.price)
         details.append("          screenshot: %s" % self.screenshot)
         details.append("             summary: %s" % self.summary)
+        details.append("     display_summary: %s" % self.display_summary)
         details.append("           thumbnail: %s" % self.thumbnail)
         details.append("             version: %s" % self.version)
         details.append("             website: %s" % self.website)

=== modified file 'softwarecenter/db/database.py'
--- softwarecenter/db/database.py	2010-09-10 08:52:17 +0000
+++ softwarecenter/db/database.py	2010-09-10 09:06:51 +0000
@@ -230,12 +230,12 @@
 
     def get_appname(self, doc):
         """ Return a appname from a xapian document """
-        pkgname = doc.get_value(XAPIAN_VALUE_PKGNAME)
+        appname = doc.get_value(XAPIAN_VALUE_APPNAME)
         # if there is no value it means we use the apt-xapian-index 
         # and that has no appname
-        if not pkgname:
-            return None
-        return doc.get_data()
+        if not appname:
+            appname = doc.get_data()
+        return appname
 
     def get_iconname(self, doc):
         """ Return the iconname from the xapian document """

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2010-08-31 18:48:17 +0000
+++ softwarecenter/db/update.py	2010-09-10 09:06:51 +0000
@@ -276,22 +276,6 @@
         index_app_info_from_parser(parser, db, cache)
     return True
 
-def update_from_apt_cache_for_whats_new_repo(db, cache):
-
-    SPECIAL_ORIGINS_THAT_ARE_CONSIDERED_APPS = (
-        "Application Review Board PPA",
-        )
-
-    for pkg in cache:
-        if not pkg.candidate:
-            continue
-        for origin in pkg.candidate.origins:
-            # FIXME: make this configuration
-            if (origin.label in SPECIAL_ORIGINS_THAT_ARE_CONSIDERED_APPS and
-                origin.trusted):
-                parser = AptCachePkgParser(pkg)
-                index_app_info_from_parser(parser, db, cache)
-
 def update_from_var_lib_apt_lists(db, cache, listsdir=None):
     """ index the files in /var/lib/apt/lists/*AppInfo """
     if not listsdir:
@@ -478,6 +462,8 @@
         if parser.has_option_desktop("X-AppInstall-Price"):
             price = parser.get_desktop("X-AppInstall-Price")
             doc.add_value(XAPIAN_VALUE_PRICE, price)
+            # since this is a commercial app, indicate it in the component value
+            doc.add_value(XAPIAN_VALUE_ARCHIVE_SECTION, "commercial")
         # icon
         if parser.has_option_desktop("Icon"):
             icon = parser.get_desktop("Icon")

=== modified file 'softwarecenter/distro/Ubuntu.py'
--- softwarecenter/distro/Ubuntu.py	2010-09-08 16:41:23 +0000
+++ softwarecenter/distro/Ubuntu.py	2010-09-10 09:06:51 +0000
@@ -87,9 +87,9 @@
         return self.codename
 
     def get_license_text(self, component):
-        if component in ("main", "universe"):
+        if component in ("main", "universe", "independent"):
             return _("Open source")
-        elif component == "restricted":
+        elif component in ("restricted", "commercial"):
             return _("Proprietary")
 
     def is_supported(self, cache, doc, pkgname):
@@ -184,7 +184,8 @@
                
         # if we couldn't determine a support date, use a generic maintenance
         # string without the date
-        if channelname or component == "partner":
+        if (channelname or
+            component in ("partner", "independent", "commercial")):
             return _("Canonical does not provide updates for %s. "
                      "Some updates may be provided by the third party "
                      "vendor.") % appname

=== modified file 'softwarecenter/view/appdetailsview_gtk.py'
--- softwarecenter/view/appdetailsview_gtk.py	2010-09-09 14:13:40 +0000
+++ softwarecenter/view/appdetailsview_gtk.py	2010-09-10 09:06:51 +0000
@@ -1360,6 +1360,8 @@
             version = '%s (%s)' % (app_details.version, app_details.pkgname)
         else:
             version = _("Unknown")
+            # if the version is unknown, just hide the field
+            self.version_info.hide()
         if app_details.license:
             license = app_details.license
         else:

=== modified file 'softwarecenter/view/appview.py'
--- softwarecenter/view/appview.py	2010-09-10 07:47:03 +0000
+++ softwarecenter/view/appview.py	2010-09-10 09:06:51 +0000
@@ -564,20 +564,20 @@
                     # machine, this is a significant burden because get_value
                     # is called *a lot*. caching is the only option
                     
-                    # check if this is a downloadable icon
-                    if not self.db.get_icon_needs_download(doc):
-                        # load the icon from the theme
+                    # look for the icon on the iconpath
+                    if self.icons.has_icon(icon_name):
                         icon = self.icons.load_icon(icon_name, self.icon_size, 0)
-                        self.icon_cache[icon_name] = icon
-                        return icon
-                    else:
+                        if icon:
+                            self.icon_cache[icon_name] = icon
+                            return icon
+                    elif self.db.get_icon_needs_download(doc):
                         self._download_icon_and_show_when_ready(self.cache, 
                                                                 app.pkgname,
                                                                 icon_file_name)
-                        return self._appicon_missing_icon
+                        # display the missing icon while the real one downloads
+                        self.icon_cache[icon_name] = self._appicon_missing_icon
             except glib.GError, e:
                 self._logger.debug("get_icon returned '%s'" % e)
-                self.icon_cache[icon_name] = self._appicon_missing_icon
             return self._appicon_missing_icon
         elif column == self.COL_INSTALLED:
             pkgname = app.pkgname

=== modified file 'test/test_database.py'
--- test/test_database.py	2010-09-10 07:17:42 +0000
+++ test/test_database.py	2010-09-10 09:06:51 +0000
@@ -133,6 +133,10 @@
             if doc.get_data() == "Ubuntu Software Center Test":
                 appdetails = AppDetails(db, doc=doc)
                 break
+        # test get_appname and get_pkgname
+        self.assertEqual(db.get_appname(doc), "Ubuntu Software Center Test")
+        self.assertEqual(db.get_pkgname(doc), "software-center")
+        # test appdetails
         self.assertEqual(appdetails.name, "Ubuntu Software Center Test")
         self.assertEqual(appdetails.pkgname, "software-center")
         # FIXME: add a dekstop file with a real channel to test