Merge lp:~ted/mediaplayer-app/url-overlays into lp:mediaplayer-app

[Ted Gould]

Setup to use the URL overlay feature

Use URL overlays for video:/// URLs

[Ted Gould (ted)]

Note, needs to be matched with: https://code.launchpad.net/~ted/url-dispatcher/url-overlay/+merge/261415

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/265/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3110
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21017

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/265/rebuild

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

This works in that it gets started by the URL dispatcher and comes up as an overlay. But it seems that media-hub won't talk to it, I'm guessing because it has an apparmor profile it puts some restrictions on it that aren't expected. I'm not sure of the future of mediaplayer, so I'm not going to debug further, just using to it prove out the URL overlay feature.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/266/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3117
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21042

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/266/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/267/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21216

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/267/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

I'm not sure what is meant by url overlay. Can you better describe what this feature is exactly?

[Ted Gould (ted)]

On Tue, 2016-05-10 at 15:34 +0000, Jim Hodapp wrote:
> I'm not sure what is meant by url overlay. Can you better describe
> what this feature is exactly?
It allows it to show as an overlay to the current app instead of as an
application itself. We're removing the ability to use malformed desktop
files so the media player has become an issue again with not wanting
the app icon in the app grid. This allows it to be a URL to be called
from a scope, and show up over the dash when requested. I've built it
in a silo so you can see the behavior there: https://requests.ci-train.
ubuntu.com/#/ticket/1400

[Jim Hodapp (jhodapp)]

Makes sense, thanks Ted.

Unmerged revisions

364. By Ted Gould on 2016-05-10

Update to trunk

363. By Ted Gould on 2015-06-09

Adding 'attach_disconnected' for phone

362. By Ted Gould on 2015-06-09

Change to profile recommended by security

361. By Ted Gould on 2015-06-09

Move the apparmor config

360. By Ted Gould on 2015-06-09

Adding dh_apparmor dep

359. By Ted Gould on 2015-06-09

Removing unrelated comment

358. By Ted Gould on 2015-06-09

Adding an apparmor profile

357. By Ted Gould on 2015-06-08

Setup to use the URL overlay feature

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-01-20 15:44:22 +0000
+++ data/CMakeLists.txt	2016-05-10 15:23:33 +0000
@@ -11,7 +11,7 @@
         )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE}
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/url-overlays
 )
 
 install(FILES ${MEDIAPLAYER_APP_ICON} ${MEDIAPLAYER_APP_SYMBOLIC_ICON}

=== added directory 'debian/apparmor'
=== added file 'debian/apparmor/mediaplayer-app'
--- debian/apparmor/mediaplayer-app	1970-01-01 00:00:00 +0000
+++ debian/apparmor/mediaplayer-app	2016-05-10 15:23:33 +0000
@@ -0,0 +1,15 @@
+# vim:syntax=apparmor
+#include <tunables/global>
+
+# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
+# exec inherits from this profile
+profile mediaplayer-app (attach_disconnected) {
+  network,
+  / rwkl,
+  /** rwlkm,
+  /** pix,
+  dbus,
+  signal,
+  ptrace,
+  unix,
+}

=== modified file 'debian/control'
--- debian/control	2016-04-28 15:02:04 +0000
+++ debian/control	2016-05-10 15:23:33 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               dh-apparmor,
                dh-translations,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,

=== modified file 'debian/mediaplayer-app.install'
--- debian/mediaplayer-app.install	2016-01-20 15:44:22 +0000
+++ debian/mediaplayer-app.install	2016-05-10 15:23:33 +0000
@@ -1,8 +1,9 @@
-/usr/share/applications/mediaplayer-app.desktop
+/usr/share/url-dispatcher/url-overlays/mediaplayer-app.desktop
 /usr/bin/mediaplayer-app
 /usr/share/mediaplayer-app/mediaplayer-app.png
 /usr/share/mediaplayer-app/mediaplayer-app-symbolic.svg
 /usr/share/mediaplayer-app/qml/*
 /usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo
 /usr/share/url-dispatcher/urls/*
+debian/apparmor/mediaplayer-app etc/apparmor.d
 /usr/share/content-hub/peers/mediaplayer-app

=== modified file 'debian/rules'
--- debian/rules	2013-06-11 15:20:49 +0000
+++ debian/rules	2016-05-10 15:23:33 +0000
@@ -7,6 +7,7 @@
 	dh $@ --parallel --with translations
 
 override_dh_install:
+	dh_apparmor --profile-name=mediaplayer-app -p mediaplayer-app
 	dh_install --fail-missing
 
 override_dh_translations: