Unity Media Scanner Scope

Merge lp://staging/~stolowski/unity-scope-mediascanner/category-order into lp://staging/unity-scope-mediascanner

  1. category-order
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: James Henstridge
Approved revision: 77
Merged at revision: 65
Proposed branch: lp://staging/~stolowski/unity-scope-mediascanner/category-order
Merge into: lp://staging/unity-scope-mediascanner
Diff against target: 390 lines (+248/-12)
10 files modified
src/CMakeLists.txt (+7/-3)
src/bufferedresultforwarder.cpp (+53/-0)
src/bufferedresultforwarder.h (+49/-0)
src/musicaggregatorquery.cpp (+6/-3)
src/musicaggregatorscope.cpp (+1/-1)
src/onlinemusicresultforwarder.cpp (+45/-0)
src/onlinemusicresultforwarder.h (+39/-0)
src/resultforwarder.cpp (+31/-0)
src/resultforwarder.h (+11/-2)
src/videoaggregatorquery.cpp (+6/-3)
To merge this branch: bzr merge lp://staging/~stolowski/unity-scope-mediascanner/category-order
Reviewer Review Type Date Requested Status
James Henstridge Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+207253@code.staging.launchpad.net

Commit message

Buffer up online results until first local result is displayed, or local search finishes (whichever comes first). Query grooveshark remote scope instead of onlinemusic. Grooveshark returns two categories, we want "Songs" only and rename it to "Grooveshark" when displayed by Music aggregator scope.

Description of the change

Buffer up online results until first local result is displayed, or local search finishes (whichever comes first).
Query grooveshark remote scope instead of onlinemusic (change requested for MWC). Grooveshark returns two categories, we want "Songs" only and rename it to "Grooveshark" when displayed by Music aggregator scope.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-trusty-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-trusty-i386-ci/53

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

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good. The fact that Grooveshark uses a category called "cat_0" seems a bit worrying though: it means nothing, and could easily conflict with other scopes' category IDs.

review: Approve

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: