Merge lp:~alecu/unity-scope-click/update-for-api-0.5.0 into lp:unity-scope-click/devel

[Alejandro J. Cura]

Updated to new scopes API 0.5.0

Updated to new scopes API 0.5.0

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

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

merged with /devel

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-27 13:15:52 +0000
+++ CMakeLists.txt	2014-06-19 16:49:26 +0000
@@ -21,7 +21,7 @@
 
 include(FindPkgConfig)
 
-pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.4.0 libunity-api>=0.1.3)
+pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.5.0 libunity-api>=0.1.3)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
 find_package (PkgConfig REQUIRED)

=== modified file 'debian/control'
--- debian/control	2014-06-13 15:21:16 +0000
+++ debian/control	2014-06-19 16:49:26 +0000
@@ -13,7 +13,7 @@
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev,
                libunity-api-dev (>= 7.80.7),
-               libunity-scopes-dev (>= 0.4.0),
+               libunity-scopes-dev (>= 0.5.0),
                pkg-config,
                python3-all,
 Maintainer: Ubuntu Developers <[e-mail]>

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-06-17 21:05:05 +0000
+++ libclickscope/click/preview.cpp	2014-06-19 16:49:26 +0000
@@ -57,6 +57,7 @@
                  const unity::scopes::ActionMetadata& metadata,
                  const QSharedPointer<click::web::Client>& client,
                  const QSharedPointer<click::network::AccessManager>& nam)
+    : PreviewQueryBase(result, metadata)
 {
     strategy.reset(choose_strategy(result, metadata, client, nam));
 }

=== modified file 'libclickscope/click/scope_activation.cpp'
--- libclickscope/click/scope_activation.cpp	2014-05-28 07:42:24 +0000
+++ libclickscope/click/scope_activation.cpp	2014-06-19 16:49:26 +0000
@@ -33,6 +33,11 @@
 #include <click/qtbridge.h>
 #include <unity/scopes/ActivationResponse.h>
 
+click::ScopeActivation::ScopeActivation(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata)
+    : unity::scopes::ActivationQueryBase(result, metadata)
+{
+}
+
 unity::scopes::ActivationResponse click::ScopeActivation::activate()
 {
     auto response = unity::scopes::ActivationResponse(status_);
@@ -50,18 +55,19 @@
     hints_[key] = value;
 }
 
-click::PerformUninstallAction::PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActivationResponse& response)
-    : result(result),
+click::PerformUninstallAction::PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata, const unity::scopes::ActivationResponse& response)
+    : unity::scopes::ActivationQueryBase(result, metadata),
       response(response)
 {
 }
 
 unity::scopes::ActivationResponse click::PerformUninstallAction::activate()
 {
+    auto const res = result();
     click::Package package;
-    package.title = result.title();
-    package.name = result["name"].get_string();
-    package.version = result["version"].get_string();
+    package.title = res.title();
+    package.name = res["name"].get_string();
+    package.version = res["version"].get_string();
     qt::core::world::enter_with_task([this, package] ()
     {
         click::PackageManager manager;

=== modified file 'libclickscope/click/scope_activation.h'
--- libclickscope/click/scope_activation.h	2014-05-28 07:42:24 +0000
+++ libclickscope/click/scope_activation.h	2014-06-19 16:49:26 +0000
@@ -40,11 +40,10 @@
 class PerformUninstallAction: public unity::scopes::ActivationQueryBase
 {
 public:
-    PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActivationResponse& response);
+    PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata, const unity::scopes::ActivationResponse& response);
     unity::scopes::ActivationResponse activate() override;
 
 private:
-    unity::scopes::Result result;
     unity::scopes::ActivationResponse response;
 };
 
@@ -53,6 +52,7 @@
     unity::scopes::ActivationResponse activate() override;
 
 public:
+    ScopeActivation(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata);
     void setStatus(unity::scopes::ActivationResponse::Status status);
     void setHint(std::string key, unity::scopes::Variant value);
 

=== removed file 'libclickscope/tests/test_data.cpp'
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-06-10 21:09:52 +0000
+++ scope/clickapps/apps-query.cpp	2014-06-19 16:49:26 +0000
@@ -128,25 +128,24 @@
 
 struct click::Query::Private
 {
-    Private(const unity::scopes::CannedQuery& query, click::Index& index, const scopes::SearchMetadata& metadata)
-        : query(query),
-          index(index),
+    Private(click::Index& index, const scopes::SearchMetadata& metadata)
+        : index(index),
           meta(metadata)
     {
     }
-    unity::scopes::CannedQuery query;
     click::Index& index;
     scopes::SearchMetadata meta;
 };
 
 click::Query::Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata)
