Merge lp:~ian-liu88/unity-lens-applications/fix-for-bug-734762 into lp:unity-lens-applications

[Ian Liu Rodrigues]

The intent of this branch is to interpret the tilde character as the home directory before executing commands. Substitution of ~user also works.

[Didier Roche-Tolomelli (didrocks)]

Excellent Ian! Working as advertised and the code looks good :)

I wondering if you want to do the final polish on that, I mean:
Type Alt + F2:
- enter ~foo/bar
-> the directories matching in instance: /home/foo/bar* as we have with direct typing in /home/foo/bar*

For that, I would:
- move subst_tilde to src/utils.vala
- in update_search for runner.vala, in addition to if (search_string.has_prefix ("/")), add a or "~" in search_string and call the subst_tilde function to introspect in it.

Anyway, just tell me if you want to finish this or not, I can do it, you've already made most of the hard work and thanks for this! :)

[Ian Liu Rodrigues (ian-liu88)]

> Excellent Ian! Working as advertised and the code looks good :)
[...]
> Anyway, just tell me if you want to finish this or not, I can do it,
> you've already made most of the hard work and thanks for this! :)

Thanks!
I would love to do it and I can finish it today at night (in Brazil GMT -3)

[lp:~ian-liu88/unity-lens-applications/fix-for-bug-734762]

198. By Ian Liu Rodrigues on 2011-03-31

Expands tilde character before listing directories

[Didier Roche-Tolomelli (didrocks)]

Code looks good and works as advertised.

Thanks for doing the change and for this awesome contribution! :-)
Approved and merging

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-03-10 11:03:15 +0000
+++ src/Makefile.am	2011-03-31 01:34:24 +0000
@@ -24,6 +24,7 @@
 unity_applications_daemon_VALAFLAGS = \
   -C \
   --vapidir=$(top_srcdir)/vapi \
+  --pkg posix \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
   --pkg dee-1.0 \

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-03-28 14:50:54 +0000
+++ src/daemon.vala	2011-03-31 01:34:24 +0000
@@ -742,7 +742,7 @@
           return;
       }
     }
-    
+
     /**
      * Override of the default activation handler. The apps place daemon
      * can handle activation of installable apps using the Software Center
@@ -761,9 +761,14 @@
         }
       else if (uri.has_prefix ("unity-runner://"))
         {
-          exec_or_dir = uri.offset (15);
+          string orig;
+          orig = uri.offset (15);
+          exec_or_dir = Utils.subst_tilde (orig);
           args = exec_or_dir.split (" ", 0);
-          this.runner.add_history (exec_or_dir);
+          for (int i = 0; i < args.length; i++)
+            args[i] = Utils.subst_tilde (args[i]);
+
+          this.runner.add_history (orig);
         }
       else
         {

=== modified file 'src/runner.vala'
--- src/runner.vala	2011-03-23 15:25:00 +0000
+++ src/runner.vala	2011-03-31 01:34:24 +0000
@@ -185,8 +185,9 @@
       }
       
       /* manual seek with directory and executables result */
-      if (search_string.has_prefix ("/"))
+      if (search_string.has_prefix ("/") || search_string.has_prefix ("~"))
       {
+        search_string = Utils.subst_tilde (search_string);
         var search_dirname = Path.get_dirname (search_string);
         var directory = File.new_for_path (search_dirname);
         var search_dirname_in_path = false;

=== modified file 'src/utils.vala'
--- src/utils.vala	2011-03-08 15:57:37 +0000
+++ src/utils.vala	2011-03-31 01:34:24 +0000
@@ -16,6 +16,7 @@
  * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
  *
  */
+using Posix;
 using Unity;
 using Gee;
  
@@ -130,5 +131,35 @@
           return s1.strip () != s2.strip ();
       }
   }
-  
+
+  /* Substitute tilde character in @s by the home directory.
+   * Expansion of ~username also works if 'username' is found. */
+  public string subst_tilde (string s)
+  {
+    int k;
+    string name;
+    unowned Passwd? pw;
+
+    if (s[0] != '~')
+      return s;
+
+    if (s.length == 1 || s[1] == '/')
+      return Environment.get_home_dir () + s.substring (1, -1);
+
+    k = s.index_of ("/");
+    if (k == -1)
+      name = s.substring (1, -1);
+    else
+      name = s.substring (1, k-1);
+
+    pw = Posix.getpwnam (name);
+    if (pw == null)
+      return s;
+
+    if (k == -1)
+      return pw.pw_dir;
+    else
+      return pw.pw_dir + s.substring (k, -1);
+  }
+
 }