Merge lp:~donadigo/slingshot/fix-app-ranking into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

* Fix app ranking being incorrect about keywords

This branch aims to fix app rankings, and keyword queries which are currently incorrectly handeled (as well as actions).

The code should be easier to read and understand now since matchers are iterated only twice for app searching and action searching. Some of the statements caused returning the highest possible values for a match, these are now removed, I've also adjusted current values a little bit.

[David Hewitt (davidmhewitt)]

I've tried all of the apps that come with elementary in the search plus a few others and all the results were as I'd expect. So this has definitely fixed the weird ordering of some of the results.

review: Approve (code, function)

=== modified file 'lib/synapse-plugins/desktop-file-plugin.vala'
--- lib/synapse-plugins/desktop-file-plugin.vala	2017-02-15 13:14:11 +0000
+++ lib/synapse-plugins/desktop-file-plugin.vala	2017-03-08 19:39:36 +0000
@@ -191,74 +191,75 @@
                 unowned string generic_name = dfm.generic_name;
                 unowned string gettext_domain = dfm.gettext_domain;
 
-                bool matched = false;
-                // FIXME: we need to do much smarter relevancy computation in fuzzy re
-                // "sysmon" matching "System Monitor" is very good as opposed to
-                // "seto" matching "System Monitor"
-                foreach (var matcher in matchers) {
-                    MatchInfo info;
-                    if (matcher.key.match (folded_title, 0, out info)) {
-                        results.add (dfm, compute_relevancy (dfm, matcher.value));
-                        matched = true;
-                        break;
-                    } else if (unaccented_title != null && matcher.key.match (unaccented_title)) {
-                        results.add (dfm, compute_relevancy (dfm, matcher.value - Match.Score.INCREMENT_SMALL));
-                        matched = true;
-                        break;
-                    }  else if (info.is_partial_match ()) {
-                        results.add (dfm, compute_relevancy (dfm, Match.Score.INCREMENT_SMALL));
-                        matched = true;
-                        break;
-                    }
-                }
-
                 string id = dfm.desktop_id.replace ("application://", "");
                 var desktop_app_info = new DesktopAppInfo (id);
-                string[] actions = desktop_app_info.list_actions ();
-                foreach (string action in actions) {
+
+                MatchInfo info;
+
+                // Populate actions
+                foreach (string action in desktop_app_info.list_actions ()) {
                     string title = desktop_app_info.get_action_name (action);
                     if (gettext_domain != null) {
                         title = GLib.dgettext (gettext_domain, title).down ();
                     } else {
                         title = title.down ();
-                    }
-
-                    foreach (var matcher in matchers) {
-                        MatchInfo action_info;
-                        if (matcher.key.match (title, 0, out action_info) || title.contains (q.query_string_folded) || title.has_prefix (q.query_string)) {
-                            var am = new ActionMatch (id, action);
-                            results.add (am, compute_relevancy (dfm, Match.Score.INCREMENT_SMALL));
-                            matched = true;
-                            break;
-                        } else if (action_info.is_partial_match ()) {
-                            var am = new ActionMatch (id, action);
-                            results.add (am, compute_relevancy (dfm, Match.Score.INCREMENT_SMALL));
-                            matched = true;  
-                            break;        
-                        }
-                    }
-                }
-
-                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))) {
-                    results.add (dfm, compute_relevancy (dfm, Match.Score.AVERAGE - Match.Score.INCREMENT_MEDIUM));
-                    matched = true;
-                } if (!matched && dfm.exec.has_prefix (q.query_string)) {
+                    }   
+
+                    foreach (var matcher in matchers) {
+                        if (matcher.key.match (title, 0, out info)) {
+                            var am = new ActionMatch (id, action);
+                            results.add (am, compute_relevancy (dfm, matcher.value));
+                            break;
+                        } else if (info.is_partial_match ()) {
+                            var am = new ActionMatch (id, action);
+                            results.add (am, compute_relevancy (dfm, Match.Score.AVERAGE));      
+                            break;
+                        }
+                    }
+                }
+
+                // Populate apps
+                bool matched = false;
+                unowned string[] keywords = desktop_app_info.get_keywords ();
+                foreach (var matcher in matchers) {
+                    // FIXME: we need to do much smarter relevancy computation in fuzzy re
+                    // "sysmon" matching "System Monitor" is very good as opposed to
+                    // "seto" matching "System Monitor"
+                    if (matcher.key.match (folded_title, 0, out info)) {
+                        results.add (dfm, compute_relevancy (dfm, matcher.value));
+                        matched = true;
+                        break;
+                    } else if (unaccented_title != null && matcher.key.match (unaccented_title)) {
+                        results.add (dfm, compute_relevancy (dfm, matcher.value - Match.Score.INCREMENT_SMALL));
+                        matched = true;
+                        break;
+                    } else if (info.is_partial_match ()) {
+                        results.add (dfm, compute_relevancy (dfm, Match.Score.AVERAGE));
+                        matched = true;
+                        break;
+                    }
+
+                    foreach (string keyword in keywords) {
+                        keyword = keyword.down ();
+                        if (matcher.key.match (keyword, 0, out info)) {
+                            results.add (dfm, compute_relevancy (dfm, matcher.value - Match.Score.INCREMENT_LARGE));
+                            matched = true;
+                            break;
+                        } else if (info.is_partial_match ()) {
+                            results.add (dfm, compute_relevancy (dfm, Match.Score.POOR - Match.Score.INCREMENT_LARGE));
+                            matched = true;  
+                            break;        
+                        }                         
+                    }
+                }
+
+                if (matched) {
+                    continue;
+                }
+
+                if (comment.down ().contains (q.query_string_folded) || generic_name.down ().contains (q.query_string_folded)) {
+                    results.add (dfm, compute_relevancy (dfm, Match.Score.BELOW_AVERAGE - Match.Score.INCREMENT_MEDIUM));
+                } else if (dfm.exec.has_prefix (q.query_string)) {
                     results.add (dfm, compute_relevancy (dfm, dfm.exec == q.query_string ?
                     Match.Score.VERY_GOOD : Match.Score.AVERAGE - Match.Score.INCREMENT_SMALL));
                 }