Merge lp:~alecu/unity-scope-click/start-apps-dash into lp:unity-scope-click

[Alejandro J. Cura]

Let the dash launch the apps

Let the dash launch the apps

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-click-ci/29/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/unity-scope-click-autolanding/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-autolanding/21

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/click-interface.vala'
--- src/click-interface.vala	2013-09-03 21:08:38 +0000
+++ src/click-interface.vala	2013-09-21 00:10:47 +0000
@@ -23,11 +23,6 @@
     const string ARG_DESKTOP_FILE_HINT = "--desktop_file_hint";
     delegate void ProcessManifestFunc (Json.Object manifest);
 
-    void spawn (string working_dir, string[] args) throws SpawnError {
-        debug ("launching %s", string.joinv(" ", args));
-        Process.spawn_async (working_dir, args, Environ.get (), SpawnFlags.SEARCH_PATH, null, null);
-    }
-
     public string get_click_id (string full_app_id) {
         return full_app_id.split("_")[0];
     }
@@ -116,54 +111,4 @@
         var msg = "No manifest found for app_id: %s".printf(app_id);
         throw new ClickError.EXEC_FAILURE(msg);
     }
-
-    public async void execute (string app_id) throws ClickError {
-        var dotdesktop_filename = yield get_dotdesktop (app_id);
-        var parsed_dotdesktop = new GLib.KeyFile ();
-        var dotdesktop_folder = Environment.get_user_data_dir () + "/applications/";
-        var dotdesktop_fullpath = dotdesktop_folder + dotdesktop_filename;
-        string exec;
-        string working_folder;
-        try {
-            parsed_dotdesktop.load_from_file (dotdesktop_fullpath, KeyFileFlags.NONE);
-            exec = parsed_dotdesktop.get_string ("Desktop Entry", "Exec");
-            working_folder = parsed_dotdesktop.get_string ("Desktop Entry", "Path");
-            debug ( "Exec line: %s", exec );
-        } catch (GLib.KeyFileError e) {
-            var msg = "Error using keyfile %s: %s".printf(dotdesktop_filename, e.message);
-            throw new ClickError.EXEC_FAILURE (msg);
-        } catch (GLib.FileError e) {
-            var msg = "Error using keyfile %s: %s".printf(dotdesktop_filename, e.message);
-            throw new ClickError.EXEC_FAILURE (msg);
-        }
-
-        string[] parsed_args;
-        try {
-            Shell.parse_argv (exec, out parsed_args);
-        } catch (GLib.ShellError e) {
-            var msg = "Error parsing arguments: %s".printf(e.message);
-            throw new ClickError.EXEC_FAILURE (msg);
-        }
-
-        var args = new Gee.ArrayList<string?> ();
-        foreach (var a in parsed_args) {
-            args.add (a);
-        }
-        // TODO: the following are needed for the device, but not for the desktop
-        // so, if DISPLAY is not set, we add the extra args.
-        var environ = Environ.get ();
-        var display = Environ.get_variable (environ, "DISPLAY");
-        if (display == null) {
-            var hint = ARG_DESKTOP_FILE_HINT + "=" + dotdesktop_fullpath;
-            debug (hint);
-            args.add (hint);
-        }
-
-        try {
-            args.add (null); // spawn and joinv expect this at the end of the vala array
-            spawn (working_folder, args.to_array ());
-        } catch (SpawnError e) {
-            debug ("spawn, error: %s\n", e.message);
-        }
-    }
 }

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-09-12 18:47:10 +0000
+++ src/click-scope.vala	2013-09-21 00:10:47 +0000
@@ -117,20 +117,15 @@
         return uri.has_prefix (App.CLICK_INSTALL_SCHEMA);
     }
 
-    async void launch_application (string app_id) throws ClickError {
-        var click_if = new ClickInterface ();
-        yield click_if.execute(app_id);
-    }
-
     async Unity.Preview build_uninstalled_preview (string app_id) {
         Unity.Preview preview = yield build_app_preview (app_id);
         preview.add_action (new Unity.PreviewAction (ACTION_INSTALL_CLICK, ("Install"), null));
         return preview;
     }
 
