Merge lp:~gary-lasker/software-center/icon-data-for-4.0 into lp:software-center/4.0

[Gary Lasker]

This branch for a Natty SRU removes the need for the inline icon data from the software-center-agent, and instead downloads the icon directly using the provided url from the agent.

We currently already have this functionality for Oneiric and Precise.

Thanks!

[lp:~gary-lasker/software-center/icon-data-for-4.0]

1795. By Gary Lasker on 2012-01-12

d'oh, fix typo in README

[Gary Lasker (gary-lasker)]

Just a note that I've tested this branch in a Natty VM using both staging and production servers as per my comment for the Maverick merge proposal. Thanks again!

=== modified file 'README'
--- README	2011-03-20 19:19:58 +0000
+++ README	2012-01-12 00:32:23 +0000
@@ -86,4 +86,5 @@
 XAPIAN_VALUE_SCREENSHOT_URL - a (optional) screenshot url that overrides the default
 XAPIAN_VALUE_ICON_NEEDS_DOWNLOAD - icon needs to be fetched
 XAPIAN_VALUE_THUMBNAIL_URL - thumbnail url 
+XAPIAN_VALUE_ICON_URL - the icon url for an application that has been provided by the agent (only available after the software-center-agent server was queried)
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-11-24 09:05:02 +0000
+++ debian/changelog	2012-01-12 00:32:23 +0000
@@ -1,3 +1,11 @@
+software-center (4.0.7) UNRELEASED; urgency=low
+
+  * lp:~gary-lasker/software-center/icon-data-for-4.0:
+    - remove the need for inline icon data from the agent, instead
+      download icons directly using the provided URL (LP: #914054) 
+
+ -- Gary Lasker <[e-mail]>  Wed, 11 Jan 2012 18:25:49 -0500
+
 software-center (4.0.6) natty-proposed; urgency=low
 
   * cherry pick fix to allow webkit to create additional windows
 
=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2011-04-12 13:19:00 +0000
+++ softwarecenter/db/application.py	2012-01-12 00:32:23 +0000
@@ -335,6 +335,10 @@
             
     @property
     def icon_url(self):
+        if self._doc:
+            icon_url = self._db.get_icon_url(self._doc)
+            if icon_url:
+                return icon_url
         return self._distro.get_downloadable_icon_url(self._cache, self.pkgname, self.icon_file_name)
 
     @property
 
=== modified file 'softwarecenter/db/database.py'
--- softwarecenter/db/database.py	2011-04-11 16:12:10 +0000
+++ softwarecenter/db/database.py	2012-01-12 00:32:23 +0000
@@ -331,6 +331,11 @@
         """ Return the iconname from the xapian document """
         iconname = doc.get_value(XAPIAN_VALUE_ICON)
         return iconname
+        
+    def get_icon_url(self, doc):
+        """ Return the icon_url from the xapian document """
+        icon_url = doc.get_value(XAPIAN_VALUE_ICON_URL)
+        return icon_url
 
     def pkg_in_category(self, pkgname, cat_query):
         """ Return True if the given pkg is in the given category """
 
=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2011-04-14 02:25:14 +0000
+++ softwarecenter/db/update.py	2012-01-12 00:32:23 +0000
@@ -122,6 +122,7 @@
                 'Purchased-Date' : 'purchase_date',
                 'PPA'        : 'archive_id',
                 'Icon'       : 'icon',
+                'Icon-Url'   : 'icon_url',
                 'Screenshot-Url' : 'screenshot_url',
                 'Thumbnail-Url' : 'thumbnail_url',
               }
@@ -472,21 +473,6 @@
         try:
             # magic channel
             entry.channel = AVAILABLE_FOR_PURCHASE_MAGIC_CHANNEL_NAME
-            # icon is transmited inline
-            if hasattr(entry, "icon_data") and entry.icon_data:
-                icondata = base64.b64decode(entry.icon_data)
-            elif hasattr(entry, "icon_64_data") and entry.icon_64_data:
-                # workaround for scagent bug #740112
-                icondata = base64.b64decode(entry.icon_64_data)
-            else:
-                icondata = ""
-            # write it if we have data
-            if icondata:
-		# the iconcache gets mightly confused if there is a "." in the name
-                iconname = "sc-agent-%s" % entry.package_name.replace(".", "__")
-                open(os.path.join(SOFTWARE_CENTER_ICON_CACHE_DIR,
-                                  "%s.png" % iconname),"w").write(icondata)
-                entry.icon = iconname
             # now the normal parser
             parser = SoftwareCenterAgentParser(entry)
             index_app_info_from_parser(parser, db, cache)
@@ -586,6 +572,15 @@
             # add archive origin data here so that its available even if
             # the PPA is not (yet) enabled
             doc.add_term("XOO"+"lp-ppa-%s" % archive_ppa.replace("/", "-"))
