Merge lp:~diegosarmentero/unity-scope-click/category-templates into lp:unity-scope-click

[Diego Sarmentero]

- Adding Category templates for normal and search results.

[lp:~diegosarmentero/unity-scope-click/category-templates]

140. By Diego Sarmentero on 2014-02-17

remove aspect radio

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:139
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/category-templates/+merge/206793/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'scope/click/query.cpp'
--- scope/click/query.cpp	2014-02-17 16:31:04 +0000
+++ scope/click/query.cpp	2014-02-17 19:23:21 +0000
@@ -59,6 +59,42 @@
 
 namespace
 {
+
+std::string CATEGORY_APPS_DISPLAY = R"(
+    {
+        "schema-version" : 1,
+        "template" : {
+            "category-layout" : "grid",
+            "card-size": "small"
+        },
+        "components" : {
+            "title" : "title",
+            "art" : {
+                "field": "art"
+            },
+            "subtitle" : "publisher"
+        }
+    }
+)";
+
+std::string CATEGORY_APPS_SEARCH = R"(
+    {
+        "schema-version" : 1,
+        "template" : {
+            "category-layout" : "journal",
+            "card-layout" : "horizontal",
+            "card-size": "large"
+        },
+        "components" : {
+            "title" : "title",
+            "art" : {
+                "field": "art"
+            },
+            "subtitle" : "publisher"
+        }
+    }
+)";
+
 QNetworkAccessManager* getNetworkAccessManager(qt::core::world::Environment& env)
 {
     static qt::HeapAllocatedObject<QNetworkAccessManager> nam = env.allocate<QNetworkAccessManager>(&env);
@@ -102,8 +138,6 @@
           reply(reply),
           replyProxy(replyProxy),
           installedApplications(installedApplications),
-          categoryRenderer(),
-          category(replyProxy->register_category("appstore", "App Store", "", categoryRenderer)),
           queryUrl(queryUri) {
     }
 
@@ -197,19 +231,25 @@
         }
     }
 
+    void setCategoryTemplate(std::string categoryTemplate) {
+        scopes::CategoryRenderer categoryRenderer(categoryTemplate);
+        category = scopes::Category::SCPtr(replyProxy->register_category("appstore", "App Store", "", categoryRenderer));
+    }
+
 private:
     QNetworkReply* reply;
     scopes::SearchReplyProxy replyProxy;
     std::set<std::string> installedApplications;
-    scopes::CategoryRenderer categoryRenderer;
     scopes::Category::SCPtr category;
     QUrl queryUrl;
 };
 }
 
-static void push_local_results(scopes::SearchReplyProxy const &replyProxy, std::vector<click::Application> const &apps)
+static void push_local_results(scopes::SearchReplyProxy const &replyProxy,
+                               std::vector<click::Application> const &apps,
+                               std::string categoryTemplate)
 {
-    scopes::CategoryRenderer rdr;
+    scopes::CategoryRenderer rdr(categoryTemplate);
     auto cat = replyProxy->register_category("local", "My apps", "", rdr);
 
     for(const auto & a: apps) 
@@ -262,19 +302,24 @@
 }
 void click::Query::run(scopes::SearchReplyProxy const& searchReply)
 {
+    QString query = QString::fromStdString(impl->query);
+    std::string categoryTemplate = CATEGORY_APPS_SEARCH;
+    if (query.isEmpty()) {
+        categoryTemplate = CATEGORY_APPS_DISPLAY;
+    }
     auto localResults = clickInterfaceInstance().find_installed_apps(
-                QString::fromStdString(
-                    impl->query));
+                query);
 
     push_local_results(
         searchReply, 
-        localResults);
+        localResults,
+        categoryTemplate);
 
     std::set<std::string> locallyInstalledApps;
     for(const auto& app : localResults)
         locallyInstalledApps.insert(app.title);
 
-    qt::core::world::enter_with_task([this, searchReply, locallyInstalledApps](qt::core::world::Environment& env)
+    qt::core::world::enter_with_task([this, searchReply, locallyInstalledApps, categoryTemplate](qt::core::world::Environment& env)
     {
         static const QString queryPattern(
                     "https://search.apps.ubuntu.com/api/v1/search?q=%1"
@@ -286,6 +331,7 @@
 
         impl->replyWrapper = env.allocate<ReplyWrapper>(networkReply, searchReply, locallyInstalledApps, queryUri, &env);
         auto rw = env.resolve(impl->replyWrapper);
+        rw->setCategoryTemplate(categoryTemplate);
 
         QObject::connect(
                     nam, &QNetworkAccessManager::finished,