Merge lp:~angeloc/unity-lens-files/fix-for-948086 into lp:unity-lens-files

[Angelo Compagnucci]

More robust url validation.

[lp:~angeloc/unity-lens-files/fix-for-948086]

223. By Angelo Compagnucci on 2012-03-06

Fixing Regexp glitches.

[Michal Hruby (mhr3)]

Can you please set your branch which fixes the mountable uris as a prerequisite branch for this?

review: Needs Resubmitting

[lp:~angeloc/unity-lens-files/fix-for-948086]

224. By Angelo Compagnucci on 2012-03-07

Splitting regex into const string
Use OPTIMIZE flag for regexp

225. By Angelo Compagnucci on 2012-03-07

Fixing codestyle.

Unmerged revisions

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-02-14 13:44:37 +0000
+++ src/daemon.vala	2012-03-06 17:40:28 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ * Modified by Angelo Compagnucci <[e-mail]>
  *
  */
 using Zeitgeist;
@@ -33,6 +34,7 @@
 
     private Bookmarks bookmarks;
     private UrlChecker urls;
+    private UrlType url_type;
 
     private Unity.Lens lens;
     private Unity.Scope scope;
@@ -376,14 +378,16 @@
 
         results_model.clear ();
 
-        /* check if the thing typed isn't a url (like facebook.com) */
-        var checked_url = urls.check_url (search.search_string);
+        /* check if the thing typed isn't a url (like facebook.com) 
+         * or isn't a remote mountable url (like ftp://ftp.ubuntu.com)*/
+        var url_type = UrlType.UNKNOWN;
+        var checked_url = urls.check_url (search.search_string, out url_type);
         if (checked_url != null)
         {
-          results_model.append (checked_url, urls.icon,
-                                Categories.FILES_AND_FOLDERS,
-                                "text/html", search.search_string,
-                                checked_url, checked_url);
+          results_model.append (checked_url, urls.get_icon_for_type(url_type),
+                Categories.FILES_AND_FOLDERS,
+                "text/html", search.search_string,
+                checked_url, checked_url);
         }
 
         var category_id = has_search ?
@@ -438,13 +442,16 @@
 
         txn.clear ();
 
-        /* check if the thing typed isn't a url (like facebook.com) */
-        var checked_url = urls.check_url (search.search_string);
+        /* check if the thing typed isn't a url (like facebook.com) 
+         * or isn't a remote mountable url (like ftp://ftp.ubuntu.com)*/
+        var url_type = UrlType.UNKNOWN; 
+        var checked_url = urls.check_url (search.search_string, out url_type);
         if (checked_url != null)
         {
-          txn.append (checked_url, urls.icon, Categories.RECENT,
-                      "text/html", search.search_string,
-                      checked_url, checked_url);
+          txn.append (checked_url, urls.get_icon_for_type(url_type), 
+                Categories.RECENT,
+                "text/html", search.search_string,
+                checked_url, checked_url);
         }
 
         /* apply filters to results found by zeitgeist */
@@ -757,13 +764,24 @@
     {
       debug (@"Activating: $uri");
       try {
-        if (!bookmarks.launch_if_bookmark (uri))
-          AppInfo.launch_default_for_uri (uri, null);
-        return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+        if (bookmarks.launch_if_bookmark (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);
       }
+      return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
     }
 
     private void on_zeitgeist_changed ()
 
=== modified file 'src/folder.vala'
--- src/folder.vala	2011-09-29 12:06:45 +0000
+++ src/folder.vala	2012-03-06 17:40:28 +0000
@@ -187,7 +187,7 @@
       var uris = new List<string> ();
       uris.append (uri);
       
-      launcher.launch_uris (uris, new AppLaunchContext());
+      launcher.launch_uris (uris, null);
       
       return true;
     }
 
