Merge lp:~gary-lasker/software-center/license-fix-lp864706 into lp:software-center

[Gary Lasker]

The license type for commercial apps is now provided for Software Center after a recent update to the software-center-agent. Note that this new value is currently available only via the staging server, but is expected to be deployed to the production server soon (before Oneiric final).

This branch takes this license type information and displays it in the corresponding field in the app details view for commercial apps.

If no license type is provided by the server for a commercial app, then the license text now defaults to "Unknown". Previously, the default was "Proprietary", a value that is not always appropriate as detailed in the linked bug.

NOTE: This branch displays the raw license type text as received from the server. If these values are not always appropriate for display in the raw form, I'll need to tweak this further to display specific preset strings based on the value received from the server.

Thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-04 13:31:02 +0000
+++ debian/changelog	2011-10-05 01:40:29 +0000
@@ -19,6 +19,12 @@
   * debian/control:
     - add dependency on python-gobject-cairo to prevent crash
       at startup (LP: #829067) 
+  * softwarecenter/db/application.py,
+    softwarecenter/db/update.py,
+    softwarecenter/distro/Ubuntu.py,
+    softwarecenter/enums.py:
+    - display the correct license type for commercial apps as
+      specified via the software-center-agent (LP: #864706)
 
   [ Matthew McGowan ]
   * lp:~mmcg069/software-center/bug855666:
@@ -27,7 +33,7 @@
     - fix crash when data can not be parsed from the remote reviews server
       LP: #858639
 
- -- Gary Lasker <[e-mail]>  Tue, 04 Oct 2011 01:10:09 -0400
+ -- Gary Lasker <[e-mail]>  Tue, 04 Oct 2011 21:03:47 -0400
 
 software-center (5.0) oneiric; urgency=low
 

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2011-09-29 02:25:29 +0000
+++ softwarecenter/db/application.py	2011-10-05 01:40:29 +0000
@@ -336,7 +336,11 @@
 
     @property
     def license(self):
-        return self._distro.get_license_text(self.component)
+        xapian_license = self._doc.get_value(XapianValues.LICENSE)
+        if xapian_license:
+            return xapian_license
+        else:
+            return self._distro.get_license_text(self.component)
 
     @property
     def maintenance_status(self):

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2011-09-23 11:48:29 +0000
+++ softwarecenter/db/update.py	2011-10-05 01:40:29 +0000
@@ -141,6 +141,7 @@
                 'Channel'    : 'channel',
                 'Deb-Line'   : 'deb_line',
                 'Signing-Key-Id' : 'signing_key_id',
+                'License'    : 'license',
                 'Purchased-Date' : 'purchase_date',
                 'License-Key' : 'license_key',
                 'License-Key-Path' : 'license_key_path',
@@ -148,7 +149,7 @@
                 'Icon'       : 'icon',
                 'Screenshot-Url' : 'screenshot_url',
                 'Thumbnail-Url' : 'thumbnail_url',
-                'Icon-Url' : 'icon_url',
+                'Icon-Url'   : 'icon_url',
               }
 
     # map from requested key to a static data element
@@ -644,10 +645,14 @@
             archive_channel = parser.get_desktop("X-AppInstall-Channel")
             doc.add_term("AH"+archive_channel)
             doc.add_value(XapianValues.ARCHIVE_CHANNEL, archive_channel)
-        # singing key (third party)
+        # signing key (third party)
         if parser.has_option_desktop("X-AppInstall-Signing-Key-Id"):
             keyid = parser.get_desktop("X-AppInstall-Signing-Key-Id")
             doc.add_value(XapianValues.ARCHIVE_SIGNING_KEY_ID, keyid)
+        # license (third party)
+        if parser.has_option_desktop("X-AppInstall-License"):
+            license = parser.get_desktop("X-AppInstall-License")
+            doc.add_value(XapianValues.LICENSE, license)
         # purchased date
         if parser.has_option_desktop("X-AppInstall-Purchased-Date"):
             date = parser.get_desktop("X-AppInstall-Purchased-Date")

=== modified file 'softwarecenter/distro/Ubuntu.py'
--- softwarecenter/distro/Ubuntu.py	2011-09-29 14:06:47 +0000
+++ softwarecenter/distro/Ubuntu.py	2011-10-05 01:40:29 +0000
@@ -100,8 +100,13 @@
     def get_license_text(self, component):
         if component in ("main", "universe", "independent"):
             return _("Open source")
-        elif component in ("restricted", "commercial"):
+        elif component == "restricted":
             return _("Proprietary")
+        else:
+            # commercial apps provide license info via the software-center-agent,
+            # but if a given commercial app does not provide this for some reason,
+            # default to a license type of "Unknown"
+            return _("Unknown")
 
     def is_supported(self, cache, doc, pkgname):
         # the doc does not by definition contain correct data regarding the

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2011-09-20 15:27:19 +0000
+++ softwarecenter/enums.py	2011-10-05 01:40:29 +0000
@@ -123,6 +123,7 @@
     CATEGORIES = 191
     LICENSE_KEY = 192
     LICENSE_KEY_PATH = 193           # no longer used
+    LICENSE = 194
 
 # fake channels
 PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME = "for-pay-needs-reinstall"