Merge lp:~stolowski/unity-lens-applications/use-icon-uri into lp:unity-lens-applications

[Paweł Stołowski]

Use icon_url when displaying preview of an installable app; use find_pkg_icon instead of find_app_install_icon_path, as it also uses icons from ~/.cache/software-center/icons. Removed find_app_install_icon_path as it's no longer used.

Use icon_url when displaying preview of an installable app; use find_pkg_icon instead of find_app_install_icon_path, as it also uses icons from ~/.cache/software-center/icons. Removed find_app_install_icon_path as it's no longer used.

This improves icon handling in previews, as previous implementation wouldn't look in ~/.cache/software-center/icons, and therefore a lot of purchasable content would be missing icon in the preview. Note however that this doesn't fix a problem with generic app icons being used in app lens 'More suggestions' results if icon is not available in ~/.cache/software-center/icons. Fixing this would be too expensive, as it could result in fetching several icons at the same time.

Note about testing:
- for testing purposes you may want to remove some icons from ~/.cache/software-center/icons
- both app-lens and unity caches icons internally, so you may need to restart both if you removed icons from ~/.cache/software-center/icons.

[Michal Hruby (mhr3)]

Could you please use a const string for the "applications-other"? Otherwise looking fine.

[lp:~stolowski/unity-lens-applications/use-icon-uri]

307. By Paweł Stołowski on 2012-09-25

Added GENERIC_APP_ICON const string. Removed unused ICON_APP_INSTALL_PATH.

[Paweł Stołowski (stolowski)]

Fixed.

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-18 14:06:48 +0000
+++ src/daemon.vala	2012-09-25 10:26:21 +0000
@@ -41,7 +41,7 @@
   const int64 TOP_RATED_ITEMS_CACHE_LIFETIME = 24*3600; // 24 hours
 
   const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
-  const string ICON_APP_INSTALL_PATH = Config.DATADIR + "/app-install/icons";
+  const string GENERIC_APP_ICON = "applications-other";
 
   public class Daemon : GLib.Object
   {
@@ -791,34 +791,18 @@
       }
     }
 
-    /**
-     * Find app icon in DATADIR/app-install/icons trying all supported image extensions.
-     */
-    private string find_app_install_icon_path (string icon_name)
+    public Icon find_pkg_icon (string? desktop_file, string icon_name)
     {
-      string icon = @"$ICON_APP_INSTALL_PATH/$icon_name.";
-
-      foreach (string ext in image_extensions)
+      if (desktop_file != null)
       {
-        string path = icon + ext;
-        if (FileUtils.test (path, FileTest.EXISTS))
-        {
-          return path;
-        }
+        string desktop_id = Path.get_basename (desktop_file);
+        bool installed = AppInfoManager.get_default().lookup (desktop_id) != null;
+
+        /* If the app is already installed we should be able to pull the
+         * icon from the theme */
+        if (installed)
+          return new ThemedIcon (icon_name);
       }
-      var default_icon = new ThemedIcon ("applications-other");
-      return default_icon.to_string ();
-    }
-
-    public Icon find_pkg_icon (string desktop_file, string icon_name)
-    {
-      string desktop_id = Path.get_basename (desktop_file);
-      bool installed = AppInfoManager.get_default().lookup (desktop_id) != null;
-
-      /* If the app is already installed we should be able to pull the
-       * icon from the theme */
-      if (installed)
-        return new ThemedIcon (icon_name);
 
       /* App is not installed - we need to find the right icon in the bowels
        * of the software center */
@@ -873,7 +857,7 @@
       }
 
       /* Cache the fact that we couldn't find this icon */
-      var icon = new ThemedIcon ("applications-other");
+      var icon = new ThemedIcon (GENERIC_APP_ICON);
       file_icon_cache.insert (icon_name, icon);
 
       return icon;
@@ -1145,9 +1129,8 @@
 
               launcherservice.connect_to_launcher ();
               string desktop_file = preview_installable_desktop_file;
-              string icon = find_app_install_icon_path (preview_installable_icon_file);
-              
-              launcherservice.add_launcher_item_from_position (appname, icon, 0, 0, 32, desktop_file, tid);
+              Icon icon = find_pkg_icon (null, preview_installable_icon_file);
+              launcherservice.add_launcher_item_from_position (appname, icon.to_string (), 0, 0, 32, desktop_file, tid);
             }
             catch (IOError e)
             {
@@ -1296,11 +1279,17 @@
             debug ("Requesting pkg info: %s, %s\n", pkgname, appname);
             sc_data_provider.get_app_details (appname, pkgname);
 
-            Icon icon;
+            Icon? icon = null;
             if (installed)
               icon = new GLib.ThemedIcon (sc_data_provider.icon);
             else
-              icon = new GLib.FileIcon (File.new_for_path (find_app_install_icon_path (sc_data_provider.icon)));
+            {
+              icon = find_pkg_icon (null, sc_data_provider.icon);
+              if (icon.to_string () == GENERIC_APP_ICON && sc_data_provider.icon_url != null && sc_data_provider.icon_url != "")
+              {
+                icon = new GLib.FileIcon (File.new_for_uri (sc_data_provider.icon_url));
+              }
+            }
 
             Icon? screenshot = null;
 

=== modified file 'src/software-center-data-provider.vala'
--- src/software-center-data-provider.vala	2012-09-18 12:57:06 +0000
+++ src/software-center-data-provider.vala	2012-09-25 10:26:21 +0000
@@ -56,6 +56,7 @@
     public string desktop_file { get; set; }
     public string license { get; set; }
     public string icon { get; set; }
+    public string icon_url { get; set; }
     public string price { get; set; }
     public string raw_price { get; set; }
     public PackageState pkg_state { get; set; }
@@ -94,6 +95,7 @@
       desktop_file = data["desktop_file"].get_string ();
       license = data["license"].get_string ();
       icon = data["icon_file_name"].get_string ();
+      icon_url = data["icon_url"].get_string ();
       price = data["price"].get_string ();
       raw_price = data["raw_price"].get_string ();
       installation_date = data["installation_date"].get_string ();