Merge lp:~aacid/unity-api/music_cards_extra_attributes into lp:unity-api

[Albert Astals Cid]

New properties to support more complex cards

Like music cards that play directly in the UI from the Dash

This introduces two new properties activationUri and type that will be used by the Dash to be able to special case some behaviours like playing audio files directly from the dash.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/unity-api-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/296/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good, but I've reservations about the name of the new attribute. Will be confusing for developers as it has nothing to do with result activation in the API. How about quickPreviewUri?

review: Abstain

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/unity-api-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/300/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:174
http://jenkins.qa.ubuntu.com/job/unity-api-ci/301/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/301/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

looks good to me.

review: Approve

[Michael Zanetti (mzanetti)]

Actually no, needs to bump versions still

review: Needs Fixing

Unmerged revisions

=== modified file 'include/unity/shell/scopes/ResultsModelInterface.h'
--- include/unity/shell/scopes/ResultsModelInterface.h	2014-07-18 12:15:05 +0000
+++ include/unity/shell/scopes/ResultsModelInterface.h	2015-05-18 15:08:13 +0000
@@ -61,6 +61,7 @@
         RoleCategoryId,
         RoleDndUri,
         RoleResult,
+        RoleQuickPreviewData, ///< Data for UI quick previewing. In case of audio should contain uri and duration
         // card components
         RoleTitle,
         RoleArt,
@@ -84,6 +85,7 @@
         roles[RoleUri] = "uri";
         roles[RoleCategoryId] = "categoryId";
         roles[RoleDndUri] = "dndUri";
+        roles[RoleQuickPreviewData] = "quickPreviewData";
         roles[RoleResult] = "result";
         roles[RoleTitle] = "title";
         roles[RoleArt] = "art";