Merge lp://qastaging/~jamesh/unity-scope-mediascanner/video-aggregator-design into lp://qastaging/unity-scope-mediascanner

Proposed by James Henstridge
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
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://docs.google.com/a/canonical.com/document/d/1Y9H3SY2uwbeLZSta9bGdLcyGr-tP0LwHyIUigTnieww

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
111. By James Henstridge

Merge from trunk

112. By James Henstridge

Add departments to the local videos scope.

113. By James Henstridge

Add tests for department results.

114. By James Henstridge

Add settings for enabling/disabling child scopes.

115. By James Henstridge

Merge trunk, fixing conflicts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

I think the settings file should be for videoaggregator, not mediascanner-video scope.

review: Needs Fixing
116. By James Henstridge

Add category header queries to video aggregator.

117. By James Henstridge

Add settings file to the correct scope.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
118. By James Henstridge

Update display in my videos, and change dummy department ID.

119. By James Henstridge

Fix up registration of dummy department.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
120. By James Henstridge

Have the local video scope use a carousel when being aggregated.

121. By James Henstridge

Fix up category header query in local videos scope's aggregated results.

122. By James Henstridge

Update special department ID to work with YouTube scope.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM, thanks. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: