Unity Media Scanner Scope

Merge lp://qastaging/~stolowski/unity-scope-mediascanner/keywords into lp://qastaging/unity-scope-mediascanner

keywords
Merge into trunk

Proposed by Paweł Stołowski on 2015-04-08

Status:	Merged
Approved by:	James Henstridge on 2015-04-10
Approved revision:	261
Merged at revision:	236
Proposed branch:	lp://qastaging/~stolowski/unity-scope-mediascanner/keywords
Merge into:	lp://qastaging/unity-scope-mediascanner
Diff against target:	1905 lines (+471/-865) 34 files modified CMakeLists.txt (+1/-1) debian/control (+1/-1) src/musicaggregator/CMakeLists.txt (+2/-6) src/musicaggregator/musicaggregator-settings.ini.in (+0/-24) src/musicaggregator/musicaggregator.ini.in (+2/-1) src/musicaggregator/musicaggregatorquery.cpp (+141/-111) src/musicaggregator/musicaggregatorquery.h (+2/-12) src/musicaggregator/musicaggregatorscope.cpp (+18/-46) src/musicaggregator/musicaggregatorscope.h (+1/-9) src/musicaggregator/onlinemusicresultforwarder.cpp (+0/-37) src/musicaggregator/onlinemusicresultforwarder.h (+0/-40) src/mymusic/mediascanner-music.ini.in (+1/-0) src/mymusic/music-scope.cpp (+2/-1) src/myvideos/mediascanner-video.ini.in (+1/-0) src/myvideos/video-scope.cpp (+11/-14) src/utils/CMakeLists.txt (+1/-2) src/utils/bufferedresultforwarder.cpp (+7/-25) src/utils/bufferedresultforwarder.h (+5/-11) src/utils/notify-strategy.cpp (+0/-40) src/utils/notify-strategy.h (+0/-49) src/utils/resultforwarder.cpp (+0/-87) src/utils/resultforwarder.h (+0/-68) src/utils/utils.cpp (+59/-0) src/utils/utils.h (+35/-0) src/videoaggregator/CMakeLists.txt (+1/-4) src/videoaggregator/videoaggregator-settings.ini.in (+0/-9) src/videoaggregator/videoaggregator.ini.in (+2/-1) src/videoaggregator/videoaggregatorquery.cpp (+72/-60) src/videoaggregator/videoaggregatorquery.h (+3/-5) src/videoaggregator/videoaggregatorscope.cpp (+13/-23) src/videoaggregator/videoaggregatorscope.h (+3/-3) tests/CMakeLists.txt (+1/-8) tests/test-music-aggregator.cpp (+86/-26) tests/test-result-forwarder.cpp (+0/-141)
To merge this branch:	bzr merge lp://qastaging/~stolowski/unity-scope-mediascanner/keywords
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Henstridge		2015-04-10	Approve on 2015-04-10
PS Jenkins bot (community)	continuous-integration		Approve on 2015-04-10
Unity Team		2015-04-08	Pending
Review via email: mp+255499@code.qastaging.launchpad.net

Commit message

Support for keywords. Use BufferedResultForwarder from scopes API instead of a custom implementation.

Description of the change

Support for keywords. Use BufferedResultForwarder from scopes API instead of a custom implementation.

lp://qastaging/~stolowski/unity-scope-mediascanner/keywords updated on 2015-04-09

260. By Paweł Stołowski on 2015-04-09: Bump required version of scopes api in control file

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-09:

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/7

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

review: Approve (continuous-integration)

Revision history for this message

Michi Henning (michihenning) wrote on 2015-04-10:

James, could you review this please? I don't know the mediascanner code anywhere near well enough to review this.

Revision history for this message

James Henstridge (jamesh) wrote on 2015-04-10:

Looks good. Given that the settings.ini files for the two aggregators are now empty, would it make sense to remove them? Should be fine without that change though: your call.

review: Approve

lp://qastaging/~stolowski/unity-scope-mediascanner/keywords updated on 2015-04-10