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

[Adam Bieńkowski]

Add functionality to search quicklist items

Fixes bug #888776. Search in quicklist items. The implementation is in desktop-file-plugin because it has already what is needed for such functionality. I also followed the slingshot plugin code style.

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

578. By Adam Bieńkowski on 2015-09-20

Cleaned code a bit

[Danielle Foré (danrabbit)]

Actions don't seem to activate with 'enter'

See inline comment about commented code

review: Needs Fixing

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

579. By Adam Bieńkowski on 2015-09-20

Fixed: action won't launch by pressing enter

580. By Adam Bieńkowski on 2015-09-20

Remove unreachable catch

[Danielle Foré (danrabbit)]

Works for me™

We should at some point decide how to deal with duplicate items and to explicitly label apps without being redundant. But since we're at the beginning of the cycle, I don't think we should block the merge on it.

Probably still needs a legit code review :)

review: Approve (ux)

[Florian Angermeier (florian-angermeier)]

Thanks for taking the time and working on this! :-)

See inline comments for some Code Guide issues.

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

> Thanks for taking the time and working on this! :-)
>
> See inline comments for some Code Guide issues.

@fraang: Please take a look at the rest of the synapse source (which was copied from synapse upstream) and think about your request to enforce the elementary-codestyle on it.

So it is not reasonable for files in lib/synapse-plugins/ to follow the elementary-codestyle.

[Adam Bieńkowski (donadigo)]

As Rico said I followed the general style of Synapse plugins and this is intentionable. Any other problems that I need to fix with this branch?

[Florian Angermeier (florian-angermeier)]

Works fine. :-) Approved!

review: Approve (code)

=== modified file 'lib/synapse-plugins/desktop-file-plugin.vala'
--- lib/synapse-plugins/desktop-file-plugin.vala	2015-04-27 14:10:52 +0000
+++ lib/synapse-plugins/desktop-file-plugin.vala	2015-09-20 17:52:04 +0000
@@ -35,6 +35,37 @@
       
     }
 
+    public class ActionMatch : Object, Match
+    {
+      public string title { get; construct set; }
+      public string icon_name { get; construct set; default = ""; }
+      public string description { get; set; default = ""; }
+      public bool has_thumbnail { get; construct set; default = false; }
+      public string thumbnail_path { get; construct set; }
+      public MatchType match_type { get; construct set; }
+      public string? filename { get; construct set; }
+
+      public AppInfo? app_info { get; set; default = null; }
+      public bool needs_terminal { get; set; default = false; }
+
+      private string action_name;
+
+      public ActionMatch (string desktop_id, string action_name)
+      {
+        var desktop_app_info = new DesktopAppInfo (desktop_id);
+        this.title = desktop_app_info.get_action_name (action_name);
+        this.icon_name = desktop_app_info.get_icon ().to_string ();
+        this.description = "";
+        this.app_info = desktop_app_info;
+        this.action_name = action_name;
+      }   
+
+      public void execute (Match? match)
+      {
+        ((DesktopAppInfo) app_info).launch_action (action_name, new AppLaunchContext ());
+      }       
+    }
+
     private class DesktopFileMatch: Object, Match, ApplicationMatch
     {
       // for Match interface
@@ -193,6 +224,35 @@
             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) {
+          string title = desktop_app_info.get_action_name (action).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;        
+            }
+          }
+        }
+
         if (!matched && (comment.down ().contains (q.query_string_folded) 
             || generic_name.down ().contains (q.query_string_folded)))
         {

=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2015-05-28 16:15:08 +0000
+++ src/Widgets/SearchItem.vala	2015-09-20 17:52:04 +0000
@@ -29,15 +29,21 @@
 
         private Cancellable? cancellable = null;
         public bool dragging = false; //prevent launching
+        public bool action = false;
 
         public signal bool launch_app ();
 
-        public SearchItem (Backend.App app, string search_term = "") {
+        public SearchItem (Backend.App app, string search_term = "", bool action = false, string action_title = "") {
             Object (app: app);
             
+            this.action = action;
             get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
 
-            var markup = Backend.SynapseSearch.markup_string_with_search (app.name, search_term);
+            string markup;
+            if (action)
+                markup = action_title;
+            else
+                markup = Backend.SynapseSearch.markup_string_with_search (app.name, search_term);
 
             name_label = new Gtk.Label (markup);
             name_label.set_ellipsize (Pango.EllipsizeMode.END);
@@ -67,7 +73,8 @@
 
             add (box);
 
-            launch_app.connect (app.launch);
+            if (!action)
+                launch_app.connect (app.launch);
 
             var app_match = app.match as Synapse.ApplicationMatch;
             if (app_match != null) {
@@ -85,7 +92,6 @@
                     sel.set_uris ({File.new_for_path (app_match.filename).get_uri ()});
                 });
             }
-           
         }
 
         public override void destroy () {

=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2015-06-03 19:10:24 +0000
+++ src/Widgets/SearchView.vala	2015-09-20 17:52:04 +0000
@@ -132,6 +132,8 @@
                 // We assign 9 as the id for settings results
                 if (match is Synapse.SwitchboardPlugin.SwitchboardObject)
                     type = 9;
+                else if (match is Synapse.DesktopFilePlugin.ActionMatch)
+                    type = 10;
 
                 if ((list = categories.get (type)) == null) {
                     list = new Gee.LinkedList<Synapse.Match> ();
@@ -183,6 +185,9 @@
                     case 9:
                         label = _("Settings");
                         break;
+                    case 10:
+                        label = _("Application Actions");
+                        break;
                 }
 
                 var header = new Gtk.Label (label);
@@ -199,6 +204,12 @@
                 for (var i = 0; i < limit && i < list.size; i++) {
                     var match = list.get (i);
 
+                    if (type == 10) {
+                        show_action (new Backend.App.from_synapse_match (match));
+                        n_results++;
+                        continue;
+                    }
+
                     // expand the actions we get for UNKNOWN
                     if (match.match_type == Synapse.MatchType.UNKNOWN) {
                         var actions = Backend.SynapseSearch.find_actions_for_match (match);
@@ -234,6 +245,24 @@
 
         }
 
+        private void show_action (Backend.App app) {
+            var search_item = new SearchItem (app, "", true, app.match.title);
+            app.start_search.connect ((search, target) => start_search (search, target));
+            search_item.button_release_event.connect (() => {
+                if (!search_item.dragging) {
+                    ((Synapse.DesktopFilePlugin.ActionMatch) app.match).execute (null);
+                    app_launched ();
+                }
+
+                return true;
+            });
+
+            main_box.pack_start (search_item, false, false);
+            search_item.show_all ();
+
+            items[app] = search_item;        
+        }
+
         public void toggle_context (bool show) {
             var prev_y = vadjustment.value;
 
@@ -332,9 +361,12 @@
          * @return indicates whether slingshot should now be hidden
          */
         public bool launch_selected () {
+            if (selected_app.action) {
+                ((Synapse.DesktopFilePlugin.ActionMatch) selected_app.app.match).execute (null);
+                return true;
+            }
 
             return selected_app.launch_app ();
-
         }
 
     }