Merge lp:~alecu/unity-scope-click/launcher-integration into lp:unity-scope-click/devel

[Alejandro J. Cura]

Send the dbus signals to the launcher, when a download is started and when it's completed.

To test this branch irl: start scope/tests/fake_launcher/fake_launcher on a terminal. Then, try installing an app, and watch the fake_launcher debug log for the dbus calls when starting the download, for progress 0-80% and when a download is completed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:295
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/94
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/93/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/93

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/launcher-integration]

296. By Alejandro J. Cura on 2014-06-18

Call installationStarted from the scope; use package_name instead of download_id

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:296
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/96

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/launcher-integration]

297. By Alejandro J. Cura on 2014-06-19

a skeleton for install_helper

298. By Alejandro J. Cura on 2014-06-19

merged with /devel

299. By Alejandro J. Cura on 2014-06-19

merged from /devel

300. By Alejandro J. Cura on 2014-06-19

remove skeleton of the install-helper

301. By Alejandro J. Cura on 2014-06-19

The install helper

302. By Alejandro J. Cura on 2014-06-19

Typo in helper

303. By Alejandro J. Cura on 2014-06-19

Use the install-helper instead of the hacky commandline

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/106

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/107

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/launcher-integration]

304. By Alejandro J. Cura on 2014-06-19

Use CMake to install and find the install-helper

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/108/console

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/launcher-integration]

305. By Alejandro J. Cura on 2014-06-20

Install the helper in the proper directory

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:305
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/135/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/109

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/launcher-integration]

306. By Alejandro J. Cura on 2014-06-20

Pass the right commandline, and return the proper errors

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:306
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/~alecu/unity-scope-click/launcher-integration/+merge/223461/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/110

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/launcher-integration]

307. By Alejandro J. Cura on 2014-06-20

Fix the dbus command line to refresh the launcher

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:307
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/111

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

review: Approve (continuous-integration)

[dobey (dobey)]

A few small issues. I'll let the lack of unit tests mocking the new dbus calls slide for now, as the fake_launcher is added as well. I also don't like having the generated code, and dbus XML (especially when the scope is the client, not the service) here, but I don't guess there is much we can do about that for the time being. We'll likely need to migrate away from using QDbus here though, and use dbus-cpp in the future. There's no particular need for us to use QDbus here AFAICT, as we're just the client, and not a service trying to provide magic introspected paths.

review: Needs Fixing

[lp:~alecu/unity-scope-click/launcher-integration]

308. By Alejandro J. Cura on 2014-06-20

Fixes requested on review

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/112

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-16 12:40:06 +0000
+++ CMakeLists.txt	2014-06-20 20:01:57 +0000
@@ -49,6 +49,7 @@
 
 # Add our own subdirectories.
 add_subdirectory(autopilot)
+add_subdirectory(bin)
 add_subdirectory(libclickscope)
 add_subdirectory(scope)
 add_subdirectory(data)

=== added directory 'bin'
=== added file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ bin/CMakeLists.txt	2014-06-20 20:01:57 +0000
@@ -0,0 +1,1 @@
+install(PROGRAMS install-helper DESTINATION lib/unity-scope-click/)

