Merge lp:~alecu/unity-scope-click/download-errors into lp:unity-scope-click

[Alejandro J. Cura]

Show download manager failures

[lp:~alecu/unity-scope-click/download-errors]

58. By Alejandro J. Cura on 2013-10-01

merged with trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

+ preview.add_action (new Unity.PreviewAction (ACTION_DOWNLOAD_FAILED, ("*** download_failed"), null));

What the heck? Why are we adding weird buttons like this to the UI?

This is exactly what bug #1231145 is filed about. We should remove such things, not add more of them.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

> + preview.add_action (new Unity.PreviewAction (ACTION_DOWNLOAD_FAILED, ("***
> download_failed"), null));
>
> What the heck? Why are we adding weird buttons like this to the UI?
>
> This is exactly what bug #1231145 is filed about. We should remove such
> things, not add more of them.

PreviewActions are not always buttons.

In the case of this preview, when the the dash finds out that it needs to show a progressbar, it does not show any button, and uses those two special actions (the ones that start with ***) to signal that the download manager has finished or errored out.

It was a bug that the action labeled with "*** ..." was shown as a button, but having the stars there helped uncover it.

[lp:~alecu/unity-scope-click/download-errors]

59. By Alejandro J. Cura on 2013-10-02

Add a comment explaining the sufficiently advanced technique

60. By Alejandro J. Cura on 2013-10-02

merged with trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~alecu/unity-scope-click/download-errors]

61. By Alejandro J. Cura on 2013-10-02

ident 4>>

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-01 22:13:05 +0000
+++ src/click-scope.vala	2013-10-02 16:03:31 +0000
@@ -16,6 +16,7 @@
 
 private const string ACTION_INSTALL_CLICK = "install_click";
 private const string ACTION_DOWNLOAD_COMPLETED = "download_completed";
+private const string ACTION_DOWNLOAD_FAILED = "download_failed";
 private const string ACTION_OPEN_CLICK = "open_click";
 private const string ACTION_PIN_TO_LAUNCHER = "pin_to_launcher";
 private const string ACTION_UNINSTALL_CLICK = "uninstall_click";
@@ -132,7 +133,13 @@
 
     async Unity.Preview build_installing_preview (string app_id, string progress_source) {
         Unity.Preview preview = yield build_app_preview (app_id);
+
+        // When the progressbar is shown by the preview in the dash no buttons should be shown.
+        // The two following actions (marked with ***) are not shown as buttons, but instead are triggered by the dash
+        // when the download manager succeeds or fails with a given download+installation.
         preview.add_action (new Unity.PreviewAction (ACTION_DOWNLOAD_COMPLETED, ("*** download_completed"), null));
+        preview.add_action (new Unity.PreviewAction (ACTION_DOWNLOAD_FAILED, ("*** download_failed"), null));
+
         preview.add_info(new Unity.InfoHint.with_variant("show_progressbar", "Progressbar", null, new Variant.boolean(true)));
         preview.add_info(new Unity.InfoHint.with_variant("progressbar_source", "Progress Source", null, progress_source));
         return preview;
@@ -164,6 +171,10 @@
             } else if (action_id == ACTION_INSTALL_CLICK) {
                 var progress_source = yield install_app(app_id);
                 preview = yield build_installing_preview (app_id, progress_source);
+            } else if (action_id.has_prefix(ACTION_DOWNLOAD_FAILED)) {
+                // we don't have access to the error message in SearchMetadata, LP: #1233836
+                var errormsg = "please check ubuntu-download-manager.log";
+                throw new ClickScopeError.INSTALL_ERROR("Installation failed: %s".printf(errormsg));
             } else if (action_id == ACTION_DOWNLOAD_COMPLETED) {
                 results_invalidated(Unity.SearchType.GLOBAL);
                 results_invalidated(Unity.SearchType.DEFAULT);