-    : impl(new Private(query, index, metadata))
+    : unity::scopes::SearchQueryBase(query, metadata),
+      impl(new Private(index, metadata))
 {
 }
 
 void click::Query::cancelled()
 {
-    qDebug() << "cancelling search of" << QString::fromStdString(impl->query.query_string());
+    qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
 }
 
 click::Query::~Query()
@@ -171,10 +170,10 @@
     static const std::string title = _("Get more apps in Ubuntu store");
     auto name = title;
 
-    std::string query = impl->query.query_string();
-    std::transform(query.begin(), query.end(), query.begin(), ::tolower);
+    std::string querystr = query().query_string();
+    std::transform(querystr.begin(), querystr.end(), querystr.begin(), ::tolower);
     std::transform(name.begin(), name.end(), name.begin(), ::tolower);
-    if (query.empty() || name.find(query) != std::string::npos)
+    if (querystr.empty() || name.find(querystr) != std::string::npos)
     {
         scopes::CategoryRenderer rdr(CATEGORY_STORE);
         auto cat = searchReply->register_category("store", "", "", rdr);
@@ -196,13 +195,13 @@
 
 void click::Query::run(scopes::SearchReplyProxy const& searchReply)
 {
-    auto query = impl->query.query_string();
+    auto querystr = query().query_string();
     std::string categoryTemplate = CATEGORY_APPS_SEARCH;
-    if (query.empty()) {
+    if (querystr.empty()) {
         categoryTemplate = CATEGORY_APPS_DISPLAY;
     }
     auto localResults = clickInterfaceInstance().find_installed_apps(
-                query);
+                querystr);
 
     push_local_results(
         searchReply,

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-06-12 14:26:26 +0000
+++ scope/clickapps/apps-scope.cpp	2014-06-19 16:49:26 +0000
@@ -54,13 +54,11 @@
 {
 }
 
-int click::Scope::start(std::string const&, scopes::RegistryProxy const&)
+void click::Scope::start(std::string const&, scopes::RegistryProxy const&)
 {
     setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-
-    return VERSION;
 }
 
 void click::Scope::run()
@@ -91,14 +89,15 @@
 }
 
 
-unity::scopes::ActivationQueryBase::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::ActivationQueryBase::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)
 {
     if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
         const unity::scopes::CannedQuery cquery("clickscope");
-        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, unity::scopes::ActivationResponse(cquery)));
+        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata, unity::scopes::ActivationResponse(cquery)));
     }
 
-    auto activation = new ScopeActivation();
+    auto activation = new ScopeActivation(result, metadata);
     qDebug() << "perform_action called with action_id" << QString().fromStdString(action_id);
 
     if (action_id == click::Preview::Actions::UNINSTALL_CLICK) {

=== modified file 'scope/clickapps/apps-scope.h'
--- scope/clickapps/apps-scope.h	2014-05-27 06:57:52 +0000
+++ scope/clickapps/apps-scope.h	2014-06-19 16:49:26 +0000
@@ -49,14 +49,14 @@
     Scope();
     ~Scope();
 
-    virtual int start(std::string const&, scopes::RegistryProxy const&) override;
+    virtual void start(std::string const&, scopes::RegistryProxy const&) override;
 
     virtual void run() override;
     virtual void stop() override;
 
-    virtual scopes::SearchQueryBase::UPtr search(scopes::CannedQuery const& q, scopes::SearchMetadata const&) override;
+    virtual scopes::SearchQueryBase::UPtr search(scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata) override;
     unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
-            const unity::scopes::ActionMetadata&) override;
+            const unity::scopes::ActionMetadata& hints) override;
 
     virtual unity::scopes::ActivationQueryBase::UPtr perform_action(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata, std::string const& widget_id, std::string const& action_id) override;
 

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-06-13 23:18:41 +0000
+++ scope/clickstore/store-query.cpp	2014-06-19 16:49:26 +0000
@@ -93,20 +93,19 @@
 
 struct click::Query::Private
 {
-    Private(const unity::scopes::CannedQuery& query, click::Index& index, const scopes::SearchMetadata& metadata)
-        : query(query),
-          index(index),
+    Private(click::Index& index, const scopes::SearchMetadata& metadata)
+        : index(index),
           meta(metadata)
     {
     }
-    unity::scopes::CannedQuery query;
     click::Index& index;
     scopes::SearchMetadata meta;
     click::web::Cancellable search_operation;
 };
 
 click::Query::Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata)
