Merge lp:~stolowski/unity-lens-applications/results-ribbons into lp:unity-lens-applications

[Paweł Stołowski]

Implemented price ribbons for Application Lens search results.

Implemented price ribbons for Application Lens search results.

Requires lp:~mvo/software-center-make-currency-part-of-the-db !

[Neil J. Patel (njpatel)]

Approved, works well. Leaving as needs-review as waiting for other things to land before this can be merged.

DO NOT MARK AS APPROVED UNTIL SOFTWARE CENTER BRANCHES HAVE LANDED.

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity-lens-applications failed due to conflicts:

text conflict in src/daemon.vala

[lp:~stolowski/unity-lens-applications/results-ribbons]

308. By Paweł Stołowski on 2012-09-18

Merged trunk.

=== modified file 'configure.ac'
--- configure.ac	2012-08-22 18:57:14 +0000
+++ configure.ac	2012-09-18 14:08:19 +0000
@@ -65,7 +65,7 @@
                   gee-1.0
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
-                  unity >= 4.99.0
+                  unity >= 6.5.1
                   libgnome-menu)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-09-12 14:48:25 +0000
+++ src/Makefile.am	2012-09-18 14:08:19 +0000
@@ -60,6 +60,7 @@
   schemas.vala \
   utils.vala \
   aptd-client.vala \
+  purchase-info-helper.vala \
   software-center-data-provider.vala \
   software-center-data-cache.vala \
   $(NULL)

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-18 12:57:06 +0000
+++ src/daemon.vala	2012-09-18 14:08:19 +0000
@@ -120,6 +120,8 @@
     public bool display_recent_apps { get; set; default = true; }
     public bool display_available_apps { get; set; default = true; }
 
