Merge lp:~renatofilho/mediaplayer-app/use-cotent-hub into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Open content peer selection in case of the app start without a video url.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:443
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2328
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2327
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2149
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2149/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2149
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2149/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2149
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2149/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2149
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2149/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2149
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2149/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2149
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2149/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/3/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/mediaplayer-app/use-cotent-hub]

444. By Renato Araujo Oliveira Filho on 2017-03-20

Added missing files.

445. By Renato Araujo Oliveira Filho on 2017-03-20

Fixed vide import using content-hub.

446. By Renato Araujo Oliveira Filho on 2017-03-20

add a option to switch to full screen.

447. By Renato Araujo Oliveira Filho on 2017-03-20

Fixed check for desktop mode on unity7.

448. By Renato Araujo Oliveira Filho on 2017-03-21

Ask to pick a video file if player is empty while clicking on "play" button.

449. By Renato Araujo Oliveira Filho on 2017-03-21

Added a open-file button.

450. By Renato Araujo Oliveira Filho on 2017-03-21

Always show quit an fullscreen button.
Does not pause video if the app loses focus.

451. By Renato Araujo Oliveira Filho on 2017-03-21

Show a empty state if the app was started without a URL.

452. By Renato Araujo Oliveira Filho on 2017-03-21

Fixed empty state on player startup.

453. By Renato Araujo Oliveira Filho on 2017-03-21

Use a different icon for open a new file.

454. By Renato Araujo Oliveira Filho on 2017-03-21

Pause video player if it is playing while picking a new file.

=== modified file 'data/mediaplayer-app.desktop.in.in'
--- data/mediaplayer-app.desktop.in.in	2016-11-23 22:58:39 +0000
+++ data/mediaplayer-app.desktop.in.in	2017-03-21 19:39:57 +0000
@@ -12,4 +12,3 @@
 X-Ubuntu-Gettext-Domain=mediaplayer-app
 X-Ubuntu-Single-Instance=true
 X-Ubuntu-Default-Department-ID=sound-video
-OnlyShowIn=Old

=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp	2017-01-12 13:17:45 +0000
+++ src/mediaplayer.cpp	2017-03-21 19:39:57 +0000
@@ -47,7 +47,7 @@
 }
 
 MediaPlayer::MediaPlayer(int &argc, char **argv)
-    : QApplication(argc, argv), m_view(0), m_fileChooser(0)
+    : QApplication(argc, argv), m_view(0)
 {
 }
 
@@ -57,9 +57,6 @@
     bool windowed = args.removeAll("-w") + args.removeAll("--windowed") > 0;
     bool testability = args.removeAll("-testability") > 0;
 
-    // use windowed in desktop as default
-    windowed = windowed || isDesktopMode();
-
     // The testability driver is only loaded by QApplication but not by
     // QGuiApplication.
     // However, QApplication depends on QWidget which would add some
@@ -155,10 +152,6 @@
     if (m_view) {
         delete m_view;
     }
-    if (m_fileChooser) {
-        delete m_fileChooser;
-        m_fileChooser = 0;
-    }
 }
 
 void
@@ -189,44 +182,6 @@
     m_view->rootContext()->setContextProperty("screenHeight", height);
 }
 
-bool MediaPlayer::isDesktopMode() const
-{
-    // WORKAROUND: check unity profile
-    if (qgetenv("UNITY_INDICATOR_PROFILE") == "desktop")
-        return true;
-
-    // Assume that platformName (QtUbuntu) with ubuntu
-    // in name means it's running on device
-    // TODO: replace this check with SDK call for formfactor
-    QString platform = QGuiApplication::platformName();
-    return !((platform == "ubuntu") || (platform == "ubuntumirclient"));
-}
-
-QUrl MediaPlayer::chooseFile()
-{
-    QUrl fileName;
-    if (!m_fileChooser) {
-        m_fileChooser = new QFileDialog(0,
-                                        tr("Open Video"),
-                                        QStandardPaths::writableLocation(QStandardPaths::MoviesLocation),
-                                        tr("Video files (*.avi *.mov *.mp4 *.divx *.ogg *.ogv *.mpeg);;All files (*)"));
-        m_fileChooser->setModal(true);
-        int result = m_fileChooser->exec();
-        if (result == QDialog::Accepted) {
-            QStringList selectedFiles = m_fileChooser->selectedFiles();
-            if (selectedFiles.count() > 0) {
-                fileName = selectedFiles[0];
-            }
-        }
-        delete m_fileChooser;
-        m_fileChooser = 0;
-    } else {
-        m_fileChooser->raise();
-    }
-
-    return fileName;
-}
-
 QList<QUrl> MediaPlayer::copyFiles(const QList<QUrl> &urls)
 {
     static QString moviesDir = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);

