Merge lp:~diegosarmentero/unity-scope-click/open-after-install into lp:unity-scope-click

[Diego Sarmentero]

Enable uninstall, fix launching apps right after installation.

[lp:~diegosarmentero/unity-scope-click/open-after-install]

175. By Diego Sarmentero on 2014-02-23

remove commented code for testing

176. By Diego Sarmentero on 2014-02-23

avoid unnecesary repetitions in the loop

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:175
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diegosarmentero/unity-scope-click/open-after-install/+merge/207836/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/244/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:176
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diegosarmentero/unity-scope-click/open-after-install/+merge/207836/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/347/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/245/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~diegosarmentero/unity-scope-click/open-after-install]

177. By Diego Sarmentero on 2014-02-23

using url-dispatch to launch the new apps

178. By Diego Sarmentero on 2014-02-23

fix uninstall process

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:178
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diegosarmentero/unity-scope-click/open-after-install/+merge/207836/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/246
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/246/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~diegosarmentero/unity-scope-click/open-after-install]

179. By Diego Sarmentero on 2014-02-23

using liburl-dispatcher

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~diegosarmentero/unity-scope-click/open-after-install]

180. By Diego Sarmentero on 2014-02-23

typo in uninstall fixed

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-02-18 15:34:14 +0000
+++ debian/control	2014-02-23 22:50:47 +0000
@@ -20,6 +20,7 @@
                libubuntuoneauth-2.0-dev,
                libunity-dev (>= 7.0.0),
                libunity-scopes-dev (>= 0.3.1),
+               liburl-dispatcher1-dev,
                pkg-config,
                python (>= 2.7),
                valac,

=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-02-17 08:45:26 +0000
+++ scope/click/CMakeLists.txt	2014-02-23 22:50:47 +0000
@@ -1,6 +1,7 @@
 SET (CMAKE_INCLUDE_CURRENT_DIR ON)
 SET (CMAKE_AUTOMOC ON)
 find_package (Qt5Core REQUIRED)
+pkg_check_modules(LIBURL_DISPATCHER REQUIRED url-dispatcher-1)
 
 add_library(${SCOPE_LIB_UNVERSIONED} SHARED
   download-manager.cpp
@@ -21,14 +22,17 @@
 configure_file(config.h.in config.h)
 
 include_directories (${CMAKE_BINARY_DIR}/scope)
+include_directories(${LIBURL_DISPATCHER_INCLUDE_DIRS})
+link_directories(${LIBURL_DISPATCHER_LIBRARY_DIRS})
 
-qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network)
+qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network Gui)
 
 target_link_libraries (${SCOPE_LIB_UNVERSIONED}
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+  ${LIBURL_DISPATCHER_LIBRARIES}
 )
 
 install(

=== modified file 'scope/click/index.cpp'
--- scope/click/index.cpp	2014-02-23 22:50:47 +0000
+++ scope/click/index.cpp	2014-02-23 22:50:47 +0000
@@ -75,7 +75,7 @@
 void PackageManager::uninstall(const Package& package,
                                std::function<void(int, std::string)> callback)
 {
-    std::string package_id = package.name + ";" + package.version + ";all;local;click";
+    std::string package_id = package.name + ";" + package.version + ";all;local:click";
     std::string command = "pkcon -p remove " + package_id;
     execute_uninstall_command(command, callback);
 }
@@ -89,7 +89,7 @@
     typedef void(QProcess::*QProcessError)(QProcess::ProcessError);
     QObject::connect(process.data(),
                      static_cast<QProcessFinished>(&QProcess::finished),
-                     [&](int code, QProcess::ExitStatus status) {
+                     [process, callback](int code, QProcess::ExitStatus status) {
                          Q_UNUSED(status);
                          qDebug() << "command finished with exit code:" << code;
                          callback(code, process.data()->readAllStandardError().data());
@@ -99,7 +99,7 @@
                      } );
     QObject::connect(process.data(),
                      static_cast<QProcessError>(&QProcess::error),
-                     [&](QProcess::ProcessError error) {
+                     [process, callback](QProcess::ProcessError error) {
                          qCritical() << "error running command:" << error;
                          callback(-255 + error, process.data()->readAllStandardError().data());
                      } );

=== modified file 'scope/click/interface.cpp'
--- scope/click/interface.cpp	2014-02-23 22:50:47 +0000
+++ scope/click/interface.cpp	2014-02-23 22:50:47 +0000
@@ -29,6 +29,7 @@
 
 #include <QDebug>
 #include <QDir>
+#include <QProcess>
 #include <QStandardPaths>
 #include <QTimer>
 
@@ -36,6 +37,11 @@
 #include <sys/stat.h>
 #include <map>
 
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/exceptions.hpp>
+#include <boost/foreach.hpp>
+
 #include <unity/UnityExceptions.h>
 #include <unity/util/IniParser.h>
 
@@ -231,4 +237,102 @@
     }
 }
 
+
+ManifestList manifest_list_from_json(const std::string& json)
+{
+    using namespace boost::property_tree;
+
+    std::istringstream is(json);
+
+    ptree pt;
+    read_json(is, pt);
+
+    ManifestList manifests;
+
+    BOOST_FOREACH(ptree::value_type &v, pt)
+    {
+        assert(v.first.empty()); // array elements have no names
+        auto node = v.second;
+        std::string name = node.get<std::string>("name");
+        std::string version = node.get<std::string>("version");
+        std::string first_app_name;
+
+        BOOST_FOREACH(ptree::value_type &sv, node.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();
+
+        manifests.push_back(Manifest(name, version, first_app_name));
+    }
+
+    return manifests;
+}
+
+void Interface::get_manifests(std::function<void(ManifestList, 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();
+                             ManifestList manifests = manifest_list_from_json(data);
+                             qDebug() << "calling back ";
+                             callback(manifests, ManifestError::NoError);
+                         }
+                         catch ( ... ) {
+                             callback(ManifestList(), ManifestError::ParseError);
+                         }
+                     } );
+
+    QObject::connect(process.data(),
+                     static_cast<QProcessError>(&QProcess::error),
+                     [callback, process](QProcess::ProcessError error) {
+                         qCritical() << "error running command:" << error;
+                         callback(ManifestList(), ManifestError::CallError);
+                     } );
+
+    std::string command = "click list --manifest";
+    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) {
+        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;
+            std::string ddstr = manifest.name + "_" + manifest.first_app_name + "_" + manifest.version + ".desktop";
+            callback(ddstr, ManifestError::NoError);
+            break;
+        }
+        if (!found) {
+            qCritical() << "Warning: no manifest found for " << app_id.c_str();
+            callback(std::string("Not found"), ManifestError::CallError);
+        }
+    });
+}
+
+
+
+
 } // namespace click

=== modified file 'scope/click/interface.h'
--- scope/click/interface.h	2014-02-17 19:12:56 +0000
+++ scope/click/interface.h	2014-02-23 22:50:47 +0000
@@ -46,6 +46,25 @@
 // Hash map of desktop files that are not yet click packages
 const std::unordered_set<std::string>& nonClickDesktopFiles();
 
+struct Manifest
+{
+    Manifest() = default;
+    Manifest(std::string name, std::string version, std::string first_app_name) :
+        name(name), version(version), first_app_name(first_app_name)
+    {
+    }
+    virtual ~Manifest() = default;
+
+    std::string name;
+    std::string version;
+    std::string first_app_name;
+};
+
+enum class ManifestError {NoError, CallError, ParseError};
+typedef std::list<Manifest> ManifestList;
+
+ManifestList manifest_list_from_json(const std::string& json);
+
 class Interface
 {
 public:
@@ -61,6 +80,9 @@
 
     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_dotdesktop_filename(const std::string &app_id,
+                                        std::function<void(std::string filename, ManifestError)> callback);
 private:
     QSharedPointer<KeyFileLocator> keyFileLocator;
 };

=== modified file 'scope/click/scope.cpp'
--- scope/click/scope.cpp	2014-02-23 22:50:47 +0000
+++ scope/click/scope.cpp	2014-02-23 22:50:47 +0000
@@ -33,8 +33,22 @@
 #include "preview.h"
 #include "webclient.h"
 #include "network_access_manager.h"
+#include "key_file_locator.h"
+#include "interface.h"
 
 #include <QSharedPointer>
