Merge lp:~jeremy-munsch/synapse-project/improved-search2 into lp:synapse-project

[Jeremy Munsch]

* Add minimum MatchScore for given regex match : Using fuzzy only on title only
* Add Caseless Regex Compile Flag
* Add search in description, keywords, generic name, categories
* Comptes proportionnal relevancies for less valuable matches (categories, etc..)

For generic_name and keywords, it checks if locale is different than eng strings.
If so it takes the locale ones and add them to the english ones.
If not, it uses SUPPORTED_GETTEXT_DOMAINS_KEYS to add the available translations without any check though.

I believe I checked all I could to be compliant.

Unmerged revisions

637. By Jeremy Munsch on 2015-12-03

* Add minimum MatchScore for given regex match : Using fuzzy only on title only
* Add Caseless Regex Compile Flag
* Add search in description, keywords, generic name, categories
* Comptes proportionnal relevancies for less valuable matches (categories, etc..)

=== modified file 'src/core/desktop-file-service.vala'
--- src/core/desktop-file-service.vala	2015-11-14 20:58:02 +0000
+++ src/core/desktop-file-service.vala	2015-12-03 14:45:08 +0000
@@ -82,6 +82,7 @@
     public string name { get; construct set; }
     public string comment { get; set; default = ""; }
     public string icon_name { get; construct set; default = ""; }
+    public string generic_name { get; set; default = ""; }
 
     public bool needs_terminal { get; set; default = false; }
     public string filename { get; construct set; }
@@ -93,6 +94,8 @@
 
     public string[] actions = null;
     public string[] mime_types = null;
+    public string[] categories = null;
+    public string[] keywords = null;
 
     private string? name_folded = null;
     public unowned string get_name_folded ()
@@ -183,6 +186,55 @@
         if (keyfile.has_key (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_ACTIONS))
           actions = keyfile.get_string_list (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_ACTIONS);
 
+        unowned string string_comparator = "";
+        unowned string? textdomain = null;
+        StringBuilder key_info_builder = new StringBuilder ();
+        foreach (unowned string domain_key in DesktopFileService.SUPPORTED_GETTEXT_DOMAINS_KEYS)
+          if (keyfile.has_key (KeyFileDesktop.GROUP, domain_key)) {
+            textdomain = keyfile.get_string (KeyFileDesktop.GROUP, domain_key);
+            break;
+          }
+
+        if (keyfile.has_key (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_GENERIC_NAME))
+        {
+          key_info_builder.append (keyfile.get_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_GENERIC_NAME));
+          string_comparator = keyfile.get_locale_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_GENERIC_NAME);
+          if (key_info_builder.str.hash () != string_comparator.hash ())
+            key_info_builder.append_c (' ').append (string_comparator);
+          else if (textdomain != null)
+          {
+            key_info_builder.append_c (' ')
+              .append (GLib.dgettext (textdomain, key_info_builder.str));
+          }
+          generic_name = key_info_builder.str;
+        }
+
+        // categories are never translated
+        if (keyfile.has_key (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_CATEGORIES))
+          categories = keyfile.get_string_list (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_CATEGORIES);
+
+        if (keyfile.has_key (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_KEYWORDS))
+        {
+          string[] temp_keywords = keyfile.get_string_list (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_KEYWORDS);
+          string[] locale_list = keyfile.get_locale_string_list (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_KEYWORDS);
+          if (string.joinv ("", temp_keywords).hash () != string.joinv ("", locale_list).hash ())
+          {
+            foreach (unowned string word in locale_list)
+            {
+              temp_keywords += word;
+            }
+            keywords = temp_keywords;
+          }
+          else if (textdomain != null)
+          {
+            foreach (unowned string word in temp_keywords)
+            {
+              locale_list += GLib.dgettext (textdomain, word).dup ();
+            }
+            keywords = locale_list;
+          }
+        }
+
         // special case these, people are using them quite often and wonder
         // why they don't appear
         if (filename.has_suffix ("gconf-editor.desktop") ||
@@ -221,6 +273,10 @@
     private Gee.Map<string, Gee.List<DesktopFileInfo>> exec_map;
     private Gee.Map<string, DesktopFileInfo> desktop_id_map;
     private Gee.MultiMap<string, string> mimetype_parent_map;
+    public const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {
+      "X-Ubuntu-Gettext-Domain",
+      "X-GNOME-Gettext-Domain"
+    };
 
     construct
     {
 
=== modified file 'src/plugins/desktop-file-plugin.vala'
--- src/plugins/desktop-file-plugin.vala	2015-11-14 20:58:02 +0000
+++ src/plugins/desktop-file-plugin.vala	2015-12-03 14:45:08 +0000
@@ -42,6 +42,9 @@
       public string title_unaccented { get; construct; }
       public string desktop_id { get; construct; }
       public string exec { get; construct; }
+      public string generic_name_folded { get; set; }
+      public string categories_string_folded { get; set; }
+      public string keywords_string_folded { get; construct; }
 
       public DesktopFileMatch (DesktopFileInfo info)
       {
@@ -59,6 +62,9 @@
         title_folded = desktop_info.get_name_folded () ?? title.casefold ();
         title_unaccented = Utils.remove_accents (title_folded);
         desktop_id = "application://" + desktop_info.desktop_id;
+        generic_name_folded = desktop_info.generic_name.casefold ();
+        categories_string_folded = string.joinv (" ", desktop_info.categories).casefold ();
+        keywords_string_folded = string.joinv (" ", desktop_info.keywords).casefold ();
       }
     }
 
@@ -130,12 +136,20 @@
       return r;
     }
 
