Merge lp:~donadigo/slingshot/search-keywords into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

Search .desktop keywords (lp:1581145)

Fixes bug #1581145: "Search doesn't use keywords".

This branch adds support for searching in the keywords. The keywords returned by desktop app info will be always localized.

* Note: you must have Vala version 0.32.1 in order to compile the branch, since there was an binding issue within the GIO vapi, that's now fixed upstream.

[lp:~donadigo/slingshot/search-keywords]

658. By Adam Bieńkowski on 2016-05-31

Add support for searching keywords

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-25 05:52:20 +0000
+++ CMakeLists.txt	2016-05-31 12:33:20 +0000
@@ -84,7 +84,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.26.2" MINIMUM)
+ensure_vala_version ("0.32.1" MINIMUM)
 
 # Include vala precompile
 include (ValaPrecompile)
 
=== modified file 'lib/synapse-plugins/desktop-file-plugin.vala'
--- lib/synapse-plugins/desktop-file-plugin.vala	2015-12-23 15:10:29 +0000
+++ lib/synapse-plugins/desktop-file-plugin.vala	2016-05-31 12:33:20 +0000
@@ -275,6 +275,29 @@
           }
         }
 
+        foreach (unowned string keyword in desktop_app_info.get_keywords ()) {
+          string _keyword = keyword.down ();
+          foreach (var matcher in matchers)
+          {
+            MatchInfo action_info;
+            if (matcher.key.match (_keyword, 0, out action_info)
+                || _keyword.contains (q.query_string_folded)
+                || _keyword.has_prefix (q.query_string))
+            {
+              results.add (dfm, compute_relevancy (dfm, Match.Score.INCREMENT_SMALL));
+              matched = true;
+              break;
+            }
+
+            else if (action_info.is_partial_match ())
+            {
+              results.add (dfm, compute_relevancy (dfm, Match.Score.INCREMENT_SMALL));
+              matched = true;  
+              break;        
+            }
+          }          
+        }
+
         if (!matched && (comment.down ().contains (q.query_string_folded) 
             || generic_name.down ().contains (q.query_string_folded)))
         {