Merge lp:~mikemc/unity-scope-click/queued-downloads into lp:unity-scope-click

[Mike McCracken]

When opening a preview, check if there's a download in progress

When opening a preview, check if there's a download in progress

[dobey (dobey)]

review: Approve

[Mike McCracken (mikemc)]

Approved with just dobey's review because this is actually alecu's branch, see:
https://code.launchpad.net/~mikemc/unity-scope-click/queued-downloads/+merge/198110

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/15

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

review: Approve (continuous-integration)

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-12-06 16:00:49 +0000
+++ src/click-scope.vala	2013-12-06 18:32:27 +0000
@@ -154,7 +154,7 @@
         return preview;
     }
 
-    async Unity.Preview build_installing_preview (Unity.ScopeResult result, string progress_source) {
+    protected async virtual Unity.Preview build_installing_preview (Unity.ScopeResult result, string progress_source) {
         Unity.Preview preview = yield build_app_preview (result);
 
         // When the progressbar is shown by the preview in the dash no buttons should be shown.
@@ -191,15 +191,23 @@
         }
     }
 
-    async Unity.ActivationResponse? activate_async (Unity.ScopeResult result, Unity.SearchMetadata metadata, string? action_id) {
+    internal virtual string? get_progress_source (string app_id) {
+        return get_download_progress(app_id);
+    }
+
+    internal async Unity.ActivationResponse? activate_async (Unity.ScopeResult result, Unity.SearchMetadata metadata, string? action_id) {
         var app_id = result.metadata.get(METADATA_APP_ID).get_string();
         Unity.Preview preview = null;
         string next_url = null;
 
         try {
-            debug ("action started: %s", action_id);
+            debug ("action started: %s for app_id: %s", action_id, app_id);
             if (action_id == null) {
-                if (uri_is_click_install(result.uri)) {
+                var progress_source = get_progress_source(app_id);
+                debug ("Progress source: %s", progress_source);
+                if (progress_source != null) {
+                    preview = yield build_installing_preview (result, progress_source);
+                } else if (uri_is_click_install(result.uri)) {
                     preview = yield build_uninstalled_preview (result);
                 } else {
                     debug ("Let the dash launch the app: %s", result.uri);

=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2013-12-06 16:00:49 +0000
+++ src/test-click-webservice.vala	2013-12-06 18:32:27 +0000
@@ -261,7 +261,7 @@
                                                    Unity.ResultType.DEFAULT,
                                                    "application/x-desktop",
                                                    "", "", "", metadata);
-        
+
         scope.build_purchasing_preview.begin(fake_result, (obj, res) => {
                 mainloop.quit ();
                 try {
@@ -272,14 +272,65 @@
                                                  new Variant.string("FAKE_APP_ID")));
                     assert(preview_has_action(preview, "purchase_succeeded", "*** purchase_succeeded"));
                     assert(preview_has_action(preview, "purchase_failed", "*** purchase_failed"));
-                    
+
                 } catch (GLib.Error e) {
                     error ("Exception caught building purchasing preview: %s", e.message);
                 }
             });
-        
-        assert (run_with_timeout (mainloop, 10000));
-    }
+
+        assert (run_with_timeout (mainloop, 10000));
+    }
+
+    public static Unity.ScopeResult create_fake_result () {
+        uint fake_category = 0;
+        var fake_result_type = Unity.ResultType.DEFAULT;
+        var fake_metadata = new HashTable<string, Variant> (str_hash, str_equal);
+        fake_metadata.insert(METADATA_APP_ID, new GLib.Variant.string("fake_app_id"));
+        fake_metadata.insert(METADATA_PRICE, new GLib.Variant.string("0"));
+        return Unity.ScopeResult.create("fake_uri", "fake_icon_hint", fake_category,
+                                fake_result_type, "fake_mimetype", "fake_title",
+                                "fake_comment", "fake_dnd_uri", fake_metadata);
+    }
+
+    class FakeClickScope : ClickScope {
+        public bool preview_is_installing = false;
+        protected async override Unity.Preview build_installing_preview (Unity.ScopeResult result, string progress_source) {
+            preview_is_installing = true;
+            var fake_icon = null;
+            var fake_screenshot = null;
+            var preview = new Unity.ApplicationPreview ("fake_title", "fake_subtitle", "fake_description", fake_icon, fake_screenshot);
+            return preview;
+        }
+
+        internal override string? get_progress_source(string app_id) {
+            if (app_id == "fake_app_id") {
+                return "fake_progress_source";
+            }
+            return null;
+        }
+    }
+
+    public static void test_scope_in_progress ()
+    {
+        MainLoop mainloop = new MainLoop ();
+        var scope = new FakeClickScope ();
+        var result = create_fake_result ();
+        var metadata = new Unity.SearchMetadata();
+        string action_id = null;
+
+        assert (!scope.preview_is_installing);
+        scope.activate_async.begin(result, metadata, action_id, (obj, res) => {
+            mainloop.quit ();
+            try {
+                var response = scope.activate_async.end (res);
+            } catch (GLib.Error e) {
+                error ("Failure in activate_async: %s", e.message);
+            }
+        });
+        assert (run_with_timeout (mainloop, 10000));
+        assert (scope.preview_is_installing);
+    }
+
 
     public static int main (string[] args)
     {
@@ -296,6 +347,7 @@
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_GetDotDesktop", test_click_get_dotdesktop);
         Test.add_data_func ("/Unit/ClickChecker/Test_Scope_Build_Purchasing_Preview", 
                             test_scope_build_purchasing_preview);
+        Test.add_data_func ("/Unit/ClickChecker/Test_Scope_InProgress", test_scope_in_progress);
         return Test.run ();
     }
 }