Merge lp:~parnold-x/slingshot/fix-1347956 into lp:~elementary-pantheon/slingshot/trunk

[Djax]

Search generic name (lp:1347956)

Fix Bug #1347956

[Tom Beckmann (tombeckmann)]

Code looks good, you may want to consider decreasing the score by INCREMENT_MEDIUM though, so that titles score higher than comments. I can't test it today though to see how the decreased score feels.

review: Approve (code)

[lp:~parnold-x/slingshot/fix-1347956]

445. By Djax on 2014-08-31

reduce score

[Djax (parnold-x)]

Reduced the score.
I think it will not make any difference since in all my tested cases the matcher.value gives back 90000 and AVERAGE is 70000.

=== modified file 'lib/synapse-core/desktop-file-service.vala'
--- lib/synapse-core/desktop-file-service.vala	2014-06-05 14:34:21 +0000
+++ lib/synapse-core/desktop-file-service.vala	2014-08-31 12:12:32 +0000
@@ -50,6 +50,7 @@
    
     public string desktop_id { get; construct set; } 
     public string name { get; construct set; }
+    public string generic_name { get; construct set; }
     public string comment { get; set; default = ""; }
     public string icon_name { get; construct set; default = ""; }
 
@@ -134,6 +135,7 @@
         }
 
         name = app_info.get_name ();
+        generic_name = app_info.get_generic_name () ?? "";     
         exec = app_info.get_commandline ();
         if (exec == null)
         {
@@ -632,4 +634,3 @@
     }
   }
 }
-

=== modified file 'lib/synapse-plugins/desktop-file-plugin.vala'
--- lib/synapse-plugins/desktop-file-plugin.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-plugins/desktop-file-plugin.vala	2014-08-31 12:12:32 +0000
@@ -50,6 +50,9 @@
       public bool needs_terminal { get; set; default = false; }
       public string? filename { get; construct set; }
 
+      // for additional matching
+      public string generic_name { get; construct set; default = ""; }
+      
       private string? title_folded = null;
       public unowned string get_title_folded ()
       {
@@ -79,6 +82,7 @@
         this.title_folded = info.get_name_folded ();
         this.title_unaccented = Utils.remove_accents (this.title_folded);
         this.desktop_id = "application://" + info.desktop_id;
+        this.generic_name = info.generic_name;
       }
     }
 
@@ -112,10 +116,10 @@
       dfs.reload_done.connect (() => {
         mimetype_map.clear ();
         desktop_files.clear ();
-        load_all_desktop_files ();
+        load_all_desktop_files.begin ();
       });
 
-      load_all_desktop_files ();
+      load_all_desktop_files.begin ();
     }
 
     public signal void load_complete ();
@@ -160,6 +164,9 @@
       {
         unowned string folded_title = dfm.get_title_folded ();
         unowned string unaccented_title = dfm.title_unaccented;
+        unowned string comment = dfm.description;
+        unowned string generic_name = dfm.generic_name;
+
         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
@@ -177,7 +184,13 @@
             results.add (dfm, compute_relevancy (dfm, matcher.value - 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))
         {
@@ -277,7 +290,7 @@
           var app_info = new DesktopAppInfo.from_filename (desktop_info.filename);
           List<File> files = new List<File> ();
           files.prepend (f);
-          app_info.launch (files, new Gdk.AppLaunchContext ());
+          app_info.launch (files, Gdk.Display.get_default ().get_app_launch_context ());
         }
         catch (Error err)
         {