Merge lp:~diegosarmentero/unity-scope-click/fix-progress into lp:unity-scope-click

[Diego Sarmentero]

- Fix to send to unity the real Dbus Name to show progress in the preview.

[Alejandro J. Cura (alecu)]

Code looks good, and it works as expected.

review: Approve

=== modified file 'scope/click/preview.cpp'
--- scope/click/preview.cpp	2014-02-18 23:28:12 +0000
+++ scope/click/preview.cpp	2014-02-19 18:11:52 +0000
@@ -227,7 +227,7 @@
     {
         scopes::PreviewWidget progress("download", "progress");
         scopes::VariantMap tuple;
-        tuple["dbus-name"] = "com.canonical.DownloadManager";
+        tuple["dbus-name"] = "com.canonical.applications.Downloader";
         tuple["dbus-object"] = object_path;
         progress.add_attribute("source", scopes::Variant(tuple));
         widgets.push_back(progress);
@@ -265,6 +265,11 @@
     type(Type::UNINSTALLED)
 {
     qDebug() << "Preview::Preview()";
+    if (result["installed"].get_bool()) {
+        setPreview(Type::INSTALLED);
+    } else {
+        setPreview(Type::UNINSTALLED);
+    }
 }
 
 Preview::~Preview()
@@ -279,12 +284,6 @@
 {
     qDebug() << "Preview::run()";
 
-    if (result["installed"].get_bool()) {
-        setPreview(Type::INSTALLED);
-    } else {
-        setPreview(Type::UNINSTALLED);
-    }
-
     if (result["name"].get_string().empty()) {
         click::PackageDetails details;
         details.title = result.title();

=== modified file 'scope/click/scope.cpp'
--- scope/click/scope.cpp	2014-02-18 12:44:49 +0000
+++ scope/click/scope.cpp	2014-02-19 18:11:52 +0000
@@ -101,7 +101,11 @@
 
     if (metadata.scope_data().which() != scopes::Variant::Type::Null) {
         auto metadict = metadata.scope_data().get_dict();
-        if (metadict.count("action_id") != 0  &&
+        if (metadict.count("download_completed") != 0) {
+            Preview* prev = new Preview(result.uri(), index, result);
+            prev->setPreview(click::Preview::Type::INSTALLED);
+            return scopes::QueryBase::UPtr{prev};
+        } else if (metadict.count("action_id") != 0  &&
             metadict.count("download_url") != 0) {
             action_id = metadict["action_id"].get_string();
             download_url = metadict["download_url"].get_string();
@@ -128,6 +132,9 @@
         activation->setHint("action_id", unity::scopes::Variant(action_id));
         qDebug() << "returning ShowPreview";
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::DOWNLOAD_COMPLETED) {
+        activation->setHint("download_completed", unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     }
     return scopes::ActivationBase::UPtr(activation);
 }