Merge lp:~ahayzen/music-app/remix-fix-playlists-slow into lp:music-app/remix

Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 710
Merged at revision: 710
Proposed branch: lp:~ahayzen/music-app/remix-fix-playlists-slow
Merge into: lp:music-app/remix
Diff against target: 30 lines (+4/-3)
2 files modified
WorkerModelLoader.qml (+3/-3)
music-app.qml (+1/-0)
To merge this branch: bzr merge lp:~ahayzen/music-app/remix-fix-playlists-slow
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+239788@code.launchpad.net

Commit message

* Change playlistModel syncFactor to 1
* Never attempt to ping when processing a sync pong

Description of the change

* Change playlistModel syncFactor to 1
* Never attempt to ping when processing a sync pong

To post a comment you must log in.
710. By Andrew Hayzen

* Don't check list length if null

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM, this fixes the regression that was causing playlist items to load slowly in the SongsPage.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'WorkerModelLoader.qml'
--- WorkerModelLoader.qml 2014-10-27 23:45:25 +0000
+++ WorkerModelLoader.qml 2014-10-28 03:21:31 +0000
@@ -50,11 +50,11 @@
5050
51 onMessage: {51 onMessage: {
52 if (messageObject.sync === true) {52 if (messageObject.sync === true) {
53 if (i >= list.length) { // if synced check if list now complete53 if (list !== null && i >= list.length) { // if synced check if list now complete
54 completed = true54 completed = true
55 } else {
56 return; // do not continue from a sync 'pong' only from a process/clear
57 }55 }
56
57 return; // do not continue from a sync 'pong' only from a process/clear
58 }58 }
5959
60 if (i === 0) {60 if (i === 0) {
6161
=== modified file 'music-app.qml'
--- music-app.qml 2014-10-28 00:15:37 +0000
+++ music-app.qml 2014-10-28 03:21:31 +0000
@@ -809,6 +809,7 @@
809 // create the listmodel to use for playlists809 // create the listmodel to use for playlists
810 LibraryListModel {810 LibraryListModel {
811 id: playlistModel811 id: playlistModel
812 syncFactor: 1
812813
813 onPreLoadCompleteChanged: {814 onPreLoadCompleteChanged: {
814 if (preLoadComplete)815 if (preLoadComplete)

Subscribers

People subscribed via source and target branches