Unity Media Scanner Scope

Merge lp://qastaging/~jamesh/unity-scope-mediascanner/songkick-support into lp://qastaging/unity-scope-mediascanner

songkick-support
Merge into trunk

Proposed by James Henstridge on 2014-09-16

Status:

Merged

Approved by:

Paweł Stołowski on 2014-10-07

Approved revision:

184

Merged at revision:

186

Proposed branch:

lp://qastaging/~jamesh/unity-scope-mediascanner/songkick-support

Merge into:

lp://qastaging/unity-scope-mediascanner

Diff against target:

428 lines (+161/-71)

7 files modified

data/musicaggregator-settings.ini.in.in (+10/-5)
data/musicaggregator.ini.in.in (+1/-0)
po/unity-scope-mediascanner.pot (+61/-49)
src/musicaggregatorquery.cpp (+81/-15)
src/musicaggregatorquery.h (+3/-1)
src/musicaggregatorscope.cpp (+3/-1)
src/musicaggregatorscope.h (+2/-0)

To merge this branch:

bzr merge lp://qastaging/~jamesh/unity-scope-mediascanner/songkick-support

Related bugs:

Bug #1376439: musicaggregator should switch orders, have 7digital then grooveshark	Critical	Fix Released
Bug #1376719: Integrate songkick scope into music aggregator	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Paweł Stołowski (community)		2014-09-16	Approve on 2014-10-07
PS Jenkins bot (community)	continuous-integration		Approve on 2014-10-07
Review via email: mp+234766@code.qastaging.launchpad.net

Commit message

Add results from the Songkick scope to the music aggregator scope.

Description of the change

Add results from the Songkick scope in the music aggregator scope.

This required updating the aggregator scope to request location data. I've attempted to stop it leaking to other scopes but so far I've only seen ways to replace the location metadata rather than unset it in the current API.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/48

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

review: Approve (continuous-integration)

lp://qastaging/~jamesh/unity-scope-mediascanner/songkick-support updated on 2014-09-16

180. By James Henstridge on 2014-09-16: Update category renderer to match source.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

PASSED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/49

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

review: Approve (continuous-integration)

Revision history for this message

Paweł Stołowski (stolowski) wrote on 2014-09-30:

The code looks good, I've only encountered one issue: I didn't have location enabled for neither Songkick nor Music aggregator. When I first opened Music page in the dash, an odd-looking result coming from Songkick was displayed at the bottom, saying something like "No location found. Please make sure..."; it had an empty tile displayed next to it. I think this result should be filtered out or adjusted to look better (in the Songkick scope it doesn't have the empty icon).

I also hit what looks like an issue in the settings handling (not a fault of this branch): when I first opened settings pages for aggregator and songkick, the 'location data' option was enabled, but I had to uncheck it and check it back to make it work.

review: Needs Fixing

lp://qastaging/~jamesh/unity-scope-mediascanner/songkick-support updated on 2014-10-07

181. By James Henstridge on 2014-10-07: Merge from trunk
182. By James Henstridge on 2014-10-07: Ignore songkick results in the "noloc" category.
183. By James Henstridge on 2014-10-07: Reorder subscopes in music aggregator scope.