+#include <url-dispatcher.h>
+
+namespace
+{
+click::Interface& clickInterfaceInstance()
+{
+    static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
+    static click::Interface iface(keyFileLocator);
+
+    return iface;
+}
+}
 
 class ScopeActivation : public unity::scopes::ActivationBase
 {
@@ -105,7 +119,7 @@
         if(metadict.count(click::Preview::Actions::DOWNLOAD_FAILED) != 0) {
             return scopes::QueryBase::UPtr{new ErrorPreview(std::string("Download or install failed. Please try again."),
                                                             index, result)};
-        } else if (metadict.count(click::Preview::Actions::DOWNLOAD_COMPLETED) != 0  &&
+        } else if (metadict.count(click::Preview::Actions::DOWNLOAD_COMPLETED) != 0  ||
                    metadict.count(click::Preview::Actions::CLOSE_PREVIEW) != 0) {
             Preview* prev = new Preview(result.uri(), index, result);
             prev->setPreview(click::Preview::Type::INSTALLED);
@@ -131,13 +145,29 @@
     return previewResult;
 }
 
-unity::scopes::ActivationBase::UPtr click::Scope::perform_action(unity::scopes::Result const& /*result*/, unity::scopes::ActionMetadata const& metadata, std::string const& /* widget_id */, std::string const& action_id)
+unity::scopes::ActivationBase::UPtr click::Scope::perform_action(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata, std::string const& /* widget_id */, std::string const& action_id)
 {
     auto activation = new ScopeActivation();
     qDebug() << "perform_action called with action_id" << QString().fromStdString(action_id);
 
     if (action_id == click::Preview::Actions::OPEN_CLICK) {
-        activation->setStatus(unity::scopes::ActivationResponse::Status::NotHandled);
+        QString app_url = QString::fromStdString(result.uri());
+        if (!app_url.startsWith("application:///")) {
+            qt::core::world::enter_with_task([this, result] (qt::core::world::Environment& /*env*/)
+            {
+                clickInterfaceInstance().get_dotdesktop_filename(result["name"].get_string(),
+                     [] (std::string val, click::ManifestError error){
+                         if (error == click::ManifestError::NoError) {
+                             std::string uri = "application:///" + val;
+                             url_dispatch_send(uri.c_str() , NULL, NULL);
+                         }
+                     }
+                );
+            });
+            activation->setStatus(unity::scopes::ActivationResponse::Status::HideDash);
+        } else {
+            activation->setStatus(unity::scopes::ActivationResponse::Status::NotHandled);
+        }
     } else if (action_id == click::Preview::Actions::INSTALL_CLICK) {
         std::string download_url = metadata.scope_data().get_dict()["download_url"].get_string();
         qDebug() << "the download url is: " << QString::fromStdString(download_url);
@@ -149,7 +179,6 @@
     } else if (action_id == click::Preview::Actions::DOWNLOAD_FAILED) {
         activation->setHint(click::Preview::Actions::DOWNLOAD_FAILED, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-
     } else if (action_id == click::Preview::Actions::DOWNLOAD_COMPLETED) {
         activation->setHint(click::Preview::Actions::DOWNLOAD_COMPLETED, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-02-17 08:45:26 +0000
+++ scope/tests/CMakeLists.txt	2014-02-23 22:50:47 +0000
@@ -58,3 +58,4 @@
 
 add_subdirectory(integration)
 add_subdirectory(download_manager_tool)
+add_subdirectory(click_interface_tool)
\ No newline at end of file

=== added directory 'scope/tests/click_interface_tool'
=== added file 'scope/tests/click_interface_tool/CMakeLists.txt'
--- scope/tests/click_interface_tool/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scope/tests/click_interface_tool/CMakeLists.txt	2014-02-23 22:50:47 +0000
@@ -0,0 +1,14 @@
+set(CLICK_INTERFACE_TOOL_TARGET click_interface_tool)
+
+include_directories (
+  ${CMAKE_SOURCE_DIR}/scope/click
+  ${CMAKE_BINARY_DIR}/scope/click
+)
+
+add_executable (${CLICK_INTERFACE_TOOL_TARGET}
+  click_interface_tool.cpp
+)
+
+target_link_libraries (${CLICK_INTERFACE_TOOL_TARGET}
+  ${SCOPE_LIB_UNVERSIONED}
+)

=== added file 'scope/tests/click_interface_tool/click_interface_tool.cpp'
--- scope/tests/click_interface_tool/click_interface_tool.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/click_interface_tool/click_interface_tool.cpp	2014-02-23 22:50:47 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QString>
+#include <QTimer>
+#include <QTextStream>
+
+#include <iostream>
+
+#include <interface.h>
+#include <key_file_locator.h>
+
+int main(int argc, char *argv[])
+{
+
+    QCoreApplication a(argc, argv);
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
+    click::Interface ci(keyFileLocator);
+
+
+    QTimer timer;
+    timer.setSingleShot(true);
+
+    QObject::connect(&timer, &QTimer::timeout, [&]() {
+            ci.get_dotdesktop_filename(std::string(argv[1]),
+                                       [&a] (std::string val, click::ManifestError error){
+                                           if (error == click::ManifestError::NoError) {
+                                               std::cout << " Success, got dotdesktop:" << val << std::endl;
+                                           } else {
+                                               std::cout << " Error:" << val << std::endl;
+                                           }
+                                           a.quit();
+                                       });
+        } );
+    
+    timer.start(0);
+        
+    qInstallMessageHandler(0);
+    return a.exec();
+}
+

=== modified file 'scope/tests/test_index.cpp'
--- scope/tests/test_index.cpp	2014-02-23 22:50:47 +0000
+++ scope/tests/test_index.cpp	2014-02-23 22:50:47 +0000
@@ -283,7 +283,7 @@
         "/tmp/foo.png",
         "", "0.1.5"
     };
-    std::string expected = "pkcon -p remove org.example.testapp;0.1.5;all;local;click";
+    std::string expected = "pkcon -p remove org.example.testapp;0.1.5;all;local:click";
     EXPECT_CALL(*this, execute_uninstall_command(expected, _)).Times(1);
     uninstall(package, [](int, std::string) {});
 }