Merge lp:~ahayzen/music-app/remix-async-now-playing into lp:music-app/remix

[Andrew Hayzen]

* Async loading of MusicNowPlaying

* Async loading of MusicNowPlaying

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:700
http://91.189.93.70:8080/job/music-app-remix-ci/159/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1236
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/159

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/159/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-remix-autolanding/61/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1240
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-autolanding/61

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/remix-async-now-playing]

701. By Andrew Hayzen on 2014-10-24

* Fixes for autopilot

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:701
http://91.189.93.70:8080/job/music-app-remix-ci/161/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1242/console
    FAILURE: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/161/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/161/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/remix-async-now-playing]

702. By Andrew Hayzen on 2014-10-24

* Fixes for pyflakes and pep8

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:702
http://91.189.93.70:8080/job/music-app-remix-ci/162/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1244
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/162

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/162/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

AP test updates LGTM!

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-22 22:39:03 +0000
+++ MusicNowPlaying.qml	2014-10-24 12:56:33 +0000
@@ -302,16 +302,14 @@
 
                     Connections {
                         target: player
-                        onDurationChanged: {
-                            musicToolbarFullDurationLabel.text = durationToString(player.duration)
-                            progressSliderMusic.maximumValue = player.duration
-                        }
                         onPositionChanged: {
                             // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)
                             if (progressSliderMusic.seeking === false && !progressSliderMusic.seeked) {
-                                progressSliderMusic.value = player.position
                                 musicToolbarFullPositionLabel.text = durationToString(player.position)
                                 musicToolbarFullDurationLabel.text = durationToString(player.duration)
+
+                                progressSliderMusic.value = player.position
+                                progressSliderMusic.maximumValue = player.duration
                             }
 
                             progressSliderMusic.seeked = false;

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-22 17:46:50 +0000
+++ music-app.qml	2014-10-24 12:56:33 +0000
@@ -87,9 +87,9 @@
                 break;
             case Qt.Key_J:  //      Ctrl+J      Jump to playing song
                 tabs.pushNowPlaying()
-                nowPlaying.isListView = true;
+                mainPageStack.currentPage.isListView = true
                 break;
-            case Qt.Key_N:  //      Ctrl+N      Show now playing
+            case Qt.Key_N:  //      Ctrl+N      Show Now playing
                 tabs.pushNowPlaying()
                 break;
             case Qt.Key_P:  //      Ctrl+P      Toggle playing state
@@ -629,10 +629,10 @@
         clear = clear === undefined ? false : clear  // force clear and will ignore player.toggle()
 
         if (!clear) {
-            // If same track and on now playing page then toggle
-            if (musicToolbar.currentPage === nowPlaying &&
-                    trackQueue.model.get(player.currentIndex) !== undefined &&
-                    Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
+            // If same track and on Now playing page then toggle
+            if ((mainPageStack.currentPage.title === i18n.tr("Now playing") || mainPageStack.currentPage.title === i18n.tr("Queue"))
+                    && trackQueue.model.get(player.currentIndex) !== undefined
+                    && Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
                 player.toggle()
                 return;
             }
@@ -645,7 +645,7 @@
         if (play) {
             player.playSong(file, index);
 
-            // Show the Now Playing page and make sure the track is visible
+            // Show the Now playing page and make sure the track is visible
             tabs.pushNowPlaying();
         }
         else {
@@ -661,10 +661,8 @@
             player.playSong(trackQueue.model.get(index).filename, index);
         }
 
-        // Show the Now Playing page and make sure the track is visible
-        if (!nowPlaying.isListView) {
-            tabs.pushNowPlaying();
-        }
+        // Show the Now playing page and make sure the track is visible
+        tabs.pushNowPlaying();
     }
 
     function playRandomSong(shuffle)
@@ -762,6 +760,7 @@
     // list of tracks on startup. This is just during development
     LibraryListModel {
         id: trackQueue
+        objectName: "trackQueue"
 
         function append(listElement)
         {
@@ -842,7 +841,7 @@
 
     MusicToolbar {
         id: musicToolbar
-        visible: nowPlaying.isListView || !nowPlaying.visible
+        visible: mainPageStack.currentPage.title !== i18n.tr("Now playing")
         objectName: "musicToolbarObject"
         z: 200  // put on top of everything else
     }
@@ -993,11 +992,22 @@
             function pushNowPlaying()
             {
                 // only push if on a different page
-                if (mainPageStack.currentPage !== nowPlaying) {
+                if (mainPageStack.currentPage.title !== i18n.tr("Now playing")
+                        && mainPageStack.currentPage.title !== i18n.tr("Queue")) {
+
+                    var comp = Qt.createComponent("MusicNowPlaying.qml")
+                    var nowPlaying = comp.createObject(mainPageStack, {});
+
+                    if (nowPlaying === null) { // Error Handling
+                        console.log("Error creating object");
+                    }
+
                     mainPageStack.push(nowPlaying);
                 }
 
-                nowPlaying.isListView = false;  // ensure full view
+                if (mainPageStack.currentPage.title === i18n.tr("Queue")) {
+                    mainPageStack.currentPage.isListView = false;  // ensure full view
+                }
             }
 
             Component.onCompleted: musicToolbar.currentTab = selectedTab
@@ -1024,10 +1034,6 @@
             id: albumsPage
         }
 
-        MusicNowPlaying {
-            id: nowPlaying
-        }
-
         MusicaddtoPlaylist {
             id: addtoPlaylist
         }

=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2014-10-21 21:06:07 +0000
+++ tests/autopilot/music_app/__init__.py	2014-10-24 12:56:33 +0000
@@ -85,6 +85,10 @@
         return self.main_view.wait_select_single(
             MusicPlaylists, objectName='playlistsPage')
 
+    def get_queue_count(self):
+        return self.main_view.select_single("LibraryListModel",
+                                            objectName="trackQueue").count
+
     def get_songs_page(self):
         return self.app.wait_select_single(SongsPage, objectName="songsPage")
 
@@ -237,6 +241,8 @@
         root = self.get_root_instance()
         self.player = root.select_single(Player, objectName="player")
 
+        self.visible.wait_for(True)
+
     @ensure_now_playing_full
     @click_object
     def click_forward_button(self):

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-10-07 15:24:08 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-10-24 12:56:33 +0000
@@ -66,11 +66,10 @@
     def test_play_pause_library(self):
         """ Test playing and pausing a track (Music Library must exist) """
 
-        now_playing_page = self.app.get_now_playing_page()
         toolbar = self.app.get_toolbar()
 
         # get number of tracks in queue before queuing a track
-        initial_tracks_count = now_playing_page.get_count()
+        initial_tracks_count = self.app.get_queue_count()
 
         # switch to albums tab and select the album
         self.app.get_albums_page().click_album(0)
@@ -82,9 +81,9 @@
         track.click_add_to_queue_action()  # add track to the queue
 
         # wait for track to be queued
-        now_playing_page.get_count().wait_for(initial_tracks_count + 1)
+        self.app.get_queue_count().wait_for(initial_tracks_count + 1)
 
-        end_tracks_count = now_playing_page.get_count()
+        end_tracks_count = self.app.get_queue_count()
 
         # Assert that the song added to the list is not playing
         self.assertThat(self.player.currentIndex,
@@ -318,11 +317,10 @@
     def test_add_song_to_queue_from_albums_page(self):
         """tests navigating to the Albums tab and adding a song to queue"""
 
-        now_playing_page = self.app.get_now_playing_page()
         toolbar = self.app.get_toolbar()
 
         # get number of tracks in queue before queuing a track
-        initial_tracks_count = now_playing_page.get_count()
+        initial_tracks_count = self.app.get_queue_count()
 
         # switch to albums tab
         albums_page = self.app.get_albums_page()
@@ -341,7 +339,7 @@
         track.click_add_to_queue_action()  # add track to the queue
 
         # verify track queue has added one to initial value
-        self.assertThat(now_playing_page.get_count(),
+        self.assertThat(self.app.get_queue_count(),
                         Eventually(Equals(initial_tracks_count + 1)))
 
         # Assert that the song added to the list is not playing
@@ -370,10 +368,8 @@
         """tests navigating to the Songs tab and adding the library to the
            queue with the selected item being played. """
 
-        now_playing_page = self.app.get_now_playing_page()
-
         # get number of tracks in queue before queuing a track
-        initial_tracks_count = now_playing_page.get_count()
+        initial_tracks_count = self.app.get_queue_count()
 
         self.app.populate_queue()  # populate queue
 
@@ -401,11 +397,10 @@
         """tests navigating to the Songs tab and adding a song from the library
            to the queue via the expandable list view item. """
 
-        now_playing_page = self.app.get_now_playing_page()
         toolbar = self.app.get_toolbar()
 
         # get number of tracks in queue before queuing a track
-        initial_tracks_count = now_playing_page.get_count()
+        initial_tracks_count = self.app.get_queue_count()
 
         # switch to tracks page
         tracks_page = self.app.get_tracks_page()
@@ -417,12 +412,12 @@
         track.click_add_to_queue_action()  # add track to queue
 
         # verify track queue has added all songs to initial value
-        self.assertThat(now_playing_page.get_count(),
+        self.assertThat(self.app.get_queue_count(),
                         Eventually(Equals(initial_tracks_count + 1)))
 
         # Assert that the song added to the list is not playing
         self.assertThat(self.player.currentIndex,
-                        Eventually(NotEquals(now_playing_page.get_count())))
+                        Eventually(NotEquals(self.app.get_queue_count())))
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
         toolbar.switch_to_now_playing()  # Switch to the now playing page
@@ -490,10 +485,8 @@
     def test_artists_tab_album(self):
         """tests navigating to the Artists tab and playing an album"""
 
-        now_playing_page = self.app.get_now_playing_page()
-
         # get number of tracks in queue before queuing a track
-        initial_tracks_count = now_playing_page.get_count()
+        initial_tracks_count = self.app.get_queue_count()
 
         # switch to artists tab
         artists_page = self.app.get_artists_page()