=== added file 'bin/install-helper'
--- bin/install-helper	1970-01-01 00:00:00 +0000
+++ bin/install-helper	2014-06-20 20:01:57 +0000
@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# 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.
+#
+
+FILE_NAME="$1"
+PACKAGE_NAME="$2"
+
+SCOPES_OBJECTPATH=/com/canonical/unity/scopes
+SCOPES_INTERFACE=com.canonical.unity.scopes
+SCOPES_METHOD=InvalidateResults
+
+LAUNCHER_BUS=com.ubuntu.unity.launcher
+LAUNCHER_OBJECTPATH=/com/ubuntu/unity/launcher/installations
+LAUNCHER_INTERFACE=com.ubuntu.unity.launcher.Installations
+LAUNCHER_METHOD=completeInstallation
+
+function invalidate-scope {
+    SCOPE_ID=$1
+    dbus-send $SCOPES_OBJECTPATH $SCOPES_INTERFACE.$SCOPES_METHOD string:$SCOPE_ID
+}
+
+function install-package {
+    FILE_NAME="$1"
+    pkcon -p install-local "$FILE_NAME"
+}
+
+function app_id-from-package_name {
+    PACKAGE_NAME=$1
+    IFS=_
+    TRIPLET=($(ubuntu-app-triplet $PACKAGE_NAME))
+    unset IFS
+    echo ${TRIPLET[0]}_${TRIPLET[1]}_current-user-version
+}
+
+function complete-installation {
+    PACKAGE_NAME=$1
+    APP_ID=$2
+    dbus-send --dest=$LAUNCHER_BUS --type=method_call $LAUNCHER_OBJECTPATH $LAUNCHER_INTERFACE.$LAUNCHER_METHOD string:$PACKAGE_NAME string:$APP_ID
+}
+
+if install-package "$FILE_NAME" ; then
+    invalidate-scope clickscope
+    invalidate-scope com.canonical.scopes.clickstore
+    APP_ID=$(app_id-from-package_name $PACKAGE_NAME)
+    complete-installation $PACKAGE_NAME $APP_ID
+else
+    PKCON_STATUS=$?
+    NO_APP_ID=""
+    complete-installation $PACKAGE_NAME $NO_APP_ID
+    exit $PKCON_STATUS
+fi

=== modified file 'debian/control'
--- debian/control	2014-06-18 12:32:49 +0000
+++ debian/control	2014-06-20 20:01:57 +0000
@@ -26,6 +26,7 @@
 Architecture: armhf i386 amd64
 Depends: account-plugin-ubuntuone,
          packagekit-tools,
+         ubuntu-app-launch-tools,
          ubuntu-download-manager,
          ubuntu-sdk-libs,
          ${misc:Depends},

