Merge lp:~donadigo/slingshot/open-link-browser into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

Fix bug #1487786 "When entering web address, offer to open default browser [$15]".

Fix bug #1487786 "When entering web address, offer to open default browser [$15]".

I tried to keep the diff as small as possible, regex allows to open links with "https" and without it, plugin gets default browser by what's displayed in the applications plug. Tested with Midori, Chrome and Firefox.

[Danielle Foré (danrabbit)]

Hrm I'm not sure how terribly useful this is when the regex requires x.y.z format or http(s). I would expect that most users write urls like foo.bar as a common case

review: Needs Fixing

[lp:~donadigo/slingshot/open-link-browser]

635. By Adam Bieńkowski on 2016-02-21

Change regex to accept urls without www

=== modified file 'lib/synapse-plugins/CMakeLists.txt'
--- lib/synapse-plugins/CMakeLists.txt	2015-09-23 22:17:18 +0000
+++ lib/synapse-plugins/CMakeLists.txt	2016-02-21 20:36:00 +0000
@@ -20,6 +20,7 @@
     desktop-file-plugin.vala
     switchboard-plugin.vala
     system-managment.vala
+    link-plugin.vala
 )
 
 # Compile

=== added file 'lib/synapse-plugins/link-plugin.vala'
--- lib/synapse-plugins/link-plugin.vala	1970-01-01 00:00:00 +0000
+++ lib/synapse-plugins/link-plugin.vala	2016-02-21 20:36:00 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2010 Michal Hruby <[e-mail]>
+ *
+ * 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 St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * Authored by Magnus Kulke <[e-mail]>
+ *
+ */
+
+namespace Synapse
+{
+  public class LinkPlugin: 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 string uri;
+      private AppInfo? appinfo;
+
+      public Result (string link)
+      {
+        uri = link;
+        string _title = _("Open %s in default web browser".printf (uri));
+        string _icon_name = "web-browser";
+
+        appinfo = AppInfo.get_default_for_type ("x-scheme-handler/http", false);
+        if (appinfo != null)
+        {
+          _title = _("Open %s in %s").printf (uri, appinfo.get_display_name ());
+          _icon_name = appinfo.get_icon ().to_string ();
+        }
+
+        this.title = _title;
+        this.icon_name = _icon_name;
+        this.description = _("Open this link in default browser");
+        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 (uri);
+        try
+        {
+          appinfo.launch_uris (list, null);
+        } catch (Error e)
+        {
+          warning ("%s\n", e.message);
+        }
+      }        
+    }
+
+    static void register_plugin ()
+    {
+      DataSink.PluginRegistry.get_default ().register_plugin (
+        typeof (LinkPlugin),
+        _("Link"),
+        _("Open link in default browser"),
+        "web-browser",
+        register_plugin
+      );
+    }
+
+    static construct
+    {
+      register_plugin ();
+    }
+
+    private Regex regex;
+
+    construct
+    {
+      try
+      {
+        regex = new Regex ("[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,4}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)",
+                         RegexCompileFlags.OPTIMIZE);
+      } catch (Error e) {
+        Utils.Logger.error (this, "Error creating regexp.");
+      }
+    }
+    
+    public bool handles_query (Query query)
+    {
+      return QueryFlags.TEXT in query.query_type;
+    }
+
+    public async ResultSet? search (Query query) throws SearchError
+    {
+      bool matched = regex.match (query.query_string); 
+      if (matched)
+      {
+        Result result = new Result (query.query_string);
+        ResultSet results = new ResultSet ();
+        results.add (result, Match.Score.AVERAGE);
+        query.check_cancellable ();
+        return results;
+      }
+
+      return null;
+    }
+  }
+}

=== modified file 'src/Backend/SynapseSearch.vala'
--- src/Backend/SynapseSearch.vala	2015-06-03 19:10:24 +0000
+++ src/Backend/SynapseSearch.vala	2016-02-21 20:36:00 +0000
@@ -25,7 +25,8 @@
             typeof (Synapse.CommandPlugin),
             typeof (Synapse.DesktopFilePlugin),
             typeof (Synapse.SwitchboardPlugin),
-            typeof (Synapse.SystemManagementPlugin)
+            typeof (Synapse.SystemManagementPlugin),
+            typeof (Synapse.LinkPlugin)
         };
 
         private static Synapse.DataSink? sink = null;

=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2015-12-22 17:07:27 +0000
+++ src/Widgets/SearchItem.vala	2016-02-21 20:36:00 +0000
@@ -28,7 +28,8 @@
             CONTACT,
             INTERNET,
             SETTINGS,
-            APP_ACTIONS
+            APP_ACTIONS,
+            LINK
         }
 
         const int ICON_SIZE = 32;

=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2015-12-19 14:15:03 +0000
+++ src/Widgets/SearchView.vala	2016-02-21 20:36:00 +0000
@@ -44,8 +44,8 @@
             list_box.set_header_func ((Gtk.ListBoxUpdateHeaderFunc) update_header);
             list_box.row_activated.connect ((row) => {
                 var search_item = row as SearchItem;
-                if (search_item.result_type == SearchItem.ResultType.APP_ACTIONS) {
-                    ((Synapse.DesktopFilePlugin.ActionMatch) search_item.app.match).execute (null);
+                if (search_item.result_type == SearchItem.ResultType.APP_ACTIONS || search_item.result_type == SearchItem.ResultType.LINK) {
+                    search_item.app.match.execute (null);
                 } else {
                     search_item.app.launch ();
                 }
@@ -70,6 +70,8 @@
                     if (uri.has_prefix ("http://") || uri.has_prefix ("ftp://") || uri.has_prefix ("https://")) {
                         result_type = SearchItem.ResultType.INTERNET;
                     }
+                } else if (match is Synapse.LinkPlugin.Result) {
+                    result_type = SearchItem.ResultType.LINK;
                 }
 
                 if (result_type == SearchItem.ResultType.UNKNOWN) {
@@ -153,6 +155,7 @@
                 case SearchItem.ResultType.GENERIC_URI:
                     label = _("Files");
                     break;
+                case SearchItem.ResultType.LINK:
                 case SearchItem.ResultType.ACTION:
                     label = _("Actions");
                     break;