Merge lp:~michael.nelson/software-center/every-comm-app-already-purchased into lp:software-center

[Michael Nelson]

Overview
========

This branch fixes (1) a failing test in trunk (version was added to SCAApplicationParser but not to the test data) and (2) an issue achuni noticed last night where all for-purchase apps were displaying with " (already purchased)" next to them.

-Michael

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-01-19 17:35:21 +0000
+++ softwarecenter/db/update.py	2012-01-20 08:10:28 +0000
@@ -175,11 +175,6 @@
             self.sca_application.Comment = self.sca_application.description.split("\n")[0].strip()
             self.sca_application.Description = "\n".join(
                 self.sca_application.description.split("\n")[1:]).strip()
-        # WARNING: item.name needs to be different than
-        #          the item.name in the DB otherwise the DB
-        #          gets confused about (appname, pkgname) duplication
-        self.sca_application.name = utf8(_("%s (already purchased)")) % utf8(
-            self.sca_application.name)
 
         # XXX 2012-01-16 bug=917109
         # We can remove these work-arounds once the above bug is fixed on
@@ -220,8 +215,6 @@
         self.sca_subscription = sca_subscription
         super(SCAPurchasedApplicationParser, self).__init__(
             PistonResponseObject.from_dict(sca_subscription.application))
-        self.sca_application.channel = (
-            PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME)
 
     SUBSCRIPTION_MAPPING = {
         'Deb-Line'   : 'deb_line',
@@ -248,6 +241,16 @@
             SCAPurchasedApplicationParser, self).has_option_desktop(key)
         return subscription_has_option or application_has_option
 
+    def _apply_exceptions(self):
+        super(SCAPurchasedApplicationParser, self)._apply_exceptions()
+        # WARNING: item.name needs to be different than
+        #          the item.name in the DB otherwise the DB
+        #          gets confused about (appname, pkgname) duplication
+        self.sca_application.name = utf8(_("%s (already purchased)")) % utf8(
+            self.sca_application.name)
+        self.sca_application.channel = (
+            PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME)
+
 
 class JsonTagSectionParser(AppInfoParserBase):
 

=== modified file 'test/test_reinstall_purchased.py'
--- test/test_reinstall_purchased.py	2012-01-18 09:38:45 +0000
+++ test/test_reinstall_purchased.py	2012-01-20 08:10:28 +0000
@@ -44,7 +44,8 @@
               "signing_key_id": "1024R/75254D99",
               "name": "Photobomb",
               "package_name": "photobomb",
-              "description": "Easy and Social Image Editor\\nPhotobomb give you easy access to images in your social networking feeds, pictures on your computer and peripherals, and pictures on the web, and let\'s you draw, write, crop, combine, and generally have a blast mashing \'em all up. Then you can save off your photobomb, or tweet your creation right back to your social network."
+              "description": "Easy and Social Image Editor\\nPhotobomb give you easy access to images in your social networking feeds, pictures on your computer and peripherals, and pictures on the web, and let\'s you draw, write, crop, combine, and generally have a blast mashing \'em all up. Then you can save off your photobomb, or tweet your creation right back to your social network.",
+              "version": "1.2.1"
          },
          "distro_series": {"code_name": "natty", "version": "11.04"}
     }
@@ -89,7 +90,8 @@
         "tos_url": "https://software-center.ubuntu.com/licenses/3/",
         "icon_url": "http://software-center.ubuntu.com/site_media/icons/2011/05/fluendo-dvd.png",
         "categories": "AudioVideo",
-        "description": "Play DVD-Videos\\r\\n\\r\\nFluendo DVD Player is a software application specially designed to\\r\\nreproduce DVD on Linux/Unix platforms, which provides end users with\\r\\nhigh quality standards.\\r\\n\\r\\nThe following features are provided:\\r\\n* Full DVD Playback\\r\\n* DVD Menu support\\r\\n* Fullscreen support\\r\\n* Dolby Digital pass-through\\r\\n* Dolby Digital 5.1 output and stereo downmixing support\\r\\n* Resume from last position support\\r\\n* Subtitle support\\r\\n* Audio selection support\\r\\n* Multiple Angles support\\r\\n* Support for encrypted discs\\r\\n* Multiregion, works in all regions\\r\\n* Multiple video deinterlacing algorithms"
+        "description": "Play DVD-Videos\\r\\n\\r\\nFluendo DVD Player is a software application specially designed to\\r\\nreproduce DVD on Linux/Unix platforms, which provides end users with\\r\\nhigh quality standards.\\r\\n\\r\\nThe following features are provided:\\r\\n* Full DVD Playback\\r\\n* DVD Menu support\\r\\n* Fullscreen support\\r\\n* Dolby Digital pass-through\\r\\n* Dolby Digital 5.1 output and stereo downmixing support\\r\\n* Resume from last position support\\r\\n* Subtitle support\\r\\n* Audio selection support\\r\\n* Multiple Angles support\\r\\n* Support for encrypted discs\\r\\n* Multiregion, works in all regions\\r\\n* Multiple video deinterlacing algorithms",
+        "version": "1.2.1"
     }
 ]
 """
@@ -167,6 +169,11 @@
                 getattr(parser.sca_application, key),
                 parser.get_desktop(inverse_map[key]))
 
+    def test_name_not_updated_for_non_purchased_apps(self):
+        parser = self._make_application_parser()
+
+        self.assertEqual('Fluendo DVD Player', parser.get_desktop('Name'))
+
     def test_keys_not_provided_by_api(self):
         parser = self._make_application_parser()
 
@@ -249,6 +256,7 @@
         # an application parser for handling.
         parser = self._make_application_parser()
 
+        # We're testing here also that the name is updated automatically.
         expected_results = {
             "Name": "Photobomb (already purchased)",
             "Package": "photobomb",