Merge lp://qastaging/~jamesh/unity-scope-mediascanner/video-aggregator-design into lp://qastaging/unity-scope-mediascanner
Status: | Merged |
---|---|
Approved by: | Paweł Stołowski |
Approved revision: | 122 |
Merged at revision: | 128 |
Proposed branch: | lp://qastaging/~jamesh/unity-scope-mediascanner/video-aggregator-design |
Merge into: | lp://qastaging/unity-scope-mediascanner |
Prerequisite: | lp://qastaging/~stolowski/unity-scope-mediascanner/update-for-api-0.5.0 |
Diff against target: |
605 lines (+301/-49) 13 files modified
CMakeLists.txt (+1/-0) data/CMakeLists.txt (+8/-1) data/mediascanner-video.ini.in.in (+1/-1) data/videoaggregator-settings.ini.in.in (+4/-0) debian/control (+1/-0) src/CMakeLists.txt (+2/-2) src/video-scope.cpp (+83/-2) src/videoaggregatorquery.cpp (+110/-14) src/videoaggregatorquery.h (+5/-5) src/videoaggregatorscope.cpp (+20/-19) src/videoaggregatorscope.h (+6/-3) tests/CMakeLists.txt (+2/-2) tests/test-video-scope.cpp (+58/-0) |
To merge this branch: | bzr merge lp://qastaging/~jamesh/unity-scope-mediascanner/video-aggregator-design |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Paweł Stołowski (community) | Approve | ||
Review via email: mp+223683@code.qastaging.launchpad.net |
Commit message
Implement new design of video aggregator scope.
Description of the change
Implement the video aggregator portions of the video aggregators design spec:
https:/
There are a few areas where this is incomplete:
* The category headings are supposed to have a clickable button to drill down to the corresponding scope. There is no support in the shell for this yet.
* The design calls for result counts in searches. Again, we don't have a way for the subscope to provide this info. Even if we waited until all results from the subscope had been received, we've got no way to know whether the scope could have provided more.
* It doesn't currently show any subtitle for results from subscopes. We'll need to have some agreement about how they structure their results for this to work.
It is still only querying the local videos and online videos scopes, but adding more is now trivial.
To get surfacing results, I'm passing the "featured" department ID in the subsearch. Aggregating the main surfacing results for the subscope would limit the designs it could provide, so this gives it a way to differentiate between the two cases. If there are better ideas for how to handle this, I'd be open to change it.
FAILED: Continuous integration, rev:110 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- ci/108/ jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- utopic- amd64-ci/ 10/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- utopic- armhf-ci/ 10/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- utopic- i386-ci/ 10/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-mediascan ner-ci/ 108/rebuild
http://