Merge lp:~diegosarmentero/unity-scope-click/improve-manifest-and-accounts into lp:unity-scope-click

[Diego Sarmentero]

- Open Accounts on the proper action, and Obtain the manifest of the proper app_id

This branch opens Accounts for No Credentials, and only parse the manifest of the app_id requested, doesn't get the list of the manifest for all the installed apps and parse that.

[lp:~diegosarmentero/unity-scope-click/improve-manifest-and-accounts]

182. By Diego Sarmentero on 2014-02-24

remove commented code

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:182
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/251
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/251/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'scope/click/interface.cpp'
--- scope/click/interface.cpp	2014-02-24 14:10:31 +0000
+++ scope/click/interface.cpp	2014-02-24 14:10:31 +0000
@@ -272,6 +272,33 @@
     return manifests;
 }
 
+Manifest manifest_from_json(const std::string& json)
+{
+    using namespace boost::property_tree;
+
+    std::istringstream is(json);
+
+    ptree pt;
+    read_json(is, pt);
+
+    std::string name = pt.get<std::string>("name");
+    std::string version = pt.get<std::string>("version");
+    std::string first_app_name;
+
+    BOOST_FOREACH(ptree::value_type &sv, pt.get_child("hooks"))
+    {
+        // FIXME: "primary app" for a package is not defined, we just
+        // use first one here:
+        first_app_name = sv.first;
+        break;
+    }
+    qDebug() << "adding manifest: " << name.c_str() << version.c_str() << first_app_name.c_str();
+
+    Manifest manifest(name, version, first_app_name);
+
+    return manifest;
+}
+
 void Interface::get_manifests(std::function<void(ManifestList, ManifestError)> callback)
 {
     QSharedPointer<QProcess> process(new QProcess());
@@ -304,28 +331,55 @@
     process->start(command.c_str());
 }
 
+void Interface::get_manifest_for_app(const std::string &app_id,
+                                     std::function<void(Manifest, ManifestError)> callback)
+{
+    QSharedPointer<QProcess> process(new QProcess());
+    typedef void(QProcess::*QProcessFinished)(int, QProcess::ExitStatus);
+    typedef void(QProcess::*QProcessError)(QProcess::ProcessError);
+    QObject::connect(process.data(),
+                     static_cast<QProcessFinished>(&QProcess::finished),
+                     [callback, process](int code, QProcess::ExitStatus /*status*/) {
+                         qDebug() << "manifest command finished with exit code:" << code;
+                         try {
+                             auto data = process.data()->readAllStandardOutput().data();
+                             Manifest manifest = manifest_from_json(data);
+                             qDebug() << "calling back ";
+                             callback(manifest, ManifestError::NoError);
+                         }
+                         catch ( ... ) {
+                             callback(Manifest(), ManifestError::ParseError);
+                         }
+                     } );
+
+    QObject::connect(process.data(),
+                     static_cast<QProcessError>(&QProcess::error),
+                     [callback, process](QProcess::ProcessError error) {
+                         qCritical() << "error running command:" << error;
+                         callback(Manifest(), ManifestError::CallError);
+                     } );
+
+    std::string command = "click info " + app_id;
+    qDebug() << "Running command:" << command.c_str();
+    process->start(command.c_str());
+}
+
 void Interface::get_dotdesktop_filename(const std::string &app_id,
                                         std::function<void(std::string, ManifestError)> callback)
 {
-    get_manifests([app_id, callback] (ManifestList manifests, ManifestError error) {
+    get_manifest_for_app(app_id, [app_id, callback] (Manifest manifest, ManifestError error) {
         qDebug() << "in get_dotdesktop_filename callback";
 
         if (error != ManifestError::NoError){
             callback(std::string("Internal Error"), error);
             return;
         }
-        bool found = false;
         qDebug() << "in get_dotdesktop_filename callback";
 
-
-        for (auto manifest : manifests) {
-            if (manifest.name != app_id) continue;
-            found = true;
+        if (!manifest.name.empty()) {
             std::string ddstr = manifest.name + "_" + manifest.first_app_name + "_" + manifest.version + ".desktop";
             callback(ddstr, ManifestError::NoError);
-            break;
-        }
-        if (!found) {
+        } else {
             qCritical() << "Warning: no manifest found for " << app_id.c_str();
             callback(std::string("Not found"), ManifestError::CallError);
         }

=== modified file 'scope/click/interface.h'
--- scope/click/interface.h	2014-02-24 14:10:31 +0000
+++ scope/click/interface.h	2014-02-24 14:10:31 +0000
@@ -64,6 +64,7 @@
 typedef std::list<Manifest> ManifestList;
 
 ManifestList manifest_list_from_json(const std::string& json);
+Manifest manifest_from_json(const std::string& json);
 
 class Interface
 {
@@ -81,6 +82,7 @@
     static bool is_icon_identifier(const std::string &icon_id);
     static std::string add_theme_scheme(const std::string &filename);
     static void get_manifests(std::function<void(ManifestList, ManifestError)> callback);
+    static void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, ManifestError)> callback);
     static void get_dotdesktop_filename(const std::string &app_id,
                                         std::function<void(std::string filename, ManifestError)> callback);
 private:

=== modified file 'scope/click/scope.cpp'
--- scope/click/scope.cpp	2014-02-24 14:10:31 +0000
+++ scope/click/scope.cpp	2014-02-24 14:10:31 +0000
@@ -191,6 +191,9 @@
     } else if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
         activation->setHint(click::Preview::Actions::CONFIRM_UNINSTALL, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::OPEN_ACCOUNTS) {
+        std::string uri = "settings:///system/online-accounts";
+        url_dispatch_send(uri.c_str() , NULL, NULL);
     }
     return scopes::ActivationBase::UPtr(activation);
 }