+        # icon (for third party)
+        if parser.has_option_desktop("X-AppInstall-Icon-Url"):
+            doc.add_value(XAPIAN_VALUE_ICON_NEEDS_DOWNLOAD, "1")
+            url = parser.get_desktop("X-AppInstall-Icon-Url")
+            doc.add_value(XAPIAN_VALUE_ICON_URL, url)
+            if not parser.has_option_desktop("X-AppInstall-Icon"):
+                # prefix pkgname to avoid name clashes
+                doc.add_value(XAPIAN_VALUE_ICON, "%s-icon-%s" % (
+                        pkgname, os.path.basename(url)))
         # screenshot (for third party)
         if parser.has_option_desktop("X-AppInstall-Screenshot-Url"):
             url = parser.get_desktop("X-AppInstall-Screenshot-Url")
 
=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2011-05-10 14:50:15 +0000
+++ softwarecenter/enums.py	2012-01-12 00:32:23 +0000
@@ -101,6 +101,7 @@
 XAPIAN_VALUE_THUMBNAIL_URL = 187
 XAPIAN_VALUE_SC_DESCRIPTION = 188
 XAPIAN_VALUE_APPNAME_UNTRANSLATED = 189
+XAPIAN_VALUE_ICON_URL = 190
 
 # fake channels
 PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME = "for-pay-needs-reinstall"
 
=== modified file 'softwarecenter/models/appstore.py'
--- softwarecenter/models/appstore.py	2011-04-12 13:54:58 +0000
+++ softwarecenter/models/appstore.py	2012-01-12 00:32:23 +0000
@@ -85,6 +85,13 @@
     (NONAPPS_ALWAYS_VISIBLE,
      NONAPPS_MAYBE_VISIBLE,
      NONAPPS_NEVER_VISIBLE) = range (3)
+     
+    __gsignals__ = {
+        "needs-refresh" : (gobject.SIGNAL_RUN_LAST,
+                           None, 
+                           (str, ),
+                           ),
+        }
 
     def __init__(self, cache, db, icons, search_query=None, 
                  limit=DEFAULT_SEARCH_LIMIT,
@@ -381,7 +388,7 @@
         if result.pkgname in self.transaction_index_map:
             del self.transaction_index_map[result.pkgname]
 
-    def _download_icon_and_show_when_ready(self, cache, pkgname, icon_file_name):
+    def _download_icon_and_show_when_ready(self, cache, pkgname, icon_file_name, icon_url):
         self._logger.debug("did not find the icon locally, must download %s" % icon_file_name)
         def on_image_download_complete(downloader, image_file_path):
             pb = gtk.gdk.pixbuf_new_from_file_at_size(icon_file_path,
@@ -390,8 +397,15 @@
             # replace the icon in the icon_cache now that we've got the real one
             icon_file = os.path.splitext(os.path.basename(image_file_path))[0]
             self.icon_cache[icon_file] = pb
-        
-        url = get_distro().get_downloadable_icon_url(cache, pkgname, icon_file_name)
+            self.emit("needs-refresh", pkgname)
+
+        if icon_url:
+            url = icon_url
+        else:
+            # if the icon url has not been provided by the agent, then this
+            # downloadable icon is from the extras repository and so we must
+            # generate the download url
+            url = get_distro().get_downloadable_icon_url(cache, pkgname, icon_file_name)
         if url is not None:
             icon_file_path = os.path.join(SOFTWARE_CENTER_ICON_CACHE_DIR, icon_file_name)
             image_downloader = SimpleFileDownloader()
@@ -514,9 +528,13 @@
                             self.icon_cache[icon_name] = icon
                             return icon
                     elif self.db.get_icon_needs_download(doc):
+                        # check if this is a downloadable icon for an
+                        # application provided by the agent
+                        icon_url = self.db.get_icon_url(doc)
                         self._download_icon_and_show_when_ready(self.cache, 
                                                                 app.pkgname,
-                                                                icon_file_name)
+                                                                icon_file_name,
+                                                                icon_url)
                         # display the missing icon while the real one downloads
                         self.icon_cache[icon_name] = self._appicon_missing_icon
             except glib.GError, e:
 
=== modified file 'softwarecenter/view/softwarepane.py'
--- softwarecenter/view/softwarepane.py	2011-06-02 19:13:33 +0000
+++ softwarecenter/view/softwarepane.py	2012-01-12 00:32:23 +0000
@@ -719,6 +719,10 @@
         # set model
         self.app_view.set_model(new_model)
         self.app_view.get_model().active = True
+        
+        # connect the refresh signal from the model
+        new_model.connect(
+            "needs-refresh", lambda helper, pkgname: self.app_view.queue_draw())
 
         self.hide_appview_spinner()
         # we can not use "new_model" here, because set_model may actually