Merge lp:~3v1n0/unity-lens-files/delegate-activation into lp:unity-lens-files/7.0

[Marco Trevisan (Treviño)]

Daemon: don't handle the file/directory opening, just parse the uri and send it back to Unity

Make unity to handle the results activation.

This needs lp:~3v1n0/unity/dash-files-open to work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-raring-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-raring-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-files-raring-ci/1/rebuild

review: Approve (continuous-integration)

Unmerged revisions

257. By Marco Trevisan (Treviño) on 2013-05-01

Daemon: don't handle the file/directory opening, just parse the uri and send it back to Unity

256. By Marco Trevisan (Treviño) on 2013-05-01

UrlChecker: only replace an URI only if it begins with wrong prefix

255. By Marco Trevisan (Treviño) on 2013-05-01

Folder: add utility function to get uri from device name

254. By Marco Trevisan (Treviño) on 2013-04-19

Folder: use a const string to handle devices prefix

253. By Marco Trevisan (Treviño) on 2013-04-19

Folder: use a const string for bookmark URIs

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-02-20 13:19:41 +0000
+++ src/daemon.vala	2013-05-02 00:39:24 +0000
@@ -997,13 +997,11 @@
             preview.subtitle = date_time.format ("%x, %X");
           }
 
-          var email_app_info = GLib.AppInfo.get_default_for_uri_scheme ("mailto");
-
           string mime_type = finfo.get_content_type ();
           preview.add_info (new InfoHint ("format", _("Format"), null, GLib.ContentType.get_description (mime_type)));
 
           var open_action = new Unity.PreviewAction ("open", _("Open"), null);
-          open_action.activated.connect (on_preview_open);
+          open_action.activated.connect (activate);
           preview.add_action (open_action);
 
           uint64 total_size = 0;
@@ -1033,10 +1031,12 @@
             preview.add_info (new InfoHint ("size", _("Size"), null, GLib.format_size (total_size)));
 
             var open_folder_action = new Unity.PreviewAction ("open-dir", _("Show in Folder"), null);
-            open_folder_action.activated.connect (on_preview_open_folder);
+            open_folder_action.activated.connect ((uri) => {
+              return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED, "directory://"+uri);
+            });
             preview.add_action (open_folder_action);
 
-            if (email_app_info != null)
+            if (GLib.AppInfo.get_default_for_uri_scheme ("mailto") != null)
             {
               var email_action = new Unity.PreviewAction ("email", _("Email"), null);
               email_action.activated.connect (on_email_file);
@@ -1095,7 +1095,7 @@
       preview.add_info (new InfoHint ("contents", _("Contents"), null, _("%s, %u items").printf (GLib.format_size (contents_size), contents_count)));
 
       var open_action = new Unity.PreviewAction ("open", _("Open"), null);
-      open_action.activated.connect (on_preview_open);
+      open_action.activated.connect (activate);
       preview.add_action (open_action);
 
       return preview;
@@ -1120,62 +1120,23 @@
       return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
     }
 
-    public Unity.ActivationResponse on_preview_open (string uri)
-    {
-      try
-      {
-        if (bookmarks.launch_if_bookmark (uri) || devices.launch_if_device (uri) || GLib.AppInfo.launch_default_for_uri (uri, null))
-        {
-          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-        }
-      }
-      catch (GLib.Error e)
-      {
-        warning ("Failed to launch default application for uri '%s': %s", uri, e.message);
-      }
-      return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-    }
-
-    public Unity.ActivationResponse on_preview_open_folder (string uri)
-    {
-      var file_manager = AppInfo.get_default_for_type("inode/directory", true);
-      var uris = new GLib.List<string> ();
-      uris.append (uri);
-
-      try
-      {
-        if (file_manager.launch_uris (uris, null))
-          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-      }
-      catch (GLib.Error e)
-      {
-        warning ("Failed to launch default application for uri '%s': %s", uri, e.message);
-      }
-      return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-    }
-
     public Unity.ActivationResponse activate (string uri)
     {
       debug (@"Activating: $uri");
-      try {
-        if (bookmarks.launch_if_bookmark (uri) || devices.launch_if_device (uri))
-          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-
-        /* this code ensures that a file manager will be used
-         * * if uri it's a remote location that should be mounted */
-        var url_type = UrlType.UNKNOWN;
-        var checked_url = urls.check_url (uri, out url_type);
-        if (checked_url != null && url_type == UrlType.MOUNTABLE) {
-          var muris = new GLib.List<string>();
-          muris.prepend (uri);
-          var file_manager = AppInfo.get_default_for_type("inode/directory", true);
-          file_manager.launch_uris(muris,null);
-          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-        }
-      } catch (GLib.Error error) {
-        warning ("Failed to launch URI %s", uri);
-      }
-      return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
+
+      if (Bookmark.is_bookmark_uri (uri))
+      {
+        var bookmark = Bookmark.uri_from_bookmark (uri);
+        return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED, bookmark);
+      }
+
+      if (Device.is_device_uri (uri))
+      {
+        var device = Device.uri_from_device (uri);
+        return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED, device);
+      }
+
+      return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED, uri);
     }
 
     private void on_zeitgeist_changed ()
 