-    : impl(new Private(query, index, metadata))
+    : unity::scopes::SearchQueryBase(query, metadata),
+      impl(new Private(index, metadata))
 {
 }
 
@@ -117,7 +116,7 @@
 
 void click::Query::cancelled()
 {
-    qDebug() << "cancelling search of" << QString::fromStdString(impl->query.query_string());
+    qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
     impl->search_operation.cancel();
 }
 
@@ -198,8 +197,8 @@
                 this->finished(searchReply);
         };
 
-            qDebug() << "starting search of" << QString::fromStdString(impl->query.query_string());
-            impl->search_operation = impl->index.search(impl->query.query_string(), search_cb);
+            qDebug() << "starting search of" << QString::fromStdString(query().query_string());
+            impl->search_operation = impl->index.search(query().query_string(), search_cb);
     });
 }
 
@@ -222,9 +221,9 @@
 
 void click::Query::run(scopes::SearchReplyProxy const& searchReply)
 {
-    auto query = impl->query.query_string();
+    auto q = query().query_string();
     std::string categoryTemplate = CATEGORY_APPS_SEARCH;
-    if (query.empty()) {
+    if (q.empty()) {
         categoryTemplate = CATEGORY_APPS_DISPLAY;
     }
 

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-06-17 21:32:44 +0000
+++ scope/clickstore/store-scope.cpp	2014-06-19 16:49:26 +0000
@@ -54,15 +54,13 @@
 {
 }
 
-int click::Scope::start(std::string const&, scopes::RegistryProxy const&)
+void click::Scope::start(std::string const&, scopes::RegistryProxy const&)
 {
     setlocale(LC_ALL, "");
     // FIXME: This is wrong, but needed for json-cpp workaround.
     setlocale(LC_MONETARY, "C");
     bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-
-    return VERSION;
 }
 
 void click::Scope::run()
@@ -93,11 +91,11 @@
     return scopes::PreviewQueryBase::UPtr{new click::Preview(result, metadata, client, nam)};
 }
 
-unity::scopes::ActivationQueryBase::UPtr click::Scope::perform_action(unity::scopes::Result const& /* result */, unity::scopes::ActionMetadata const& metadata,
+unity::scopes::ActivationQueryBase::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)
 {
     std::string action_id = _action_id;
-    auto activation = new ScopeActivation();
+    auto activation = new ScopeActivation(result, metadata);
     qDebug() << "perform_action called with widget_id" << QString::fromStdString(widget_id) << "and action_id:" << QString::fromStdString(action_id);
 
     // if the purchase is completed, do the install

=== modified file 'scope/clickstore/store-scope.h'
--- scope/clickstore/store-scope.h	2014-05-27 06:57:52 +0000
+++ scope/clickstore/store-scope.h	2014-06-19 16:49:26 +0000
@@ -49,12 +49,12 @@
     Scope();
     ~Scope();
 
-    virtual int start(std::string const&, scopes::RegistryProxy const&) override;
+    virtual void start(std::string const&, scopes::RegistryProxy const&) override;
 
     virtual void run() override;
     virtual void stop() override;
 
-    virtual scopes::SearchQueryBase::UPtr search(scopes::CannedQuery const& q, scopes::SearchMetadata const&) override;
+    virtual scopes::SearchQueryBase::UPtr search(scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata) override;
     unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
             const unity::scopes::ActionMetadata&) override;