Merge lp:~davidmhewitt/slingshot/fix-1636632 into lp:~elementary-pantheon/slingshot/trunk

[David Hewitt]

Provide "Search AppCenter for x" results at bottom of list.

Note: This depends on https://code.launchpad.net/~davidmhewitt/appcenter/fix-1636632/+merge/317046

Added a new synapse plugin to provide a "Search AppCenter for x" result for every search query entered. These appear underneath every other result in the list in their own section. Upon selecting one, AppCenter opens with the search already executed.

[Jeremy Wootten (jeremywootten)]

Provides one "Search AppCenter for [search term]" line (with heading) when a search term is entered and this launches a search in AppCenter when clicked.

The description above refers to "these" and "upon selecting one" which implies there should be more than one line but enter in several search terms separated by spaces or commas did not produce this. I am not sure what the intended behaviour is.

[David Hewitt (davidmhewitt)]

> Provides one "Search AppCenter for [search term]" line (with heading) when a
> search term is entered and this launches a search in AppCenter when clicked.
>
> The description above refers to "these" and "upon selecting one" which implies
> there should be more than one line but enter in several search terms separated
> by spaces or commas did not produce this. I am not sure what the intended
> behaviour is.

This is possibly just my poor use of the English language. Despite it being my native language ;)

The intended functionality is to only provide one result for whatever you searched for and pass that search query to AppCenter when the result is opened.

[Jeremy Wootten (jeremywootten)]

OK, I will approve then.

review: Approve (code, function)

[lp:~davidmhewitt/slingshot/fix-1636632]

735. By David Hewitt on 2017-02-18

Code style fixes

736. By David Hewitt on 2017-02-18

Added translators comment

[Danielle Foré (danrabbit)]

I think this should probably appear under "Actions" instead of making a new category.

Just a note for Cody:

It looks like AppCenter will open to the home page without the other branch. I think that's an acceptable default and I don't think this branch introduces a dependency on AppCenter.

review: Needs Fixing

[lp:~davidmhewitt/slingshot/fix-1636632]

737. By David Hewitt on 2017-02-18

Move results to actions instead of own category

=== modified file 'lib/synapse-plugins/CMakeLists.txt'
--- lib/synapse-plugins/CMakeLists.txt	2016-02-20 17:11:51 +0000
+++ lib/synapse-plugins/CMakeLists.txt	2017-02-18 21:09:54 +0000
@@ -21,6 +21,7 @@
     switchboard-plugin.vala
     system-managment.vala
     link-plugin.vala
+    appcenter-plugin.vala
 )
 
 # Compile
 
=== added file 'lib/synapse-plugins/appcenter-plugin.vala'
--- lib/synapse-plugins/appcenter-plugin.vala	1970-01-01 00:00:00 +0000
+++ lib/synapse-plugins/appcenter-plugin.vala	2017-02-18 21:09:54 +0000
@@ -0,0 +1,118 @@
+/*
+* Copyright (c) 2017 David Hewitt <[e-mail]>
+*               2017 elementary LLC.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: David Hewitt <[e-mail]>
+*/
+
+namespace Synapse {
+    public class AppcenterPlugin: Object, Activatable, ItemProvider {
+
+        public bool enabled { get; set; default = true; }
+
+        public void activate () { }
+
+        public void deactivate () { }
+
+        public class Result : Object, Match {
+            // from Match interface
+            public string title { get; construct set; }
+            public string description { get; set; }
+            public string icon_name { get; construct set; }
+            public bool has_thumbnail { get; construct set; }
+            public string thumbnail_path { get; construct set; }
+            public MatchType match_type { get; construct set; }
+
+            public int default_relevancy { get; set; default = 0; }
+
+            private AppInfo? appinfo;
+            private string search_term;
+
+            public Result (string search) {
+                search_term = search;
+
+                string _title = "";
+                string _icon_name = "";
+
+                appinfo = AppInfo.get_default_for_type ("x-scheme-handler/appstream", false);
+                if (appinfo != null) {
+                    // TRANSLATORS: The first %s is what the user searched for, the second will be replaced with the localized name of AppCenter
+                    _title = _("Search for %s in %s".printf (search_term, appinfo.get_display_name ()));
+                    _icon_name = appinfo.get_icon ().to_string ();
+                }
+
+                this.title = _title;
+                this.icon_name = _icon_name;
+                this.description = _("Search the app store");
+                this.has_thumbnail = false;
+                this.match_type = MatchType.ACTION;
+            }
+
+            public void execute (Match? match) {
+                if (appinfo == null) {
+                    return;
+                }
+
+                var list = new List<string> ();
+                list.append ("appstream://" + Uri.escape_string (search_term));
+
+                try {
+                    appinfo.launch_uris (list, null);
+                } catch (Error e) {
+                    warning ("%s\n", e.message);
+                }
+            }        
+        }
+
+        private static AppInfo? appinfo;
+
+        static void register_plugin () {
+            bool appcenter_installed = false;
+
+            appinfo = AppInfo.get_default_for_type ("x-scheme-handler/appstream", false);
+            // Only register the plugin if we have an application that supports appstream://
+            if (appinfo != null) {
+                appcenter_installed = true;
+            }
+
+            DataSink.PluginRegistry.get_default ().register_plugin (typeof (AppcenterPlugin),
+                                            _("AppCenter"),
+                                            _("Search for applications"),
+                                            "system-software-install",
+                                            register_plugin,
+                                            appcenter_installed,
+                                            _("AppCenter is not installed"));
+        }
+
+        static construct {
+            register_plugin ();
+        }
+
+        public bool handles_query (Query query) {
+            return QueryFlags.TEXT in query.query_type;
+        }
+
+        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);
+
+            return results;
+        }
+    }
+}
 
=== modified file 'src/Backend/SynapseSearch.vala'
--- src/Backend/SynapseSearch.vala	2016-02-20 17:11:51 +0000
+++ src/Backend/SynapseSearch.vala	2017-02-18 21:09:54 +0000
@@ -26,7 +26,8 @@
             typeof (Synapse.DesktopFilePlugin),
             typeof (Synapse.SwitchboardPlugin),
             typeof (Synapse.SystemManagementPlugin),
-            typeof (Synapse.LinkPlugin)
+            typeof (Synapse.LinkPlugin),
+            typeof (Synapse.AppcenterPlugin)
         };
 
         private static Synapse.DataSink? sink = null;