+    private PurchaseInfoHelper purchase_info = null;
+
     construct
     {
       populate_type_queries ();
@@ -564,6 +566,8 @@
 
       transaction.commit ();
 
+      purchase_info = new PurchaseInfoHelper ();
+
       /* If we don't have a search we display 6 random apps */
       if (usc_apps_active () && display_available_apps && pkgsearcher != null)
       {
@@ -585,6 +589,7 @@
           string? filter_query = prepare_pkg_search_string (search, filter);
 
           var pkgresults = pkgsearcher.get_apps (filter_query, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, filter_cb);
+          purchase_info.from_pkgresults (pkgresults);
           add_pkg_search_result (pkgresults, installed_uris, available_uris, model, Category.AVAILABLE, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY);
           timer.stop ();
           debug ("Entry search listed %i Available apps in %fms",
@@ -603,9 +608,15 @@
               sc_data_provider = new SoftwareCenterDataCache (TOP_RATED_ITEMS_CACHE_LIFETIME);
 
             var whats_new = sc_data_provider.get_items_for_category ("unity-whats-new");
+            var query = purchase_info.create_pkgsearch_query (whats_new);
+            var tmpresults = pkgsearcher.get_by_exact_names (query);
+            purchase_info.from_pkgresults (tmpresults);
             hits = add_sc_category_results (whats_new, model, Category.AVAILABLE, ref duplicates_lookup, MAX_WHATS_NEW_APPS_FOR_EMPTY_QUERY);
 
             var top_rated = sc_data_provider.get_items_for_category ("unity-top-rated");
+            query = purchase_info.create_pkgsearch_query (top_rated);
+            tmpresults = pkgsearcher.get_by_exact_names (query);
+            purchase_info.from_pkgresults (tmpresults);
             hits += add_sc_category_results (top_rated, model, Category.AVAILABLE, ref duplicates_lookup, MAX_TOP_RATED_APPS_FOR_EMPTY_QUERY);
           }
           catch (GLib.Error e)
@@ -930,6 +941,25 @@
       return GLib.Path.get_basename (name);
     }
 
+    private string get_annotated_icon (Icon app_icon, string price, bool paid)
+    {
+      var annotated_icon = new AnnotatedIcon (app_icon);
+      annotated_icon.category = CategoryType.APPLICATION;
+      if (price != null && price != "")
+      {
+        if (paid)
+          annotated_icon.ribbon = _("Paid");
+        else
+          annotated_icon.ribbon = price;
+      }
+      else
+      {
+        annotated_icon.ribbon = _("Free");
+      }
+      
+      return annotated_icon.to_string ();
+    }
+
     /**
      * Add all results obtained from SoftwareCenterDataProvider
      */
@@ -943,15 +973,24 @@
       foreach (SoftwareCenterDataProviderService.AppInfo app in results)
       {
         string uri = @"unity-install://$(app.package_name)/$(app.application_name)";
-
         if (uri in duplicates_lookup)
-        {
           continue;
-        }
-
-        Icon icon = find_pkg_icon (app.desktop_file, app.icon);
-
-        model.append (uri, icon.to_string (),
+
+        string icon_obj;
+        Icon app_icon = find_pkg_icon (app.desktop_file, app.icon);
+        var pinfo = purchase_info.find (app.application_name, app.package_name);
+        if (pinfo != null)
+        {
+          var annotated_icon = get_annotated_icon (app_icon, pinfo.formatted_price, pinfo.paid);
+          icon_obj = annotated_icon.to_string ();
+        }
+        else
+        {
+          warning ("No purchase info for: %s, %s", app.application_name, app.package_name);
+          icon_obj = app_icon.to_string ();
+        }
+
+        model.append (uri, icon_obj,
                       category, 
                       "application/x-desktop",
                       app.application_name,
@@ -1021,6 +1060,8 @@
         if (app != null && !app.should_show ())
           continue;
 
+        Icon icon = find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
+        string icon_str;
         if (category == Category.AVAILABLE)
         {
           /* If we have an available item, which is not a dupe, but is
@@ -1035,12 +1076,16 @@
            * but only use that after we've de-duped the results.
            * But only change the URI *after* we've de-duped the results! */
           uri = @"unity-install://$(pkginfo.package_name)/$(pkginfo.application_name)";
-          available_uris.add (uri);            
-        }
-
-        Icon icon = find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
-
-        model.append (uri, icon.to_string (),
+          available_uris.add (uri);   
+
+          icon_str = get_annotated_icon (icon, pkginfo.price, !pkginfo.needs_purchase);
+        }
+        else
+        {
+          icon_str = icon.to_string ();
+        }
+     
+        model.append (uri, icon_str,
                       category,"application/x-desktop",
                       display_name != null ? display_name : "",
                       comment != null ? comment : "", 

=== added file 'src/purchase-info-helper.vala'
--- src/purchase-info-helper.vala	1970-01-01 00:00:00 +0000
+++ src/purchase-info-helper.vala	2012-09-18 14:08:19 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Pawel Stolowski <[e-mail]>
+ */
+
+namespace Unity.ApplicationsLens {
+
+  class PurchaseInfoHelper
+  {
+    public struct AppInfo
+    {
+      string application_name;
+      string package_name;
+      string formatted_price;
+      bool paid;
+    }
+
+    private HashTable<string, AppInfo?> data;
+
+    public PurchaseInfoHelper ()
+    {
+      data = new HashTable<string, AppInfo?> (str_hash, str_equal);
+    }
+
+    public void from_pkgresults (Unity.Package.SearchResult results)
+    {
+      foreach (var pkg in results.results)
+      {
+        var app_info = from_pkgresult (pkg);
+        data.insert (pkg.application_name + "/" + pkg.package_name, app_info);
+      }
+    }
+
+    public AppInfo from_pkgresult (Unity.Package.PackageInfo pkg)
+    {
+      var app_info = AppInfo ()
+      {
+        package_name = pkg.package_name,
+        application_name = pkg.application_name,
+        formatted_price = pkg.price,
+        paid = false
+      };
+      return app_info;
+    }
+
+    public GLib.SList<string> create_pkgsearch_query (SoftwareCenterDataProviderService.AppInfo?[] results)
+    {
+      var params = new GLib.SList<string> ();
+      foreach (var res in results)
+      {
+        params.append (res.application_name);
+        params.append (res.package_name);
+      }
+      return params;
+    }
+
+    public AppInfo? find (string application_name, string package_name)
+    {
+      string key = application_name + "/" + package_name;
+      if (data.contains (key))
+      {
+        return data[key];
+      }
+      return null;
+    }
+  }
+}
\ No newline at end of file

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2012-09-12 16:38:53 +0000
+++ src/unity-package-search.cc	2012-09-18 14:08:19 +0000
@@ -50,9 +50,12 @@
 #define XAPIAN_VALUE_SUMMARY 177
 #define XAPIAN_VALUE_ARCHIVE_CHANNEL 178
 #define XAPIAN_VALUE_DESKTOP_FILE 179
+#define XAPIAN_VALUE_PRICE 180
+#define XAPIAN_VALUE_PURCHASED_DATE 184
 #define XAPIAN_VALUE_SCREENSHOT_URLS 185
 #define XAPIAN_VALUE_DESCRIPTION 188
 #define XAPIAN_VALUE_VERSION_INFO 198
+#define XAPIAN_VALUE_CURRENCY 201
 
 #include "unity-package-search.h"
 
@@ -368,6 +371,17 @@
   string icon = doc.get_value (XAPIAN_VALUE_ICON);
   pkginfo->icon = g_strdup (icon.c_str ());
 
+  // FIXME: we may want to format it according to locales at some point
+  string price = doc.get_value (XAPIAN_VALUE_CURRENCY);
+  if (!price.empty ())
+  {
+    price += " " + doc.get_value (XAPIAN_VALUE_PRICE);
+  }
+  pkginfo->price = g_strdup (price.c_str ());
+
+  const string purchase_date = doc.get_value (XAPIAN_VALUE_PURCHASED_DATE);
+  pkginfo->needs_purchase = purchase_date.empty ();
+
   return pkginfo;
 }
 
@@ -382,6 +396,7 @@
   g_free (pkginfo->package_name);
   g_free (pkginfo->application_name);
   g_free (pkginfo->desktop_file);
+  g_free (pkginfo->price);
   g_free (pkginfo->icon);
 
   g_slice_free (UnityPackageInfo, pkginfo);
@@ -405,13 +420,13 @@
   {
     switch (search_type)
     {
-      case UNITY_PACKAGE_SEARCHTYPE_PREFIX:
+    case UNITY_PACKAGE_SEARCHTYPE_PREFIX:
         query = searcher->query_parser->parse_query (_search_string, QUERY_PARSER_PREFIXSEARCH_FLAGS);
         break;
-      case UNITY_PACKAGE_SEARCHTYPE_EXACT:
+    case UNITY_PACKAGE_SEARCHTYPE_EXACT:
         query = searcher->query_parser->parse_query (_search_string, QUERY_PARSER_EXACTSEARCH_FLAGS);
         break;
-      default:
+    default:
         g_critical ("Unknown search type '%i'. Fallback to a prefix search", search_type);
         query = searcher->query_parser->parse_query (_search_string, QUERY_PARSER_PREFIXSEARCH_FLAGS);
         break;
@@ -628,6 +643,69 @@
   return result;
 }
 
+/**
+ * Returns all apps that match exactly app+pkg names.
+ * names must be a flat list of appname1, pkgname1, appname2, pkgname2... strings (must have even number of elements).
+ */
+UnityPackageSearchResult*
+unity_package_searcher_get_by_exact_names (UnityPackageSearcher *searcher, GSList *names)
+{
+  g_return_val_if_fail (searcher != NULL, NULL);
+
+  vector<Xapian::Query> query_list;
+  GSList *iter = names;
+
+  while (iter)
+  {
+    const string appname ((char *)iter->data);
+    iter = g_slist_next (iter);
+    if (iter == NULL)
+    {
+      g_warning ("List should have even list of arguments");
+      return NULL;
+    }
+    
+    const string pkgname = ((char *)iter->data);
+    Xapian::Query query1 ("AA" + appname);
+    Xapian::Query query2 ("AP" + pkgname);
+    Xapian::Query query (Xapian::Query::OP_AND, query1, query2);
+    query_list.push_back (query);
+
+    iter = g_slist_next (iter);
+  }
+
+  guint num_matches = 0;
+  UnityPackageSearchResult *result;
+
+  result = g_slice_new0 (UnityPackageSearchResult);
+
+  try
+  {
+    Xapian::Query top_query = Xapian::Query (Xapian::Query::OP_OR, query_list.begin (), query_list.end ());
+    searcher->enquire->set_sort_by_relevance ();
+    searcher->enquire->set_query (top_query);
+
+    Xapian::MSet matches = searcher->enquire->get_mset(0, searcher->db->get_doccount ());
+    Xapian::MSetIterator iter = matches.begin();
+    while (iter != matches.end ())
+    {
+      Xapian::Document doc = iter.get_document ();
+      UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
+      result->results = g_slist_prepend (result->results, pkginfo);
+      num_matches++;
+      ++iter;
+    }
+  }
+  catch (Xapian::Error e)
+  {
+    g_debug ("Error getting apps: %s", e.get_msg().c_str());
+    return g_slice_new0 (UnityPackageSearchResult);
+  }
+
+  result->num_hits = num_matches;
+  return result;
+}
+
 UnityPackageInfo *
 unity_package_searcher_get_by_desktop_file (UnityPackageSearcher *searcher, const gchar *desktop_file)
 {

=== modified file 'src/unity-package-search.h'
--- src/unity-package-search.h	2012-09-12 16:38:53 +0000
+++ src/unity-package-search.h	2012-09-18 14:08:19 +0000
@@ -46,6 +46,8 @@
         gchar    *application_name;
         gchar    *desktop_file;
         gchar    *icon;
+        gchar    *price;
+        gboolean  needs_purchase;
         gint      relevancy;
 } UnityPackageInfo;
 
@@ -82,6 +84,8 @@
 
 void                      unity_package_package_info_free (UnityPackageInfo *pkginfo);
 
+UnityPackageSearchResult* unity_package_searcher_get_by_exact_names (UnityPackageSearcher *searcher, GSList *names);
+
 UnityPackageInfo*         unity_package_searcher_get_by_desktop_file (UnityPackageSearcher *searcher, const gchar *desktop_file);
 
 #ifdef __cplusplus

=== modified file 'vapi/unity-package-search.vapi'
--- vapi/unity-package-search.vapi	2012-09-12 16:38:53 +0000
+++ vapi/unity-package-search.vapi	2012-09-18 14:08:19 +0000
@@ -30,6 +30,7 @@
       public SearchResult search (string search_string, uint max_hits, Unity.Package.SearchType search_type, Unity.Package.Sort sort);
       public SearchResult get_random_apps (string? filter_query, uint n_apps);
       public SearchResult get_apps (string? filter_query, uint n_apps, AppFilterCallback cb);
+      public SearchResult get_by_exact_names (GLib.SList<string> names);
       public PackageInfo? get_by_desktop_file (string desktop_file);
     }
     
@@ -43,11 +44,13 @@
     [Compact]
     [CCode (cname = "UnityPackageInfo", free_function = "unity_package_package_info_free", cheader_filename = "unity-package-search.h")]
     public class PackageInfo {
-      public string package_name;
-	    public string application_name;
-	    public string desktop_file;
-	    public string icon;
-	    public int relevancy;
+        public string package_name;
+        public string application_name;
+        public string desktop_file;
+        public string icon;
+        public string price;
+        public bool needs_purchase;
+        public int relevancy;
     }
   }
 }