Merge lp:~marcustomlinson/unity-scope-vimeo/respond_to_aggregators into lp:unity-scope-vimeo

[Marcus Tomlinson]

Update Query::run() to react accordingly when being aggregated.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/unity-scope-vimeo-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-vimeo-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-vimeo-vivid-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-vimeo-vivid-i386-ci/1/console

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

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'src/vimeo/scope/query.cpp'
--- src/vimeo/scope/query.cpp	2014-11-10 11:50:21 +0000
+++ src/vimeo/scope/query.cpp	2014-11-14 09:23:05 +0000
@@ -16,6 +16,7 @@
  * Author: Pete Woods <[e-mail]>
  */
 
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
 
 #include <vimeo/scope/localisation.h>
@@ -122,20 +123,30 @@
                         channel->id(), query, channel->name());
                 all_depts->add_subdepartment(dept);
             }
-            reply->register_departments(all_depts);
 
             bool include_login_nag = !client_.config()->authenticated;
-            if (include_login_nag) {
-                add_login_nag(reply);
-            }
-
-            if (!query.department_id().empty()) {
+
+            if (alg::starts_with(query.department_id(), "aggregated:")) {
+                // Need to add a dummy department to pass the validation check
+                sc::Department::SPtr dummy = sc::Department::create(
+                        query.department_id(), query, " ");
+                all_depts->add_subdepartment(dummy);
+
+                include_login_nag = false;
+                videos = client_.channels_videos("staffpicks");
+            } else if (!query.department_id().empty()) {
                 videos = client_.channels_videos(query.department_id());
             } else if (client_.config()->authenticated) {
                 videos = client_.feed();
             } else {
                 videos = client_.channels_videos("staffpicks");
             }
+
+            reply->register_departments(all_depts);
+
+            if (include_login_nag) {
+                add_login_nag(reply);
+            }
         } else {
             videos = client_.videos(query_string);
         }