=== modified file 'src/mediaplayer.h'
--- src/mediaplayer.h	2016-01-20 15:44:22 +0000
+++ src/mediaplayer.h	2017-03-21 19:39:57 +0000
@@ -25,7 +25,6 @@
 class MediaPlayer : public QApplication
 {
     Q_OBJECT
-    Q_PROPERTY(bool desktopMode READ isDesktopMode CONSTANT)
 
 public:
     MediaPlayer(int &argc, char **argv);
@@ -38,13 +37,10 @@
     void leaveFullScreen();
     void onWidthChanged(int);
     void onHeightChanged(int);
-    bool isDesktopMode() const;
-    QUrl chooseFile();
     QList<QUrl> copyFiles(const QList<QUrl> &urls);
 
 private:
     QQuickView *m_view;
-    QFileDialog *m_fileChooser;
 };
 
 #endif // MEDIAPLAYER_H

=== added file 'src/qml/VideoImport.qml'
--- src/qml/VideoImport.qml	1970-01-01 00:00:00 +0000
+++ src/qml/VideoImport.qml	2017-03-21 19:39:57 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012-2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Item {
+    id: root
+
+    property var importDialog: null
+
+    signal videoReceived(string videoUrl)
+
+    function requestVideo()
+    {
+        if (!root.importDialog) {
+            root.importDialog = PopupUtils.open(Qt.resolvedUrl("VideoImportDialog.qml"), null)
+            root.importDialog.videoReceived.connect(root.videoReceived)
+            root.importDialog.destruction.connect(function () {root.importDialog = null})
+
+        } else {
+            console.warn("Import dialog already running")
+        }
+    }
+}

=== added file 'src/qml/VideoImportDialog.qml'
--- src/qml/VideoImportDialog.qml	1970-01-01 00:00:00 +0000
+++ src/qml/VideoImportDialog.qml	2017-03-21 19:39:57 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Content 1.3
+
+PopupBase {
+    id: dialogue
+
+    property alias activeTransfer: signalConnections.target
+    signal videoReceived(string videoUrl)
+    signal destruction()
+
+    parent: QuickUtils.rootItem(this)
+    focus: true
+
+    Rectangle {
+        anchors.fill: parent
+
+        ContentTransferHint {
+            anchors.fill: parent
+            activeTransfer: dialogue.activeTransfer
+        }
+
+        ContentPeerPicker {
+            id: peerPicker
+
+            anchors.fill: parent
+            contentType: ContentType.Videos
+            handler: ContentHandler.Source
+
+            onPeerSelected: {
+                peer.selectionType = ContentTransfer.Single
+                dialogue.activeTransfer = peer.request()
+            }
+
+            onCancelPressed: {
+                PopupUtils.close(dialogue)
+            }
+        }
+    }
+
+    Connections {
+        id: signalConnections
+
+        onStateChanged: {
+            var done = ((dialogue.activeTransfer.state === ContentTransfer.Charged) ||
+                        (dialogue.activeTransfer.state === ContentTransfer.Aborted))
+
+            if (dialogue.activeTransfer.state === ContentTransfer.Charged) {
+                if (dialogue.activeTransfer.items.length > 0) {
+                    dialogue.videoReceived(dialogue.activeTransfer.items[0].url)
+                }
+            }
+
+            if (done) {
+                acceptTimer.restart()
+            }
+        }
+    }
+
+    // WORKAROUND: Work around for application becoming insensitive to touch events
+    // if the dialog is dismissed while the application is inactive.
+    // Just listening for changes to Qt.application.active doesn't appear
+    // to be enough to resolve this, so it seems that something else needs
+    // to be happening first. As such there's a potential for a race
+    // condition here, although as yet no problem has been encountered.
+    Timer {
+        id: acceptTimer
+
+        interval: 100
+        repeat: true
+        running: false
+        onTriggered: {
+            if(Qt.application.state === Qt.ApplicationActive) {
+               PopupUtils.close(dialogue)
+           }
+        }
+    }
+
+    Component.onDestruction: dialogue.destruction()
+}

