Merge lp:~mhr3/unity-lens-applications/fix-841847 into lp:unity-lens-applications

[Michal Hruby]

Allow selection of multiple categories in the type filter. UNBLOCK

[lp:~mhr3/unity-lens-applications/fix-841847]

263. By Michal Hruby on 2012-01-26

Bump vala requirement (we no longer compile with 0.12)

[Mikkel Kamstrup Erlandsen (kamstrup)]

Tested against Unity trunk and works very well. I am not particularly keen on maintaining a dupe list of the filter ids, but it doesn't seem to be easily fixable without a major refactoring. Otherwise, the code looks great.

All in all, nice work!

(wrt testing - this branch is currently exceptionally hard to test in an automated manner. I took extra care in the review (and to some degree the branch can be considered a refactoring so I don't see big risk from this branch))

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-01-24 11:30:08 +0000
+++ configure.ac	2012-01-26 14:02:36 +0000
@@ -15,7 +15,7 @@
 # Init the other things we depend on
 #############################################
 AM_MAINTAINER_MODE
-AM_PROG_VALAC([0.12.1])
+AM_PROG_VALAC([0.14.0])
 AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
 AC_PROG_CC
 AC_PROG_CXX
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-25 08:38:17 +0000
+++ src/daemon.vala	2012-01-26 14:02:36 +0000
@@ -249,7 +249,7 @@
 
       /* Type filter */
       {
-        var filter = new RadioOptionFilter ("type", _("Type"));
+        var filter = new CheckOptionFilter ("type", _("Type"));
         filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
         
         filter.add_option ("accessories", _("Accessories"));
@@ -358,7 +358,7 @@
     }
 
     private string prepare_zg_search_string (Unity.LensSearch search,
-                                             string type_id="all")
+                                             OptionsFilter? options)
     {
       string s = search.search_string.strip ();
       
@@ -368,12 +368,12 @@
       if (s != "")
         s = @"app:($s)";
       else
-        return type_queries.lookup(type_id);
+        return extract_type_query (options);
       
-      if (type_id == "all")
+      if (options == null || !options.filtering)
         return s;
       else
-        return s + @" AND $(type_queries.lookup(type_id))";
+        return s + " AND " + extract_type_query (options);
     }
 
     private async void update_scope_search (Unity.LensSearch search,
@@ -385,17 +385,15 @@
 
       debug ("Searching for: %s", search.search_string);
       
-      var filter = scope.get_filter ("type") as RadioOptionFilter;
-      Unity.FilterOption? option =  filter.get_active_option ();
-      string type_id = option == null ? "all" : option.id;
+      var filter = scope.get_filter ("type") as OptionsFilter;
 
-      string pkg_search_string = prepare_pkg_search_string (search, type_id);
+      string pkg_search_string = prepare_pkg_search_string (search, filter);
 
       bool has_search = !Utils.is_search_empty (search);
       
       Timer timer = new Timer ();
 
-      var zg_search_string = prepare_zg_search_string (search, type_id);
+      var zg_search_string = prepare_zg_search_string (search, filter);
 
       var transaction = new Dee.Transaction (model);
       transaction.clear ();
@@ -469,7 +467,7 @@
         else
         {
           timer.start ();
-          string? filter_query = prepare_pkg_search_string (search, type_id);
+          string? filter_query = prepare_pkg_search_string (search, filter);
           var random_pkgresults = pkgsearcher.get_random_apps (filter_query, 12);
           add_pkg_search_result (random_pkgresults, installed_uris, available_uris,
                                  model, Category.AVAILABLE, 6);
@@ -506,7 +504,7 @@
     
       model.clear ();
       
-      var search_string = prepare_pkg_search_string (search, "all");
+      var search_string = prepare_pkg_search_string (search, null);
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
       var timer = new Timer ();
@@ -538,7 +536,7 @@
       
       Timer timer = new Timer ();
 
-      var zg_search_string = prepare_zg_search_string (search, "all");
+      var zg_search_string = prepare_zg_search_string (search, null);
 
       if (local_apps_active () && display_recent_apps) {
         try {
@@ -569,15 +567,51 @@
 
       search.finished ();
     }
+
+    private const string[] option_types =
+    {
+      "accessories",
+      "education",
+      "game",
+      "graphics",
+      "internet",
+      "fonts",
+      "office",
+      "media",
+      "customization",
+      "accessibility",
+      "developer",
+      "science-and-engineering",
+      "system"
+    };
+
+    private string extract_type_query (OptionsFilter? options)
+    {
+      if (options == null || !options.filtering) return "NOT category:XYZ";
+
+      string? result = null;
+      foreach (unowned string type_id in option_types)
+      {
+        var option = options.get_option (type_id);
+        if (option == null) continue;
+        if (!option.active) continue;
+
+        if (result == null) result = type_queries[type_id];
+        else result += " OR " + type_queries[type_id];
+      }
+
+      return result == null ? "NOT category:XYZ" : result;
+    }
     
-    private string prepare_pkg_search_string (Unity.LensSearch search, string type_id="all")
+    private string prepare_pkg_search_string (Unity.LensSearch search,
+                                              OptionsFilter? options)
     {
       if (Utils.is_search_empty (search))
         {
-          if (type_id == "all")
+          if (options == null || !options.filtering)
             return "type:Application";
           else
-            return @"type:Application AND $(type_queries.lookup(type_id))";
+            return "type:Application AND " + extract_type_query (options);
         }
       else
         {
@@ -592,10 +626,10 @@
            * match 'd-feet' etc. */
           s = s.delimit ("-", ' ');
 
-          if (type_id == "all")
-            return @"type:Application AND $s";
+          if (options == null || !options.filtering)
+            return "type:Application AND " + s;
           else
-            return @"type:Application AND $(type_queries.lookup(type_id)) AND $s";
+            return "type:Application AND %s AND %s".printf (extract_type_query (options), s);
         }
     }