=== modified file 'src/url-checker.vala'
--- src/url-checker.vala	2012-01-30 11:26:40 +0000
+++ src/url-checker.vala	2012-03-06 17:40:28 +0000
@@ -14,51 +14,96 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ * Modified by Angelo Compagnucci <[e-mail]>
  *
  */
 
 namespace Unity.FilesLens {
+  public enum UrlType {
+  UNKNOWN,
+  WEB,
+  MOUNTABLE;
+  }
 
   public class UrlChecker : Object
   {
     /* A string serialized GIcon */
-    public string icon { get; private set; }
+    public string web_icon { get; private set; }
+    public string mountable_icon { get; private set; }
     
     /* Regexes URLs must match */
-    private List<Regex> regexes;
+    private Regex web_regex;
+    private Regex mountable_regex;
     
     public UrlChecker ()
     {
-      icon = new ThemedIcon ("web-browser").to_string ();
-      regexes = new List<Regex> ();
+      web_icon = new ThemedIcon ("web-browser").to_string ();
+      mountable_icon = new ThemedIcon ("folder-remote").to_string ();
       
       try {
-        regexes.prepend (new Regex (".+\\...+")); // contains a dot + >= 2 chars
-        regexes.prepend (new Regex ("www.*"));
-        regexes.prepend (new Regex ("http://.+"));
-        regexes.prepend (new Regex ("https://.+"));
+        web_regex = new Regex ("(http[s]{0,1}://.+){0,1}"                 +
+                                "[a-zA-Z0-9\\-\\.]+\\.(ac|ad|ae|aero|af|ag|" +
+                                "ai|al|am|an|ao|aq|ar|arpa|as|asia|at|"   +
+                                "au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|"    +
+                                "biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|"   +
+                                "ca|cat|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|"+
+                                "com|coop|cr|cu|cv|cw|cx|cy|cz|de|dj|dk|" +
+                                "dm|do|dz|ec|edu|ee|eg|er|es|et|eu|fi|fj|"+
+                                "fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|" +
+                                "gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|"   +
+                                "hm|hn|hr|ht|hu|id|ie|il|im|in|info|int|" +
+                                "io|iq|ir|is|it|je|jm|jo|jobs|jp|ke|kg|"  +
+                                "kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|" +
+                                "lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|" +
+                                "mil|mk|ml|mm|mn|mo|mobi|mp|mq|mr|ms|mt|" +
+                                "mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|" +
+                                "net|nf|ng|ni|nl|no|np|nr|nu|nz|om|org|"  +
+                                "pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|"+
+                                "pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|" +
+                                "sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|" +
+                                "sx|sy|sz|tc|td|tel|tf|tg|th|tj|tk|tl|"   +
+                                "tm|tn|to|tp|tr|travel|tt|tv|tw|tz|ua|"   +
+                                "ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|" +
+                                "ws|xn|xxx|ye|yt|za|zm|zw|local|[0-9]{1,3})$");
+        mountable_regex = new Regex ("(\\\\|(ftp|ssh|sftp|smb|dav)://).+");
       } catch (RegexError e) {
         warning ("Error compiling regular expressions for URL matching. URL launching will not work: %s", e.message);
       }
     }
     
-    /* Returns a valid HTTP/HTTPS URL if the input looks like it,
-     * or null otherwise */
-    public string? check_url (string sample)
+    /* Returns a valid URL if the input looks like it or null otherwise,
+     * returns also url type which can after be used
+     * to retrive corresponding icon
+     */
+    public string? check_url (string sample, out UrlType url_type)
     {
       if (sample.strip () == "") return null;
-
-      foreach (var regex in regexes)
-      {
-        if (regex.match (sample))
-          {
-            return sample.has_prefix ("http") ? sample : ("http://" + sample);
-          }
-      }
       
+      if (mountable_regex.match (sample))
+      {
+        url_type = UrlType.MOUNTABLE;
+        return sample.replace("\\\\","smb://");
+      }
+      else if (web_regex.match (sample))
+      {
+        url_type = UrlType.WEB;
+        return sample.has_prefix ("http") ? sample : ("http://" + sample);
+      }
+      url_type = UrlType.UNKNOWN;
       return null;
     }
     
+    public string get_icon_for_type (UrlType url_type)
+    {
+      switch (url_type){
+        case UrlType.WEB:
+      return web_icon;
+        case UrlType.MOUNTABLE:
+      return mountable_icon;
+      }
+      return web_icon;
+  }
+    
   } /* end: class UrlChecker */
 
 } /* end: namespace */