+    /**
+     * computes proportionnal relevancy
+     */
+    private int compute_proportional_match_score (int matcher_value, int average_score)
+    {
+      return (int)Math.floor ((long)matcher_value * average_score / MatchScore.HIGHEST);
+    }
+
     private void full_search (Query q, ResultSet results,
                               MatcherFlags flags = 0)
     {
       // try to match against global matchers and if those fail, try also exec
       var matchers = Query.get_matchers_for_query (q.query_string_folded,
-                                                   flags);
+                                                   flags, RegexCompileFlags.CASELESS);
 
       foreach (var dfm in desktop_files)
       {
@@ -153,12 +167,44 @@
             matched = true;
             break;
           }
-          else if (unaccented_title != null && matcher.key.match (unaccented_title))
+          if (unaccented_title != null && matcher.key.match (unaccented_title))
           {
             results.add (dfm, compute_relevancy (dfm, matcher.value - MatchScore.INCREMENT_SMALL));
             matched = true;
             break;
           }
+          if (dfm.generic_name_folded != null
+                    && matcher.value >= MatchScore.AVERAGE
+                    && matcher.key.match (dfm.generic_name_folded))
+          {
+            results.add (dfm, compute_relevancy (dfm, compute_proportional_match_score (matcher.value, MatchScore.AVERAGE)));
+            matched = true;
+            break;
+          }
+          if (dfm.keywords_string_folded != null
+                    && matcher.value >= MatchScore.AVERAGE
+                    && matcher.key.match (dfm.keywords_string_folded))
+          {
+            results.add (dfm, compute_relevancy (dfm, compute_proportional_match_score (matcher.value, MatchScore.AVERAGE)));
+            matched = true;
+            break;
+          }
+          if (dfm.categories_string_folded != null
+                    && matcher.value >= MatchScore.BELOW_AVERAGE
+                    && matcher.key.match (dfm.categories_string_folded))
+          {
+            results.add (dfm, compute_relevancy (dfm, compute_proportional_match_score (matcher.value, MatchScore.BELOW_AVERAGE)));
+            matched = true;
+            break;
+          }
+          if (dfm.description != null
+                    && matcher.value >= MatchScore.BELOW_AVERAGE
+                    && matcher.key.match (dfm.description.casefold ()))
+          {
+            results.add (dfm, compute_relevancy (dfm, compute_proportional_match_score (matcher.value, MatchScore.BELOW_AVERAGE)));
+            matched = true;
+            break;
+          }
         }
         if (!matched && dfm.exec.has_prefix (q.query_string))
         {