Merge lp:~davidmhewitt/slingshot/limit-appcenter-search-queries into lp:~elementary-pantheon/slingshot/trunk

[David Hewitt]

Prevent AppCenter results for short/number only queries

Now only shows AppCenter results for search queries with 2 or more characters as long as they contain at least one letter.

[lp:~davidmhewitt/slingshot/limit-appcenter-search-queries]

754. By David Hewitt on 2017-03-12

Removed code to detect links

755. By David Hewitt on 2017-03-12

Merge trunk

[Corentin Noël (tintou)]

review: Approve (looks good)

=== modified file 'lib/synapse-plugins/appcenter-plugin.vala'
--- lib/synapse-plugins/appcenter-plugin.vala	2017-02-18 19:48:37 +0000
+++ lib/synapse-plugins/appcenter-plugin.vala	2017-03-12 19:07:10 +0000
@@ -80,6 +80,7 @@
         }
 
         private static AppInfo? appinfo;
+        private static Regex regex;
 
         static void register_plugin () {
             bool appcenter_installed = false;
@@ -101,6 +102,13 @@
 
         static construct {
             register_plugin ();
+            
+            try {
+                // 2 or more characters, must contain at least one letter
+                regex = new Regex ("""^(?=\pL).{2,}$""", RegexCompileFlags.OPTIMIZE);
+            } catch (Error e) {
+                error ("Error creating regexp.");
+            }
         }
 
         public bool handles_query (Query query) {
@@ -108,11 +116,15 @@
         }
 
         public async ResultSet? search (Query query) throws SearchError {
-            ResultSet results = new ResultSet ();
-            Result search_result = new Result (query.query_string);
-            results.add (search_result, Match.Score.INCREMENT_MINOR);
+            if (regex.match (query.query_string)) {
+                ResultSet results = new ResultSet ();
+                Result search_result = new Result (query.query_string);
+                results.add (search_result, Match.Score.INCREMENT_MINOR);
 
-            return results;
+                return results;
+            } else {
+                return null;
+            }
         }
     }
 }