=== modified file 'src/folder.vala'
--- src/folder.vala	2012-09-19 10:48:09 +0000
+++ src/folder.vala	2013-05-02 00:39:24 +0000
@@ -189,12 +189,11 @@
 
     public bool launch_if_bookmark (string uri) throws Error
     {
-      if (!uri.has_prefix ("bookmark:"))
+      if (!Bookmark.is_bookmark_uri (uri))
         return false;
 
       var launcher = AppInfo.get_default_for_type ("inode/directory", true);
 
-      uri = uri.offset (9); // Remove "bookmark:" prefix from uri
 
       if (launcher == null)
         {
@@ -203,7 +202,7 @@
         }
 
       var uris = new List<string> ();
-      uris.append (uri);
+      uris.append (Bookmark.uri_from_bookmark (uri));
 
       launcher.launch_uris (uris, null);
 
@@ -214,6 +213,8 @@
 
   public class Bookmark : Object
   {
+    public const string PREFIX = "bookmark:";
+
     public string uri { get; set construct; }
     public string icon { get; set construct; }
     public string mimetype { get; set construct; }
@@ -224,7 +225,7 @@
 
     public Bookmark (string uri, string mimetype, string display_name)
     {
-      Object (uri:"bookmark:"+uri, icon:Utils.get_icon_for_uri (uri, mimetype),
+      Object (uri:PREFIX+uri, icon:Utils.get_icon_for_uri (uri, mimetype),
               mimetype:mimetype, display_name:display_name, dnd_uri:uri);
 
       index_terms = new List<string> ();
@@ -237,15 +238,15 @@
       return index_terms;
     }
 
-	public static bool is_bookmark_uri (string uri)
-	{
-	  return uri.has_prefix ("bookmark:");
-	}
+    public static bool is_bookmark_uri (string uri)
+    {
+      return uri.has_prefix (PREFIX);
+    }
 
-	public static string uri_from_bookmark (string uri)
-	{
-	  return uri.substring (9);
-	}
+    public static string uri_from_bookmark (string uri)
+    {
+      return uri.substring (PREFIX.length);
+    }
   }
 
 
@@ -362,6 +363,8 @@
 
   public class Device : Object
   {
+    public const string PREFIX = "device://";
+
     public Volume volume { get; set construct; }
     public string name { get; set construct; }
     public string uri { get; set construct; }
@@ -379,8 +382,8 @@
       var icon_name = icon.to_string ();
       var label = volume.get_identifier (VolumeIdentifier.LABEL) ?? "";
       var uuid = volume.get_identifier (VolumeIdentifier.UUID) ?? "";
-      var id = "device://" + uuid + "-" + label;
- 
+      var id = PREFIX + uuid + "-" + label;
+
       Object (volume:volume, name:name, uri:id, icon:icon,icon_name:icon_name, display_name:name, dnd_uri:id);
 
       index_terms_ = new List<string> ();
@@ -394,7 +397,12 @@
 
     public static bool is_device_uri (string uri)
     {
-      return uri.has_prefix ("device://");
+      return uri.has_prefix (PREFIX);
+    }
+
+    public static string uri_from_device (string uri)
+    {
+      return uri.substring (PREFIX.length);
     }
 
     public void mount_and_open () throws Error
 
=== modified file 'src/url-checker.vala'
--- src/url-checker.vala	2012-03-20 09:40:56 +0000
+++ src/url-checker.vala	2013-05-02 00:39:24 +0000
@@ -74,7 +74,11 @@
       if (mountable_regex.match (sample))
       {
         url_type = UrlType.MOUNTABLE;
-        return sample.replace("\\\\","smb://");
+
+        if (sample.has_prefix("\\\\"))
+          return sample.replace("\\\\","smb://");
+
+        return sample;
       }
       else if (web_regex.match (sample))
       {