Merge lp:~mvo/software-center/support-size-from-agent into lp:software-center

[Michael Vogt]

Support showing the download size if the software-center-agent provides it.

[dobey (dobey)]

Looks ok to me.

review: Approve

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2012-11-28 17:36:38 +0000
+++ softwarecenter/db/application.py	2012-12-12 14:43:27 +0000
@@ -23,6 +23,7 @@
 import logging
 import os
 import re
+import xapian
 
 import softwarecenter.distro
 
@@ -696,6 +697,11 @@
                 return self._pkg.candidate.size
             else:
                 return self._pkg.installed.size
+        elif self._doc:
+            size = self._doc.get_value(XapianValues.DOWNLOAD_SIZE)
+            if size:
+                return xapian.sortable_unserialise(
+                    self._doc.get_value(XapianValues.DOWNLOAD_SIZE))
 
     @property
     def tags(self):
 
=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-12-06 16:16:49 +0000
+++ softwarecenter/db/update.py	2012-12-12 14:43:27 +0000
@@ -148,6 +148,7 @@
         AppInfoFields.CHANNEL: XapianValues.ARCHIVE_CHANNEL,
         AppInfoFields.DEB_LINE: XapianValues.ARCHIVE_DEB_LINE,
         AppInfoFields.DESCRIPTION: XapianValues.SC_DESCRIPTION,
+        AppInfoFields.DOWNLOAD_SIZE: XapianValues.DOWNLOAD_SIZE,
         AppInfoFields.CATEGORIES: XapianValues.CATEGORIES,
         AppInfoFields.CURRENCY: XapianValues.CURRENCY,
         AppInfoFields.DATE_PUBLISHED: XapianValues.DATE_PUBLISHED,
@@ -383,6 +384,12 @@
             # ever changes we can update
             doc.add_value(XapianValues.CURRENCY, "US$")
 
+        # add donwload size as string (its send as int)
+        download_size = self.get_value(AppInfoFields.DOWNLOAD_SIZE)
+        if download_size is not None:
+            doc.add_value(XapianValues.DOWNLOAD_SIZE,
+                          xapian.sortable_serialise((download_size)))
+
         # write out categories
         for cat in self.get_categories():
             doc.add_term("AC" + cat.lower())
@@ -534,6 +541,7 @@
         AppInfoFields.PACKAGE: 'package_name',
         AppInfoFields.PRICE: 'price',
         AppInfoFields.DESCRIPTION: 'description',
+        AppInfoFields.DOWNLOAD_SIZE: 'binary_filesize',
         AppInfoFields.SUPPORTED_DISTROS: 'series',
         AppInfoFields.SCREENSHOT_URLS: 'screenshot_url',
         AppInfoFields.SUMMARY: 'comment',
@@ -792,6 +800,7 @@
         AppInfoFields.DATE_PUBLISHED: 'X-AppInstall-Date-Published',
         AppInfoFields.DEB_LINE: 'X-AppInstall-Deb-Line',
         AppInfoFields.DESCRIPTION: 'X-AppInstall-Description',
+        AppInfoFields.DOWNLOAD_SIZE: 'X-AppInstall-DownloadSize',
         AppInfoFields.GENERIC_NAME: 'GenericName',
         AppInfoFields.GETTEXT_DOMAIN: 'X-Ubuntu-Gettext-Domain',
         AppInfoFields.ICON: 'Icon',
 
=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-11-28 16:58:59 +0000
+++ softwarecenter/enums.py	2012-12-12 14:43:27 +0000
@@ -169,6 +169,8 @@
     # 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
+    # download size as the agent provides it
+    DOWNLOAD_SIZE = 203
 
 
 class AppInfoFields:
@@ -176,6 +178,7 @@
     CHANNEL = 'CHANNEL'
     DEB_LINE = 'DEB_LINE'
     DEB_LINE_ORIG = 'DEB_LINE_ORIG'
+    DOWNLOAD_SIZE = 'DOWNLOAD_SIZE'
     CATEGORIES = 'CATEGORIES'
     DATE_PUBLISHED = 'DATE_PUBLISHED'
     DESCRIPTION = 'DESCRIPTION'
 
=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-12-06 16:16:49 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-12-12 14:43:27 +0000
@@ -2004,6 +2004,17 @@
         if not self.totalsize_info.get_property('visible'):
             return False
 
+        # if we need to purchase/enable the report use the agent info
+        if self.app_details.pkg_state in (
+            PkgStates.NEEDS_SOURCE,
+            PkgStates.NEEDS_PURCHASE,
+            PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED,
+            ):
+            if self.app_details.size:
+                self.totalsize_info.set_value(
+                    GLib.format_size(self.app_details.size))
+                return
+
         self.totalsize_info.set_value(_("Calculating..."))
 
         while Gtk.events_pending():
 
=== modified file 'tests/test_reinstall_purchased.py'
--- tests/test_reinstall_purchased.py	2012-11-28 15:52:31 +0000
+++ tests/test_reinstall_purchased.py	2012-12-12 14:43:27 +0000
@@ -96,7 +96,8 @@
         "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",
         "website": null,
-        "version": "1.2.1"
+        "version": "1.2.1",
+        "binary_filesize": 12345
     },
     {
     "website": "",
@@ -163,6 +164,12 @@
         self.assertEqual('Fluendo DVD Player',
                          parser.get_value(AppInfoFields.NAME))
 
+    def test_binary_filesize(self):
+        parser = self._make_application_parser()
+
+        self.assertEqual(12345,
+                         parser.get_value(AppInfoFields.DOWNLOAD_SIZE))
+
     def test_keys_not_provided_by_api(self):
         parser = self._make_application_parser()