=== modified file 'debian/unity-scope-click.install'
--- debian/unity-scope-click.install	2014-05-06 21:28:13 +0000
+++ debian/unity-scope-click.install	2014-06-20 20:01:57 +0000
@@ -1,3 +1,4 @@
 usr/lib/*/unity-scopes/*
+usr/lib/unity-scope-click/*
 usr/share/unity/scopes/*
-usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo
\ No newline at end of file
+usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-06-13 15:21:16 +0000
+++ libclickscope/click/CMakeLists.txt	2014-06-20 20:01:57 +0000
@@ -6,6 +6,7 @@
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
   -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\"
+  -DCLICK_INSTALL_HELPER=\"${CMAKE_INSTALL_PREFIX}/lib/unity-scope-click/install-helper\"
 )
 
 add_library(${SCOPE_LIB_NAME} STATIC
@@ -14,6 +15,7 @@
   index.cpp
   interface.cpp
   key_file_locator.cpp
+  launcher.cpp
   network_access_manager.cpp
   package.cpp
   preview.cpp

=== added file 'libclickscope/click/dbus_constants.h'
--- libclickscope/click/dbus_constants.h	1970-01-01 00:00:00 +0000
+++ libclickscope/click/dbus_constants.h	2014-06-20 20:01:57 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+#ifndef DBUS_CONSTANTS_H
+#define DBUS_CONSTANTS_H
+
+#define LAUNCHER_BUSNAME "com.ubuntu.unity.launcher"
+#define LAUNCHER_OBJECT_PATH "/com/ubuntu/unity/launcher/installations"
+#define LAUNCHER_INTERFACE "com.ubuntu.unity.launcher.Installations"
+
+#endif // DBUS_CONSTANTS_H

=== modified file 'libclickscope/click/download-manager.cpp'
--- libclickscope/click/download-manager.cpp	2014-05-26 14:02:45 +0000
+++ libclickscope/click/download-manager.cpp	2014-06-20 20:01:57 +0000
@@ -52,19 +52,7 @@
 static const QString DOWNLOAD_APP_ID_KEY = "app_id";
 static const QString DOWNLOAD_COMMAND_KEY = "post-download-command";
 
-// Pass two commands using sh -c because UDM expects a single
-// executable.
-// Use a single string for both commands because the
-// list is eventually given to QProcess, which adds quotes around each
-// argument, while -c expects a single quoted string.
-// Then, use the $0 positional variable in the pkcon command to let us
-// pass "$file" as a separate list element, which UDM requires for
-// substitution.
-
-static const QString DOWNLOAD_COMMAND = QStringLiteral("pkcon -p install-local ") % click::QUOTED_ARG0 % QStringLiteral(" && ") % click::DBUSSEND_COMMAND;
-static const QVariant DOWNLOAD_CMDLINE = QVariant(QStringList()
-                                                  << "/bin/sh" << "-c" <<
-                                                  DOWNLOAD_COMMAND << "$file");
+static const QString DOWNLOAD_COMMAND = CLICK_INSTALL_HELPER;
 
 static const QString DOWNLOAD_MANAGER_DO_NOT_HASH = "";
 static const QString DOWNLOAD_MANAGER_IGNORE_HASH_ALGORITHM = "";
@@ -90,7 +78,7 @@
     QSharedPointer<udm::Manager> systemDownloadManager;
     QSharedPointer<click::network::Reply> reply;
     QString downloadUrl;
-    QString appId;
+    QString package_name;
 };
 
 const QByteArray& click::CLICK_TOKEN_HEADER()
@@ -133,9 +121,9 @@
 click::DownloadManager::~DownloadManager(){
 }
 
-void click::DownloadManager::startDownload(const QString& downloadUrl, const QString& appId)
+void click::DownloadManager::startDownload(const QString& downloadUrl, const QString& package_name)
 {
-    impl->appId = appId;
+    impl->package_name = package_name;
 
     // NOTE: using SIGNAL/SLOT macros here because new-style
     // connections are flaky on ARM.
@@ -151,8 +139,11 @@
 void click::DownloadManager::handleClickTokenFetched(const QString& clickToken)
 {
     QVariantMap metadata;
-    metadata[DOWNLOAD_COMMAND_KEY] = DOWNLOAD_CMDLINE;
-    metadata[DOWNLOAD_APP_ID_KEY] = impl->appId;
+
+    QVariant commandline = QVariant(QStringList() << DOWNLOAD_COMMAND << "$file" << impl->package_name);
+    metadata[DOWNLOAD_COMMAND_KEY] = commandline;
+    metadata[DOWNLOAD_APP_ID_KEY] = impl->package_name;
+    metadata["package_name"] = impl->package_name;
 
     QMap<QString, QString> headers;
     headers[CLICK_TOKEN_HEADER()] = clickToken;

=== modified file 'libclickscope/click/download-manager.h'
--- libclickscope/click/download-manager.h	2014-05-26 14:02:45 +0000
+++ libclickscope/click/download-manager.h	2014-06-20 20:01:57 +0000
@@ -49,7 +49,6 @@
 
 namespace click
 {
-static const QString QUOTED_ARG0 = QStringLiteral("\"$0\"");
 // The dbus-send command to refresh the search results in the dash.
 static const QString DBUSSEND_COMMAND = QStringLiteral("dbus-send /com/canonical/unity/scopes com.canonical.unity.scopes.InvalidateResults string:clickscope");
 
@@ -67,7 +66,7 @@
     virtual ~DownloadManager();
 
 public slots:
-    virtual void startDownload(const QString& downloadUrl, const QString& appId);
+    virtual void startDownload(const QString& downloadUrl, const QString& package_name);
     virtual void fetchClickToken(const QString& downloadUrl);
 
 signals:

=== added file 'libclickscope/click/launcher.cpp'
--- libclickscope/click/launcher.cpp	1970-01-01 00:00:00 +0000
+++ libclickscope/click/launcher.cpp	2014-06-20 20:01:57 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp launcher.xml -p launcher -c Launcher -N
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "launcher.h"
+
+/*
+ * Implementation of interface class Launcher
+ */
+
+Launcher::Launcher(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+Launcher::~Launcher()
+{
+}
+

=== added file 'libclickscope/click/launcher.h'
--- libclickscope/click/launcher.h	1970-01-01 00:00:00 +0000
+++ libclickscope/click/launcher.h	2014-06-20 20:01:57 +0000
@@ -0,0 +1,56 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp launcher.xml -p launcher -c Launcher -N
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef LAUNCHER_H_1403062747
+#define LAUNCHER_H_1403062747
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface com.ubuntu.unity.launcher.Installations
+ */
+class Launcher: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "com.ubuntu.unity.launcher.Installations"; }
+
+public:
+    Launcher(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~Launcher();
+
+public Q_SLOTS: // METHODS
+    inline Q_NOREPLY void completeInstallation(const QString &package_name, const QString &app_id)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(package_name) << QVariant::fromValue(app_id);
+        callWithArgumentList(QDBus::NoBlock, QLatin1String("completeInstallation"), argumentList);
+    }
+
+    inline Q_NOREPLY void startInstallation(const QString &title, const QString &icon_url, const QString &package_name)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(title) << QVariant::fromValue(icon_url) << QVariant::fromValue(package_name);
+        callWithArgumentList(QDBus::NoBlock, QLatin1String("startInstallation"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
+#endif

=== added file 'libclickscope/click/launcher.xml'
--- libclickscope/click/launcher.xml	1970-01-01 00:00:00 +0000
+++ libclickscope/click/launcher.xml	2014-06-20 20:01:57 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="com.ubuntu.unity.launcher.Installations">
+    <method name="startInstallation">
+      <arg name="title" type="s" direction="in"/>
+      <arg name="icon_url" type="s" direction="in"/>
+      <arg name="package_name" type="s" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="completeInstallation">
+      <arg name="package_name" type="s" direction="in"/>
+      <arg name="app_id" type="s" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+  </interface>
+</node>

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-06-19 16:55:02 +0000
+++ libclickscope/click/preview.cpp	2014-06-20 20:01:57 +0000
@@ -32,6 +32,8 @@
 #include "preview.h"
 #include <click/qtbridge.h>
 #include <click/download-manager.h>
+#include <click/launcher.h>
+#include <click/dbus_constants.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
@@ -354,6 +356,15 @@
 {
 }
 
+void InstallingPreview::startLauncherAnimation(const PackageDetails &details)
+{
+    Launcher l(LAUNCHER_BUSNAME, LAUNCHER_OBJECT_PATH, QDBusConnection::sessionBus());
+    l.startInstallation(QString::fromStdString(details.package.title),
+                        QString::fromStdString(details.package.icon_url),
+                        QString::fromStdString(details.package.name));
+
+}
+
 void InstallingPreview::run(const unity::scopes::PreviewReplyProxy &reply)
 {
     downloader->startDownload(download_url, result["name"].get_string(),
@@ -370,11 +381,13 @@
                   reply->push(downloadErrorWidgets());
                   return;
               default:
+                  std::string object_path = rc.first;
                   qDebug() << "Successfully created UDM Download.";
-                  populateDetails([this, reply, rc](const PackageDetails &details){
+                  populateDetails([this, reply, object_path](const PackageDetails &details){
                           reply->push(headerWidgets(details));
-                          reply->push(progressBarWidget(rc.first));
+                          reply->push(progressBarWidget(object_path));
                           reply->push(descriptionWidgets(details));
+                          startLauncherAnimation(details);
                       },
                       [this, reply](const ReviewList& reviewlist,
                                     click::Reviews::Error error) {

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-06-12 21:05:25 +0000
+++ libclickscope/click/preview.h	2014-06-20 20:01:57 +0000
@@ -150,7 +150,7 @@
     virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
     std::string download_url;
     QSharedPointer<click::Downloader> downloader;
-
+    void startLauncherAnimation(const PackageDetails& details);
 };
 
 class InstalledPreview : public PreviewStrategy

=== modified file 'libclickscope/tests/test_download_manager.cpp'
--- libclickscope/tests/test_download_manager.cpp	2014-05-26 14:27:31 +0000
+++ libclickscope/tests/test_download_manager.cpp	2014-06-20 20:01:57 +0000
@@ -482,29 +482,3 @@
                             StartDownloadTestParameters(true, false, false),
                             StartDownloadTestParameters(false, true, false)
                             ));
-
-class ArgZeroTest : public ::testing::TestWithParam<QString> {};
-
-TEST_P(ArgZeroTest, testArgZero)
-{
-    auto expected_arg = GetParam();
-    auto fake_command = "for n in " % click::QUOTED_ARG0 % "; do echo $n; done";
-    QStringList arguments;
-    arguments << "-c" << fake_command << expected_arg;
-
-    QProcess sh;
-    sh.start("/bin/sh", arguments);
-
-    EXPECT_TRUE(sh.waitForStarted());
-    sh.closeWriteChannel();
-
-    EXPECT_TRUE(sh.waitForFinished());
-    QByteArray result = sh.readAll().trimmed();
-    EXPECT_EQ(sh.exitCode(), 0);
-
-    ASSERT_EQ(expected_arg, QString(result));
-}
-
-INSTANTIATE_TEST_CASE_P(TestSampleFilenames,
-                        ArgZeroTest,
-                        ::testing::Values("sample_filename.click", "spaced_filename (1).click"));

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-05-26 15:56:40 +0000
+++ scope/tests/CMakeLists.txt	2014-06-20 20:01:57 +0000
@@ -59,3 +59,4 @@
 add_subdirectory(integration)
 add_subdirectory(download_manager_tool)
 add_subdirectory(click_interface_tool)
+add_subdirectory(fake_launcher)

=== added directory 'scope/tests/fake_launcher'
=== added file 'scope/tests/fake_launcher/CMakeLists.txt'
--- scope/tests/fake_launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scope/tests/fake_launcher/CMakeLists.txt	2014-06-20 20:01:57 +0000
@@ -0,0 +1,14 @@
+set(FAKE_LAUNCHER_TARGET fake_launcher)
+
+include_directories (
+  ${CMAKE_SOURCE_DIR}/scope/click
+)
+
+add_executable (${FAKE_LAUNCHER_TARGET}
+  fake_launcher.cpp
+  fake_launcher.h
+)
+
+target_link_libraries (${FAKE_LAUNCHER_TARGET}
+  ${STORE_LIB_UNVERSIONED}
+)

=== added file 'scope/tests/fake_launcher/fake_launcher.cpp'
--- scope/tests/fake_launcher/fake_launcher.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/fake_launcher/fake_launcher.cpp	2014-06-20 20:01:57 +0000
@@ -0,0 +1,118 @@
+/*
+ * 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 <ubuntu/download_manager/download.h>
+#include <ubuntu/download_manager/downloads_list.h>
+#include <ubuntu/download_manager/error.h>
+
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDebug>
+#include <QString>
+#include <QTimer>
+#include <QTextStream>
+
+#include <iostream>
+
+#include <boost/optional.hpp>
+
+#include <fake_launcher.h>
+
+void FakeLauncher::startInstallation(QString title, QString icon_url, QString package_name)
+{
+    qDebug() << "startInstallation" << title << icon_url << package_name;
+    installations.insert(package_name, new FakeIcon(title, icon_url, this));
+    manager->getAllDownloadsWithMetadata("package_name", package_name);
+}
+
+void FakeLauncher::handleDownloadsFound(const QString& key, const QString& value, DownloadsList *download_list)
+{
+    Q_UNUSED(key)
+    Q_UNUSED(value)
+    foreach (const QSharedPointer<Download> download, download_list->downloads()) {
+        QString package_name{download->metadata()["package_name"].toString()};
+        qDebug() << "download found for" << package_name;
+        installations[package_name]->downloadFound(*download);
+    }
+}
+
+void FakeLauncher::completeInstallation(QString package_name, QString app_id)
+{
+    qDebug() << "completeInstallation" << package_name << app_id;
+    installations[package_name]->complete(app_id);
+}
+
+void FakeIcon::downloadFound(Download& download)
+{
+    connect(&download, SIGNAL(progress(qulonglong,qulonglong)), this, SLOT(handleProgress(qulonglong,qulonglong)));
+    connect(&download, SIGNAL(error(Error*)), this, SLOT(handleDownloadError(Error*)));
+    qDebug() << title << "starting installation";
+    // TODO: add icon to the launcher
+}
+
+void FakeIcon::handleProgress(qulonglong transferred, qulonglong total)
+{
+    qDebug() << title << "download progress" << double(transferred)/total*80;
+    // TODO: update progress bar
+}
+
+void FakeIcon::handleDownloadError(Error *error)
+{
+    failure(error->errorString());
+}
+
+void FakeIcon::failure(QString message)
+{
+    qDebug() << title << "installation failed" << message;
+    // TODO: remove icon from the launcher
+}
+
+void FakeIcon::complete(QString app_id)
+{
+    if (app_id.isEmpty()) {
+        failure("Failed to install");
+    } else {
+        qDebug() << title << "installation completed" << app_id;
+        // TODO: update icon with proper app_id
+    }
+}
+
+int main(int argc, char *argv[])
+{
+
+    QCoreApplication app(argc, argv);
+    FakeLauncher launcher;
+    new FakeLauncherAdaptor(&launcher);
+    qDebug() << "starting";
+    auto bus = QDBusConnection::sessionBus();
+    bus.registerObject(LAUNCHER_OBJECT_PATH, &launcher);
+    bus.registerService(LAUNCHER_BUSNAME);
+    return app.exec();
+}
+

=== added file 'scope/tests/fake_launcher/fake_launcher.h'
--- scope/tests/fake_launcher/fake_launcher.h	1970-01-01 00:00:00 +0000
+++ scope/tests/fake_launcher/fake_launcher.h	2014-06-20 20:01:57 +0000
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+#ifndef _FAKE_LAUNCHER_H_
+#define _FAKE_LAUNCHER_H_
+
+#include <QObject>
+#include <QDBusObjectPath>
+#include <QDBusAbstractAdaptor>
+
+#include <click/dbus_constants.h>
+#include <ubuntu/download_manager/manager.h>
+
+class FakeIcon : public QObject {
+    Q_OBJECT
+
+public:
+    explicit FakeIcon(QString title, QString icon_url, QObject *parent=0)
+        : QObject(parent), title(title), icon_url(icon_url)
+    {
+    }
+    void downloadFound(Download& download);
+    void complete(QString app_id);
+
+private slots:
+    void handleProgress(qulonglong transferred, qulonglong total);
+    void handleDownloadError(Error* error);
+
+private:
+    Download* download;
+    QString title;
+    QString icon_url;
+    void failure(QString message);
+};
+
+class FakeLauncher : public QObject {
+    Q_OBJECT
+
+public:
+    explicit FakeLauncher(QObject *parent=0) : QObject(parent)
+    {
+        manager = Ubuntu::DownloadManager::Manager::createSessionManager();
+        connect(manager, SIGNAL(downloadsWithMetadataFound(QString,QString,DownloadsList*)),
+                this, SLOT(handleDownloadsFound(QString,QString,DownloadsList*)));
+    }
+                                                             
+public slots:
+    void startInstallation(QString title, QString icon_url, QString package_name);
+    void completeInstallation(QString package_name, QString app_id);
+
+private slots:
+    void handleDownloadsFound(const QString& key, const QString& value, DownloadsList* downloads);
+
+signals:
+
+private:
+    Ubuntu::DownloadManager::Manager* manager;
+    QMap<QString, FakeIcon*> installations;
+};
+
+
+class FakeLauncherAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", LAUNCHER_INTERFACE)
+
+private:
+    FakeLauncher *_launcher;
+
+public:
+    FakeLauncherAdaptor(FakeLauncher *launcher) : QDBusAbstractAdaptor(launcher), _launcher(launcher)
+    {
+    }
+
+public slots:
+    Q_NOREPLY void startInstallation(QString title, QString icon_url, QString package_name)
+    {
+        _launcher->startInstallation(title, icon_url, package_name);
+    }
+
+    Q_NOREPLY void completeInstallation(QString package_name, QString app_id)
+    {
+        _launcher->completeInstallation(package_name, app_id);
+    }
+};
+
+
+#endif /* _FAKE_LAUNCHER_H_ */
+
+