Merge lp:~jeremy-munsch/synapse-project/add-script-execute into lp:synapse-project

[Jeremy Munsch]

fixes https://bugs.launchpad.net/synapse-project/+bug/695437

Add Runner and TerminalRunner for UriMatch

[Jeremy Munsch (jeremy-munsch)]

This is also linked to https://code.launchpad.net/~jeremy-munsch/synapse-project/add-script-execute/+merge/277502
which if is approved and merged (the linked PR) would be need to be applied on this PR.

[Rico Tzschichholz (ricotz)]

Your are referencing this very same merge-proposal in your preview comment.

Apply this clean up https://paste.debian.net/plain/332685

Use "bzr commit --fixes lp:695437" -m "core: Handle UriMatches pointing to executable files"

review: Needs Fixing

[lp:~jeremy-munsch/synapse-project/add-script-execute]

616. By Jeremy Munsch on 2015-11-14

core: Handle UriMatches pointing to executable files

[Jeremy Munsch (jeremy-munsch)]

Well i meant lp:~jeremy-munsch/synapse-project/fix-ssh-terminal into lp:synapse-project sorry about that.

Fixing done thanks for reviewing

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'src/core/common-actions.vala'
--- src/core/common-actions.vala	2014-07-10 13:45:44 +0000
+++ src/core/common-actions.vala	2015-11-14 19:25:26 +0000
@@ -92,6 +92,25 @@
         {
           ((Action) match).do_execute (match, target);
         }
+        else if (match is UriMatch)
+        {
+          try
+          {
+            unowned string uri = ((UriMatch) match).uri;
+            if (uri.has_prefix ("file:"))
+            {
+              File file = File.new_for_uri (uri);
+              AppInfo app = AppInfo.create_from_commandline (
+                file.get_path (), file.get_basename (),
+                AppInfoCreateFlags.NONE);
+              app.launch (null, Gdk.Display.get_default ().get_app_launch_context ());
+            }
+          }
+          catch (Error err)
+          {
+            warning ("%s", err.message);
+          }
+        }
         else
         {
           warning ("'%s' is not be handled here", match.title);
@@ -100,6 +119,16 @@
 
       public override bool valid_for_match (Match match)
       {
+        if (match is UriMatch)
+        {
+          unowned string uri = ((UriMatch) match).uri;
+          if (uri.has_prefix ("file:"))
+          {
+            string path = File.new_for_uri (uri).get_path ();
+            return FileUtils.test (path, FileTest.IS_EXECUTABLE);
+          }
+        }
+
         return (match is Action ||
                 match is ActionMatch ||
                (match is ApplicationMatch && !(((ApplicationMatch) match).needs_terminal)));
@@ -138,10 +167,38 @@
             warning ("%s", err.message);
           }
         }
+        else if (match is UriMatch)
+        {
+          try
+          {
+            unowned string uri = ((UriMatch) match).uri;
+            if (uri.has_prefix ("file:"))
+            {
+              File file = File.new_for_uri (uri);
+              AppInfo app = AppInfo.create_from_commandline (
+                file.get_path (), file.get_basename (),
+                AppInfoCreateFlags.NEEDS_TERMINAL);
+              app.launch (null, Gdk.Display.get_default ().get_app_launch_context ());
+            }
+          }
+          catch (Error err)
+          {
+            warning ("%s", err.message);
+          }
+        }
       }
 
       public override bool valid_for_match (Match match)
       {
+        if (match is UriMatch)
+        {
+          unowned string uri = ((UriMatch) match).uri;
+          if (uri.has_prefix ("file:"))
+          {
+            string path = File.new_for_uri (uri).get_path ();
+            return FileUtils.test (path, FileTest.IS_EXECUTABLE);
+          }
+        }
         return (match is ApplicationMatch);
       }
     }