=== modified file 'src/qml/player.qml'
--- src/qml/player.qml	2016-01-26 14:48:04 +0000
+++ src/qml/player.qml	2017-03-21 19:39:57 +0000
@@ -25,7 +25,7 @@
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0 as Popups
-import Ubuntu.Content 0.1 as ContentHub
+import Ubuntu.Content 1.3
 
 Item {
     id: mediaPlayer
@@ -38,15 +38,25 @@
     property bool appActive: Qt.application.active
     property variant nativeOrientation: Screen.primaryOrientation
 
-    onAppActiveChanged: {
-        if (!appActive &&
-            !mpApplication.desktopMode &&
-            playerLoader.item &&
-            playerLoader.item.playing) {
+    function pickAFile()
+    {
+        if (playerLoader.item.playing)
             playerLoader.item.pause()
-        }
+        videoImport.requestVideo()
     }
 
+//    FIXME: For now keep the video playing even if the app is not active
+//    Wait for a better app life cycle to inform if the app will be suspended or not
+//
+//    onAppActiveChanged: {
+//        if (!appActive &&
+//            !mpApplication.desktopMode &&
+//            playerLoader.item &&
+//            playerLoader.item.playing) {
+//            playerLoader.item.pause()
+//        }
+//    }
+
     Screen.onOrientationChanged: {
         // Rotate the UI when the device orientation changes
         mediaPlayer.orientation = Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
@@ -170,6 +180,7 @@
                 playerLoader.item.controlsActive = true
             }
         }
+        onPlayEmptyFile: mediaPlayer.pickAFile()
     }
 
     UnityActions.ActionManager {
@@ -225,10 +236,10 @@
     }
 
     Connections {
-        target: ContentHub.ContentHub
+        target: ContentHub
         onImportRequested: {
             lateUrlCheck.stop()
-            if (transfer.state === ContentHub.ContentTransfer.Charged) {
+            if (transfer.state === ContentTransfer.Charged) {
                 var urls = []
                 for(var i=0; i < transfer.items.length; i++) {
                     urls.push(transfer.items[i].url)
@@ -241,6 +252,14 @@
         }
     }
 
+    VideoImport {
+        id: videoImport
+
+        onVideoReceived: {
+            playerLoader.item.playUri(videoUrl)
+        }
+    }
+
     Timer {
         id: lateUrlCheck
 
@@ -248,15 +267,8 @@
         repeat: false
         running: true
         onTriggered: {
-            if ((playUri == "") && !ContentHub.ContentHub.hasPending) {
-                if (mpApplication.desktopMode) {
-                    var videoFile = mpApplication.chooseFile()
-                    if (videoFile != "") {
-                        playerLoader.item.playUri(videoFile)
-                    }
-                } else {
-                    PopupUtils.open(dialogNoUrl, null)
-                }
+            if (playerLoader.item && (playerLoader.item.source == "") && !ContentHub.hasPending) {
+                mediaPlayer.pickAFile()
             }
         }
     }

=== modified file 'src/qml/player/Controls.qml'
--- src/qml/player/Controls.qml	2016-11-22 20:22:15 +0000
+++ src/qml/player/Controls.qml	2017-03-21 19:39:57 +0000
@@ -35,11 +35,12 @@
     property variant playerStatus: MediaPlayer.NoMedia
 
     property alias finalSeekPosition: _timeline.finalSeekPosition
-    property alias settingsEnabled: _settingsButton.enabled
+    property alias openFileEnabled: _openFileButton.enabled
 
     signal fullscreenClicked
     signal playbackClicked
     signal settingsClicked
+    signal openFileClicked
     signal shareClicked
     signal seekRequested(int time)
     signal startSeek
@@ -153,12 +154,7 @@
             IconButton {
                 id: _fullScreenButton
 
-                //TODO: use the correct icon based on window state
-//                visible: (mpApplication.desktopMode || (Window.visibility ===  Window.FullScreen))
-//                iconSource: mpApplication.desktopMode ?
-//                                Window.visibility ===  Window.FullScreen ? "image://theme/view-restore" : "image://theme/view-fullscreen" :
-//                                "image://theme/close"
-                iconSource:  mpApplication.desktopMode ? "image://theme/view-fullscreen" : "image://theme/close"
+                iconSource: Window.visibility ===  Window.FullScreen ? "image://theme/view-restore" : "image://theme/view-fullscreen"
                 iconSize: units.gu(3)
                 anchors.verticalCenter: parent.verticalCenter
                 width: visible ? units.gu(8) : 0
@@ -184,7 +180,8 @@
                                                               _fullScreenButton.width -
                                                               _timeLabel.width -
                                                               _shareButton.width -
-                                                              _settingsButton.width
+                                                              _openFileButton.width -
+                                                              _quitButton.width
 
                 height: units.gu(4)
                 onClicked: controls.playbackClicked()
@@ -206,9 +203,8 @@
                        playbackButton.width -
                        _timeLabel.width -
                        _shareButton.width -
-                       _settingsButton.width -
-                       units.gu(2) : 0
-
+                       _openFileButton.width -
+                       _quitButton.width : 0
 
                 TimeLine {
                     id: _timeline
@@ -297,14 +293,14 @@
             }
 
             VLine {
-                visible: _settingsButton.visible
+                visible: _openFileButton.visible
             }
 
             IconButton {
-                id: _settingsButton
+                id: _openFileButton
 
-                visible: false
-                iconSource: "artwork/icon_settings.png"
+                visible: enabled
+                iconSource: "image://theme/document-open"
                 iconSize: units.gu(3)
                 anchors {
                     top: parent.top
@@ -313,7 +309,22 @@
                 width: visible ? units.gu(7) : 0
                 enabled: false
                 opacity: enabled ? 1.0 : 0.2
-                onClicked: settingsClicked()
+                onClicked: openFileClicked()
+            }
+
+            VLine {}
+
+            IconButton {
+                id: _quitButton
+
+                iconSource: "image://theme/close"
+                iconSize: units.gu(3)
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                }
+                width: units.gu(7)
+                onClicked: Qt.quit()
             }
         }
     }

=== modified file 'src/qml/player/VideoPlayer.qml'
--- src/qml/player/VideoPlayer.qml	2016-02-19 11:14:53 +0000
+++ src/qml/player/VideoPlayer.qml	2017-03-21 19:39:57 +0000
@@ -28,20 +28,21 @@
 AbstractPlayer {
     id: player
 
-    property variant nfo
+    property variant info
     property int pressCount: 0
     property bool wasPlaying: false
-    property string uri
     property bool rotating: false
     property alias controlsActive: _controls.active
     property bool componentLoaded: false
     readonly property int seekStep: 1000
+    readonly property bool isEmpty: source == ""
     property var errorDialog: null
 
     signal timeClicked
+    signal playEmptyFile
 
     objectName: "player"
-    nfo: VideoInfo {
+    info: VideoInfo {
         uri: source
     }
 
@@ -134,8 +135,7 @@
                 player.video.seek(time)
             }
 
-            settingsEnabled: mpApplication.desktopMode
-
+            openFileEnabled: true
             objectName: "controls"
             state: player.state
             video: player.video
@@ -149,46 +149,79 @@
             sceneSelectorHeight: units.gu(18)
             playerStatus: player.status
 
-            onPlaybackClicked: player.playPause()
-
-            onFullscreenClicked: {
-                if (mpApplication.desktopMode) {
-                    mpApplication.toggleFullscreen()
+            onPlaybackClicked: {
+                if (player.source == "") {
+                    player.playEmptyFile()
                 } else {
-                    Qt.quit()
+                    player.playPause()
                 }
             }
 
+            onFullscreenClicked: mpApplication.toggleFullscreen()
+            onOpenFileClicked: player.playEmptyFile()
             onStartSeek: aboutToSeek()
             onEndSeek: seekDone()
             onSeekRequested: seek(time)
-
-            onSettingsClicked: {
-                if (mpApplication.desktopMode) {
-                    var videoFile = mpApplication.chooseFile()
-                    if (videoFile != "") {
-                        player.stop()
-                        item.playUri(videoFile)
-                    }
-                }
-            }
         }
     }
 
     MouseArea {
-            id: _mouseArea
-
-            objectName: "videoMouseArea"
+        id: _mouseArea
+
+        objectName: "videoMouseArea"
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: _controls.top
+        }
+        onClicked: _controls.active = !_controls.active
+    }
+
+    Item {
+        id: emptyState
+
+        anchors.fill: parent
+        visible: false
+        Icon {
+            id: emptyStateIcon
+
+            source: "image://theme/document-open"
+            color: "white"
+            anchors.centerIn: parent
+            width: units.gu(4)
+        }
+        Label {
+            text: i18n.tr("Please choose a file to open")
+            color: "white"
+            textSize: Label.Large
             anchors {
-                left: parent.left
-                right: parent.right
-                top: parent.top
-                bottom: _controls.top
-            }
-
-            onClicked: _controls.active = !_controls.active
-        }
-
+                horizontalCenter: parent.horizontalCenter
+                top: emptyStateIcon.bottom
+                topMargin: units.gu(2)
+            }
+        }
+    }
+
+    state: player.isEmpty ? "empty" : ""
+    states: [
+        State {
+            name: "empty"
+            PropertyChanges {
+                target:  _controls
+                active: true
+            }
+            PropertyChanges {
+                target: emptyState
+                visible: true
+            }
+            PropertyChanges {
+                target: _mouseArea
+                enabled: false
+            }
+        }
+
+    ]
 
     Keys.onReleased:
     {

=== modified file 'tests/unittest/tst_video_player.qml'
--- tests/unittest/tst_video_player.qml	2016-09-26 23:12:42 +0000
+++ tests/unittest/tst_video_player.qml	2017-03-21 19:39:57 +0000
@@ -75,6 +75,21 @@
             tryCompare(player, 'paused', false)
             tryCompare(player, 'playing', false)
             tryCompare(player, 'wasPlaying', false)
+            tryCompare(player, 'isEmpty', true)
+        }
+
+        function test_empty_state()
+        {
+            tryCompare(player, 'isEmpty', true)
+            tryCompare(player, 'controlsActive', true)
+
+            // test if controls stay active after click on empty state
+            mouseClick(player)
+            tryCompare(player, 'controlsActive', true)
+
+            // play any uri should leave empty state
+            player.playUri(videUri)
+            tryCompare(player, 'isEmpty', false)
         }
 
         function test_open_video()
@@ -87,6 +102,8 @@
         function test_play_pause_video()
         {
             player.playUri(videUri)
+
+            tryCompare(player, 'isEmpty', false)
             tryCompare(player, 'playing', true)
             player.playPause()
             tryCompare(player, 'paused', true)
@@ -98,6 +115,7 @@
         {
             player.playUri(videUri)
             tryCompare(player, 'playing', true)
+            tryCompare(player, 'controlsActive', false)
 
             mouseClick(player)
             tryCompare(player, 'controlsActive', true)
@@ -126,7 +144,6 @@
             tryCompare(player, 'paused', true)
         }
 
-
         function test_play_after_pause()
         {
             // play video