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

[Paweł Stołowski]

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.

Land together with branches from https://requests.ci-train.ubuntu.com/#/ticket/29

[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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/unity-api-ci/307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/6

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

=== modified file 'debian/changelog'
+unity-api (7.97+15.04.20150619-0ubuntu1) UNRELEASED; urgency=medium

Since you've made API change, suggest you bump the minor version and have something more like this:

+unity-api (7.98) UNRELEASED; urgency=medium
+
+ * New property to support more complex cards
+
+ -- Albert Astals Cid <email address hidden> Fri, 29 May 2015 18:16:26 +0200

The CI train will fill in the rest of the version string on release & reformat it to suit itself. But it won't bump the major/minor version unless we do this.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/unity-api-ci/327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/26

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Had a scan over this along with the associated changes in:

https://code.launchpad.net/~unity-team/unity8/audioCardSupport/+merge/269029
and https://code.launchpad.net/~stolowski/unity-scopes-shell/audio-card/+merge/267341

Looks good to me. Although, I am a an outsider regarding this development, so best to confirm this review with someone directly involved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/unity-api-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/31

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

review: Approve (continuous-integration)

[lp:~unity-team/unity-api/music_cards_extra_attributes]

184. By Paweł Stołowski on 2015-09-16

Merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/unity-api-ci/333/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/32

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Since the branch was proposed by Albert and I only re-proposed the MP, I take the liberty of top-approving.

review: Approve

[lp:~unity-team/unity-api/music_cards_extra_attributes]

185. By Albert Astals Cid on 2015-09-16

move the new enum value at the end

186. By Paweł Stołowski on 2015-10-16

Merged trunk

187. By Paweł Stołowski on 2015-10-27

Merge trunk

188. By Paweł Stołowski on 2015-11-30

Merged trunk

189. By Paweł Stołowski on 2015-12-15

Merged trunk

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-07 16:21:29 +0000
+++ debian/changelog	2015-12-15 15:21:45 +0000
@@ -1,3 +1,10 @@
+unity-api (7.105-0ubuntu1) UNRELEASED; urgency=medium
+
+  [Albert Astals Cid ]
+  * New property to support more complex cards
+
+ -- Michael Zanetti <[e-mail]>  Fri, 29 May 2015 18:16:26 +0200
+
 unity-api (7.104+16.04.20151207-0ubuntu1) xenial; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2015-10-06 16:07:24 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2015-12-15 15:21:45 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 8)
+set(VERSION 9)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/scopes/ResultsModelInterface.h'
--- include/unity/shell/scopes/ResultsModelInterface.h	2015-05-18 15:07:49 +0000
+++ include/unity/shell/scopes/ResultsModelInterface.h	2015-12-15 15:21:45 +0000
@@ -61,7 +61,6 @@
         RoleCategoryId,
         RoleDndUri,
         RoleResult,
-        RoleQuickPreviewData, ///< Data for UI quick previewing. In case of audio should contain uri and duration
         // card components
         RoleTitle,
         RoleArt,
@@ -71,7 +70,8 @@
         RoleSummary,
         RoleAttributes,
         RoleBackground,
-        RoleOverlayColor
+        RoleOverlayColor,
+        RoleQuickPreviewData ///< Data for UI quick previewing. In case of audio should contain uri and duration
     };
 
     // @cond