Merge lp:~stolowski/unity-scope-click/topapps-use-pkg-and-appname into lp:unity-scope-click/devel

[Paweł Stołowski]

Expect package_appid name format in dconf key for core apps.

Expect package_appid name format in dconf key for core apps. For now only the 'package'part is used, but this will prepare us for multiple apps per click package in the future.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-07-07 12:18:40 +0000
+++ libclickscope/click/configuration.h	2014-07-15 15:50:36 +0000
@@ -67,10 +67,10 @@
         static std::vector<std::string> default_apps {
             "dialer-app",
             "messaging-app",
-            "com.ubuntu.calculator",
-            "com.ubuntu.clock",
-            "com.ubuntu.camera",
-            "com.ubuntu.calendar"
+            "com.ubuntu.calculator_calculator",
+            "com.ubuntu.clock_clock",
+            "com.ubuntu.camera_camera",
+            "com.ubuntu.calendar_calendar"
         };
         return default_apps;
     }
 
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-07-14 12:44:48 +0000
+++ scope/clickapps/apps-query.cpp	2014-07-15 15:50:36 +0000
@@ -87,11 +87,28 @@
 
 }
 
-click::apps::ResultPusher::ResultPusher(const scopes::SearchReplyProxy &replyProxy, const std::vector<std::string>& core_apps)
-    :  replyProxy(replyProxy),
-       core_apps(core_apps),
-       top_apps_lookup(core_apps.begin(), core_apps.end())
+click::apps::ResultPusher::ResultPusher(const scopes::SearchReplyProxy &replyProxy, const std::vector<std::string>& apps)
+    :  replyProxy(replyProxy)
 {
+    for (auto const& app: apps)
+    {
+        //
+        // click entries in the dconf key are expected to be in the format of
+        // "foo.bar.package_appname"; split on underscore and just use the first part
+        // for now (second part should be honored when we support multiple apps per package).
+        auto i = app.find("_");
+        if (i != std::string::npos)
+        {
+            const std::string pkg = app.substr(0, i);
+            core_apps.push_back(pkg);
+            top_apps_lookup.insert(pkg);
+        }
+        else
+        {
+            core_apps.push_back(app);
+            top_apps_lookup.insert(app);
+        }
+    }
 }
 
 void click::apps::ResultPusher::push_result(scopes::Category::SCPtr& cat, const click::Application& a)
 
=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-14 12:44:48 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-15 15:50:36 +0000
@@ -68,7 +68,7 @@
         {"", "App4", 0.0f, "icon", "application:///app4.desktop", "", "sshot"} // a non-click app
     };
 
-    click::apps::ResultPusher pusher(reply, {"app2", "app4"});
+    click::apps::ResultPusher pusher(reply, {"app2_fooappname", "app4"});
     auto mockreply = (scopes::testing::MockSearchReply*)reply.get();
 
     scopes::CategoryRenderer renderer("{}");