-    async Unity.Preview build_installed_preview (string app_id) {
+    async Unity.Preview build_installed_preview (string app_id, string application_uri) {
         Unity.Preview preview = yield build_app_preview (app_id);
-        preview.add_action (new Unity.PreviewAction (ACTION_OPEN_CLICK, ("Open"), null));
+        preview.add_action (new Unity.PreviewAction (ACTION_OPEN_CLICK + ":" + application_uri, ("Open"), null));
         preview.add_action (new Unity.PreviewAction (ACTION_PIN_TO_LAUNCHER, ("Pin to launcher"), null));
         preview.add_action (new Unity.PreviewAction (ACTION_UNINSTALL_CLICK, ("Uninstall"), null));
         return preview;
@@ -149,7 +144,7 @@
         if (uri_is_click_install(result.uri)) {
             return yield build_uninstalled_preview (app_id);
         } else {
-            return yield build_installed_preview (app_id);
+            return yield build_installed_preview (app_id, result.uri);
         }
     }
 
@@ -164,7 +159,8 @@
                 if (uri_is_click_install(result.uri)) {
                     preview = yield build_uninstalled_preview (app_id);
                 } else {
-                    yield launch_application (app_id);
+                    debug ("Let the dash launch the app: %s", result.uri);
+                    return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
                 }
             } else if (action_id == ACTION_INSTALL_CLICK) {
                 var progress_source = yield install_app(app_id);
@@ -172,9 +168,14 @@
             } else if (action_id == ACTION_DOWNLOAD_COMPLETED) {
                 results_invalidated(Unity.SearchType.GLOBAL);
                 results_invalidated(Unity.SearchType.DEFAULT);
-                preview = yield build_installed_preview (app_id);
-            } else if (action_id == ACTION_OPEN_CLICK) {
-                yield launch_application (app_id);
+                var click_if = new ClickInterface ();
+                var dotdesktop = yield click_if.get_dotdesktop(app_id);
+                var application_uri = "application://" + dotdesktop;
+                preview = yield build_installed_preview (app_id, application_uri);
+            } else if (action_id.has_prefix(ACTION_OPEN_CLICK)) {
+                var application_uri = action_id.split(":", 2)[1];
+                debug ("Let the dash launch the app: %s", application_uri);
+                return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED, application_uri);
             } else if (action_id == ACTION_CLOSE_PREVIEW) {
                 // default is to close the dash
             } else {

=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2013-08-22 00:36:57 +0000
+++ src/test-click-webservice.vala	2013-09-21 00:10:47 +0000
@@ -173,23 +173,6 @@
         assert (run_with_timeout (mainloop, 10000));
     }
 
-    public static void test_click_execute ()
-    {
-        MainLoop mainloop = new MainLoop ();
-        var click_if = new ClickInterface ();
-
-        click_if.execute.begin("com.ubuntu.dropping-letters", (obj, res) => {
-            mainloop.quit ();
-            try {
-                click_if.execute.end (res);
-                debug ("app executed");
-            } catch (GLib.Error e) {
-                error ("Can't execute app %s", e.message);
-            }
-        });
-        assert (run_with_timeout (mainloop, 10000));
-    }
-
     public static void test_click_get_dotdesktop ()
     {
         MainLoop mainloop = new MainLoop ();
@@ -246,7 +229,6 @@
         Test.init (ref args);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Interface", test_click_interface);
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_Get_DotDesktop", test_click_get_dotdesktop);
-        Test.add_data_func ("/Unit/ClickChecker/Test_Click_Execute", test_click_execute);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_Search_Result", test_parse_search_result);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_Search_Result_Item", test_parse_search_result_item);
         Test.add_data_func ("/Unit/ClickChecker/Test_Parse_App_Details", test_parse_app_details);