1
=== modified file 'LibraryListModel.qml'
2
--- LibraryListModel.qml	2014-02-22 21:46:04 +0000
3
+++ LibraryListModel.qml	2014-06-19 01:49:30 +0000
4
@@ -1,6 +1,8 @@
5
1
/*
1
/*
8
2
 * Copyright (C) 2013 Victor Thompson <victor.thompson@gmail.com>
2
 * Copyright (C) 2013, 2014
9
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
10
4
 *      Daniel Holm <d.holmen@gmail.com>
11
5
 *      Victor Thompson <victor.thompson@gmail.com>
12
4
 *
6
 *
13
5
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
14
6
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
15
@@ -21,7 +23,11 @@
16
21
import "playlists.js" as Playlists
23
import "playlists.js" as Playlists
17
22
24
18
23
Item {
25
Item {
20
24
    property ListModel model : ListModel { id: libraryModel }
26
    id: libraryListModelItem
21
27
    property ListModel model : ListModel {
22
28
        id: libraryModel
23
29
        property var linkLibraryListModel: libraryListModelItem
24
30
    }
25
25
    property alias count: libraryModel.count
31
    property alias count: libraryModel.count
26
26
    property var query: null
32
    property var query: null
27
27
    property var param: null
33
    property var param: null
28
@@ -37,6 +43,13 @@
29
37
        }
43
        }
30
38
    }
44
    }
31
39
45
32
46
    /* Pretent to be like a mediascanner2 listmodel */
33
47
    property alias rowCount: libraryModel.count
34
48
35
49
    function get(index, role) {
36
50
        return model.get(index);
37
51
    }
38
52
39
40
    WorkerScript {
53
    WorkerScript {
40
41
         id: worker
54
         id: worker
41
42
         source: "worker-library-loader.js"
55
         source: "worker-library-loader.js"
42
@@ -105,66 +118,6 @@
43
105
        return -1;
118
        return -1;
44
106
    }
119
    }
45
107
120
46
108
    function populate() {
47
109
        console.log("called LibraryListModel::populate()")
48
110
49
111
        // Save query for queue
50
112
        query = Library.getAll
51
113
        param = null
52
114
53
115
        worker.list = Library.getAll();
54
116
    }
55
117
56
118
    function filterArtists() {
57
119
        console.log("called LibraryListModel::filterArtists()")
58
120
59
121
        // Save query for queue
60
122
        query = Library.getArtists
61
123
        param = null
62
124
63
125
        worker.list = Library.getArtists();
64
126
    }
65
127
66
128
    function filterArtistTracks(artist) {
67
129
        console.log("called LibraryListModel::filterArtistTracks()")
68
130
69
131
        // Save query for queue
70
132
        query = Library.getArtistTracks
71
133
        param = artist
72
134
73
135
        worker.list = Library.getArtistTracks(artist);
74
136
    }
75
137
76
138
    function filterArtistAlbums(artist) {
77
139
        console.log("called LibraryListModel::filterArtistAlbums()")
78
140
79
141
        // Save query for queue
80
142
        query = Library.getArtistAlbums
81
143
        param = artist
82
144
83
145
        worker.list = Library.getArtistAlbums(artist);
84
146
    }
85
147
86
148
    function filterAlbums() {
87
149
        console.log("called LibraryListModel::filterAlbums()")
88
150
89
151
        // Save query for queue
90
152
        query = Library.getAlbums
91
153
        param = null
92
154
93
155
        worker.list = Library.getAlbums();
94
156
    }
95
157
96
158
    function filterAlbumTracks(album) {
97
159
        console.log("called LibraryListModel::filterAlbumTracks()")
98
160
99
161
        // Save query for queue
100
162
        query = Library.getAlbumTracks
101
163
        param = album
102
164
103
165
        worker.list = Library.getAlbumTracks(album);
104
166
    }
105
167
106
168
    function filterPlaylists() {
121
    function filterPlaylists() {
107
169
        console.log("called LibraryListModel::filterPlaylistTracks()")
122
        console.log("called LibraryListModel::filterPlaylistTracks()")
108
170
123
109
@@ -195,36 +148,10 @@
110
195
        worker.list = Library.getRecent();
148
        worker.list = Library.getRecent();
111
196
    }
149
    }
112
197
150
113
198
    function filterGenres() {
114
199
        console.log("called LibraryListModel::filterGenres()")
115
200
116
201
        // Save query for queue
117
202
        query = Library.getGenres
118
203
        param = null
119
204
120
205
        worker.list = Library.getGenres();
121
206
    }
122
207
123
208
    function filterGenreTracks(genre) {
124
209
        console.log("called LibraryListModel::filterGenreTracks()")
125
210
126
211
        // Save query for queue
127
212
        query = Library.getGenreTracks
128
213
        param = genre
129
214
130
215
        worker.list = Library.getGenreTracks(genre);
131
216
    }
132
217
133
218
    function clear() {
151
    function clear() {
134
219
        if (worker.list !== null)
152
        if (worker.list !== null)
135
220
        {
153
        {
136
221
            worker.sendMessage({'clear': true, 'model': libraryModel})
154
            worker.sendMessage({'clear': true, 'model': libraryModel})
137
222
        }
155
        }
138
223
    }
156
    }
139
224
140
225
    function filterSearch(searchQuery) {
141
226
        query = Library.search
142
227
        param = searchQuery
143
228
        worker.list = Library.search(searchQuery)
144
229
    }
145
230
}
157
}
146
231
158
147
=== modified file 'LoginLastFM.qml'
148
--- LoginLastFM.qml	2014-01-11 17:41:20 +0000
149
+++ LoginLastFM.qml	2014-06-19 01:49:30 +0000
150
@@ -24,7 +24,6 @@
151
24
import QtQuick.LocalStorage 2.0
24
import QtQuick.LocalStorage 2.0
152
25
import QtQuick.XmlListModel 2.0
25
import QtQuick.XmlListModel 2.0
153
26
import "settings.js" as Settings
26
import "settings.js" as Settings
154
27
import "meta-database.js" as Library
155
28
import "scrobble.js" as Scrobble
27
import "scrobble.js" as Scrobble
156
29
28
157
30
// Last.fm login dialog
29
// Last.fm login dialog
158
31
30
159
=== modified file 'MusicAlbums.qml'
160
--- MusicAlbums.qml	2014-04-17 14:42:51 +0000
161
+++ MusicAlbums.qml	2014-06-19 01:49:30 +0000
162
@@ -1,6 +1,8 @@
163
1
/*
1
/*
166
2
 * Copyright (C) 2013 Victor Thompson <victor.thompson@gmail.com>
2
 * Copyright (C) 2013, 2014
167
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
168
4
 *      Daniel Holm <d.holmen@gmail.com>
169
5
 *      Victor Thompson <victor.thompson@gmail.com>
170
4
 *
6
 *
171
5
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
172
6
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
173
@@ -17,14 +19,16 @@
174
17
19
175
18
import QtQuick 2.0
20
import QtQuick 2.0
176
19
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
177
22
import Ubuntu.Components 1.1 as Toolkit
178
20
import Ubuntu.Components.ListItems 0.1
23
import Ubuntu.Components.ListItems 0.1
179
21
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 0.1
180
22
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
181
26
import Ubuntu.MediaScanner 0.1
182
27
import Ubuntu.Thumbnailer 0.1
183
23
import QtMultimedia 5.0
28
import QtMultimedia 5.0
184
24
import QtQuick.LocalStorage 2.0
29
import QtQuick.LocalStorage 2.0
185
25
import QtGraphicalEffects 1.0
30
import QtGraphicalEffects 1.0
186
26
import "settings.js" as Settings
31
import "settings.js" as Settings
187
27
import "meta-database.js" as Library
188
28
import "playlists.js" as Playlists
32
import "playlists.js" as Playlists
189
29
import "common"
33
import "common"
190
30
34
191
@@ -59,21 +63,23 @@
192
59
        anchors.bottomMargin: units.gu(1)
63
        anchors.bottomMargin: units.gu(1)
193
60
        cellHeight: height/3
64
        cellHeight: height/3
194
61
        cellWidth: height/3
65
        cellWidth: height/3
196
62
        model: albumModel.model
66
        model: Toolkit.SortFilterModel {
197
67
            id: albumsModelFilter
198
68
            property alias rowCount: albumsModel.rowCount
199
69
            model: AlbumsModel {
200
70
                id: albumsModel
201
71
                store: musicStore
202
72
            }
203
73
            sort.property: "title"
204
74
            sort.order: Qt.AscendingOrder
205
75
        }
206
76
207
63
        delegate: albumDelegate
77
        delegate: albumDelegate
208
64
        flow: GridView.TopToBottom
78
        flow: GridView.TopToBottom
209
65
79
210
66
        Component {
80
        Component {
211
67
            id: albumDelegate
81
            id: albumDelegate
212
68
            Item {
82
            Item {
213
69
                property string artist: model.artist
214
70
                property string album: model.album
215
71
                property string title: model.title
216
72
                property string cover: model.cover  !== "" ? model.cover :  Qt.resolvedUrl("images/music-app-cover@30.png")
217
73
                property string length: model.length
218
74
                property string file: model.file
219
75
                property string year: model.year
220
76
221
77
                id: albumItem
83
                id: albumItem
222
78
                height: albumlist.cellHeight - units.gu(1)
84
                height: albumlist.cellHeight - units.gu(1)
223
79
                width: albumlist.cellHeight - units.gu(1)
85
                width: albumlist.cellHeight - units.gu(1)
224
@@ -85,7 +91,7 @@
225
85
                    image: Image {
91
                    image: Image {
226
86
                        id: icon
92
                        id: icon
227
87
                        fillMode: Image.Stretch
93
                        fillMode: Image.Stretch
229
88
                        source: cover
94
                        source: "image://albumart/artist=" + model.artist + "&album=" + model.title
230
89
                        onStatusChanged: {
95
                        onStatusChanged: {
231
90
                            if (status === Image.Error) {
96
                            if (status === Image.Error) {
232
91
                                source = Qt.resolvedUrl("images/music-app-cover@30.png")
97
                                source = Qt.resolvedUrl("images/music-app-cover@30.png")
233
@@ -118,7 +124,7 @@
234
118
                        anchors.rightMargin: units.gu(1)
124
                        anchors.rightMargin: units.gu(1)
235
119
                        color: styleMusic.nowPlaying.labelSecondaryColor
125
                        color: styleMusic.nowPlaying.labelSecondaryColor
236
120
                        elide: Text.ElideRight
126
                        elide: Text.ElideRight
238
121
                        text: artist
127
                        text: model.artist
239
122
                        fontSize: "x-small"
128
                        fontSize: "x-small"
240
123
                    }
129
                    }
241
124
                    Label {
130
                    Label {
242
@@ -131,7 +137,7 @@
243
131
                        anchors.rightMargin: units.gu(1)
137
                        anchors.rightMargin: units.gu(1)
244
132
                        color: styleMusic.common.white
138
                        color: styleMusic.common.white
245
133
                        elide: Text.ElideRight
139
                        elide: Text.ElideRight
247
134
                        text: album
140
                        text: model.title
248
135
                        fontSize: "small"
141
                        fontSize: "small"
249
136
                    }
142
                    }
250
137
                }
143
                }
251
@@ -143,14 +149,12 @@
252
143
                    onPressAndHold: {
149
                    onPressAndHold: {
253
144
                    }
150
                    }
254
145
                    onClicked: {
151
                    onClicked: {
259
146
                        albumTracksModel.filterAlbumTracks(album)
152
                        songsSheet.album = model.title;
260
147
153
                        songsSheet.genre = undefined
261
148
                        songsSheet.line1 = artist
154
                        songsSheet.line1 = model.artist
262
149
                        songsSheet.line2 = album
155
                        songsSheet.line2 = model.title
263
150
                        songsSheet.isAlbum = true
156
                        songsSheet.isAlbum = true
267
151
                        songsSheet.file = file
157
                        songsSheet.covers = [{author: model.artist, album: model.title}]
265
152
                        songsSheet.year = year
266
153
                        songsSheet.covers = [cover]
268
154
                        PopupUtils.open(songsSheet.sheet)
158
                        PopupUtils.open(songsSheet.sheet)
269
155
                    }
159
                    }
270
156
                }
160
                }
271
157
161
272
=== modified file 'MusicArtists.qml'
273
--- MusicArtists.qml	2014-05-19 23:13:39 +0000
274
+++ MusicArtists.qml	2014-06-19 01:49:30 +0000
275
@@ -1,6 +1,8 @@
276
1
/*
1
/*
279
2
 * Copyright (C) 2013 Victor Thompson <victor.thompson@gmail.com>
2
 * Copyright (C) 2013, 2014
280
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
281
4
 *      Daniel Holm <d.holmen@gmail.com>
282
5
 *      Victor Thompson <victor.thompson@gmail.com>
283
4
 *
6
 *
284
5
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
285
6
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
286
@@ -20,6 +22,8 @@
287
20
import Ubuntu.Components.ListItems 0.1
22
import Ubuntu.Components.ListItems 0.1
288
21
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 0.1
289
22
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 0.1 as ListItem
290
25
import Ubuntu.MediaScanner 0.1
291
26
import Ubuntu.Thumbnailer 0.1
292
23
import QtMultimedia 5.0
27
import QtMultimedia 5.0
293
24
import QtQuick.LocalStorage 2.0
28
import QtQuick.LocalStorage 2.0
294
25
import "settings.js" as Settings
29
import "settings.js" as Settings
295
@@ -47,7 +51,12 @@
296
47
        id: artistlist
51
        id: artistlist
297
48
        anchors.fill: parent
52
        anchors.fill: parent
298
49
        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
53
        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
300
50
        model: artistModel.model
54
        model: ArtistsModel {
301
55
            id: artistsModel
302
56
            albumArtists: true
303
57
            store: musicStore
304
58
        }
305
59
306
51
        delegate: artistDelegate
60
        delegate: artistDelegate
307
52
61
308
53
        Component {
62
        Component {
309
@@ -55,9 +64,46 @@
310
55
64
311
56
            ListItem.Standard {
65
            ListItem.Standard {
312
57
                id: track
66
                id: track
313
58
                property string artist: model.artist
314
59
                height: styleMusic.common.itemHeight
67
                height: styleMusic.common.itemHeight
315
60
68
316
69
                AlbumsModel {
317
70
                    id: albumArtistModel
318
71
                    albumArtist: model.artist
319
72
                    store: musicStore
320
73
                }
321
74
322
75
                Repeater {
323
76
                    id: albumArtistModelRepeater
324
77
                    model: albumArtistModel
325
78
                    delegate: Item {
326
79
                        property string author: model.artist
327
80
                        property string album: model.title
328
81
                    }
329
82
                    property var covers: []
330
83
                    signal finished()
331
84
332
85
                    onFinished: {
333
86
                        coverRow.count = count
334
87
                        coverRow.covers = covers
335
88
                    }
336
89
                    onItemAdded: {
337
90
                        covers.push({author: item.author, album: item.album});
338
91
339
92
                        if (index === count - 1) {
340
93
                            finished();
341
94
                        }
342
95
                    }
343
96
                }
344
97
345
98
                SongsModel {
346
99
                    id: songArtistModel
347
100
                    albumArtist: model.artist
348
101
                    // HACK: Temporarily setting limit to 500 to ensure model
349
102
                    //       is populated. See lp:1326753
350
103
                    limit: 500
351
104
                    store: musicStore
352
105
                }
353
106
354
61
                CoverRow {
107
                CoverRow {
355
62
                    id: coverRow
108
                    id: coverRow
356
63
                    anchors {
109
                    anchors {
357
@@ -65,9 +111,10 @@
358
65
                        left: parent.left
111
                        left: parent.left
359
66
                        margins: units.gu(1)
112
                        margins: units.gu(1)
360
67
                    }
113
                    }
362
68
                    count: parseInt(Library.getArtistCovers(artist).length)
114
363
115
                    count: 0
364
69
                    size: styleMusic.common.albumSize
116
                    size: styleMusic.common.albumSize
366
70
                    covers: Library.getArtistCovers(artist)
117
                    covers: []
367
71
                }
118
                }
368
72
119
369
73
                Label {
120
                Label {
370
@@ -86,7 +133,7 @@
371
86
                        rightMargin: units.gu(1.5)
133
                        rightMargin: units.gu(1.5)
372
87
                    }
134
                    }
373
88
                    elide: Text.ElideRight
135
                    elide: Text.ElideRight
375
89
                    text: artist
136
                    text: model.artist
376
90
                }
137
                }
377
91
138
378
92
                Label {
139
                Label {
379
@@ -103,8 +150,7 @@
380
103
                        rightMargin: units.gu(1.5)
150
                        rightMargin: units.gu(1.5)
381
104
                    }
151
                    }
382
105
                    elide: Text.ElideRight
152
                    elide: Text.ElideRight
385
106
                    // model for number of albums?
153
                    text: i18n.tr("%1 album", "%1 albums", albumArtistModel.rowCount).arg(albumArtistModel.rowCount)
384
107
                    text: i18n.tr("%1 album", "%1 albums", Library.getArtistAlbumCount(artist)).arg(Library.getArtistAlbumCount(artist))
386
108
                }
154
                }
387
109
155
388
110
                Label {
156
                Label {
389
@@ -121,7 +167,7 @@
390
121
                        rightMargin: units.gu(1.5)
167
                        rightMargin: units.gu(1.5)
391
122
                    }
168
                    }
392
123
                    elide: Text.ElideRight
169
                    elide: Text.ElideRight
394
124
                    text: i18n.tr("%1 song", "%1 songs", Library.getArtistTracks(artist).length).arg(Library.getArtistTracks(artist).length)
170
                    text: i18n.tr("%1 song", "%1 songs", songArtistModel.rowCount).arg(songArtistModel.rowCount)
395
125
                }
171
                }
396
126
                onFocusChanged: {
172
                onFocusChanged: {
397
127
                }
173
                }
398
@@ -132,14 +178,11 @@
399
132
                    onPressAndHold: {
178
                    onPressAndHold: {
400
133
                    }
179
                    }
401
134
                    onClicked: {
180
                    onClicked: {
404
135
                        artistAlbumsModel.filterArtistAlbums(artist)
181
                        artistSheet.artist = model.artist
403
136
                        artistSheet.artist = artist
405
137
                        artistSheet.covers = coverRow.covers
182
                        artistSheet.covers = coverRow.covers
406
138
                        PopupUtils.open(artistSheet.sheet)
183
                        PopupUtils.open(artistSheet.sheet)
407
139
                    }
184
                    }
408
140
                }
185
                }
409
141
                Component.onCompleted: {
410
142
                }
411
143
            }
186
            }
412
144
        }
187
        }
413
145
    }
188
    }
414
146
189
415
=== modified file 'MusicNowPlaying.qml'
416
--- MusicNowPlaying.qml	2014-05-08 22:58:35 +0000
417
+++ MusicNowPlaying.qml	2014-06-19 01:49:30 +0000
418
@@ -1,7 +1,8 @@
419
1
/*
1
/*
423
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
424
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
425
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
426
5
 *      Victor Thompson <victor.thompson@gmail.com>
427
5
 *
6
 *
428
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
429
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
430
@@ -22,9 +23,9 @@
431
22
import QtQuick.LocalStorage 2.0
23
import QtQuick.LocalStorage 2.0
432
23
import Ubuntu.Components 0.1
24
import Ubuntu.Components 0.1
433
24
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
434
26
import Ubuntu.Thumbnailer 0.1
435
25
import "common"
27
import "common"
436
26
import "common/ExpanderItems"
28
import "common/ExpanderItems"
437
27
import "meta-database.js" as Library
438
28
import "settings.js" as Settings
29
import "settings.js" as Settings
439
29
30
440
30
Page {
31
Page {
441
@@ -254,8 +255,8 @@
442
254
255
443
255
                    onClicked: {
256
                    onClicked: {
444
256
                        collapseSwipeDelete(-1);  // collapse all expands
257
                        collapseSwipeDelete(-1);  // collapse all expands
447
257
                        customdebug("File: " + model.file) // debugger
258
                        customdebug("File: " + model.filename) // debugger
448
258
                        trackClicked(trackQueue, index) // play track
259
                        trackQueueClick(index);  // toggle track state
449
259
                    }
260
                    }
450
260
261
451
261
                    onMouseXChanged: {
262
                    onMouseXChanged: {
452
@@ -309,7 +310,7 @@
453
309
                        {
310
                        {
454
310
                            collapseSwipeDelete(-1);  // collapse all swipedeletes
311
                            collapseSwipeDelete(-1);  // collapse all swipedeletes
455
311
                            collapseExpand();  // collapse all
312
                            collapseExpand();  // collapse all
457
312
                            customdebug("Pressed and held queued track "+model.file)
313
                            customdebug("Pressed and held queued track "+model.filename)
458
313
                            queuelist.state = "reorder";  // enable reordering state
314
                            queuelist.state = "reorder";  // enable reordering state
459
314
                            trackContainerReorderAnimation.start();
315
                            trackContainerReorderAnimation.start();
460
315
                        }
316
                        }
461
@@ -490,7 +491,6 @@
462
490
491
463
491
                                // Remove item from queue and clear caches
492
                                // Remove item from queue and clear caches
464
492
                                trackQueue.model.remove(index);
493
                                trackQueue.model.remove(index);
465
493
                                queueChanged = true;
466
494
                            }
494
                            }
467
495
                        }
495
                        }
468
496
                    }
496
                    }
469
@@ -537,7 +537,7 @@
470
537
                        height: (queueListItem.state === "current" ? queuelist.currentHeight - units.gu(8) : queuelist.normalHeight) - units.gu(2)
537
                        height: (queueListItem.state === "current" ? queuelist.currentHeight - units.gu(8) : queuelist.normalHeight) - units.gu(2)
471
538
                        width: height
538
                        width: height
472
539
                        image: Image {
539
                        image: Image {
474
540
                            source: cover !== "" ? cover : "images/music-app-cover@30.png"
540
                            source: "image://albumart/artist=" + model.author + "&album=" + model.album
475
541
                            onStatusChanged: {
541
                            onStatusChanged: {
476
542
                                if (status === Image.Error) {
542
                                if (status === Image.Error) {
477
543
                                    source = Qt.resolvedUrl("images/music-app-cover@30.png")
543
                                    source = Qt.resolvedUrl("images/music-app-cover@30.png")
478
@@ -579,7 +579,7 @@
479
579
                        color: styleMusic.nowPlaying.labelSecondaryColor
579
                        color: styleMusic.nowPlaying.labelSecondaryColor
480
580
                        elide: Text.ElideRight
580
                        elide: Text.ElideRight
481
581
                        height: units.gu(1)
581
                        height: units.gu(1)
483
582
                        text: artist
582
                        text: model.author
484
583
                        fontSize: 'small'
583
                        fontSize: 'small'
485
584
                        width: parent.width - trackImage.width - units.gu(3.5)
584
                        width: parent.width - trackImage.width - units.gu(3.5)
486
585
                        x: trackImage.x + trackImage.width + units.gu(1)
585
                        x: trackImage.x + trackImage.width + units.gu(1)
487
@@ -591,7 +591,7 @@
488
591
                        color: styleMusic.common.white
591
                        color: styleMusic.common.white
489
592
                        elide: Text.ElideRight
592
                        elide: Text.ElideRight
490
593
                        height: units.gu(1)
593
                        height: units.gu(1)
492
594
                        text: title
594
                        text: model.title
493
595
                        fontSize: 'medium'
595
                        fontSize: 'medium'
494
596
                        width: parent.width - trackImage.width - units.gu(3.5)
596
                        width: parent.width - trackImage.width - units.gu(3.5)
495
597
                        x: trackImage.x + trackImage.width + units.gu(1)
597
                        x: trackImage.x + trackImage.width + units.gu(1)
496
@@ -603,7 +603,7 @@
497
603
                        color: styleMusic.nowPlaying.labelSecondaryColor
603
                        color: styleMusic.nowPlaying.labelSecondaryColor
498
604
                        elide: Text.ElideRight
604
                        elide: Text.ElideRight
499
605
                        height: units.gu(1)
605
                        height: units.gu(1)
501
606
                        text: album
606
                        text: model.album
502
607
                        fontSize: 'x-small'
607
                        fontSize: 'x-small'
503
608
                        width: parent.width - trackImage.width - units.gu(3.5)
608
                        width: parent.width - trackImage.width - units.gu(3.5)
504
609
                        x: trackImage.x + trackImage.width + units.gu(1)
609
                        x: trackImage.x + trackImage.width + units.gu(1)
505
610
610
506
=== modified file 'MusicPlaylists.qml'
507
--- MusicPlaylists.qml	2014-04-26 17:13:02 +0000
508
+++ MusicPlaylists.qml	2014-06-19 01:49:30 +0000
509
@@ -1,6 +1,8 @@
510
1
/*
1
/*
513
2
 * Copyright (C) 2013 Daniel Holm <d.holmen@gmail.com>
2
 * Copyright (C) 2013, 2014
514
3
                      Victor Thompson <victor.thompson@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
515
4
 *      Daniel Holm <d.holmen@gmail.com>
516
5
 *      Victor Thompson <victor.thompson@gmail.com>
517
4
 *
6
 *
518
5
 *
7
 *
519
6
 * This program is free software; you can redistribute it and/or modify
8
 * This program is free software; you can redistribute it and/or modify
520
@@ -24,7 +26,6 @@
521
24
import QtMultimedia 5.0
26
import QtMultimedia 5.0
522
25
import QtQuick.LocalStorage 2.0
27
import QtQuick.LocalStorage 2.0
523
26
import "settings.js" as Settings
28
import "settings.js" as Settings
524
27
import "meta-database.js" as Library
525
28
import "scrobble.js" as Scrobble
29
import "scrobble.js" as Scrobble
526
29
import "playlists.js" as Playlists
30
import "playlists.js" as Playlists
527
30
import "common"
31
import "common"
528
31
32
529
=== modified file 'MusicSearch.qml'
530
--- MusicSearch.qml	2014-05-14 23:39:19 +0000
531
+++ MusicSearch.qml	2014-06-19 01:49:30 +0000
532
@@ -1,7 +1,8 @@
533
1
/*
1
/*
537
2
 * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
538
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
539
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
540
5
 *      Victor Thompson <victor.thompson@gmail.com>
541
5
 *
6
 *
542
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
543
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
544
@@ -21,9 +22,10 @@
545
21
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
546
22
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 0.1 as ListItem
547
23
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 0.1
548
25
import Ubuntu.MediaScanner 0.1
549
26
import Ubuntu.Thumbnailer 0.1
550
24
import QtQuick.LocalStorage 2.0
27
import QtQuick.LocalStorage 2.0
551
25
import "playlists.js" as Playlists
28
import "playlists.js" as Playlists
552
26
import "meta-database.js" as Library
553
27
import "common"
29
import "common"
554
28
import "common/ExpanderItems"
30
import "common/ExpanderItems"
555
29
31
556
@@ -93,18 +95,13 @@
557
93
                 // Provide a small pause before search
95
                 // Provide a small pause before search
558
94
                 Timer {
96
                 Timer {
559
95
                     id: searchTimer
97
                     id: searchTimer
561
96
                     interval: 1500
98
                     interval: 500
562
97
                     repeat: false
99
                     repeat: false
563
98
                     onTriggered: {
100
                     onTriggered: {
573
99
                         if(searchField.text) {
101
                         songsSearchModel.query = searchField.text;
574
100
                             searchModel.filterSearch(searchField.text) // query the databse
102
                         searchActivity.running = true // start the activity indicator
575
101
                             searchActivity.running = true // start the activity indicator
103
576
102
                         }
104
                         indicatorTimer.start()
568
103
                         else {
569
104
                             customdebug("No search terms.")
570
105
                             searchModel.filterSearch("empty somehow?")
571
106
                         }
572
107
                        indicatorTimer.start()
577
108
                     }
105
                     }
578
109
                 }
106
                 }
579
110
                 // and onother one for the indicator
107
                 // and onother one for the indicator
580
@@ -133,6 +130,7 @@
581
133
                 width: parent.width
130
                 width: parent.width
582
134
                 height: parent.height
131
                 height: parent.height
583
135
                 color: "transparent"
132
                 color: "transparent"
584
133
                 visible: searchField.text
585
136
                 clip: true
134
                 clip: true
586
137
                 anchors {
135
                 anchors {
587
138
                     top: searchField.bottom
136
                     top: searchField.bottom
588
@@ -147,7 +145,10 @@
589
147
                     objectName: "searchtrackview"
145
                     objectName: "searchtrackview"
590
148
                     width: parent.width
146
                     width: parent.width
591
149
                     height: parent.width
147
                     height: parent.width
593
150
                     model: searchModel.model
148
                     model: SongsSearchModel {
594
149
                        id: songsSearchModel
595
150
                        store: musicStore
596
151
                     }
597
151
152
598
152
                     onMovementStarted: {
153
                     onMovementStarted: {
599
153
                         searchTrackView.forceActiveFocus()
154
                         searchTrackView.forceActiveFocus()
600
@@ -158,18 +159,12 @@
601
158
                            objectName: "playlist"
159
                            objectName: "playlist"
602
159
                            width: parent.width
160
                            width: parent.width
603
160
                            height: styleMusic.common.itemHeight
161
                            height: styleMusic.common.itemHeight
604
161
                            property string title: model.title
605
162
                            property string artist: model.artist
606
163
                            property string file: model.file
607
164
                            property string album: model.album
608
165
                            property string cover: model.cover
609
166
                            property string genre: model.genre
610
167
162
611
168
                            onClicked: {
163
                            onClicked: {
612
169
                                console.debug("Debug: "+title+" added to queue")
164
                                console.debug("Debug: "+title+" added to queue")
613
170
                                // now play this track, but keep current queue
165
                                // now play this track, but keep current queue
614
171
                                trackQueue.append(model)
166
                                trackQueue.append(model)
616
172
                                trackClicked(trackQueue, trackQueue.model.count - 1, true)
167
                                trackQueueClick(trackQueue.model.count - 1);
617
173
                                onDoneClicked: PopupUtils.close(searchTrack)
168
                                onDoneClicked: PopupUtils.close(searchTrack)
618
174
                            }
169
                            }
619
175
170
620
@@ -189,7 +184,7 @@
621
189
                                    width: styleMusic.common.albumSize
184
                                    width: styleMusic.common.albumSize
622
190
                                    height: styleMusic.common.albumSize
185
                                    height: styleMusic.common.albumSize
623
191
                                    image: Image {
186
                                    image: Image {
625
192
                                        source: cover !== "" ? cover : Qt.resolvedUrl("images/music-app-cover@30.png")
187
                                        source: "image://albumart/artist=" + model.author + "&album=" + model.title
626
193
                                        onStatusChanged: {
188
                                        onStatusChanged: {
627
194
                                            if (status === Image.Error) {
189
                                            if (status === Image.Error) {
628
195
                                                source = Qt.resolvedUrl("images/music-app-cover@30.png")
190
                                                source = Qt.resolvedUrl("images/music-app-cover@30.png")
629
@@ -211,7 +206,7 @@
630
211
                                    anchors.right: parent.right
206
                                    anchors.right: parent.right
631
212
                                    anchors.rightMargin: units.gu(1.5)
207
                                    anchors.rightMargin: units.gu(1.5)
632
213
                                    elide: Text.ElideRight
208
                                    elide: Text.ElideRight
634
214
                                    text: artist
209
                                    text: model.author
635
215
                                }
210
                                }
636
216
                                Label {
211
                                Label {
637
217
                                    id: trackTitle
212
                                    id: trackTitle
638
@@ -227,7 +222,7 @@
639
227
                                    anchors.right: parent.right
222
                                    anchors.right: parent.right
640
228
                                    anchors.rightMargin: units.gu(1.5)
223
                                    anchors.rightMargin: units.gu(1.5)
641
229
                                    elide: Text.ElideRight
224
                                    elide: Text.ElideRight
643
230
                                    text: title
225
                                    text: model.title
644
231
                                }
226
                                }
645
232
                                Label {
227
                                Label {
646
233
                                    id: trackAlbum
228
                                    id: trackAlbum
647
@@ -242,7 +237,7 @@
648
242
                                    anchors.right: parent.right
237
                                    anchors.right: parent.right
649
243
                                    anchors.rightMargin: units.gu(1.5)
238
                                    anchors.rightMargin: units.gu(1.5)
650
244
                                    elide: Text.ElideRight
239
                                    elide: Text.ElideRight
652
245
                                    text: album
240
                                    text: model.album
653
246
                                }
241
                                }
654
247
                                Label {
242
                                Label {
655
248
                                    id: trackDuration
243
                                    id: trackDuration
656
@@ -267,7 +262,7 @@
657
267
                                    fill: parent
262
                                    fill: parent
658
268
                                }
263
                                }
659
269
                                listItem: search
264
                                listItem: search
661
270
                                model: searchModel.model.get(index)
265
                                model: songsSearchModel.get(index, songsSearchModel.RoleModelData)
662
271
                                row: Row {
266
                                row: Row {
663
272
                                    AddToPlaylist {
267
                                    AddToPlaylist {
664
273
268
665
274
269
666
=== modified file 'MusicStart.qml'
667
--- MusicStart.qml	2014-06-02 15:51:48 +0000
668
+++ MusicStart.qml	2014-06-19 01:49:30 +0000
669
@@ -1,7 +1,8 @@
670
1
/*
1
/*
674
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
675
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
676
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
677
5
 *      Victor Thompson <victor.thompson@gmail.com>
678
5
 *
6
 *
679
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
680
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
681
@@ -18,9 +19,12 @@
682
18
19
683
19
import QtQuick 2.0
20
import QtQuick 2.0
684
20
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
685
22
import Ubuntu.Components 1.1 as Toolkit
686
21
import Ubuntu.Components.ListItems 0.1
23
import Ubuntu.Components.ListItems 0.1
687
22
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 0.1
688
23
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
689
26
import Ubuntu.MediaScanner 0.1
690
27
import Ubuntu.Thumbnailer 0.1
691
24
import QtMultimedia 5.0
28
import QtMultimedia 5.0
692
25
import QtQuick.LocalStorage 2.0
29
import QtQuick.LocalStorage 2.0
693
26
import "settings.js" as Settings
30
import "settings.js" as Settings
694
@@ -94,7 +98,7 @@
695
94
            model: recentModel.model
98
            model: recentModel.model
696
95
            delegate: recentDelegate
99
            delegate: recentDelegate
697
96
            header: Item {
100
            header: Item {
699
97
                id: spacer
101
                id: recentSpacer
700
98
                width: units.gu(1)
102
                width: units.gu(1)
701
99
            }
103
            }
702
100
            footer: Item {
104
            footer: Item {
703
@@ -121,7 +125,7 @@
704
121
                Item {
125
                Item {
705
122
                    property string title: model.title
126
                    property string title: model.title
706
123
                    property string title2: model.title2
127
                    property string title2: model.title2
708
124
                    property var covers: type === "playlist" ? Playlists.getPlaylistCovers(title) : [Library.getAlbumCover(title)]
128
                    property var covers: type === "playlist" ? Playlists.getPlaylistCovers(title) : [{author: model.title2, album: model.title}]
709
125
                    property string type: model.type
129
                    property string type: model.type
710
126
                    property string time: model.time
130
                    property string time: model.time
711
127
                    property string key: model.key
131
                    property string key: model.key
712
@@ -187,8 +191,9 @@
713
187
                            if (type === "playlist") {
191
                            if (type === "playlist") {
714
188
                                albumTracksModel.filterPlaylistTracks(key)
192
                                albumTracksModel.filterPlaylistTracks(key)
715
189
                            } else {
193
                            } else {
717
190
                                albumTracksModel.filterAlbumTracks(title)
194
                                songsSheet.album = title;
718
191
                            }
195
                            }
719
196
                            songsSheet.genre = undefined;
720
192
197
721
193
                            songsSheet.line1 = title2
198
                            songsSheet.line1 = title2
722
194
                            songsSheet.line2 = title
199
                            songsSheet.line2 = title
723
@@ -226,10 +231,13 @@
724
226
            anchors.topMargin: units.gu(1)
231
            anchors.topMargin: units.gu(1)
725
227
            spacing: units.gu(1)
232
            spacing: units.gu(1)
726
228
            height: units.gu(18)
233
            height: units.gu(18)
728
229
            model: genreModel.model
234
            model: GenresModel {
729
235
                store: musicStore
730
236
            }
731
237
732
230
            delegate: genreDelegate
238
            delegate: genreDelegate
733
231
            header: Item {
239
            header: Item {
735
232
                id: spacer
240
                id: genreSpacer
736
233
                width: units.gu(1)
241
                width: units.gu(1)
737
234
            }
242
            }
738
235
            orientation: ListView.Horizontal
243
            orientation: ListView.Horizontal
739
@@ -237,19 +245,47 @@
740
237
            Component {
245
            Component {
741
238
                id: genreDelegate
246
                id: genreDelegate
742
239
                Item {
247
                Item {
743
240
                    property string artist: model.artist
744
241
                    property string album: model.album
745
242
                    property string title: model.title
746
243
                    property var covers: Library.getGenreCovers(model.genre)
747
244
                    property string length: model.length
748
245
                    property string file: model.file
749
246
                    property string year: model.year
750
247
                    property string genre: model.genre
751
248
752
249
                    id: genreItem
248
                    id: genreItem
753
250
                    objectName: "genreItemObject"
249
                    objectName: "genreItemObject"
754
251
                    height: genrelist.height - units.gu(1)
250
                    height: genrelist.height - units.gu(1)
755
252
                    width: height
251
                    width: height
756
252
757
253
                    Repeater {
758
254
                        id: albumGenreModelRepeater
759
255
                        model: AlbumsModel {
760
256
                            genre: model.genre
761
257
                            store: musicStore
762
258
                        }
763
259
764
260
                        delegate: Item {
765
261
                            property string author: model.artist
766
262
                            property string album: model.title
767
263
                        }
768
264
                        property var covers: []
769
265
                        signal finished()
770
266
771
267
                        onFinished: {
772
268
                            genreShape.count = count
773
269
                            genreShape.covers = covers
774
270
                        }
775
271
                        onItemAdded: {
776
272
                            covers.push({author: item.author, album: item.album});
777
273
778
274
                            if (index === count - 1) {
779
275
                                finished();
780
276
                            }
781
277
                        }
782
278
                    }
783
279
784
280
                    SongsModel {
785
281
                        id: songGenreModel
786
282
                        genre: model.genre
787
283
                        // HACK: Temporarily setting limit to 500 to ensure model
788
284
                        //       is populated. See lp:1326753
789
285
                        limit: 500
790
286
                        store: musicStore
791
287
                    }
792
288
793
253
                    CoverRow {
289
                    CoverRow {
794
254
                        id: genreShape
290
                        id: genreShape
795
255
                        anchors {
291
                        anchors {
796
@@ -257,19 +293,20 @@
797
257
                            left: parent.left
293
                            left: parent.left
798
258
                            verticalCenter: parent.verticalCenter
294
                            verticalCenter: parent.verticalCenter
799
259
                        }
295
                        }
801
260
                        count: genreItem.covers.length
296
                        count: 0
802
261
                        size: genreItem.width
297
                        size: genreItem.width
804
262
                        covers: genreItem.covers
298
                        covers: []
805
263
                        spacing: units.gu(2)
299
                        spacing: units.gu(2)
806
264
                    }
300
                    }
807
265
                    MouseArea {
301
                    MouseArea {
808
266
                        anchors.fill: parent
302
                        anchors.fill: parent
809
267
                        onClicked: {
303
                        onClicked: {
811
268
                            albumTracksModel.filterGenreTracks(genre)
304
                            songsSheet.album = undefined
812
305
                            songsSheet.genre = model.genre
813
269
                            songsSheet.line1 = "Genre"
306
                            songsSheet.line1 = "Genre"
817
270
                            songsSheet.line2 = genre
307
                            songsSheet.line2 = model.genre
818
271
                            songsSheet.isAlbum = false
308
                            songsSheet.isAlbum = true
819
272
                            songsSheet.covers =  covers
309
                            songsSheet.covers = genreShape.covers
820
273
                            PopupUtils.open(songsSheet.sheet)
310
                            PopupUtils.open(songsSheet.sheet)
821
274
                        }
311
                        }
822
275
                    }
312
                    }
823
@@ -298,7 +335,7 @@
824
298
                        anchors.rightMargin: units.gu(1)
335
                        anchors.rightMargin: units.gu(1)
825
299
                        color: styleMusic.common.white
336
                        color: styleMusic.common.white
826
300
                        elide: Text.ElideRight
337
                        elide: Text.ElideRight
828
301
                        text: genre
338
                        text: model.genre
829
302
                        fontSize: "small"
339
                        fontSize: "small"
830
303
                    }
340
                    }
831
304
                    Label {
341
                    Label {
832
@@ -311,7 +348,7 @@
833
311
                        anchors.rightMargin: units.gu(1)
348
                        anchors.rightMargin: units.gu(1)
834
312
                        color: styleMusic.nowPlaying.labelSecondaryColor
349
                        color: styleMusic.nowPlaying.labelSecondaryColor
835
313
                        elide: Text.ElideRight
350
                        elide: Text.ElideRight
837
314
                        text: i18n.tr("%1 song", "%1 songs", model.total).arg(model.total)
351
                        text: i18n.tr("%1 song", "%1 songs", songGenreModel.rowCount).arg(songGenreModel.rowCount)
838
315
                        fontSize: "x-small"
352
                        fontSize: "x-small"
839
316
                    }
353
                    }
840
317
                }
354
                }
841
@@ -343,7 +380,16 @@
842
343
            anchors.topMargin: units.gu(1)
380
            anchors.topMargin: units.gu(1)
843
344
            spacing: units.gu(1)
381
            spacing: units.gu(1)
844
345
            height: units.gu(18)
382
            height: units.gu(18)
846
346
            model: albumModel.model
383
            model: Toolkit.SortFilterModel {
847
384
                id: albumsModelFilter
848
385
                property alias rowCount: albumsModel.rowCount
849
386
                model: AlbumsModel {
850
387
                    id: albumsModel
851
388
                    store: musicStore
852
389
                }
853
390
                sort.property: "title"
854
391
                sort.order: Qt.AscendingOrder
855
392
            }
856
347
            delegate: albumDelegate
393
            delegate: albumDelegate
857
348
            header: Item {
394
            header: Item {
858
349
                id: albumSpacer
395
                id: albumSpacer
859
@@ -355,12 +401,8 @@
860
355
                id: albumDelegate
401
                id: albumDelegate
861
356
                Item {
402
                Item {
862
357
                    property string artist: model.artist
403
                    property string artist: model.artist
869
358
                    property string album: model.album
404
                    property string album: model.title
870
359
                    property var covers: [Library.getAlbumCover(album)]
405
                    property var covers: [{author: model.artist, album: model.title}]
865
360
                    property string length: model.length
866
361
                    property string file: model.file
867
362
                    property string year: model.year
868
363
                    property string genre: model.genre
871
364
406
872
365
                    id: albumItem
407
                    id: albumItem
873
366
                    objectName: "albumItemObject"
408
                    objectName: "albumItemObject"
874
@@ -381,7 +423,8 @@
875
381
                    MouseArea {
423
                    MouseArea {
876
382
                        anchors.fill: parent
424
                        anchors.fill: parent
877
383
                        onClicked: {
425
                        onClicked: {
879
384
                            albumTracksModel.filterAlbumTracks(album)
426
                            songsSheet.album = album;
880
427
                            songsSheet.genre = undefined
881
385
                            songsSheet.line1 = artist
428
                            songsSheet.line1 = artist
882
386
                            songsSheet.line2 = album
429
                            songsSheet.line2 = album
883
387
                            songsSheet.isAlbum = true
430
                            songsSheet.isAlbum = true
884
388
431
885
=== modified file 'MusicToolbar.qml'
886
--- MusicToolbar.qml	2014-05-04 05:30:54 +0000
887
+++ MusicToolbar.qml	2014-06-19 01:49:30 +0000
888
@@ -1,7 +1,8 @@
889
1
/*
1
/*
893
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
894
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
895
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
896
5
 *      Victor Thompson <victor.thompson@gmail.com>
897
5
 *
6
 *
898
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
899
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
900
@@ -21,7 +22,6 @@
901
21
import QtMultimedia 5.0
22
import QtMultimedia 5.0
902
22
import Ubuntu.Components 0.1
23
import Ubuntu.Components 0.1
903
23
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 0.1
904
24
import "meta-database.js" as Library
905
25
import "settings.js" as Settings
25
import "settings.js" as Settings
906
26
26
907
27
Item {
27
Item {
908
28
28
909
=== modified file 'MusicTracks.qml'
910
--- MusicTracks.qml	2014-04-26 17:13:02 +0000
911
+++ MusicTracks.qml	2014-06-19 01:49:30 +0000
912
@@ -1,6 +1,8 @@
913
1
/*
1
/*
916
2
 * Copyright (C) 2013 Victor Thompson <victor.thompson@gmail.com>
2
 * Copyright (C) 2013, 2014
917
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
918
4
 *      Daniel Holm <d.holmen@gmail.com>
919
5
 *      Victor Thompson <victor.thompson@gmail.com>
920
4
 *
6
 *
921
5
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
922
6
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
923
@@ -17,12 +19,14 @@
924
17
19
925
18
import QtQuick 2.0
20
import QtQuick 2.0
926
19
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
927
22
import Ubuntu.Components 1.1 as Toolkit
928
20
import Ubuntu.Components.ListItems 0.1
23
import Ubuntu.Components.ListItems 0.1
929
21
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 0.1 as ListItem
930
25
import Ubuntu.MediaScanner 0.1
931
26
import Ubuntu.Thumbnailer 0.1
932
22
import QtMultimedia 5.0
27
import QtMultimedia 5.0
933
23
import QtQuick.LocalStorage 2.0
28
import QtQuick.LocalStorage 2.0
934
24
import "settings.js" as Settings
29
import "settings.js" as Settings
935
25
import "meta-database.js" as Library
936
26
import "playlists.js" as Playlists
30
import "playlists.js" as Playlists
937
27
import "common"
31
import "common"
938
28
import "common/ExpanderItems"
32
import "common/ExpanderItems"
939
@@ -43,23 +47,30 @@
940
43
        }
47
        }
941
44
    }
48
    }
942
45
49
943
50
944
46
    ListView {
51
    ListView {
945
47
        id: tracklist
52
        id: tracklist
946
48
        anchors.fill: parent
53
        anchors.fill: parent
947
49
        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
54
        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
948
50
        highlightFollowsCurrentItem: false
55
        highlightFollowsCurrentItem: false
950
51
        model: libraryModel.model
56
        model: Toolkit.SortFilterModel {
951
57
            id: songsModelFilter
952
58
            property alias rowCount: songsModel.rowCount
953
59
            model: SongsModel {
954
60
                id: songsModel
955
61
                // HACK: Temporarily setting limit to 500 to ensure model
956
62
                //       is populated. See lp:1326753
957
63
                limit: 500
958
64
                store: musicStore
959
65
            }
960
66
            sort.property: "title"
961
67
            sort.order: Qt.AscendingOrder
962
68
        }
963
52
        delegate: trackDelegate
69
        delegate: trackDelegate
964
53
        Component {
70
        Component {
965
54
            id: trackDelegate
71
            id: trackDelegate
966
55
            ListItem.Standard {
72
            ListItem.Standard {
967
56
                id: track
73
                id: track
968
57
                property string artist: model.artist
969
58
                property string album: model.album
970
59
                property string title: model.title
971
60
                property string cover: model.cover
972
61
                property string length: model.length
973
62
                property string file: model.file
974
63
                width: parent.width
74
                width: parent.width
975
64
                height: styleMusic.common.itemHeight
75
                height: styleMusic.common.itemHeight
976
65
76
977
@@ -70,7 +81,7 @@
978
70
                            focus = true
81
                            focus = true
979
71
                        }
82
                        }
980
72
83
982
73
                        trackClicked(libraryModel, index)  // play track
84
                        trackClicked(tracklist.model, index)  // play track
983
74
                    }
85
                    }
984
75
                }
86
                }
985
76
87
986
@@ -90,7 +101,7 @@
987
90
                        width: styleMusic.common.albumSize
101
                        width: styleMusic.common.albumSize
988
91
                        height: styleMusic.common.albumSize
102
                        height: styleMusic.common.albumSize
989
92
                        image: Image {
103
                        image: Image {
991
93
                            source: cover !== "" ? cover : Qt.resolvedUrl("images/music-app-cover@30.png")
104
                            source: "image://albumart/artist=" + model.author + "&album=" + model.album
992
94
                            onStatusChanged: {
105
                            onStatusChanged: {
993
95
                                if (status === Image.Error) {
106
                                if (status === Image.Error) {
994
96
                                    source = Qt.resolvedUrl("images/music-app-cover@30.png")
107
                                    source = Qt.resolvedUrl("images/music-app-cover@30.png")
995
@@ -111,7 +122,7 @@
996
111
                        anchors.right: parent.right
122
                        anchors.right: parent.right
997
112
                        anchors.rightMargin: units.gu(1.5)
123
                        anchors.rightMargin: units.gu(1.5)
998
113
                        elide: Text.ElideRight
124
                        elide: Text.ElideRight
1000
114
                        text: artist
125
                        text: model.author
1001
115
                    }
126
                    }
1002
116
                    Label {
127
                    Label {
1003
117
                        id: trackTitle
128
                        id: trackTitle
1004
@@ -127,7 +138,7 @@
1005
127
                        anchors.right: parent.right
138
                        anchors.right: parent.right
1006
128
                        anchors.rightMargin: units.gu(1.5)
139
                        anchors.rightMargin: units.gu(1.5)
1007
129
                        elide: Text.ElideRight
140
                        elide: Text.ElideRight
1009
130
                        text: track.title
141
                        text: model.title
1010
131
                    }
142
                    }
1011
132
                    Label {
143
                    Label {
1012
133
                        id: trackAlbum
144
                        id: trackAlbum
1013
@@ -142,7 +153,7 @@
1014
142
                        anchors.right: parent.right
153
                        anchors.right: parent.right
1015
143
                        anchors.rightMargin: units.gu(1.5)
154
                        anchors.rightMargin: units.gu(1.5)
1016
144
                        elide: Text.ElideRight
155
                        elide: Text.ElideRight
1018
145
                        text: album
156
                        text: model.album
1019
146
                    }
157
                    }
1020
147
                    Label {
158
                    Label {
1021
148
                        id: trackDuration
159
                        id: trackDuration
1022
@@ -157,7 +168,7 @@
1023
157
                        anchors.rightMargin: units.gu(1.5)
168
                        anchors.rightMargin: units.gu(1.5)
1024
158
                        elide: Text.ElideRight
169
                        elide: Text.ElideRight
1025
159
                        visible: false
170
                        visible: false
1027
160
                        text: ""
171
                        text: ""  // model.duration
1028
161
                    }
172
                    }
1029
162
                }
173
                }
1030
163
174
1031
@@ -167,7 +178,7 @@
1032
167
                        fill: parent
178
                        fill: parent
1033
168
                    }
179
                    }
1034
169
                    listItem: track
180
                    listItem: track
1036
170
                    model: libraryModel.model.get(index)
181
                    model: songsModelFilter.get(index, songsModelFilter.RoleModelData)
1037
171
                    row: Row {
182
                    row: Row {
1038
172
                        AddToPlaylist {
183
                        AddToPlaylist {
1039
173
184
1040
174
185
1041
=== modified file 'MusicaddtoPlaylist.qml'
1042
--- MusicaddtoPlaylist.qml	2014-04-26 17:13:02 +0000
1043
+++ MusicaddtoPlaylist.qml	2014-06-19 01:49:30 +0000
1044
@@ -1,7 +1,8 @@
1045
1
/*
1
/*
1049
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1050
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1051
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1052
5
 *      Victor Thompson <victor.thompson@gmail.com>
1053
5
 *
6
 *
1054
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1055
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1056
@@ -78,13 +79,13 @@
1057
78
                    property string name: model.name
79
                    property string name: model.name
1058
79
                    property string count: model.count
80
                    property string count: model.count
1059
80
                    onClicked: {
81
                    onClicked: {
1061
81
                        console.debug("Debug: "+chosenElement.file+" added to "+name)
82
                        console.debug("Debug: "+chosenElement.filename+" added to "+name)
1062
82
                        Playlists.addtoPlaylist(name,
83
                        Playlists.addtoPlaylist(name,
1065
83
                                                chosenElement.file,
84
                                                chosenElement.filename,
1066
84
                                                chosenElement.artist,
85
                                                chosenElement.author,
1067
85
                                                chosenElement.title,
86
                                                chosenElement.title,
1068
86
                                                chosenElement.album,
87
                                                chosenElement.album,
1070
87
                                                chosenElement.cover,
88
                                                chosenElement.art,
1071
88
                                                "","","","")
89
                                                "","","","")
1072
89
                        count = Playlists.getPlaylistCount(name) // get the new count
90
                        count = Playlists.getPlaylistCount(name) // get the new count
1073
90
                        playlistModel.model.set(index, {"count": count}) // update number ot tracks in playlist
91
                        playlistModel.model.set(index, {"count": count}) // update number ot tracks in playlist
1074
91
92
1075
=== modified file 'Player.qml'
1076
--- Player.qml	2014-04-16 11:58:54 +0000
1077
+++ Player.qml	2014-06-19 01:49:30 +0000
1078
@@ -1,7 +1,8 @@
1079
1
/*
1
/*
1083
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1084
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1085
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1086
5
 *      Victor Thompson <victor.thompson@gmail.com>
1087
5
 *
6
 *
1088
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1089
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1090
@@ -33,7 +34,6 @@
1091
33
34
1092
34
    property string currentMetaAlbum: ""
35
    property string currentMetaAlbum: ""
1093
35
    property string currentMetaArtist: ""
36
    property string currentMetaArtist: ""
1094
36
    property string currentMetaCover: ""
1095
37
    property string currentMetaFile: ""
37
    property string currentMetaFile: ""
1096
38
    property string currentMetaTitle: ""
38
    property string currentMetaTitle: ""
1097
39
    property int currentIndex: -1
39
    property int currentIndex: -1
1098
@@ -61,9 +61,9 @@
1099
61
        onCountChanged: {
61
        onCountChanged: {
1100
62
            if (trackQueue.model.count === 1) {
62
            if (trackQueue.model.count === 1) {
1101
63
                player.currentIndex = 0;
63
                player.currentIndex = 0;
1103
64
                player.source = Qt.resolvedUrl(trackQueue.model.get(0).file)
64
                player.source = Qt.resolvedUrl(trackQueue.model.get(0).filename)
1104
65
            } else if (trackQueue.model.count === 0) {
65
            } else if (trackQueue.model.count === 0) {
1106
66
                player.currentMetaCover = ""
66
                currentMetaFile = ""
1107
67
            }
67
            }
1108
68
        }
68
        }
1109
69
    }
69
    }
1110
@@ -117,11 +117,11 @@
1111
117
        }
117
        }
1112
118
118
1113
119
        if (startPlaying) {  // only start the track if told
119
        if (startPlaying) {  // only start the track if told
1115
120
            playSong(trackQueue.model.get(newIndex).file, newIndex)
120
            playSong(trackQueue.model.get(newIndex).filename, newIndex)
1116
121
        }
121
        }
1117
122
        else {
122
        else {
1118
123
            currentIndex = newIndex
123
            currentIndex = newIndex
1120
124
            source = Qt.resolvedUrl(trackQueue.model.get(newIndex).file)
124
            source = Qt.resolvedUrl(trackQueue.model.get(newIndex).filename)
1121
125
        }
125
        }
1122
126
    }
126
    }
1123
127
127
1124
@@ -183,9 +183,8 @@
1125
183
            else {
183
            else {
1126
184
                var obj = trackQueue.model.get(player.currentIndex);
184
                var obj = trackQueue.model.get(player.currentIndex);
1127
185
                currentMetaAlbum = obj.album;
185
                currentMetaAlbum = obj.album;
1131
186
                currentMetaArtist = obj.artist;
186
                currentMetaArtist = obj.author;
1132
187
                currentMetaCover = obj.cover;
187
                currentMetaFile = obj.filename;
1130
188
                currentMetaFile = obj.file;
1133
189
                currentMetaTitle = obj.title;
188
                currentMetaTitle = obj.title;
1134
190
            }
189
            }
1135
191
190
1136
192
191
1137
=== modified file 'Style.qml'
1138
--- Style.qml	2014-04-25 17:05:03 +0000
1139
+++ Style.qml	2014-06-19 01:49:30 +0000
1140
@@ -1,7 +1,8 @@
1141
1
/*
1
/*
1145
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1146
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1147
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1148
5
 *      Victor Thompson <victor.thompson@gmail.com>
1149
5
 *
6
 *
1150
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1151
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1152
8
9
1153
=== modified file 'click/apparmor.json'
1154
--- click/apparmor.json	2014-05-30 14:23:43 +0000
1155
+++ click/apparmor.json	2014-06-19 01:49:30 +0000
1156
@@ -1,5 +1,5 @@
1157
1
{
1
{
1159
2
    "policy_version": 1.1,
2
    "policy_version": 1.2,
1160
3
    "template": "unconfined",
3
    "template": "unconfined",
1161
4
    "policy_groups": []
4
    "policy_groups": []
1162
5
}
5
}
1163
6
6
1164
=== modified file 'click/manifest.json.in'
1165
--- click/manifest.json.in	2014-06-06 11:35:53 +0000
1166
+++ click/manifest.json.in	2014-06-19 01:49:30 +0000
1167
@@ -1,7 +1,6 @@
1168
1
{
1
{
1172
2
    "description": "A music application for Ubuntu",
2
    "description": "A music application for ubuntu",
1173
3
    "framework": "ubuntu-sdk-14.04-dev1",
3
    "framework": "ubuntu-sdk-14.10-qml-dev1",
1171
4
    "architecture": "armhf",
1174
5
    "hooks": {
4
    "hooks": {
1175
6
        "@APP_NAME@": {
5
        "@APP_NAME@": {
1176
7
            "apparmor": "apparmor.json",
6
            "apparmor": "apparmor.json",
1177
8
7
1178
=== modified file 'common/AlbumsSheet.qml'
1179
--- common/AlbumsSheet.qml	2014-05-19 23:13:39 +0000
1180
+++ common/AlbumsSheet.qml	2014-06-19 01:49:30 +0000
1181
@@ -1,7 +1,8 @@
1182
1
/*
1
/*
1186
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1187
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1188
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1189
5
 *      Victor Thompson <victor.thompson@gmail.com>
1190
5
 *
6
 *
1191
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1192
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1193
@@ -21,6 +22,8 @@
1194
21
import Ubuntu.Components.ListItems 0.1
22
import Ubuntu.Components.ListItems 0.1
1195
22
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 0.1
1196
23
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 0.1 as ListItem
1197
25
import Ubuntu.MediaScanner 0.1
1198
26
import Ubuntu.Thumbnailer 0.1
1199
24
import QtQuick.LocalStorage 2.0
27
import QtQuick.LocalStorage 2.0
1200
25
import "../meta-database.js" as Library
28
import "../meta-database.js" as Library
1201
26
29
1202
@@ -58,7 +61,12 @@
1203
58
                width: parent.width
61
                width: parent.width
1204
59
                anchors.top: parent.top
62
                anchors.top: parent.top
1205
60
                anchors.bottom: parent.bottom
63
                anchors.bottom: parent.bottom
1207
61
                model: artistAlbumsModel.model
64
                model: AlbumsModel {
1208
65
                    id: artistsModel
1209
66
                    albumArtist: sheetItem.artist
1210
67
                    store: musicStore
1211
68
                }
1212
69
1213
62
                delegate: albumTracksDelegate
70
                delegate: albumTracksDelegate
1214
63
                header: artistHeaderDelegate
71
                header: artistHeaderDelegate
1215
64
72
1216
@@ -132,6 +140,15 @@
1217
132
                                fontSize: "large"
140
                                fontSize: "large"
1218
133
                            }
141
                            }
1219
134
142
1220
143
                            SongsModel {
1221
144
                                id: songArtistModel
1222
145
                                albumArtist: sheetItem.artist
1223
146
                                // HACK: Temporarily setting limit to 500 to ensure model
1224
147
                                //       is populated. See lp:1326753
1225
148
                                limit: 500
1226
149
                                store: musicStore
1227
150
                            }
1228
151
1229
135
                            // Play
152
                            // Play
1230
136
                            Rectangle {
153
                            Rectangle {
1231
137
                                id: playRow
154
                                id: playRow
1232
@@ -167,10 +184,7 @@
1233
167
                                MouseArea {
184
                                MouseArea {
1234
168
                                    anchors.fill: parent
185
                                    anchors.fill: parent
1235
169
                                    onClicked: {
186
                                    onClicked: {
1240
170
                                        albumTracksModel.filterArtistTracks(artist)
187
                                        trackClicked(songArtistModel, 0, true)
1237
171
                                        trackQueue.model.clear()
1238
172
                                        addQueueFromModel(albumTracksModel)
1239
173
                                        trackClicked(trackQueue, 0)  // play track
1241
174
188
1242
175
                                        // TODO: add links to recent
189
                                        // TODO: add links to recent
1243
176
190
1244
@@ -218,8 +232,7 @@
1245
218
                                MouseArea {
232
                                MouseArea {
1246
219
                                    anchors.fill: parent
233
                                    anchors.fill: parent
1247
220
                                    onClicked: {
234
                                    onClicked: {
1250
221
                                        albumTracksModel.filterArtistTracks(artist)
235
                                        addQueueFromModel(songArtistModel)
1249
222
                                        addQueueFromModel(albumTracksModel)
1251
223
                                    }
236
                                    }
1252
224
                                }
237
                                }
1253
225
                            }
238
                            }
1254
@@ -236,6 +249,23 @@
1255
236
                        width: parent.width
249
                        width: parent.width
1256
237
                        height: units.gu(20)
250
                        height: units.gu(20)
1257
238
251
1258
252
                        SongsModel {
1259
253
                            id: songAlbumArtistModel
1260
254
                            albumArtist: model.artist
1261
255
                            album: model.title
1262
256
                            // HACK: Temporarily setting limit to 500 to ensure model
1263
257
                            //       is populated. See lp:1326753
1264
258
                            limit: 500
1265
259
                            store: musicStore
1266
260
                        }
1267
261
                        Repeater {
1268
262
                            id: songAlbumArtistModelRepeater
1269
263
                            model: songAlbumArtistModel
1270
264
                            delegate: Text { text: new Date(model.date).toLocaleString(Qt.locale(),'yyyy'); visible: false }
1271
265
                            property string year: ""
1272
266
                            onItemAdded: year = item.text
1273
267
                        }
1274
268
1275
239
                        CoverRow {
269
                        CoverRow {
1276
240
                            id: albumImage
270
                            id: albumImage
1277
241
                            anchors {
271
                            anchors {
1278
@@ -246,7 +276,7 @@
1279
246
                            }
276
                            }
1280
247
                            count: 1
277
                            count: 1
1281
248
                            size: parent.height
278
                            size: parent.height
1283
249
                            covers: [Library.getAlbumCover(model.album)]
279
                            covers: [{author: artist, album: model.title}]
1284
250
                            objectName: "artistsheet-albumcover"
280
                            objectName: "artistsheet-albumcover"
1285
251
                            spacing: units.gu(2)
281
                            spacing: units.gu(2)
1286
252
282
1287
@@ -259,13 +289,12 @@
1288
259
                                        focus = true
289
                                        focus = true
1289
260
                                    }
290
                                    }
1290
261
291
1292
262
                                    albumTracksModel.filterAlbumTracks(album)
292
                                    albumSheet.album = model.title;
1293
293
1294
263
                                    albumSheet.line1 = artist
294
                                    albumSheet.line1 = artist
1296
264
                                    albumSheet.line2 = model.album
295
                                    albumSheet.line2 = model.title
1297
265
                                    albumSheet.isAlbum = true
296
                                    albumSheet.isAlbum = true
1301
266
                                    albumSheet.file = file
297
                                    albumSheet.covers = [{author: artist, album: model.title}]
1299
267
                                    albumSheet.year = year
1300
268
                                    albumSheet.covers = [Library.getAlbumCover(model.album) || Qt.resolvedUrl("../images/music-app-cover@30.png")]
1302
269
                                    PopupUtils.open(albumSheet.sheet)
298
                                    PopupUtils.open(albumSheet.sheet)
1303
270
299
1304
271
                                    // TODO: This closes the SDK defined sheet
300
                                    // TODO: This closes the SDK defined sheet
1305
@@ -305,7 +334,7 @@
1306
305
                            anchors.right: parent.right
334
                            anchors.right: parent.right
1307
306
                            anchors.rightMargin: units.gu(1.5)
335
                            anchors.rightMargin: units.gu(1.5)
1308
307
                            elide: Text.ElideRight
336
                            elide: Text.ElideRight
1310
308
                            text: album
337
                            text: model.title
1311
309
                        }
338
                        }
1312
310
                        Label {
339
                        Label {
1313
311
                            id: albumYear
340
                            id: albumYear
1314
@@ -320,7 +349,9 @@
1315
320
                            anchors.right: parent.right
349
                            anchors.right: parent.right
1316
321
                            anchors.rightMargin: units.gu(1.5)
350
                            anchors.rightMargin: units.gu(1.5)
1317
322
                            elide: Text.ElideRight
351
                            elide: Text.ElideRight
1319
323
                            text: i18n.tr(model.year + " | %1 song", model.year + " | %1 songs", Library.getAlbumTracks(album).length).arg(Library.getAlbumTracks(album).length)
352
                            text: i18n.tr(songAlbumArtistModelRepeater.year + " | %1 song",
1320
353
                                          songAlbumArtistModelRepeater.year + " | %1 songs",
1321
354
                                          songAlbumArtistModelRepeater.count).arg(songAlbumArtistModelRepeater.count)
1322
324
                        }
355
                        }
1323
325
356
1324
326
                        // Play
357
                        // Play
1325
@@ -355,13 +386,10 @@
1326
355
                            MouseArea {
386
                            MouseArea {
1327
356
                                anchors.fill: parent
387
                                anchors.fill: parent
1328
357
                                onClicked: {
388
                                onClicked: {
1331
358
                                    albumTracksModel.filterAlbumTracks(album)
389
                                    Library.addRecent(model.title, artist, "", model.title, "album")
1330
359
                                    Library.addRecent(album, artist, Library.getAlbumCover(album), album, "album")
1332
360
                                    mainView.hasRecent = true
390
                                    mainView.hasRecent = true
1333
361
                                    recentModel.filterRecent()
391
                                    recentModel.filterRecent()
1337
362
                                    trackQueue.model.clear()
392
                                    trackClicked(songAlbumArtistModel, 0, true)
1335
363
                                    addQueueFromModel(albumTracksModel)
1336
364
                                    trackClicked(trackQueue, 0)  // play track
1338
365
393
1339
366
                                    // TODO: This closes the SDK defined sheet
394
                                    // TODO: This closes the SDK defined sheet
1340
367
                                    //       component. It should be able to close
395
                                    //       component. It should be able to close
1341
@@ -403,8 +431,7 @@
1342
403
                            MouseArea {
431
                            MouseArea {
1343
404
                                anchors.fill: parent
432
                                anchors.fill: parent
1344
405
                                onClicked: {
433
                                onClicked: {
1347
406
                                    albumTracksModel.filterAlbumTracks(album)
434
                                    addQueueFromModel(songAlbumArtistModel)
1346
407
                                    addQueueFromModel(albumTracksModel)
1348
408
                                }
435
                                }
1349
409
                            }
436
                            }
1350
410
                        }
437
                        }
1351
411
438
1352
=== modified file 'common/BlurredBackground.qml'
1353
--- common/BlurredBackground.qml	2014-04-12 01:06:28 +0000
1354
+++ common/BlurredBackground.qml	2014-06-19 01:49:30 +0000
1355
@@ -1,7 +1,8 @@
1356
1
/*
1
/*
1360
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1361
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1362
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1363
5
 *      Victor Thompson <victor.thompson@gmail.com>
1364
5
 *
6
 *
1365
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1366
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1367
@@ -23,15 +24,14 @@
1368
23
// Blurred background
24
// Blurred background
1369
24
Rectangle {
25
Rectangle {
1370
25
    anchors.fill: parent
26
    anchors.fill: parent
1374
26
    property string cover: player.currentMetaCover !== "" ?
27
    property string art: player.currentMetaFile === "" ? Qt.resolvedUrl("../images/music-app-cover@30.png") : "image://albumart/artist=" + player.currentMetaArtist + "&album=" + player.currentMetaAlbum
1375
27
                               player.currentMetaCover :
28
1373
28
                               "../images/music-app-cover@30.png"
1376
29
    // the album art
29
    // the album art
1377
30
    Image {
30
    Image {
1378
31
        id: backgroundImage
31
        id: backgroundImage
1379
32
        anchors.horizontalCenter: parent.horizontalCenter
32
        anchors.horizontalCenter: parent.horizontalCenter
1380
33
        anchors.verticalCenter: parent.verticalCenter
33
        anchors.verticalCenter: parent.verticalCenter
1382
34
        source: cover // this has to be fixed for the default cover art to work - cant find in this dir
34
        source: art // this has to be fixed for the default cover art to work - cant find in this dir
1383
35
        height: Math.max(parent.height, parent.width)
35
        height: Math.max(parent.height, parent.width)
1384
36
        width: Math.max(parent.height, parent.width)
36
        width: Math.max(parent.height, parent.width)
1385
37
        visible: false
37
        visible: false
1386
@@ -54,10 +54,10 @@
1387
54
        color: "white"
54
        color: "white"
1388
55
        opacity: 0.7
55
        opacity: 0.7
1389
56
    }
56
    }
1391
57
    onCoverChanged: {
57
    onArtChanged: {
1392
58
        // TODO: This is a work around for LP:1261078 and LP:1306845. Ideally,
58
        // TODO: This is a work around for LP:1261078 and LP:1306845. Ideally,
1393
59
        //       there should be a better way of getting the blur to repaint
59
        //       there should be a better way of getting the blur to repaint
1395
60
        backgroundImage.source = cover
60
        backgroundImage.source = art
1396
61
        backgroundBlur.source = null
61
        backgroundBlur.source = null
1397
62
        backgroundBlur.source = backgroundImage
62
        backgroundBlur.source = backgroundImage
1398
63
    }
63
    }
1399
64
64
1400
=== modified file 'common/CoverRow.qml'
1401
--- common/CoverRow.qml	2014-04-11 18:18:12 +0000
1402
+++ common/CoverRow.qml	2014-06-19 01:49:30 +0000
1403
@@ -1,5 +1,8 @@
1404
1
/*
1
/*
1406
2
 * Copyright (C) 2013 Nekhelesh Ramananthan <krnekhelesh@gmail.com>
2
 * Copyright (C) 2013, 2014
1407
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1408
4
 *      Nekhelesh Ramananthan <krnekhelesh@gmail.com>
1409
5
 *      Victor Thompson <victor.thompson@gmail.com>
1410
3
 *
6
 *
1411
4
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1412
5
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1413
@@ -52,8 +55,9 @@
1414
52
            delegate: Image {
55
            delegate: Image {
1415
53
                width: coverRow.size
56
                width: coverRow.size
1416
54
                height: width
57
                height: width
1419
55
                source: coverRow.count === 0 || coverRow.covers[index] === ""
58
                source: coverRow.count !== 0 && coverRow.covers[index] !== "" && coverRow.covers[index] !== undefined
1420
56
                        ? Qt.resolvedUrl("../images/music-app-cover@30.png") : coverRow.covers[index]
59
                          ? "image://albumart/artist=" + coverRow.covers[index].author + "&album=" + coverRow.covers[index].album
1421
60
                          : Qt.resolvedUrl("../images/music-app-cover@30.png")
1422
57
                onStatusChanged: {
61
                onStatusChanged: {
1423
58
                    if (status === Image.Error) {
62
                    if (status === Image.Error) {
1424
59
                        source = Qt.resolvedUrl("../images/music-app-cover@30.png")
63
                        source = Qt.resolvedUrl("../images/music-app-cover@30.png")
1425
60
64
1426
=== modified file 'common/Expander.qml'
1427
--- common/Expander.qml	2014-04-30 01:59:41 +0000
1428
+++ common/Expander.qml	2014-06-19 01:49:30 +0000
1429
@@ -1,7 +1,8 @@
1430
1
/*
1
/*
1434
2
 * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1435
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1436
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1437
5
 *      Victor Thompson <victor.thompson@gmail.com>
1438
5
 *
6
 *
1439
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1440
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1441
8
9
1442
=== modified file 'common/SongsSheet.qml'
1443
--- common/SongsSheet.qml	2014-04-26 17:13:02 +0000
1444
+++ common/SongsSheet.qml	2014-06-19 01:49:30 +0000
1445
@@ -1,7 +1,8 @@
1446
1
/*
1
/*
1450
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
1451
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1452
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
1453
5
 *      Victor Thompson <victor.thompson@gmail.com>
1454
5
 *
6
 *
1455
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1456
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1457
@@ -21,6 +22,8 @@
1458
21
import Ubuntu.Components.ListItems 0.1
22
import Ubuntu.Components.ListItems 0.1
1459
22
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 0.1
1460
23
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 0.1 as ListItem
1461
25
import Ubuntu.MediaScanner 0.1
1462
26
import Ubuntu.Thumbnailer 0.1
1463
24
import QtQuick.LocalStorage 2.0
27
import QtQuick.LocalStorage 2.0
1464
25
import "../meta-database.js" as Library
28
import "../meta-database.js" as Library
1465
26
import "ExpanderItems"
29
import "ExpanderItems"
1466
@@ -38,6 +41,17 @@
1467
38
    property bool isAlbum: false
41
    property bool isAlbum: false
1468
39
    property alias sheet: sheetComponent
42
    property alias sheet: sheetComponent
1469
40
43
1470
44
    property alias album: songsModel.album
1471
45
    property alias genre: songsModel.genre
1472
46
1473
47
    SongsModel {
1474
48
        id: songsModel
1475
49
        // HACK: Temporarily setting limit to 500 to ensure model
1476
50
        //       is populated. See lp:1326753
1477
51
        limit: 500
1478
52
        store: musicStore
1479
53
    }
1480
54
1481
41
    Component {
55
    Component {
1482
42
        id: sheetComponent
56
        id: sheetComponent
1483
43
        DefaultSheet {
57
        DefaultSheet {
1484
@@ -61,7 +75,8 @@
1485
61
                width: parent.width
75
                width: parent.width
1486
62
                anchors.top: parent.top
76
                anchors.top: parent.top
1487
63
                anchors.bottom: parent.bottom
77
                anchors.bottom: parent.bottom
1489
64
                model: albumTracksModel.model
78
                model: isAlbum ? songsModel : albumTracksModel.model
1490
79
1491
65
                delegate: albumTracksDelegate
80
                delegate: albumTracksDelegate
1492
66
                header: ListItem.Standard {
81
                header: ListItem.Standard {
1493
67
                    id: albumInfo
82
                    id: albumInfo
1494
@@ -125,8 +140,8 @@
1495
125
                        anchors.right: parent.right
140
                        anchors.right: parent.right
1496
126
                        anchors.rightMargin: units.gu(1.5)
141
                        anchors.rightMargin: units.gu(1.5)
1497
127
                        elide: Text.ElideRight
142
                        elide: Text.ElideRight
1500
128
                        text: isAlbum ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumTracksModel.model.count).arg(albumTracksModel.model.count)
143
                        text: isAlbum ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
1501
129
                                      : i18n.tr("%1 song", "%1 songs", albumTracksModel.model.count).arg(albumTracksModel.model.count)
144
                                      : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
1502
130
145
1503
131
                    }
146
                    }
1504
132
147
1505
@@ -162,13 +177,14 @@
1506
162
                        MouseArea {
177
                        MouseArea {
1507
163
                            anchors.fill: parent
178
                            anchors.fill: parent
1508
164
                            onClicked: {
179
                            onClicked: {
1512
165
                                trackClicked(albumTracksModel, 0)  // play track
180
                                trackClicked(albumtrackslist.model, 0)  // play track
1513
166
                                if (isAlbum) {
181
1514
167
                                    Library.addRecent(sheetItem.line2, sheetItem.line1, sheetItem.cover, sheetItem.line2, "album")
182
                                if (isAlbum && sheetItem.line1 != "Genre") {
1515
183
                                    Library.addRecent(sheetItem.line2, sheetItem.line1, sheetItem.covers[0], sheetItem.line2, "album")
1516
168
                                    mainView.hasRecent = true
184
                                    mainView.hasRecent = true
1517
169
                                    recentModel.filterRecent()
185
                                    recentModel.filterRecent()
1518
170
                                } else if (sheetItem.line1 == "Playlist") {
186
                                } else if (sheetItem.line1 == "Playlist") {
1520
171
                                    Library.addRecent(sheetItem.line2, "Playlist", sheetItem.cover, sheetItem.line2, "playlist")
187
                                    Library.addRecent(sheetItem.line2, "Playlist", sheetItem.covers[0], sheetItem.line2, "playlist")
1521
172
                                    mainView.hasRecent = true
188
                                    mainView.hasRecent = true
1522
173
                                    recentModel.filterRecent()
189
                                    recentModel.filterRecent()
1523
174
                                }
190
                                }
1524
@@ -213,7 +229,7 @@
1525
213
                        MouseArea {
229
                        MouseArea {
1526
214
                            anchors.fill: parent
230
                            anchors.fill: parent
1527
215
                            onClicked: {
231
                            onClicked: {
1529
216
                                addQueueFromModel(albumTracksModel)
232
                                addQueueFromModel(albumtrackslist.model)
1530
217
                            }
233
                            }
1531
218
                        }
234
                        }
1532
219
                    }
235
                    }
1533
@@ -237,13 +253,13 @@
1534
237
                                if (focus == false) {
253
                                if (focus == false) {
1535
238
                                    focus = true
254
                                    focus = true
1536
239
                                }
255
                                }
1540
240
                                trackClicked(albumTracksModel, index)  // play track
256
                                trackClicked(albumtrackslist.model, index)  // play track
1541
241
                                if (isAlbum) {
257
                                if (isAlbum && sheetItem.line1 != "Genre") {
1542
242
                                    Library.addRecent(sheetItem.line2, sheetItem.line1, sheetItem.cover, sheetItem.line2, "album")
258
                                    Library.addRecent(sheetItem.line2, sheetItem.line1, sheetItem.covers[0], sheetItem.line2, "album")
1543
243
                                    mainView.hasRecent = true
259
                                    mainView.hasRecent = true
1544
244
                                    recentModel.filterRecent()
260
                                    recentModel.filterRecent()
1545
245
                                } else if (sheetItem.line1 == "Playlist") {
261
                                } else if (sheetItem.line1 == "Playlist") {
1547
246
                                    Library.addRecent(sheetItem.line2, "Playlist", sheetItem.cover, sheetItem.line2, "playlist")
262
                                    Library.addRecent(sheetItem.line2, "Playlist", sheetItem.covers[0], sheetItem.line2, "playlist")
1548
247
                                    mainView.hasRecent = true
263
                                    mainView.hasRecent = true
1549
248
                                    recentModel.filterRecent()
264
                                    recentModel.filterRecent()
1550
249
                                }
265
                                }
1551
@@ -275,7 +291,7 @@
1552
275
                                height: styleMusic.common.albumSize
291
                                height: styleMusic.common.albumSize
1553
276
                                visible: !isAlbum
292
                                visible: !isAlbum
1554
277
                                image: Image {
293
                                image: Image {
1556
278
                                    source: model.cover !== "" ? model.cover : Qt.resolvedUrl("../images/music-app-cover@30.png")
294
                                    source: "image://albumart/artist=" + model.author + "&album=" + model.album
1557
279
                                    onStatusChanged: {
295
                                    onStatusChanged: {
1558
280
                                        if (status === Image.Error) {
296
                                        if (status === Image.Error) {
1559
281
                                            source = Qt.resolvedUrl("../images/music-app-cover@30.png")
297
                                            source = Qt.resolvedUrl("../images/music-app-cover@30.png")
1560
@@ -300,7 +316,7 @@
1561
300
                                    rightMargin: units.gu(1.5)
316
                                    rightMargin: units.gu(1.5)
1562
301
                                }
317
                                }
1563
302
                                elide: Text.ElideRight
318
                                elide: Text.ElideRight
1565
303
                                text: model.artist
319
                                text: model.author
1566
304
                            }
320
                            }
1567
305
321
1568
306
                            Label {
322
                            Label {
1569
@@ -348,7 +364,7 @@
1570
348
                                fill: parent
364
                                fill: parent
1571
349
                            }
365
                            }
1572
350
                            listItem: track
366
                            listItem: track
1574
351
                            model: albumTracksModel.model.get(index)
367
                            model: isAlbum ? albumtrackslist.model.get(index, albumTracksModel.model.RoleModelData) : albumtrackslist.model.get(index)
1575
352
                            row: Row {
368
                            row: Row {
1576
353
                                AddToPlaylist {
369
                                AddToPlaylist {
1577
354
370
1578
@@ -360,10 +376,10 @@
1579
360
                        }
376
                        }
1580
361
377
1581
362
                        Component.onCompleted: {
378
                        Component.onCompleted: {
1583
363
                            if (index === 0)
379
                            if (model.date !== undefined && sheetItem.year === "")
1584
364
                            {
380
                            {
1587
365
                                sheetItem.file = model.file;
381
                                sheetItem.file = model.filename;
1588
366
                                sheetItem.year = model.year;
382
                                sheetItem.year = new Date(model.date).toLocaleString(Qt.locale(),'yyyy');
1589
367
                            }
383
                            }
1590
368
                        }
384
                        }
1591
369
                    }
385
                    }
1592
370
386
1593
=== modified file 'debian/control'
1594
--- debian/control	2014-06-06 11:35:53 +0000
1595
+++ debian/control	2014-06-19 01:49:30 +0000
1596
@@ -13,18 +13,21 @@
1597
13
13
1598
14
Package: music-app
14
Package: music-app
1599
15
Architecture: all
15
Architecture: all
1602
16
Depends: grilo-plugins-0.2-mediascanner,
16
Depends: mediascanner2.0,
1603
17
         mediascanner,
17
         gstreamer0.10-fluendo-mp3,
1604
18
         gstreamer1.0-fluendo-mp3,
1605
18
         qmlscene,
19
         qmlscene,
1606
19
         qtdeclarative5-localstorage-plugin,
20
         qtdeclarative5-localstorage-plugin,
1607
20
         qtdeclarative5-particles-plugin,
21
         qtdeclarative5-particles-plugin,
1608
21
         qtdeclarative5-qtgrilo0.1,
1609
22
         qtdeclarative5-qtmultimedia-plugin,
22
         qtdeclarative5-qtmultimedia-plugin,
1610
23
         qtdeclarative5-qtquick2-plugin,
23
         qtdeclarative5-qtquick2-plugin,
1611
24
         qtdeclarative5-ubuntu-mediascanner0.1,
1612
25
         qtdeclarative5-ubuntu-thumbnailer0.1,
1613
24
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
26
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
1614
25
         qtdeclarative5-usermetrics0.1,
27
         qtdeclarative5-usermetrics0.1,
1615
26
         qtdeclarative5-window-plugin,
28
         qtdeclarative5-window-plugin,
1616
27
         qtdeclarative5-xmllistmodel-plugin,
29
         qtdeclarative5-xmllistmodel-plugin,
1617
30
         thumbnailer-service,
1618
28
         suru-icon-theme | ubuntu-mobile-icons,
31
         suru-icon-theme | ubuntu-mobile-icons,
1619
29
         ${misc:Depends},
32
         ${misc:Depends},
1620
30
Description: Music player for Ubuntu Touch
33
Description: Music player for Ubuntu Touch
1621
@@ -32,9 +35,7 @@
1622
32
35
1623
33
Package: music-app-autopilot
36
Package: music-app-autopilot
1624
34
Architecture: all
37
Architecture: all
1628
35
Depends: gstreamer0.10-fluendo-mp3,
38
Depends: libautopilot-qt (>= 1.4),
1626
36
         gstreamer1.0-fluendo-mp3,
1627
37
         libautopilot-qt (>= 1.4),
1629
38
         libqt5test5,
39
         libqt5test5,
1630
39
         music-app (= ${source:Version}),
40
         music-app (= ${source:Version}),
1631
40
         python-mock,
41
         python-mock,
1632
41
42
1633
=== modified file 'meta-database.js'
1634
--- meta-database.js	2014-05-02 04:03:50 +0000
1635
+++ meta-database.js	2014-06-19 01:49:30 +0000
1636
@@ -1,6 +1,8 @@
1637
1
/*
1
/*
1640
2
 * Copyright (C) 2013 Victor Thompson <victor.thompson@gmail.com>
2
 * Copyright (C) 2013, 2014
1641
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
1642
4
 *      Daniel Holm <d.holmen@gmail.com>
1643
5
 *      Victor Thompson <victor.thompson@gmail.com>
1644
4
 *
6
 *
1645
5
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
1646
6
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
1647
@@ -15,9 +17,6 @@
1648
15
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1649
16
 */
18
 */
1650
17
19
1651
18
var buffer = [];  // Buffer of metadata to write to the db
1652
19
var maxBufferLength = 8000;  // Maximum size of buffer before auto write to db
1653
20
1654
21
// First, let's create a short helper function to get the database connection
20
// First, let's create a short helper function to get the database connection
1655
22
function getDatabase() {
21
function getDatabase() {
1656
23
     return LocalStorage.openDatabaseSync("music-app-metadata", "1.0", "StorageDatabase", 1000000);
22
     return LocalStorage.openDatabaseSync("music-app-metadata", "1.0", "StorageDatabase", 1000000);
1657
@@ -30,19 +29,8 @@
1658
30
        function(tx) {
29
        function(tx) {
1659
31
            // Create the table if it doesn't already exist
30
            // Create the table if it doesn't already exist
1660
32
            // If the table exists, this is skipped
31
            // If the table exists, this is skipped
1674
33
            //tx.executeSql('DROP TABLE metadata');
32
            tx.executeSql('DROP TABLE IF EXISTS metadata');  // TODO: drop recent as well to reset data
1675
34
            tx.executeSql('CREATE TABLE IF NOT EXISTS metadata(file TEXT UNIQUE, title TEXT, artist TEXT, album TEXT, cover TEXT, year TEXT, number TEXT, length TEXT, genre TEXT)');
33
1663
35
            createRecent();
1664
36
      });
1665
37
}
1666
38
function reset() {
1667
39
    var db = getDatabase();
1668
40
    db.transaction(
1669
41
        function(tx) {
1670
42
            // Create the table if it doesn't already exist
1671
43
            // If the table exists, this is skipped
1672
44
            tx.executeSql('DROP TABLE IF EXISTS metadata');
1673
45
            tx.executeSql('CREATE TABLE IF NOT EXISTS metadata(file TEXT UNIQUE, title TEXT, artist TEXT, album TEXT, cover TEXT, year TEXT, number TEXT, length TEXT, genre TEXT)');
1676
46
            createRecent();
34
            createRecent();
1677
47
      });
35
      });
1678
48
}
36
}
1679
@@ -67,348 +55,6 @@
1680
67
      });
55
      });
1681
68
}
56
}
1682
69
57
1683
70
// This function is used to flush the buffer of metadata to the db
1684
71
function writeDb()
1685
72
{
1686
73
    var db = getDatabase();
1687
74
    var res = "";
1688
75
    var i;
1689
76
1690
77
    console.debug("Writing DB");
1691
78
    console.debug(buffer.length);
1692
79
1693
80
    // Keep within one transaction for performance win
1694
81
    db.transaction(function(tx) {
1695
82
        // Loop through all the metadata in the buffer
1696
83
        for (i=0; i < buffer.length; i++)
1697
84
        {
1698
85
            var res = tx.executeSql('INSERT OR REPLACE INTO metadata VALUES (?,?,?,?,?,?,?,?,?);', buffer[i]);
1699
86
1700
87
            if (res.rowsAffected <= 0)
1701
88
            {
1702
89
                // Nothing was added error occured?
1703
90
                console.debug("Error occured writing to db for ", buffer[i]);
1704
91
            }
1705
92
        }
1706
93
    });
1707
94
1708
95
    buffer = [];  // Clear buffer
1709
96
}
1710
97
1711
98
// This function is used to write meta data into the database
1712
99
function setMetadata(record) {
1713
100
    buffer.push([record.file,record.title,record.artist,record.album,record.cover,record.year,record.number,record.length,record.genre]);  // Add metadata to buffer
1714
101
1715
102
    if (buffer.length >= maxBufferLength)
1716
103
    {
1717
104
        console.debug("Buffer full, flushing buffer to disk");
1718
105
        writeDb();
1719
106
    }
1720
107
}
1721
108
1722
109
1723
110
function removeFiles(files)
1724
111
{
1725
112
    var db = getDatabase();
1726
113
1727
114
    db.transaction(function(tx) {
1728
115
        for (var i=0; i < files.length; i++)
1729
116
        {
1730
117
            for (var k in files[i])
1731
118
            {
1732
119
                tx.executeSql('DELETE FROM metadata WHERE file=?;', files[i]["file"]);
1733
120
            }
1734
121
        }
1735
122
    });
1736
123
}
1737
124
1738
125
// This function is used to retrieve meta data from the database
1739
126
function getMetadata(file) {
1740
127
   var db = getDatabase();
1741
128
   var res="";
1742
129
1743
130
   try {
1744
131
       db.transaction(function(tx) {
1745
132
         var rs = tx.executeSql('SELECT * FROM metadata WHERE file=?;', [file]); // tries to get the title of track
1746
133
1747
134
         if (rs.rows.length > 0) {
1748
135
              res = rs.rows.item(0);
1749
136
         } else {
1750
137
             res = "Unknown";
1751
138
         }
1752
139
      })
1753
140
   } catch(e) {
1754
141
       return "";
1755
142
   }
1756
143
1757
144
  // The function returns “Unknown” if the setting was not found in the database
1758
145
  // For more advanced projects, this should probably be handled through error codes
1759
146
  return res
1760
147
}
1761
148
1762
149
// This function is used to retrieve meta data from the database
1763
150
function hasCover(file) {
1764
151
   var db = getDatabase();
1765
152
   var res = false;
1766
153
1767
154
   try {
1768
155
       db.transaction(function(tx) {
1769
156
         var rs = tx.executeSql('SELECT cover FROM metadata WHERE file = ?;', [file]); // tries to get the cover art of track
1770
157
1771
158
         if (rs.rows.length > 0) {
1772
159
              res = rs.rows.item(0).cover !== ""
1773
160
         }
1774
161
      })
1775
162
   } catch(e) {
1776
163
       return false;
1777
164
   }
1778
165
1779
166
  // The function returns false if cover art was not found in the database
1780
167
  return res
1781
168
}
1782
169
1783
170
1784
171
function printValues() {
1785
172
    var db = getDatabase();
1786
173
    db.transaction( function(tx) {
1787
174
        var rs = tx.executeSql("SELECT * FROM metadata");
1788
175
        for(var i = 0; i < rs.rows.length; i++) {
1789
176
            var dbItem = rs.rows.item(i);
1790
177
            console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover);
1791
178
        }
1792
179
    });
1793
180
}
1794
181
1795
182
1796
183
function getAll() {
1797
184
    var res = [];
1798
185
    var db = getDatabase();
1799
186
    db.transaction( function(tx) {
1800
187
        var rs = tx.executeSql("SELECT * FROM metadata ORDER BY title COLLATE NOCASE ASC, artist COLLATE NOCASE ASC, album COLLATE NOCASE ASC, CAST(number AS int) ASC");
1801
188
        for(var i = 0; i < rs.rows.length; i++) {
1802
189
            var dbItem = rs.rows.item(i);
1803
190
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1804
191
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1805
192
        }
1806
193
    });
1807
194
    return res;
1808
195
}
1809
196
1810
197
function getAllFileOrder() {
1811
198
    var res = [];
1812
199
    var db = getDatabase();
1813
200
    db.transaction( function(tx) {
1814
201
        var rs = tx.executeSql("SELECT * FROM metadata ORDER BY file COLLATE NOCASE ASC");
1815
202
        for(var i = 0; i < rs.rows.length; i++) {
1816
203
            var dbItem = rs.rows.item(i);
1817
204
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1818
205
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, number:dbItem.number, year:dbItem.year, genre:dbItem.genre});
1819
206
        }
1820
207
    });
1821
208
    return res;
1822
209
}
1823
210
1824
211
function getArtists() {
1825
212
    var res = [];
1826
213
    var db = getDatabase();
1827
214
    db.transaction( function(tx) {
1828
215
        var rs = tx.executeSql("SELECT * FROM metadata GROUP BY artist ORDER BY artist COLLATE NOCASE ASC");
1829
216
        for(var i = 0; i < rs.rows.length; i++) {
1830
217
            var dbItem = rs.rows.item(i);
1831
218
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1832
219
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1833
220
        }
1834
221
    });
1835
222
    return res;
1836
223
}
1837
224
1838
225
function getArtistTracks(artist) {
1839
226
    var res = [];
1840
227
    var db = getDatabase();
1841
228
    db.transaction( function(tx) {
1842
229
        var rs = tx.executeSql("SELECT * FROM metadata WHERE artist=? ORDER BY artist COLLATE NOCASE ASC, year ASC, CAST(number AS int) ASC", [artist]);
1843
230
        for(var i = 0; i < rs.rows.length; i++) {
1844
231
            var dbItem = rs.rows.item(i);
1845
232
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1846
233
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1847
234
        }
1848
235
    });
1849
236
    return res;
1850
237
}
1851
238
1852
239
function getArtistAlbums(artist) {
1853
240
    var res = [];
1854
241
    var db = getDatabase();
1855
242
    db.transaction( function(tx) {
1856
243
        var rs = tx.executeSql("SELECT * FROM metadata WHERE artist=? GROUP BY album ORDER BY year ASC, CAST(number AS int) ASC", [artist]);
1857
244
        for(var i = 0; i < rs.rows.length; i++) {
1858
245
            var dbItem = rs.rows.item(i);
1859
246
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1860
247
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1861
248
        }
1862
249
    });
1863
250
    return res;
1864
251
}
1865
252
1866
253
function getArtistCovers(artist) {
1867
254
    var res = [];
1868
255
    var db = getDatabase();
1869
256
    try {
1870
257
        db.transaction( function(tx) {
1871
258
            var rs = tx.executeSql("SELECT cover FROM metadata WHERE artist=? AND cover <> '' ORDER BY album COLLATE NOCASE ASC", [artist]);
1872
259
            for(var i = 0; i < rs.rows.length; i++) {
1873
260
                var dbItem = rs.rows.item(i);
1874
261
                //console.log("Cover:"+ dbItem.cover+" Size:"+res.length);
1875
262
                if (res.indexOf(dbItem.cover) == -1) res.push(dbItem.cover);
1876
263
            }
1877
264
        });
1878
265
    } catch(e) {
1879
266
        return [];
1880
267
    }
1881
268
1882
269
    return res;
1883
270
}
1884
271
1885
272
function getAlbumCover(album) {
1886
273
    var res = "";
1887
274
    var db = getDatabase();
1888
275
    try {
1889
276
        db.transaction( function(tx) {
1890
277
            var rs = tx.executeSql("SELECT cover FROM metadata WHERE album=? ORDER BY cover DESC", [album]);
1891
278
            var dbItem = rs.rows.item(0);
1892
279
            //console.log("Cover:"+ dbItem.cover+" Size:"+res.length);
1893
280
            if (rs.rows.length > 0) res = rs.rows.item(0).cover;
1894
281
        });
1895
282
    } catch(e) {
1896
283
        return "";
1897
284
    }
1898
285
1899
286
    return res;
1900
287
}
1901
288
1902
289
function getArtistAlbumCount(artist) {
1903
290
    var res = 0;
1904
291
    var db = getDatabase();
1905
292
    db.transaction( function(tx) {
1906
293
        var rs = tx.executeSql("SELECT count(DISTINCT album) AS value FROM metadata WHERE artist=?", [artist]);
1907
294
        if (rs.rows.item(0).value > 0) {
1908
295
            res = rs.rows.item(0).value;
1909
296
        } else {
1910
297
            res = 0;
1911
298
        }
1912
299
    });
1913
300
    return res;
1914
301
}
1915
302
1916
303
function getAlbums() {
1917
304
    var res = [];
1918
305
    var db = getDatabase();
1919
306
    try {
1920
307
        db.transaction( function(tx) {
1921
308
            var rs = tx.executeSql("SELECT * FROM metadata GROUP BY album ORDER BY album COLLATE NOCASE ASC");
1922
309
            for(var i = 0; i < rs.rows.length; i++) {
1923
310
                var dbItem = rs.rows.item(i);
1924
311
                //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1925
312
                res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1926
313
            }
1927
314
        });
1928
315
    } catch(e) {
1929
316
        return [];
1930
317
    }
1931
318
1932
319
    return res;
1933
320
}
1934
321
1935
322
function getAlbumTracks(album) {
1936
323
    var res = [];
1937
324
    var db = getDatabase();
1938
325
    //console.log("Album: " + album);
1939
326
    db.transaction( function(tx) {
1940
327
        var rs = tx.executeSql("SELECT * FROM metadata WHERE album=? ORDER BY artist COLLATE NOCASE ASC, album COLLATE NOCASE ASC, CAST(number AS int) ASC", [album]);
1941
328
        for(var i = 0; i < rs.rows.length; i++) {
1942
329
            var dbItem = rs.rows.item(i);
1943
330
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1944
331
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1945
332
        }
1946
333
    });
1947
334
    return res;
1948
335
}
1949
336
1950
337
function getArtistAlbumTracks(artist, album) {
1951
338
    var res = [];
1952
339
    var db = getDatabase();
1953
340
    //console.log("Album: " + album);
1954
341
    db.transaction( function(tx) {
1955
342
        var rs = tx.executeSql("SELECT * FROM metadata WHERE artist=? AND album=? ORDER BY artist COLLATE NOCASE ASC, album COLLATE NOCASE ASC, CAST(number AS int) ASC", [artist, album]);
1956
343
        for(var i = 0; i < rs.rows.length; i++) {
1957
344
            var dbItem = rs.rows.item(i);
1958
345
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1959
346
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1960
347
        }
1961
348
    });
1962
349
    return res;
1963
350
}
1964
351
1965
352
function getGenres() {
1966
353
    var res = [];
1967
354
    var db = getDatabase();
1968
355
    db.transaction( function(tx) {
1969
356
        var rs = tx.executeSql("SELECT *, count(genre) AS total FROM metadata GROUP BY genre ORDER BY genre COLLATE NOCASE ASC");
1970
357
        for(var i = 0; i < rs.rows.length; i++) {
1971
358
            var dbItem = rs.rows.item(i);
1972
359
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1973
360
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre, total: dbItem.total});
1974
361
        }
1975
362
    });
1976
363
    return res;
1977
364
}
1978
365
1979
366
function getGenreTracks(genre) {
1980
367
    var res = [];
1981
368
    var db = getDatabase();
1982
369
    //console.log("Genre: " + genre);
1983
370
    db.transaction( function(tx) {
1984
371
        var rs = tx.executeSql("SELECT * FROM metadata WHERE genre=? ORDER BY artist COLLATE NOCASE ASC, album COLLATE NOCASE ASC, CAST(number AS int) ASC", [genre]);
1985
372
        for(var i = 0; i < rs.rows.length; i++) {
1986
373
            var dbItem = rs.rows.item(i);
1987
374
            //console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
1988
375
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
1989
376
        }
1990
377
    });
1991
378
    return res;
1992
379
}
1993
380
1994
381
function getGenreCovers(genre) {
1995
382
    var res = [];
1996
383
    var db = getDatabase();
1997
384
    try {
1998
385
        db.transaction( function(tx) {
1999
386
            var rs = tx.executeSql("SELECT cover FROM metadata WHERE genre=? AND cover <> '' ORDER BY artist COLLATE NOCASE ASC", [genre]);
2000
387
            for(var i = 0; i < rs.rows.length; i++) {
2001
388
                if (res.indexOf(rs.rows.item(i).cover) === -1) {
2002
389
                    res.push(rs.rows.item(i).cover);
2003
390
                }
2004
391
            }
2005
392
        });
2006
393
    } catch(e) {
2007
394
        return [];
2008
395
    }
2009
396
2010
397
    return res;
2011
398
}
2012
399
2013
400
2014
401
function size() {
2015
402
    var db = getDatabase();
2016
403
    var res="";
2017
404
2018
405
    db.transaction( function(tx) {
2019
406
        var rs = tx.executeSql("SELECT count(*) FROM metadata");
2020
407
        res = rs.rows.item(0).value;
2021
408
    });
2022
409
    return res;
2023
410
}
2024
411
2025
412
// This function is used to insert a recent item into the database
58
// This function is used to insert a recent item into the database
2026
413
function addRecent(title, title2, cover, key, type) {
59
function addRecent(title, title2, cover, key, type) {
2027
414
    var db = getDatabase();
60
    var db = getDatabase();
2028
@@ -436,21 +82,20 @@
2029
436
        var rs = tx.executeSql("SELECT * FROM recent ORDER BY time DESC LIMIT 15");
82
        var rs = tx.executeSql("SELECT * FROM recent ORDER BY time DESC LIMIT 15");
2030
437
        for(var i = 0; i < rs.rows.length; i++) {
83
        for(var i = 0; i < rs.rows.length; i++) {
2031
438
            var dbItem = rs.rows.item(i);
84
            var dbItem = rs.rows.item(i);
2033
439
            console.log("Time:"+ dbItem.time + ", Key:"+dbItem.key + ", Title:"+dbItem.title + ", Title2:"+dbItem.title2 + ", Cover:"+dbItem.cover + ", Type:"+dbItem.type);
85
            console.log("Time:"+ dbItem.time + ", Key:"+dbItem.key + ", Title:"+dbItem.title + ", Title2:"+dbItem.title2 + ", Type:"+dbItem.type);
2034
440
86
2035
441
            if (dbItem.type === "album")
87
            if (dbItem.type === "album")
2036
442
            {
88
            {
2037
443
                res.push({time:dbItem.time,
89
                res.push({time:dbItem.time,
2038
444
                             title:dbItem.title || i18n.tr("Unknown Album"),
90
                             title:dbItem.title || i18n.tr("Unknown Album"),
2039
445
                             title2:dbItem.title2 || i18n.tr("Unknown Artist"),
91
                             title2:dbItem.title2 || i18n.tr("Unknown Artist"),
2040
446
                             cover:dbItem.cover,
2041
447
                             key:dbItem.key || i18n.tr("Unknown Album"),
92
                             key:dbItem.key || i18n.tr("Unknown Album"),
2042
448
                             type:dbItem.type
93
                             type:dbItem.type
2043
449
                         });
94
                         });
2044
450
            }
95
            }
2045
451
            else
96
            else
2046
452
            {
97
            {
2048
453
                res.push({time:dbItem.time, title:dbItem.title, title2:dbItem.title2, cover:dbItem.cover, key:dbItem.key, type:dbItem.type});
98
                res.push({time:dbItem.time, title:dbItem.title, title2:dbItem.title2, key:dbItem.key, type:dbItem.type});
2049
454
            }
99
            }
2050
455
        }
100
        }
2051
456
    });
101
    });
2052
@@ -474,20 +119,3 @@
2053
474
    );
119
    );
2054
475
    return res === 0;
120
    return res === 0;
2055
476
}
121
}
2056
477
2057
478
// Search track LIKE
2058
479
function search(input) {
2059
480
    console.debug("Got a new search: "+input)
2060
481
    input = "%" + input + "%" // workaround
2061
482
    var res = [];
2062
483
    var db = getDatabase();
2063
484
    db.transaction( function(tx) {
2064
485
        var rs = tx.executeSql("SELECT * FROM metadata WHERE title LIKE ? OR artist LIKE ? OR album LIKE ? OR genre LIKE ?;", [input,input,input,input]); // WRONG! WHy?
2065
486
        for(var i = 0; i < rs.rows.length; i++) {
2066
487
            var dbItem = rs.rows.item(i);
2067
488
            console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover + ", Genre:"+dbItem.genre);
2068
489
            res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length, year:dbItem.year, genre:dbItem.genre});
2069
490
        }
2070
491
    });
2071
492
    return res;
2072
493
}
2073
494
122
2074
=== modified file 'music-app.qml'
2075
--- music-app.qml	2014-05-08 22:58:35 +0000
2076
+++ music-app.qml	2014-06-19 01:49:30 +0000
2077
@@ -1,7 +1,8 @@
2078
1
/*
1
/*
2082
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
2083
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
2084
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
2085
5
 *      Victor Thompson <victor.thompson@gmail.com>
2086
5
 *
6
 *
2087
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
2088
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
2089
@@ -21,8 +22,8 @@
2090
21
import Ubuntu.Components.ListItems 0.1
22
import Ubuntu.Components.ListItems 0.1
2091
22
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 0.1
2092
23
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 0.1 as ListItem
2093
25
import Ubuntu.MediaScanner 0.1
2094
24
import Ubuntu.Unity.Action 1.0 as UnityActions
26
import Ubuntu.Unity.Action 1.0 as UnityActions
2095
25
import org.nemomobile.grilo 0.1
2096
26
import QtMultimedia 5.0
27
import QtMultimedia 5.0
2097
27
import QtQuick.LocalStorage 2.0
28
import QtQuick.LocalStorage 2.0
2098
28
import QtQuick.XmlListModel 2.0
29
import QtQuick.XmlListModel 2.0
2099
@@ -199,9 +200,6 @@
2100
199
    actions: [searchAction, nextAction, playsAction, prevAction, stopAction, backAction]
200
    actions: [searchAction, nextAction, playsAction, prevAction, stopAction, backAction]
2101
200
201
2102
201
    // signal to open new URIs
202
    // signal to open new URIs
2103
202
    // TODO currently this only allows playing file:// URIs of known files
2104
203
    // (already in the database), not e.g. http:// URIs or files in directories
2105
204
    // not picked up by Grilo
2106
205
    Connections {
203
    Connections {
2107
206
        id: uriHandler
204
        id: uriHandler
2108
207
        target: UriHandler
205
        target: UriHandler
2109
@@ -214,33 +212,29 @@
2110
214
                return;
212
                return;
2111
215
            }
213
            }
2112
216
214
2115
217
            // Get tracks
215
            // Filter by artist and album
2116
218
            var tracks = Library.getArtistAlbumTracks(decodeURIComponent(split[0]), decodeURIComponent(split[1]));
216
            songsAlbumArtistModel.artist = decodeURIComponent(split[0]);
2117
217
            songsAlbumArtistModel.album = decodeURIComponent(split[1]);
2118
219
218
2120
220
            if (tracks.length === 0) {
219
            // Play album it tracks exist
2121
220
            if (songsAlbumArtistModel.rowCount > 0) {
2122
221
                trackClicked(songsAlbumArtistModel, 0, true);
2123
222
            }
2124
223
            else {
2125
221
                console.debug("Unknown artist-album " + uri + ", skipping")
224
                console.debug("Unknown artist-album " + uri + ", skipping")
2126
222
                return;
225
                return;
2127
223
            }
226
            }
2128
224
2129
225
            // Enqueue
2130
226
            for (var track in tracks) {
2131
227
                trackQueue.append(tracks[track]);
2132
228
            }
2133
229
2134
230
            // Play first track
2135
231
            trackClicked(trackQueue, 0, true);
2136
232
        }
227
        }
2137
233
228
2138
234
        function processFile(uri, play) {
229
        function processFile(uri, play) {
2139
235
            uri = decodeURIComponent(uri);
230
            uri = decodeURIComponent(uri);
2140
236
231
2141
237
            // search for path in library
2142
238
            var library = Library.getAll();
2143
239
            var track = false;
232
            var track = false;
2144
240
233
2148
241
            for (var item in library) {
234
            // Search for track in songs model
2149
242
                if (decodeURIComponent(library[item].file) === uri) {
235
            for (var i=0; i < allSongsModel.rowCount; i++) {
2150
243
                    track = library[item];
236
                if (decodeURIComponent(allSongsModel.get(i, allSongsModel.RoleModelData).filename) === uri) {
2151
237
                    track = allSongsModel.get(i, allSongsModel.RoleModelData);
2152
244
                    break;
238
                    break;
2153
245
                }
239
                }
2154
246
            }
240
            }
2155
@@ -255,7 +249,7 @@
2156
255
249
2157
256
            // play first URI
250
            // play first URI
2158
257
            if (play) {
251
            if (play) {
2160
258
                trackClicked(trackQueue, 0, true)
252
                trackQueueClick(0);
2161
259
            }
253
            }
2162
260
        }
254
        }
2163
261
255
2164
@@ -340,8 +334,7 @@
2165
340
            Settings.setSetting("repeat", "0") // default state of repeat
334
            Settings.setSetting("repeat", "0") // default state of repeat
2166
341
            //Settings.setSetting("scrobble", "0") // default state of scrobble
335
            //Settings.setSetting("scrobble", "0") // default state of scrobble
2167
342
        }
336
        }
2170
343
        Library.reset()
337
        Library.initialize();
2169
344
        //Library.initialize();
2171
345
338
2172
346
        // initialize playlists
339
        // initialize playlists
2173
347
        Playlists.initializePlaylists()
340
        Playlists.initializePlaylists()
2174
@@ -355,13 +348,27 @@
2175
355
        // push the page to view
348
        // push the page to view
2176
356
        pageStack.push(tabs)
349
        pageStack.push(tabs)
2177
357
350
2178
351
        loadedUI = true;
2179
352
2180
358
        // TODO: Switch tabs back and forth to get the background color in the
353
        // TODO: Switch tabs back and forth to get the background color in the
2181
359
        //       header to work properly.
354
        //       header to work properly.
2182
360
        tabs.selectedTabIndex = 1
355
        tabs.selectedTabIndex = 1
2183
361
        tabs.selectedTabIndex = 0
356
        tabs.selectedTabIndex = 0
2184
357
2185
358
        // Run post load
2186
359
        tabs.ensurePopulated(tabs.selectedTab);
2187
360
2188
361
        if (args.values.url) {
2189
362
            uriHandler.process(args.values.url, true);
2190
363
        }
2191
364
2192
365
        // Show toolbar and start timer if there is music
2193
366
        if (!emptyPage.noMusic) {
2194
367
            musicToolbar.showToolbar();
2195
368
            musicToolbar.startAutohideTimer();
2196
369
        }
2197
362
    }
370
    }
2198
363
371
2199
364
2200
365
    // VARIABLES
372
    // VARIABLES
2201
366
    property string musicName: i18n.tr("Music")
373
    property string musicName: i18n.tr("Music")
2202
367
    property string appVersion: '1.2'
374
    property string appVersion: '1.2'
2203
@@ -371,16 +378,13 @@
2204
371
    property string lastfmpassword
378
    property string lastfmpassword
2205
372
    property string timestamp // used to scrobble
379
    property string timestamp // used to scrobble
2206
373
    property var chosenElement: null
380
    property var chosenElement: null
2207
374
    property LibraryListModel currentModel: null  // Current model being used
2208
375
    property var currentQuery: null
2209
376
    property var currentParam: null
2210
377
    property bool queueChanged: false
2211
378
    property bool toolbarShown: musicToolbar.shown
381
    property bool toolbarShown: musicToolbar.shown
2212
379
    signal collapseExpand();
382
    signal collapseExpand();
2213
380
    signal collapseSwipeDelete(int index);
383
    signal collapseSwipeDelete(int index);
2214
381
    signal onToolbarShownChanged(bool shown, var currentPage, var currentTab)
384
    signal onToolbarShownChanged(bool shown, var currentPage, var currentTab)
2215
382
385
2216
383
    property bool wideAspect: width >= units.gu(70)
386
    property bool wideAspect: width >= units.gu(70)
2217
387
    property bool loadedUI: false  // property to detect if the UI has finished
2218
384
388
2219
385
    // FUNCTIONS
389
    // FUNCTIONS
2220
386
390
2221
@@ -393,28 +397,20 @@
2222
393
        }
397
        }
2223
394
    }
398
    }
2224
395
399
2227
396
    // Add items from a stored query in libraryModel into the queue
400
    function addQueueFromModel(model)
2226
397
    function addQueueFromModel(libraryModel)
2228
398
    {
401
    {
2248
399
        var items;
402
        // TODO: remove once playlists uses U1DB
2249
400
403
        if (model.hasOwnProperty("linkLibraryListModel")) {
2250
401
        if (libraryModel.query === null)
404
            model = model.linkLibraryListModel;
2251
402
        {
405
        }
2252
403
            return
406
2253
404
        }
407
        for (var i=0; i < model.rowCount; i++) {
2254
405
408
            var item = model.get(i, model.RoleModelData);
2255
406
        if (libraryModel.param === null)
409
            if (item.art !== undefined && (item.art === "" || item.art === null)) {
2256
407
        {
410
                item.art = "image://albumart/artist=" + item.author + "&album=" + item.album
2257
408
            items = libraryModel.query()
411
            }
2258
409
        }
412
2259
410
        else
413
            trackQueue.model.append(makeDict(item));
2241
411
        {
2242
412
            items = libraryModel.query(libraryModel.param)
2243
413
        }
2244
414
2245
415
        for (var key in items)
2246
416
        {
2247
417
            trackQueue.append(items[key])
2260
418
        }
414
        }
2261
419
    }
415
    }
2262
420
416
2263
@@ -430,64 +426,39 @@
2264
430
        return minutes + ":" + (seconds<10 ? "0"+seconds : seconds);
426
        return minutes + ":" + (seconds<10 ? "0"+seconds : seconds);
2265
431
    }
427
    }
2266
432
428
2269
433
    function trackClicked(libraryModel, index, play)
429
    // Make dictionary from model item
2270
434
    {
430
    function makeDict(model) {
2271
431
        return {
2272
432
            album: model.album,
2273
433
            author: model.author,
2274
434
            filename: model.filename,
2275
435
            title: model.title
2276
436
        };
2277
437
    }
2278
438
2279
439
    function trackClicked(model, index, play) {
2280
440
        // TODO: remove once playlists uses U1DB
2281
441
        if (model.hasOwnProperty("linkLibraryListModel")) {
2282
442
            model = model.linkLibraryListModel;
2283
443
        }
2284
444
2285
445
        var file = Qt.resolvedUrl(model.get(index, model.RoleModelData).filename);
2286
446
2287
435
        play = play === undefined ? true : play  // default play to true
447
        play = play === undefined ? true : play  // default play to true
2288
436
448
2291
437
        if (index > libraryModel.model.count - 1 || index < 0) {
449
        // If same track and on now playing page then toggle
2292
438
            customdebug("Incorrect index given to trackClicked.")
450
        if (musicToolbar.currentPage === nowPlaying &&
2293
451
                Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
2294
452
            player.toggle()
2295
439
            return;
453
            return;
2296
440
        }
454
        }
2297
441
455
2347
442
        var file = Qt.resolvedUrl(libraryModel.model.get(index).file)
456
        trackQueue.model.clear();  // clear the old model
2348
443
457
2349
444
        // Clear the play queue and load the new tracks - if not trackQueue
458
        addQueueFromModel(model);
2350
445
        // Don't reload queue if model, query and parameters are the same
459
2351
446
        // Same file different pages is treated as a new session
460
        if (play) {
2352
447
        if (libraryModel !== trackQueue &&
461
            player.playSong(file, index);
2304
448
                (currentModel !== libraryModel ||
2305
449
                 currentQuery !== libraryModel.query ||
2306
450
                 currentParam !== libraryModel.param ||
2307
451
                 queueChanged === true))
2308
452
        {
2309
453
            trackQueue.model.clear()
2310
454
            addQueueFromModel(libraryModel)
2311
455
        }
2312
456
        else if (player.source == file &&
2313
457
                    player.currentIndex === index)
2314
458
        {
2315
459
            // Same track so just toggle playing state
2316
460
            if (play === true) {
2317
461
                console.log("Is current track: "+player.playbackState)
2318
462
2319
463
                // Show the Now Playing page and make sure the track is visible
2320
464
                tabs.pushNowPlaying();
2321
465
                nowPlaying.ensureVisibleIndex = index;
2322
466
2323
467
                musicToolbar.showToolbar();
2324
468
2325
469
                if (musicToolbar.currentPage == nowPlaying) {
2326
470
                    player.toggle()
2327
471
                }
2328
472
            }
2329
473
2330
474
            return
2331
475
        }
2332
476
2333
477
        // Current index must be updated before player.source
2334
478
        currentModel = libraryModel
2335
479
        currentQuery = libraryModel.query
2336
480
        currentParam = libraryModel.param
2337
481
2338
482
        if (Qt.resolvedUrl(trackQueue.model.get(index).file) != file) {
2339
483
            index = trackQueue.indexOf(file)  // pick given index first
2340
484
        }
2341
485
        queueChanged = false
2342
486
2343
487
        console.log("Click of fileName: " + file)
2344
488
2345
489
        if (play === true) {
2346
490
            player.playSong(file, index)
2353
491
462
2354
492
            // Show the Now Playing page and make sure the track is visible
463
            // Show the Now Playing page and make sure the track is visible
2355
493
            tabs.pushNowPlaying();
464
            tabs.pushNowPlaying();
2356
@@ -496,34 +467,59 @@
2357
496
            musicToolbar.showToolbar();
467
            musicToolbar.showToolbar();
2358
497
        }
468
        }
2359
498
        else {
469
        else {
2361
499
            player.source = file
470
            player.source = file;
2362
500
        }
471
        }
2363
501
472
2364
502
        collapseExpand();  // collapse all expands if track clicked
473
        collapseExpand();  // collapse all expands if track clicked
2367
503
474
    }
2368
504
        return file
475
2369
476
    function trackQueueClick(index) {
2370
477
        if (player.currentIndex === index) {
2371
478
            player.toggle();
2372
479
        }
2373
480
        else {
2374
481
            player.playSong(trackQueue.model.get(index).filename, index);
2375
482
        }
2376
483
2377
484
        // Show the Now Playing page and make sure the track is visible
2378
485
        tabs.pushNowPlaying();
2379
486
        nowPlaying.ensureVisibleIndex = index;
2380
487
2381
488
        musicToolbar.showToolbar();
2382
505
    }
489
    }
2383
506
490
2384
507
    function playRandomSong(shuffle)
491
    function playRandomSong(shuffle)
2385
508
    {
492
    {
2386
509
        trackQueue.model.clear();
493
        trackQueue.model.clear();
2387
510
494
2388
511
        var items = Library.getAll();
2389
512
2390
513
        for (var key in items) {
2391
514
            trackQueue.append(items[key]);
2392
515
        }
2393
516
2394
517
        var now = new Date();
495
        var now = new Date();
2395
518
        var seed = now.getSeconds();
496
        var seed = now.getSeconds();
2399
519
        var index = Math.floor(trackQueue.model.count * Math.random(seed));
497
        var index = Math.floor(allSongsModel.rowCount * Math.random(seed));
2397
520
2398
521
        console.debug("THIS", index);
2400
522
498
2401
523
        player.shuffle = shuffle === undefined ? true : shuffle;
499
        player.shuffle = shuffle === undefined ? true : shuffle;
2405
524
        trackClicked(trackQueue,
500
2406
525
                     index,
501
        trackClicked(allSongsModel, index, true)
2407
526
                     true);
502
    }
2408
503
2409
504
    // Load mediascanner store
2410
505
    MediaStore {
2411
506
        id: musicStore
2412
507
    }
2413
508
2414
509
    SongsModel {
2415
510
        id: allSongsModel
2416
511
        // HACK: Temporarily setting limit to 500 to ensure model
2417
512
        //       is populated. See lp:1326753
2418
513
        limit: 500
2419
514
        store: musicStore
2420
515
    }
2421
516
2422
517
    SongsModel {
2423
518
        id: songsAlbumArtistModel
2424
519
        // HACK: Temporarily setting limit to 500 to ensure model
2425
520
        //       is populated. See lp:1326753
2426
521
        limit: 500
2427
522
        store: musicStore
2428
527
    }
523
    }
2429
528
524
2430
529
    // WHERE THE MAGIC HAPPENS
525
    // WHERE THE MAGIC HAPPENS
2431
@@ -583,211 +579,19 @@
2432
583
        }
579
        }
2433
584
    }
580
    }
2434
585
581
2628
586
    GriloModel {
582
    // TODO: Used by playlisttracks move to U1DB
2436
587
        id: griloModel
2437
588
        property bool loaded: false
2438
589
2439
590
        source: GriloBrowse {
2440
591
            id: browser
2441
592
            source: "grl-mediascanner"
2442
593
            registry: registry
2443
594
            metadataKeys: [GriloBrowse.Title]
2444
595
            typeFilter: [GriloBrowse.Audio]
2445
596
            Component.onCompleted: {
2446
597
                console.log(browser.supportedKeys);
2447
598
                console.log(browser.slowKeys);
2448
599
                refresh();
2449
600
                console.log("Refreshing");
2450
601
            }
2451
602
2452
603
            onAvailableChanged: {
2453
604
                console.log("Available ? " + available);
2454
605
                if (available === true) {
2455
606
                    console.log("griloModel.count " + griloModel.count)
2456
607
                }
2457
608
            }
2458
609
            onBaseMediaChanged: refresh();
2459
610
2460
611
            /* Check if the file (needle) exists in the library (haystack)
2461
612
             * Searches the the haystack using a binary search
2462
613
             *
2463
614
             * false if the file in in grilo but not in the haystack
2464
615
             * positive if the file is the same (number is the actual index)
2465
616
             * negative if the file has changed, actual index is -(i + 1)
2466
617
             */
2467
618
            function exists(haystack, needle)
2468
619
            {
2469
620
                var keyToFind = needle["file"];
2470
621
2471
622
                var upper = haystack.length - 1;
2472
623
                var lower = 0;
2473
624
                var i = Math.floor(haystack.length / 2);
2474
625
2475
626
                while (upper >= lower)
2476
627
                {
2477
628
                    var key = haystack[i]["file"];
2478
629
2479
630
                    if (keyToFind < key)
2480
631
                    {
2481
632
                        upper = i - 1;
2482
633
                    }
2483
634
                    else if (keyToFind > key)
2484
635
                    {
2485
636
                        lower = i + 1;
2486
637
                    }
2487
638
                    else
2488
639
                    {
2489
640
                        var found = false;
2490
641
2491
642
                        for (var k in haystack[i])
2492
643
                        {
2493
644
                            if (haystack[i][k] === needle[k])
2494
645
                            {
2495
646
                                found = true;
2496
647
                            }
2497
648
                            else
2498
649
                            {
2499
650
                                found = false;
2500
651
                                break;
2501
652
                            }
2502
653
                        }
2503
654
2504
655
                        if (found === true)
2505
656
                        {
2506
657
                            return i;  // in grilo and lib - same
2507
658
                        }
2508
659
                        else
2509
660
                        {
2510
661
                            return -i - 1;  // in grilo and lib - different
2511
662
                        }
2512
663
                    }
2513
664
2514
665
                    i = Math.floor((upper + lower) / 2);
2515
666
                }
2516
667
2517
668
                return false;  // in grilo not in lib
2518
669
            }
2519
670
2520
671
            onFinished: {
2521
672
                // FIXME: remove when grilo is fixed
2522
673
                var files = [];
2523
674
                var duplicates = 0;
2524
675
2525
676
                for (var i = 0; i < griloModel.count; i++)
2526
677
                {
2527
678
                    var media = griloModel.get(i)
2528
679
                    var file = media.url.toString()
2529
680
                    if (file.indexOf("file://") === 0)
2530
681
                    {
2531
682
                        file = file.slice(7, file.length)
2532
683
                    }
2533
684
2534
685
                    // FIXME: grilo can supply duplicates
2535
686
                    if (files.indexOf(file) > -1)
2536
687
                    {
2537
688
                        duplicates++;
2538
689
                        continue;
2539
690
                    }
2540
691
                    files.push(file);
2541
692
2542
693
                    var record = {
2543
694
                        artist: media.artist || i18n.tr("Unknown Artist"),
2544
695
                        album: media.album || i18n.tr("Unknown Album"),
2545
696
                        title: media.title || file,
2546
697
                        file: file,
2547
698
                        cover: media.thumbnail.toString() || "",
2548
699
                        length: media.duration.toString(),
2549
700
                        number: media.trackNumber,
2550
701
                        year: media.year.toString() !== "0" ? media.year.toString(): i18n.tr("Unknown Year"),
2551
702
                        genre: media.genre || i18n.tr("Unknown Genre")
2552
703
                    };
2553
704
2554
705
                    //console.log("Artist:"+ media.artist + ", Album:"+media.album + ", Title:"+media.title + ", File:"+file + ", Cover:"+media.thumbnail + ", Number:"+media.trackNumber + ", Genre:"+media.genre);
2555
706
                    Library.setMetadata(record)
2556
707
                }
2557
708
2558
709
                Library.writeDb()
2559
710
2560
711
                console.debug("Grilo duplicates:", duplicates);  // FIXME: remove when grilo is fixed
2561
712
                griloModel.loaded = true
2562
713
2563
714
                // Show toolbar and start timer if there is music
2564
715
                if (!emptyPage.noMusic || wideAspect) {
2565
716
                    musicToolbar.showToolbar(); 
2566
717
                    musicToolbar.startAutohideTimer(); 
2567
718
                }
2568
719
2569
720
                tabs.ensurePopulated(tabs.selectedTab);
2570
721
2571
722
                if (args.values.url) {
2572
723
                    uriHandler.process(args.values.url, true);
2573
724
                }
2574
725
            }
2575
726
        }
2576
727
    }
2577
728
2578
729
    GriloRegistry {
2579
730
        id: registry
2580
731
2581
732
        Component.onCompleted: {
2582
733
            console.log("Registry is ready");
2583
734
            loadAll();
2584
735
        }
2585
736
    }
2586
737
2587
738
    LibraryListModel {
2588
739
        id: libraryModel
2589
740
        onPreLoadCompleteChanged: {
2590
741
            if (preLoadComplete)
2591
742
            {
2592
743
                loading.visible = false
2593
744
                tracksTab.loading = false
2594
745
                tracksTab.populated = true
2595
746
            }
2596
747
        }
2597
748
    }
2598
749
2599
750
    LibraryListModel {
2600
751
        id: artistModel
2601
752
        onPreLoadCompleteChanged: {
2602
753
            if (preLoadComplete)
2603
754
            {
2604
755
                loading.visible = false
2605
756
                artistsTab.loading = false
2606
757
                artistsTab.populated = true
2607
758
            }
2608
759
        }
2609
760
    }
2610
761
    LibraryListModel {
2611
762
        id: artistTracksModel
2612
763
    }
2613
764
    LibraryListModel {
2614
765
        id: artistAlbumsModel
2615
766
    }
2616
767
2617
768
    LibraryListModel {
2618
769
        id: albumModel
2619
770
        onPreLoadCompleteChanged: {
2620
771
            if (preLoadComplete)
2621
772
            {
2622
773
                loading.visible = false
2623
774
                albumsTab.loading = false
2624
775
                albumsTab.populated = true
2625
776
            }
2626
777
        }
2627
778
    }
2629
779
    LibraryListModel {
583
    LibraryListModel {
2630
780
        id: albumTracksModel
584
        id: albumTracksModel
2631
781
    }
585
    }
2632
782
586
2633
587
    // TODO: used by recent items move to U1DB
2634
783
    LibraryListModel {
588
    LibraryListModel {
2635
784
        id: recentModel
589
        id: recentModel
2636
785
        property bool complete: false
590
        property bool complete: false
2637
786
        onPreLoadCompleteChanged: {
591
        onPreLoadCompleteChanged: {
2638
787
            complete = true;
592
            complete = true;
2639
788
593
2642
789
            if (preLoadComplete && (genreModel.complete ||
594
            if (preLoadComplete)
2641
790
                                    genreModel.query().length === 0))
2643
791
            {
595
            {
2644
792
                loading.visible = false
596
                loading.visible = false
2645
793
                startTab.loading = false
597
                startTab.loading = false
2646
@@ -795,63 +599,29 @@
2647
795
            }
599
            }
2648
796
        }
600
        }
2649
797
    }
601
    }
2650
602
2651
603
    // TODO: used by recent albums move to U1DB
2652
798
    LibraryListModel {
604
    LibraryListModel {
2653
799
        id: recentAlbumTracksModel
605
        id: recentAlbumTracksModel
2654
800
    }
606
    }
2655
607
2656
608
    // TODO: used by recent playlists move to U1DB
2657
801
    LibraryListModel {
609
    LibraryListModel {
2658
802
        id: recentPlaylistTracksModel
610
        id: recentPlaylistTracksModel
2659
803
    }
611
    }
2660
804
612
2661
805
    LibraryListModel {
2662
806
        id: genreModel
2663
807
        property bool complete: false
2664
808
        onPreLoadCompleteChanged: {
2665
809
            complete = true;
2666
810
2667
811
            if (preLoadComplete && (recentModel.complete ||
2668
812
                                    recentModel.query().length === 0))
2669
813
            {
2670
814
                loading.visible = false
2671
815
                startTab.loading = false
2672
816
                startTab.populated = true
2673
817
            }
2674
818
        }
2675
819
    }
2676
820
2677
821
    LibraryListModel {
2678
822
        id: genreTracksModel
2679
823
    }
2680
824
2681
825
    // list of tracks on startup. This is just during development
613
    // list of tracks on startup. This is just during development
2682
826
    LibraryListModel {
614
    LibraryListModel {
2683
827
        id: trackQueue
615
        id: trackQueue
2684
828
        Connections {
2685
829
            target: trackQueue.model
2686
830
            onCountChanged: queueChanged = true
2687
831
        }
2688
832
616
2689
833
        function append(listElement)
617
        function append(listElement)
2690
834
        {
618
        {
2698
835
            model.append({
619
            model.append(makeDict(listElement))
2699
836
                             "album": listElement.album,
620
            console.debug(JSON.stringify(makeDict(listElement)));
2693
837
                             "artist": listElement.artist,
2694
838
                             "cover": listElement.cover,
2695
839
                             "file": listElement.file,
2696
840
                             "title": listElement.title
2697
841
                         })
2700
842
        }
621
        }
2701
843
    }
622
    }
2702
844
623
2713
845
    // list of songs, which has been removed.
624
    // TODO: list of playlists move to U1DB
2704
846
    ListModel {
2705
847
        id: removedTrackQueue
2706
848
    }
2707
849
2708
850
    // list of single tracks
2709
851
    ListModel {
2710
852
        id: singleTracksgriloMo
2711
853
    }
2712
854
2714
855
    // create the listmodel to use for playlists
625
    // create the listmodel to use for playlists
2715
856
    LibraryListModel {
626
    LibraryListModel {
2716
857
        id: playlistModel
627
        id: playlistModel
2717
@@ -866,11 +636,6 @@
2718
866
        }
636
        }
2719
867
    }
637
    }
2720
868
638
2721
869
    // search model
2722
870
    LibraryListModel {
2723
871
        id: searchModel
2724
872
    }
2725
873
2726
874
    // load sheets (after model)
639
    // load sheets (after model)
2727
875
    SongsSheet {
640
    SongsSheet {
2728
876
        id: songsSheet
641
        id: songsSheet
2729
@@ -1002,7 +767,7 @@
2730
1002
        title: i18n.tr("Music")
767
        title: i18n.tr("Music")
2731
1003
        visible: false
768
        visible: false
2732
1004
769
2734
1005
        property bool noMusic: griloModel.count === 0 && griloModel.loaded === true
770
        property bool noMusic: allSongsModel.rowCount === 0 && loadedUI
2735
1006
771
2736
1007
        onNoMusicChanged: {
772
        onNoMusicChanged: {
2737
1008
            if (noMusic)
773
            if (noMusic)
2738
@@ -1027,7 +792,6 @@
2739
1027
            Column {
792
            Column {
2740
1028
                anchors.centerIn: parent
793
                anchors.centerIn: parent
2741
1029
794
2742
1030
2743
1031
                Label {
795
                Label {
2744
1032
                    anchors.horizontalCenter: parent.horizontalCenter
796
                    anchors.horizontalCenter: parent.horizontalCenter
2745
1033
                    color: styleMusic.libraryEmpty.labelColor
797
                    color: styleMusic.libraryEmpty.labelColor
2746
@@ -1059,9 +823,9 @@
2747
1059
            // First tab is all music
823
            // First tab is all music
2748
1060
            Tab {
824
            Tab {
2749
1061
                property bool populated: false
825
                property bool populated: false
2751
1062
                property var loader: [recentModel.filterRecent, genreModel.filterGenres, albumModel.filterAlbums]
826
                property var loader: [recentModel.filterRecent]
2752
1063
                property bool loading: false
827
                property bool loading: false
2754
1064
                property var model: [recentModel, genreModel, albumTracksModel]
828
                property var model: [recentModel, albumTracksModel]
2755
1065
                id: startTab
829
                id: startTab
2756
1066
                objectName: "starttab"
830
                objectName: "starttab"
2757
1067
                anchors.fill: parent
831
                anchors.fill: parent
2758
@@ -1075,10 +839,10 @@
2759
1075
839
2760
1076
            // Second tab is arists
840
            // Second tab is arists
2761
1077
            Tab {
841
            Tab {
2764
1078
                property bool populated: false
842
                property bool populated: true
2765
1079
                property var loader: [artistModel.filterArtists]
843
                property var loader: []
2766
1080
                property bool loading: false
844
                property bool loading: false
2768
1081
                property var model: [artistModel, artistAlbumsModel, albumTracksModel]
845
                property var model: []
2769
1082
                id: artistsTab
846
                id: artistsTab
2770
1083
                objectName: "artiststab"
847
                objectName: "artiststab"
2771
1084
                anchors.fill: parent
848
                anchors.fill: parent
2772
@@ -1092,10 +856,10 @@
2773
1092
856
2774
1093
            // third tab is albums
857
            // third tab is albums
2775
1094
            Tab {
858
            Tab {
2778
1095
                property bool populated: false
859
                property bool populated: true
2779
1096
                property var loader: [albumModel.filterAlbums]
860
                property var loader: []
2780
1097
                property bool loading: false
861
                property bool loading: false
2782
1098
                property var model: [albumModel, albumTracksModel]
862
                property var model: []
2783
1099
                id: albumsTab
863
                id: albumsTab
2784
1100
                objectName: "albumstab"
864
                objectName: "albumstab"
2785
1101
                anchors.fill: parent
865
                anchors.fill: parent
2786
@@ -1109,10 +873,10 @@
2787
1109
873
2788
1110
            // fourth tab is all songs
874
            // fourth tab is all songs
2789
1111
            Tab {
875
            Tab {
2792
1112
                property bool populated: false
876
                property bool populated: true
2793
1113
                property var loader: [libraryModel.populate]
877
                property var loader: []
2794
1114
                property bool loading: false
878
                property bool loading: false
2796
1115
                property var model: [libraryModel]
879
                property var model: []
2797
1116
                id: tracksTab
880
                id: tracksTab
2798
1117
                objectName: "trackstab"
881
                objectName: "trackstab"
2799
1118
                anchors.fill: parent
882
                anchors.fill: parent
2800
@@ -1158,7 +922,7 @@
2801
1158
            {
922
            {
2802
1159
                allowLoading(selectedTab, true);  // allow loading of the models
923
                allowLoading(selectedTab, true);  // allow loading of the models
2803
1160
924
2805
1161
                if (!selectedTab.populated && !selectedTab.loading && griloModel.loaded) {
925
                if (!selectedTab.populated && !selectedTab.loading && loadedUI) {
2806
1162
                    loading.visible = true
926
                    loading.visible = true
2807
1163
                    selectedTab.loading = true
927
                    selectedTab.loading = true
2808
1164
928
2809
1165
929
2810
=== modified file 'playlists.js'
2811
--- playlists.js	2014-03-26 12:16:43 +0000
2812
+++ playlists.js	2014-06-19 01:49:30 +0000
2813
@@ -182,12 +182,11 @@
2814
182
         for(var i = 0; i < rs.rows.length; i++) {
182
         for(var i = 0; i < rs.rows.length; i++) {
2815
183
             var dbItem = rs.rows.item(i);
183
             var dbItem = rs.rows.item(i);
2816
184
             //console.log("Cover: "+ dbItem.cover);
184
             //console.log("Cover: "+ dbItem.cover);
2818
185
             res[i] = {'file': dbItem.track,
185
             res[i] = {'filename': dbItem.track,
2819
186
                       'title': dbItem.title,
186
                       'title': dbItem.title,
2821
187
                       'artist': dbItem.artist,
187
                       'author': dbItem.artist,
2822
188
                       'album': dbItem.album,
188
                       'album': dbItem.album,
2825
189
                       'cover': dbItem.cover,
189
                       'date': dbItem.year,
2824
190
                       'year': dbItem.year,
2826
191
                       'number': dbItem.number,
190
                       'number': dbItem.number,
2827
192
                       'length': dbItem.length,
191
                       'length': dbItem.length,
2828
193
                       'genre': dbItem.genre,
192
                       'genre': dbItem.genre,
2829
@@ -227,10 +226,10 @@
2830
227
    // Get a list of unique covers for the playlist
226
    // Get a list of unique covers for the playlist
2831
228
    try {
227
    try {
2832
229
        db.transaction(function(tx) {
228
        db.transaction(function(tx) {
2834
230
            var rs = tx.executeSql("SELECT * FROM playlist WHERE playlist=? AND cover <> '' ;", [playlist]);
229
            var rs = tx.executeSql("SELECT * FROM playlist WHERE playlist=?;", [playlist]);
2835
231
            for(var i = 0; i < rs.rows.length; i++) {
230
            for(var i = 0; i < rs.rows.length; i++) {
2838
232
                if (res.indexOf(rs.rows.item(i).cover) === -1) {
231
                if (res.indexOf({author: rs.rows.item(i).artist, album: rs.rows.item(i).album}) === -1) {
2839
233
                    res.push(rs.rows.item(i).cover);
232
                    res.push({author: rs.rows.item(i).artist, album: rs.rows.item(i).album});
2840
234
                }
233
                }
2841
235
            }
234
            }
2842
236
        })
235
        })
2843
237
236
2844
=== removed file 'plugins.json'
2845
--- plugins.json	2014-03-14 00:03:53 +0000
2846
+++ plugins.json	1970-01-01 00:00:00 +0000
2847
@@ -1,5 +0,0 @@
2848
1
[
2849
2
{
2850
3
    "package": "qtdeclarative5-qtgrilo0.1"
2851
4
}
2852
5
]
2853
6
0
2854
=== modified file 'po/com.ubuntu.music.pot'
2855
--- po/com.ubuntu.music.pot	2014-06-06 11:35:53 +0000
2856
+++ po/com.ubuntu.music.pot	2014-06-19 01:49:30 +0000
2857
@@ -8,7 +8,7 @@
2858
8
msgstr ""
8
msgstr ""
2859
9
"Project-Id-Version: music-app\n"
9
"Project-Id-Version: music-app\n"
2860
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
2862
11
"POT-Creation-Date: 2014-06-06 12:31+0100\n"
11
"POT-Creation-Date: 2014-06-17 13:05-0400\n"
2863
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2864
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2865
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
2866
@@ -18,115 +18,115 @@
2867
18
"Content-Transfer-Encoding: 8bit\n"
18
"Content-Transfer-Encoding: 8bit\n"
2868
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2869
20
20
2871
21
#: ../LoginLastFM.qml:50 ../MusicSettings.qml:145 ../MusicSettings.qml:153
21
#: ../LoginLastFM.qml:49 ../MusicSettings.qml:145 ../MusicSettings.qml:153
2872
22
msgid "Last.fm"
22
msgid "Last.fm"
2873
23
msgstr ""
23
msgstr ""
2874
24
24
2876
25
#: ../LoginLastFM.qml:56
25
#: ../LoginLastFM.qml:55
2877
26
msgid "Login to be able to scrobble."
26
msgid "Login to be able to scrobble."
2878
27
msgstr ""
27
msgstr ""
2879
28
28
2881
29
#: ../LoginLastFM.qml:64
29
#: ../LoginLastFM.qml:63
2882
30
msgid "Username"
30
msgid "Username"
2883
31
msgstr ""
31
msgstr ""
2884
32
32
2886
33
#: ../LoginLastFM.qml:74
33
#: ../LoginLastFM.qml:73
2887
34
msgid "Password"
34
msgid "Password"
2888
35
msgstr ""
35
msgstr ""
2889
36
36
2891
37
#: ../LoginLastFM.qml:96
37
#: ../LoginLastFM.qml:95
2892
38
msgid "Login"
38
msgid "Login"
2893
39
msgstr ""
39
msgstr ""
2894
40
40
2896
41
#: ../LoginLastFM.qml:103
41
#: ../LoginLastFM.qml:102
2897
42
msgid "Trying to login..."
42
msgid "Trying to login..."
2898
43
msgstr ""
43
msgstr ""
2899
44
44
2901
45
#: ../LoginLastFM.qml:117
45
#: ../LoginLastFM.qml:116
2902
46
msgid "Login Successful"
46
msgid "Login Successful"
2903
47
msgstr ""
47
msgstr ""
2904
48
48
2906
49
#: ../LoginLastFM.qml:123
49
#: ../LoginLastFM.qml:122
2907
50
msgid "Login Failed"
50
msgid "Login Failed"
2908
51
msgstr ""
51
msgstr ""
2909
52
52
2911
53
#: ../LoginLastFM.qml:129
53
#: ../LoginLastFM.qml:128
2912
54
msgid "You forgot to set your username and/or password"
54
msgid "You forgot to set your username and/or password"
2913
55
msgstr ""
55
msgstr ""
2914
56
56
2916
57
#: ../MusicAlbums.qml:33 ../MusicStart.qml:333
57
#: ../MusicAlbums.qml:37 ../MusicStart.qml:370
2917
58
msgid "Albums"
58
msgid "Albums"
2918
59
msgstr ""
59
msgstr ""
2919
60
60
2921
61
#: ../MusicArtists.qml:33
61
#: ../MusicArtists.qml:37
2922
62
msgid "Artists"
62
msgid "Artists"
2923
63
msgstr ""
63
msgstr ""
2924
64
64
2926
65
#: ../MusicArtists.qml:107 ../common/AlbumsSheet.qml:116
65
#: ../MusicArtists.qml:153 ../common/AlbumsSheet.qml:124
2927
66
#, qt-format
66
#, qt-format
2928
67
msgid "%1 album"
67
msgid "%1 album"
2929
68
msgid_plural "%1 albums"
68
msgid_plural "%1 albums"
2930
69
msgstr[0] ""
69
msgstr[0] ""
2931
70
msgstr[1] ""
70
msgstr[1] ""
2932
71
71
2935
72
#: ../MusicArtists.qml:124 ../MusicPlaylists.qml:186 ../MusicStart.qml:314
72
#: ../MusicArtists.qml:170 ../MusicPlaylists.qml:187 ../MusicStart.qml:351
2936
73
#: ../common/SongsSheet.qml:129
73
#: ../common/SongsSheet.qml:144
2937
74
#, qt-format
74
#, qt-format
2938
75
msgid "%1 song"
75
msgid "%1 song"
2939
76
msgid_plural "%1 songs"
76
msgid_plural "%1 songs"
2940
77
msgstr[0] ""
77
msgstr[0] ""
2941
78
msgstr[1] ""
78
msgstr[1] ""
2942
79
79
2944
80
#: ../MusicNowPlaying.qml:33
80
#: ../MusicNowPlaying.qml:34
2945
81
msgid "Now Playing"
81
msgid "Now Playing"
2946
82
msgstr ""
82
msgstr ""
2947
83
83
2948
84
#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
84
#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
2949
85
#. Remember to keep the translation short to fit the screen width
85
#. Remember to keep the translation short to fit the screen width
2951
86
#: ../MusicPlaylists.qml:38
86
#: ../MusicPlaylists.qml:39
2952
87
msgid "Playlists"
87
msgid "Playlists"
2953
88
msgstr ""
88
msgstr ""
2954
89
89
2955
90
#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
90
#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
2957
91
#: ../MusicPlaylists.qml:59
91
#: ../MusicPlaylists.qml:60
2958
92
msgid "Change name"
92
msgid "Change name"
2959
93
msgstr ""
93
msgstr ""
2960
94
94
2962
95
#: ../MusicPlaylists.qml:60
95
#: ../MusicPlaylists.qml:61
2963
96
msgid "Enter the new name of the playlist."
96
msgid "Enter the new name of the playlist."
2964
97
msgstr ""
97
msgstr ""
2965
98
98
2967
99
#: ../MusicPlaylists.qml:71
99
#: ../MusicPlaylists.qml:72
2968
100
msgid "Change"
100
msgid "Change"
2969
101
msgstr ""
101
msgstr ""
2970
102
102
2972
103
#: ../MusicPlaylists.qml:84
103
#: ../MusicPlaylists.qml:85
2973
104
msgid "You didn't type in a name."
104
msgid "You didn't type in a name."
2974
105
msgstr ""
105
msgstr ""
2975
106
106
2977
107
#: ../MusicPlaylists.qml:89 ../MusicPlaylists.qml:115 ../music-app.qml:987
107
#: ../MusicPlaylists.qml:90 ../MusicPlaylists.qml:116 ../music-app.qml:752
2978
108
msgid "Cancel"
108
msgid "Cancel"
2979
109
msgstr ""
109
msgstr ""
2980
110
110
2981
111
#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
111
#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
2983
112
#: ../MusicPlaylists.qml:102
112
#: ../MusicPlaylists.qml:103
2984
113
msgid "Are you sure?"
113
msgid "Are you sure?"
2985
114
msgstr ""
114
msgstr ""
2986
115
115
2988
116
#: ../MusicPlaylists.qml:103
116
#: ../MusicPlaylists.qml:104
2989
117
msgid "This will delete your playlist."
117
msgid "This will delete your playlist."
2990
118
msgstr ""
118
msgstr ""
2991
119
119
2993
120
#: ../MusicPlaylists.qml:106
120
#: ../MusicPlaylists.qml:107
2994
121
msgid "Remove"
121
msgid "Remove"
2995
122
msgstr ""
122
msgstr ""
2996
123
123
2999
124
#: ../MusicSearch.qml:42 ../MusicToolbar.qml:508 ../music-app.qml:93
124
#: ../MusicSearch.qml:44 ../MusicToolbar.qml:508 ../music-app.qml:94
3000
125
#: ../music-app.qml:141 ../music-app.qml:147
125
#: ../music-app.qml:142 ../music-app.qml:148
3001
126
msgid "Search"
126
msgid "Search"
3002
127
msgstr ""
127
msgstr ""
3003
128
128
3005
129
#: ../MusicSettings.qml:30 ../music-app.qml:191
129
#: ../MusicSettings.qml:30 ../music-app.qml:192
3006
130
msgid "Settings"
130
msgid "Settings"
3007
131
msgstr ""
131
msgstr ""
3008
132
132
3009
@@ -212,20 +212,20 @@
3010
212
msgid "Clean everything!"
212
msgid "Clean everything!"
3011
213
msgstr ""
213
msgstr ""
3012
214
214
3014
215
#: ../MusicStart.qml:33 ../music-app.qml:366 ../music-app.qml:1002
215
#: ../MusicStart.qml:37 ../music-app.qml:373 ../music-app.qml:767
3015
216
#: com.ubuntu.music_music.desktop.in.in.h:1
216
#: com.ubuntu.music_music.desktop.in.in.h:1
3016
217
msgid "Music"
217
msgid "Music"
3017
218
msgstr ""
218
msgstr ""
3018
219
219
3020
220
#: ../MusicStart.qml:80
220
#: ../MusicStart.qml:84
3021
221
msgid "Recent"
221
msgid "Recent"
3022
222
msgstr ""
222
msgstr ""
3023
223
223
3025
224
#: ../MusicStart.qml:108
224
#: ../MusicStart.qml:112
3026
225
msgid "Clear History"
225
msgid "Clear History"
3027
226
msgstr ""
226
msgstr ""
3028
227
227
3030
228
#: ../MusicStart.qml:217
228
#: ../MusicStart.qml:222
3031
229
msgid "Genres"
229
msgid "Genres"
3032
230
msgstr ""
230
msgstr ""
3033
231
231
3034
@@ -237,38 +237,38 @@
3035
237
msgid "Tap play or any item to start"
237
msgid "Tap play or any item to start"
3036
238
msgstr ""
238
msgstr ""
3037
239
239
3039
240
#: ../MusicTracks.qml:33
240
#: ../MusicTracks.qml:37
3040
241
msgid "Songs"
241
msgid "Songs"
3041
242
msgstr ""
242
msgstr ""
3042
243
243
3045
244
#: ../MusicaddtoPlaylist.qml:38 ../common/ExpanderItems/AddToPlaylist.qml:59
244
#: ../MusicaddtoPlaylist.qml:39 ../common/ExpanderItems/AddToPlaylist.qml:59
3046
245
#: ../music-app.qml:934
245
#: ../music-app.qml:699
3047
246
msgid "Select playlist"
246
msgid "Select playlist"
3048
247
msgstr ""
247
msgstr ""
3049
248
248
3051
249
#: ../MusicaddtoPlaylist.qml:130
249
#: ../MusicaddtoPlaylist.qml:131
3052
250
msgid "New playlist"
250
msgid "New playlist"
3053
251
msgstr ""
251
msgstr ""
3054
252
252
3057
253
#: ../common/AlbumsSheet.qml:163 ../common/AlbumsSheet.qml:351
253
#: ../common/AlbumsSheet.qml:180 ../common/AlbumsSheet.qml:382
3058
254
#: ../common/SongsSheet.qml:158
254
#: ../common/SongsSheet.qml:173
3059
255
msgid "Play all"
255
msgid "Play all"
3060
256
msgstr ""
256
msgstr ""
3061
257
257
3065
258
#: ../common/AlbumsSheet.qml:214 ../common/AlbumsSheet.qml:399
258
#: ../common/AlbumsSheet.qml:228 ../common/AlbumsSheet.qml:427
3066
259
#: ../common/ExpanderItems/AddToQueue.qml:45 ../common/SongsSheet.qml:209
259
#: ../common/ExpanderItems/AddToQueue.qml:45 ../common/SongsSheet.qml:225
3067
260
#: ../music-app.qml:909
260
#: ../music-app.qml:674
3068
261
msgid "Add to queue"
261
msgid "Add to queue"
3069
262
msgstr ""
262
msgstr ""
3070
263
263
3072
264
#: ../common/AlbumsSheet.qml:323 ../common/SongsSheet.qml:128
264
#: ../common/AlbumsSheet.qml:352 ../common/SongsSheet.qml:143
3073
265
#, qt-format
265
#, qt-format
3074
266
msgid " | %1 song"
266
msgid " | %1 song"
3075
267
msgid_plural " | %1 songs"
267
msgid_plural " | %1 songs"
3076
268
msgstr[0] ""
268
msgstr[0] ""
3077
269
msgstr[1] ""
269
msgstr[1] ""
3078
270
270
3080
271
#: ../common/ExpanderItems/AddToPlaylist.qml:47 ../music-app.qml:923
271
#: ../common/ExpanderItems/AddToPlaylist.qml:47 ../music-app.qml:688
3081
272
msgid "Add to playlist"
272
msgid "Add to playlist"
3082
273
msgstr ""
273
msgstr ""
3083
274
274
3084
@@ -290,112 +290,104 @@
3085
290
msgid "Clear"
290
msgid "Clear"
3086
291
msgstr ""
291
msgstr ""
3087
292
292
3089
293
#: ../meta-database.js:444 ../meta-database.js:447 ../music-app.qml:695
293
#: ../meta-database.js:90 ../meta-database.js:92
3090
294
msgid "Unknown Album"
294
msgid "Unknown Album"
3091
295
msgstr ""
295
msgstr ""
3092
296
296
3094
297
#: ../meta-database.js:445 ../music-app.qml:694
297
#: ../meta-database.js:91
3095
298
msgid "Unknown Artist"
298
msgid "Unknown Artist"
3096
299
msgstr ""
299
msgstr ""
3097
300
300
3099
301
#: ../music-app.qml:142
301
#: ../music-app.qml:143
3100
302
msgid "Search Track"
302
msgid "Search Track"
3101
303
msgstr ""
303
msgstr ""
3102
304
304
3104
305
#: ../music-app.qml:154
305
#: ../music-app.qml:155
3105
306
msgid "Next"
306
msgid "Next"
3106
307
msgstr ""
307
msgstr ""
3107
308
308
3109
309
#: ../music-app.qml:155
309
#: ../music-app.qml:156
3110
310
msgid "Next Track"
310
msgid "Next Track"
3111
311
msgstr ""
311
msgstr ""
3112
312
312
3114
313
#: ../music-app.qml:161
313
#: ../music-app.qml:162
3115
314
msgid "Pause"
314
msgid "Pause"
3116
315
msgstr ""
315
msgstr ""
3117
316
316
3119
317
#: ../music-app.qml:161
317
#: ../music-app.qml:162
3120
318
msgid "Play"
318
msgid "Play"
3121
319
msgstr ""
319
msgstr ""
3122
320
320
3124
321
#: ../music-app.qml:163
321
#: ../music-app.qml:164
3125
322
msgid "Pause Playback"
322
msgid "Pause Playback"
3126
323
msgstr ""
323
msgstr ""
3127
324
324
3129
325
#: ../music-app.qml:163
325
#: ../music-app.qml:164
3130
326
msgid "Continue or start playback"
326
msgid "Continue or start playback"
3131
327
msgstr ""
327
msgstr ""
3132
328
328
3134
329
#: ../music-app.qml:168
329
#: ../music-app.qml:169
3135
330
msgid "Back"
330
msgid "Back"
3136
331
msgstr ""
331
msgstr ""
3137
332
332
3139
333
#: ../music-app.qml:169
333
#: ../music-app.qml:170
3140
334
msgid "Go back to last page"
334
msgid "Go back to last page"
3141
335
msgstr ""
335
msgstr ""
3142
336
336
3144
337
#: ../music-app.qml:177
337
#: ../music-app.qml:178
3145
338
msgid "Previous"
338
msgid "Previous"
3146
339
msgstr ""
339
msgstr ""
3147
340
340
3149
341
#: ../music-app.qml:178
341
#: ../music-app.qml:179
3150
342
msgid "Previous Track"
342
msgid "Previous Track"
3151
343
msgstr ""
343
msgstr ""
3152
344
344
3154
345
#: ../music-app.qml:183
345
#: ../music-app.qml:184
3155
346
msgid "Stop"
346
msgid "Stop"
3156
347
msgstr ""
347
msgstr ""
3157
348
348
3159
349
#: ../music-app.qml:184
349
#: ../music-app.qml:185
3160
350
msgid "Stop Playback"
350
msgid "Stop Playback"
3161
351
msgstr ""
351
msgstr ""
3162
352
352
3164
353
#: ../music-app.qml:192
353
#: ../music-app.qml:193
3165
354
msgid "Music Settings"
354
msgid "Music Settings"
3166
355
msgstr ""
355
msgstr ""
3167
356
356
3168
357
#. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
357
#. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
3170
358
#: ../music-app.qml:294
358
#: ../music-app.qml:288
3171
359
msgid "songs played today"
359
msgid "songs played today"
3172
360
msgstr ""
360
msgstr ""
3173
361
361
3175
362
#: ../music-app.qml:295
362
#: ../music-app.qml:289
3176
363
msgid "No songs played today"
363
msgid "No songs played today"
3177
364
msgstr ""
364
msgstr ""
3178
365
365
3180
366
#: ../music-app.qml:392
366
#: ../music-app.qml:396
3181
367
msgid "Debug: "
367
msgid "Debug: "
3182
368
msgstr ""
368
msgstr ""
3183
369
369
3193
370
#: ../music-app.qml:701
370
#: ../music-app.qml:712
3185
371
msgid "Unknown Year"
3186
372
msgstr ""
3187
373
3188
374
#: ../music-app.qml:702
3189
375
msgid "Unknown Genre"
3190
376
msgstr ""
3191
377
3192
378
#: ../music-app.qml:947
3194
379
msgid "New Playlist"
371
msgid "New Playlist"
3195
380
msgstr ""
372
msgstr ""
3196
381
373
3198
382
#: ../music-app.qml:948
374
#: ../music-app.qml:713
3199
383
msgid "Name your playlist."
375
msgid "Name your playlist."
3200
384
msgstr ""
376
msgstr ""
3201
385
377
3203
386
#: ../music-app.qml:952
378
#: ../music-app.qml:717
3204
387
msgid "Name"
379
msgid "Name"
3205
388
msgstr ""
380
msgstr ""
3206
389
381
3208
390
#: ../music-app.qml:960
382
#: ../music-app.qml:725
3209
391
msgid "Create"
383
msgid "Create"
3210
392
msgstr ""
384
msgstr ""
3211
393
385
3213
394
#: ../music-app.qml:976
386
#: ../music-app.qml:741
3214
395
msgid "Error: "
387
msgid "Error: "
3215
396
msgstr ""
388
msgstr ""
3216
397
389
3218
398
#: ../music-app.qml:981
390
#: ../music-app.qml:746
3219
399
msgid "Error: You didn't type a name."
391
msgid "Error: You didn't type a name."
3220
400
msgstr ""
392
msgstr ""
3221
401
393
3222
402
394
3223
=== modified file 'po/lv.po'
3224
--- po/lv.po	2014-06-07 06:34:52 +0000
3225
+++ po/lv.po	2014-06-19 01:49:30 +0000
3226
@@ -6,11 +6,12 @@
3227
6
msgid ""
6
msgid ""
3228
7
msgstr ""
7
msgstr ""
3229
8
"Project-Id-Version: music-app\n"
8
"Project-Id-Version: music-app\n"
3231
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9
"Report-Msgid-Bugs-To: \n"
3232
10
"POT-Creation-Date: 2014-06-06 12:31+0100\n"
10
"POT-Creation-Date: 2014-06-06 12:31+0100\n"
3233
11
"PO-Revision-Date: 2014-06-06 17:55+0000\n"
11
"PO-Revision-Date: 2014-06-06 17:55+0000\n"
3234
12
"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\n"
12
"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\n"
3235
13
"Language-Team: Latvian <lv@li.org>\n"
13
"Language-Team: Latvian <lv@li.org>\n"
3236
14
"Language: lv\n"
3237
14
"MIME-Version: 1.0\n"
15
"MIME-Version: 1.0\n"
3238
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
3239
16
"Content-Transfer-Encoding: 8bit\n"
17
"Content-Transfer-Encoding: 8bit\n"
3240
17
18
3241
=== modified file 'tests/autopilot/music_app/__init__.py'
3242
--- tests/autopilot/music_app/__init__.py	2013-06-21 23:06:10 +0000
3243
+++ tests/autopilot/music_app/__init__.py	2014-06-19 01:49:30 +0000
3244
@@ -1,5 +1,5 @@
3245
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3247
2
# Copyright 2013 Canonical
2
# Copyright 2013, 2014 Canonical
3248
3
#
3
#
3249
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
3250
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
3251
6
6
3252
=== modified file 'tests/autopilot/music_app/content/1.ogg'
3253
7
Binary files tests/autopilot/music_app/content/1.ogg	2013-09-27 15:14:10 +0000 and tests/autopilot/music_app/content/1.ogg	2014-06-19 01:49:30 +0000 differ
7
Binary files tests/autopilot/music_app/content/1.ogg	2013-09-27 15:14:10 +0000 and tests/autopilot/music_app/content/1.ogg	2014-06-19 01:49:30 +0000 differ
3254
=== removed directory 'tests/autopilot/music_app/content/mediascanner'
3255
=== added directory 'tests/autopilot/music_app/content/mediascanner-2.0'
3256
=== added file 'tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db'
3257
8
Binary files tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db	2014-06-19 01:49:30 +0000 differ
8
Binary files tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db	2014-06-19 01:49:30 +0000 differ
3258
=== added file 'tests/autopilot/music_app/content/mediascanner-2.0/mediastore.sql'
3259
--- tests/autopilot/music_app/content/mediascanner-2.0/mediastore.sql	1970-01-01 00:00:00 +0000
3260
+++ tests/autopilot/music_app/content/mediascanner-2.0/mediastore.sql	2014-06-19 01:49:30 +0000
3261
@@ -0,0 +1,39 @@
3262
1
BEGIN TRANSACTION;
3263
2
DROP TABLE media;
3264
3
CREATE TABLE media (
3265
4
    filename TEXT PRIMARY KEY NOT NULL,
3266
5
    content_type TEXT,
3267
6
    etag TEXT,
3268
7
    title TEXT,
3269
8
    date TEXT,
3270
9
    artist TEXT,          -- Only relevant to audio
3271
10
    album TEXT,           -- Only relevant to audio
3272
11
    album_artist TEXT,    -- Only relevant to audio
3273
12
    genre TEXT,           -- Only relevant to audio
3274
13
    disc_number INTEGER,  -- Only relevant to audio
3275
14
    track_number INTEGER, -- Only relevant to audio
3276
15
    duration INTEGER,
3277
16
    width INTEGER,        -- Only relevant to video/images
3278
17
    height INTEGER,       -- Only relevant to video/images
3279
18
    latitude DOUBLE,
3280
19
    longitude DOUBLE,
3281
20
    type INTEGER   -- 0=Audio, 1=Video
3282
21
);
3283
22
INSERT INTO "media" VALUES('/home/phablet/Music/1.ogg','audio/ogg','1401368666:257952','Gran Vals','1902','Francisco Tárrega','','Francisco Tárrega','',0,0,202,0,0,0.0,0.0,1);
3284
23
INSERT INTO "media" VALUES('/home/phablet/Music/2.ogg','audio/ogg','1401457265:78191','Swansong','','Josh Woodward','','Josh Woodward','',0,0,62,0,0,0.0,0.0,1);
3285
24
INSERT INTO "media" VALUES('/home/phablet/Music/3.mp3','audio/mpeg','1401457265:78191','TestMP3Title','','TestMP3Artist','TestMP3Album','TestMP3Artist','',0,0,6,0,0,0.0,0.0,1);
3286
25
3287
26
CREATE INDEX media_album_album_artist_idx ON media(album, album_artist);
3288
27
CREATE TRIGGER media_ai AFTER INSERT ON media BEGIN
3289
28
  INSERT INTO media_fts(docid, title, artist, album) VALUES (new.rowid, new.title, new.artist, new.album);
3290
29
END;
3291
30
CREATE TRIGGER media_au AFTER UPDATE ON media BEGIN
3292
31
  INSERT INTO media_fts(docid, title, artist, album) VALUES (new.rowid, new.title, new.artist, new.album);
3293
32
END;
3294
33
CREATE TRIGGER media_bd BEFORE DELETE ON media BEGIN
3295
34
  DELETE FROM media_fts WHERE docid=old.rowid;
3296
35
END;
3297
36
CREATE TRIGGER media_bu BEFORE UPDATE ON media BEGIN
3298
37
  DELETE FROM media_fts WHERE docid=old.rowid;
3299
38
END;
3300
39
COMMIT;
3301
0
40
3302
=== removed directory 'tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab'
3303
=== removed file 'tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments.gen'
3304
1
Binary files tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments.gen	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments.gen	1970-01-01 00:00:00 +0000 differ
41
Binary files tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments.gen	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments.gen	1970-01-01 00:00:00 +0000 differ
3305
=== removed file 'tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments_1'
3306
2
Binary files tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments_1	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments_1	1970-01-01 00:00:00 +0000 differ
42
Binary files tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments_1	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/segments_1	1970-01-01 00:00:00 +0000 differ
3307
=== removed file 'tests/autopilot/music_app/content/mediascanner/7d246d8c-5e6d-4fe8-8271-1472eb02c3ab/write.lock'
3308
=== removed directory 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7'
3309
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_0.cfs'
3310
3
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_0.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_0.cfs	1970-01-01 00:00:00 +0000 differ
43
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_0.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_0.cfs	1970-01-01 00:00:00 +0000 differ
3311
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1.cfs'
3312
4
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1.cfs	1970-01-01 00:00:00 +0000 differ
44
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1.cfs	1970-01-01 00:00:00 +0000 differ
3313
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1_1.del'
3314
5
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1_1.del	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1_1.del	1970-01-01 00:00:00 +0000 differ
45
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1_1.del	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_1_1.del	1970-01-01 00:00:00 +0000 differ
3315
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_2.cfs'
3316
6
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_2.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_2.cfs	1970-01-01 00:00:00 +0000 differ
46
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_2.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_2.cfs	1970-01-01 00:00:00 +0000 differ
3317
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3.cfs'
3318
7
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3.cfs	1970-01-01 00:00:00 +0000 differ
47
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3.cfs	1970-01-01 00:00:00 +0000 differ
3319
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3_1.del'
3320
8
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3_1.del	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3_1.del	1970-01-01 00:00:00 +0000 differ
48
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3_1.del	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_3_1.del	1970-01-01 00:00:00 +0000 differ
3321
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_4.cfs'
3322
9
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_4.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_4.cfs	1970-01-01 00:00:00 +0000 differ
49
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_4.cfs	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/_4.cfs	1970-01-01 00:00:00 +0000 differ
3323
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments.gen'
3324
10
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments.gen	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments.gen	1970-01-01 00:00:00 +0000 differ
50
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments.gen	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments.gen	1970-01-01 00:00:00 +0000 differ
3325
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments_6'
3326
11
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments_6	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments_6	1970-01-01 00:00:00 +0000 differ
51
Binary files tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments_6	2013-10-15 18:19:36 +0000 and tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/segments_6	1970-01-01 00:00:00 +0000 differ
3327
=== removed file 'tests/autopilot/music_app/content/mediascanner/d15682c3-89f1-4e41-abfc-531e4740e5a7/write.lock'
3328
=== removed file 'tests/autopilot/music_app/content/mediascanner/mediaindex'
3329
--- tests/autopilot/music_app/content/mediascanner/mediaindex	2013-10-15 18:19:36 +0000
3330
+++ tests/autopilot/music_app/content/mediascanner/mediaindex	1970-01-01 00:00:00 +0000
3331
@@ -1,10 +0,0 @@
3332
1
[global]
3333
2
format=Ubuntu Media Scanner Meta Index 1.0
3334
3
3335
4
[media:home/autopilot-music-app/Music]
3336
5
segments=d15682c3-89f1-4e41-abfc-531e4740e5a7
3337
6
relative-path=home/autopilot-music-app/Music
3338
7
3339
8
[media:]
3340
9
segments=7d246d8c-5e6d-4fe8-8271-1472eb02c3ab
3341
10
relative-path=
3342
11
0
3343
=== modified file 'tests/autopilot/music_app/emulators.py'
3344
--- tests/autopilot/music_app/emulators.py	2014-05-03 15:54:38 +0000
3345
+++ tests/autopilot/music_app/emulators.py	2014-06-19 01:49:30 +0000
3346
@@ -1,5 +1,5 @@
3347
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3349
2
# Copyright 2013 Canonical
2
# Copyright 2013, 2014 Canonical
3350
3
#
3
#
3351
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
3352
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
3353
@@ -51,6 +51,23 @@
3354
51
51
3355
52
        self.pointing_device.drag(x1, y1, x1, y1 - toolbar.fullHeight)
52
        self.pointing_device.drag(x1, y1, x1, y1 - toolbar.fullHeight)
3356
53
53
3357
54
    def add_to_queue_from_albums_tab_album_sheet(self, artistName, trackTitle):
3358
55
        # switch to albums tab
3359
56
        self.switch_to_tab("albumstab")
3360
57
3361
58
        #select album
3362
59
        albumartist = self.get_albums_albumartist(artistName)
3363
60
        self.pointing_device.click_object(albumartist)
3364
61
3365
62
        #get track item to add to queue
3366
63
        trackicon = self.get_album_sheet_listview_trackicon(
3367
64
            trackTitle)
3368
65
        self.pointing_device.click_object(trackicon)
3369
66
3370
67
        #click on Add to queue
3371
68
        queueTrackLabel = self.get_album_sheet_queuetrack_label()
3372
69
        self.pointing_device.click_object(queueTrackLabel)
3373
70
3374
54
    def get_player(self):
71
    def get_player(self):
3375
55
        return self.select_single("*", objectName="player")
72
        return self.select_single("*", objectName="player")
3376
56
73
3377
@@ -83,7 +100,9 @@
3378
83
        return self.wait_select_single("*", objectName="genreItemObject")
100
        return self.wait_select_single("*", objectName="genreItemObject")
3379
84
101
3380
85
    def get_back_button(self):
102
    def get_back_button(self):
3382
86
        return self.select_single("*", objectName="nowPlayingBackButtonObject")
103
        backButton = self.select_single("AbstractButton",
3383
104
                                        objectName="backButton")
3384
105
        return backButton
3385
87
106
3386
88
    def get_albumstab(self):
107
    def get_albumstab(self):
3387
89
        return self.select_single("Tab", objectName="albumstab")
108
        return self.select_single("Tab", objectName="albumstab")
3388
90
109
3389
=== modified file 'tests/autopilot/music_app/tests/__init__.py'
3390
--- tests/autopilot/music_app/tests/__init__.py	2014-04-30 15:24:44 +0000
3391
+++ tests/autopilot/music_app/tests/__init__.py	2014-06-19 01:49:30 +0000
3392
@@ -1,5 +1,5 @@
3393
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3395
2
# Copyright 2013 Canonical
2
# Copyright 2013, 2014 Canonical
3396
3
#
3
#
3397
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
3398
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
3399
@@ -7,28 +7,26 @@
3400
7
7
3401
8
"""Music app autopilot tests."""
8
"""Music app autopilot tests."""
3402
9
9
3403
10
import tempfile
3404
11
try:
3405
12
    from unittest import mock
3406
13
except ImportError:
3407
14
    import mock
3408
15
import os
10
import os
3409
11
import subprocess
3410
16
import os.path
12
import os.path
3411
17
import shutil
13
import shutil
3413
18
#import subprocess
14
import sqlite3
3414
19
import logging
15
import logging
3415
20
import music_app
16
import music_app
3416
21
17
3417
18
import fixtures
3418
19
from music_app import emulators
3419
20
3420
21
from autopilot import logging as autopilot_logging
3421
22
from autopilot.input import Mouse, Touch, Pointer
22
from autopilot.input import Mouse, Touch, Pointer
3422
23
from autopilot.platform import model
23
from autopilot.platform import model
3423
24
from autopilot.testcase import AutopilotTestCase
24
from autopilot.testcase import AutopilotTestCase
3424
25
25
3425
26
from music_app import emulators
3426
27
3427
28
from ubuntuuitoolkit import (
26
from ubuntuuitoolkit import (
3428
29
    base,
27
    base,
3429
30
    emulators as toolkit_emulators,
28
    emulators as toolkit_emulators,
3431
31
    environment
29
    fixture_setup as toolkit_fixtures
3432
32
)
30
)
3433
33
31
3434
34
32
3435
@@ -50,6 +48,8 @@
3436
50
    local_location_dir = os.path.dirname(os.path.dirname(working_dir))
48
    local_location_dir = os.path.dirname(os.path.dirname(working_dir))
3437
51
    local_location = local_location_dir + "/music-app.qml"
49
    local_location = local_location_dir + "/music-app.qml"
3438
52
    installed_location = "/usr/share/music-app/music-app.qml"
50
    installed_location = "/usr/share/music-app/music-app.qml"
3439
51
    backup_root = os.path.join(
3440
52
        os.path.expanduser('~'), '.local/share/com.ubuntu.music/backups')
3441
53
53
3442
54
    def setup_environment(self):
54
    def setup_environment(self):
3443
55
        if os.path.exists(self.local_location):
55
        if os.path.exists(self.local_location):
3444
@@ -64,67 +64,199 @@
3445
64
        return launch, test_type
64
        return launch, test_type
3446
65
65
3447
66
    def setUp(self):
66
    def setUp(self):
3448
67
        subprocess.call(["stop", "mediascanner-2.0"])
3449
68
3450
69
        try:
3451
70
            pid = subprocess.check_output(["pidof", "mediascanner-dbus-2.0"])
3452
71
        except subprocess.CalledProcessError:
3453
72
            logger.debug("mediascanner-dbus-2.0 not running")
3454
73
        else:
3455
74
            pid = pid.decode("utf-8")
3456
75
            pid = pid.split(None, 1)[0]
3457
76
            subprocess.call(["kill", "-9", pid])
3458
77
3459
78
        # Stop any mediascanner-dbus and restart mediascanner on exit
3460
79
        self.addCleanup(subprocess.call,
3461
80
                        'kill -9 \
3462
81
                        `pidof \
3463
82
                        /usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0`',
3464
83
                        shell=True)
3465
84
        self.addCleanup(subprocess.call, ["start", "mediascanner-2.0"])
3466
85
3467
67
        launch, self.test_type = self.setup_environment()
86
        launch, self.test_type = self.setup_environment()
3469
68
        self.home_dir = self._patch_home()
87
3470
88
        #Use backup and restore to setup test environment
3471
89
        #################################################
3472
90
        #for now, we will use real /home
3473
91
        logger.debug("Backup root folder %s" % self.backup_root)
3474
92
3475
93
        #backup and wipe before testing
3476
94
        sqlite_dir = os.path.join(
3477
95
            os.environ.get('HOME'), '.local/share/com.ubuntu.music/Databases')
3478
96
        self.backup_folder(sqlite_dir)
3479
97
        self.addCleanup(lambda: self.restore_folder(sqlite_dir))
3480
98
3481
99
        #backup Music folder and restore it after testing
3482
100
        self.backup_folder(os.path.join(os.environ.get('HOME'), 'Music'))
3483
101
        self.addCleanup(lambda: self.restore_folder(
3484
102
                        os.path.join(os.environ.get('HOME'), 'Music')))
3485
103
3486
104
        #backup mediascanner folder and restore it after testing
3487
105
        self.backup_folder(os.path.join(os.environ.get('HOME'),
3488
106
                                        '.cache/mediascanner-2.0'))
3489
107
        self.addCleanup(lambda: self.restore_folder(os.path.join(
3490
108
                        os.environ.get('HOME'),
3491
109
                        '.cache/mediascanner-2.0')))
3492
110
3493
111
        self.home_dir = os.environ['HOME']
3494
69
        self._create_music_library()
112
        self._create_music_library()
3495
113
        #################################################
3496
114
        #Use backup and restore to setup test environment
3497
115
3498
116
        #Use mocking fakehome
3499
117
        #####################
3500
118
        #self.home_dir = self._patch_home()
3501
119
3502
120
        #self._create_music_library()
3503
121
3504
122
        ##we need to also tell upstart about our fake home
3505
123
        ##and we need to do this all in one shell,
3506
124
        ##also passing along our fake env (env=env)
3507
125
        #logger.debug("Launching mediascanner")
3508
126
        #env = os.environ.copy()
3509
127
        #sethome = "initctl set-env HOME=" + self.home_dir
3510
128
        #retcode = subprocess.check_output(sethome + "; \
3511
129
                                          #start mediascanner-2.0",
3512
130
                                          #env=env,
3513
131
                                          #stderr=subprocess.STDOUT,
3514
132
                                          #shell=True)
3515
133
        #logger.debug("mediascanner launched %s" % retcode)
3516
134
        #time.sleep(10)
3517
135
3518
136
        #logger.debug("Launching mediascanner-dbus")
3519
137
        #retcode = subprocess.call(
3520
138
            #"/usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0 &",
3521
139
            #env=env, stderr=subprocess.STDOUT, shell=True)
3522
140
        #logger.debug("mediascanner-dbus launched %s" % retcode)
3523
141
3524
142
        ##we attempt to reset home for future upstart jobs
3525
143
        #retcode = subprocess.check_output("initctl reset-env",
3526
144
                                          #env=env, shell=True)
3527
145
        #retcode = subprocess.check_output("initctl get-env HOME",
3528
146
                                          #env=env, shell=True)
3529
147
        #logger.debug("reset initctl home %s" % retcode)
3530
148
        #####################
3531
149
        #Use mocking fakehome
3532
150
3533
70
        self.pointing_device = Pointer(self.input_device_class.create())
151
        self.pointing_device = Pointer(self.input_device_class.create())
3534
71
        super(MusicTestCase, self).setUp()
152
        super(MusicTestCase, self).setUp()
3535
72
        launch()
153
        launch()
3536
73
154
3537
155
    @autopilot_logging.log_action(logger.info)
3538
74
    def launch_test_local(self):
156
    def launch_test_local(self):
3539
75
        logger.debug("Running via local installation")
3540
76
        self.app = self.launch_test_application(
157
        self.app = self.launch_test_application(
3541
77
            base.get_qmlscene_launch_command(),
158
            base.get_qmlscene_launch_command(),
3542
78
            self.local_location,
159
            self.local_location,
3543
160
            "debug",
3544
79
            app_type='qt',
161
            app_type='qt',
3545
80
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
162
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
3546
81
163
3547
164
    @autopilot_logging.log_action(logger.info)
3548
82
    def launch_test_installed(self):
165
    def launch_test_installed(self):
3549
83
        logger.debug("Running via installed debian package")
3550
84
        self.app = self.launch_test_application(
166
        self.app = self.launch_test_application(
3551
85
            base.get_qmlscene_launch_command(),
167
            base.get_qmlscene_launch_command(),
3552
86
            self.installed_location,
168
            self.installed_location,
3553
169
            "debug",
3554
87
            app_type='qt',
170
            app_type='qt',
3555
88
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
171
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
3556
89
172
3557
173
    @autopilot_logging.log_action(logger.info)
3558
90
    def launch_test_click(self):
174
    def launch_test_click(self):
3559
91
        logger.debug("Running via click package")
3560
92
        self.app = self.launch_click_package(
175
        self.app = self.launch_click_package(
3561
93
            "com.ubuntu.music",
176
            "com.ubuntu.music",
3562
94
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
177
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
3563
95
178
3580
96
    def _patch_home(self):
179
    def _copy_xauthority_file(self, directory):
3581
97
        #make a temp dir
180
        """ Copy .Xauthority file to directory, if it exists in /home
3582
98
        temp_dir = tempfile.mkdtemp()
181
        """
3583
99
182
        #If running under xvfb, as jenkins does,
3584
100
        #delete it, and recreate it to the length
183
        #xsession will fail to start without xauthority file
3585
101
        #required so our patching the db works
184
        #Thus if the Xauthority file is in the home directory
3586
102
        #require a length of 25
185
        #make sure we copy it to our temp home directory
3587
103
        shutil.rmtree(temp_dir)
186
3588
104
        temp_dir = temp_dir.ljust(25, 'X')
187
        xauth = os.path.expanduser(os.path.join(os.environ.get('HOME'),
3589
105
        os.mkdir(temp_dir)
188
                                   '.Xauthority'))
3574
106
        logger.debug("Created fake home directory " + temp_dir)
3575
107
        self.addCleanup(shutil.rmtree, temp_dir)
3576
108
3577
109
        #if the Xauthority file is in home directory
3578
110
        #make sure we copy it to temp home, otherwise do nothing
3579
111
        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
3590
112
        if os.path.isfile(xauth):
189
        if os.path.isfile(xauth):
3592
113
            logger.debug("Copying .Xauthority to fake home " + temp_dir)
190
            logger.debug("Copying .Xauthority to %s" % directory)
3593
114
            shutil.copyfile(
191
            shutil.copyfile(
3596
115
                os.path.expanduser(os.path.join('~', '.Xauthority')),
192
                os.path.expanduser(os.path.join(os.environ.get('HOME'),
3597
116
                os.path.join(temp_dir, '.Xauthority'))
193
                                   '.Xauthority')),
3598
194
                os.path.join(directory, '.Xauthority'))
3599
117
195
3601
118
        #click can use initctl env (upstart), but desktop still requires mock
196
    def _patch_home(self):
3602
197
        """ mock /home for testing purposes to preserve user data
3603
198
        """
3604
199
        #click requires apparmor profile, and writing to special dir
3605
200
        #but the desktop can write to a traditional /tmp directory
3606
119
        if self.test_type == 'click':
201
        if self.test_type == 'click':
3609
120
            environment.set_initctl_env_var('HOME', temp_dir)
202
            env_dir = os.path.join(os.environ.get('HOME'), 'autopilot',
3610
121
            self.addCleanup(environment.unset_initctl_env_var, 'HOME')
203
                                   'fakeenv')
3611
204
3612
205
            if not os.path.exists(env_dir):
3613
206
                os.makedirs(env_dir)
3614
207
3615
208
            temp_dir_fixture = fixtures.TempDir(env_dir)
3616
209
            self.useFixture(temp_dir_fixture)
3617
210
3618
211
            #apparmor doesn't allow the app to create needed directories,
3619
212
            #so we create them now
3620
213
            temp_dir = temp_dir_fixture.path
3621
214
            temp_dir_cache = os.path.join(temp_dir, '.cache')
3622
215
            temp_dir_cache_font = os.path.join(temp_dir_cache, 'fontconfig')
3623
216
            temp_dir_cache_media = os.path.join(temp_dir_cache, 'media-art')
3624
217
            temp_dir_cache_write = os.path.join(temp_dir_cache,
3625
218
                                                'tncache-write-text.null')
3626
219
            temp_dir_config = os.path.join(temp_dir, '.config')
3627
220
            temp_dir_toolkit = os.path.join(temp_dir_config,
3628
221
                                            'ubuntu-ui-toolkit')
3629
222
            temp_dir_font = os.path.join(temp_dir_cache, '.fontconfig')
3630
223
            temp_dir_local = os.path.join(temp_dir, '.local', 'share')
3631
224
            temp_dir_confined = os.path.join(temp_dir, 'confined')
3632
225
3633
226
            if not os.path.exists(temp_dir_cache):
3634
227
                os.makedirs(temp_dir_cache)
3635
228
            if not os.path.exists(temp_dir_cache_font):
3636
229
                os.makedirs(temp_dir_cache_font)
3637
230
            if not os.path.exists(temp_dir_cache_media):
3638
231
                os.makedirs(temp_dir_cache_media)
3639
232
            if not os.path.exists(temp_dir_cache_write):
3640
233
                os.makedirs(temp_dir_cache_write)
3641
234
            if not os.path.exists(temp_dir_config):
3642
235
                os.makedirs(temp_dir_config)
3643
236
            if not os.path.exists(temp_dir_toolkit):
3644
237
                os.makedirs(temp_dir_toolkit)
3645
238
            if not os.path.exists(temp_dir_font):
3646
239
                os.makedirs(temp_dir_font)
3647
240
            if not os.path.exists(temp_dir_local):
3648
241
                os.makedirs(temp_dir_local)
3649
242
            if not os.path.exists(temp_dir_confined):
3650
243
                os.makedirs(temp_dir_confined)
3651
244
3652
245
            #before we set fixture, copy xauthority if needed
3653
246
            self._copy_xauthority_file(temp_dir)
3654
247
            self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
3655
248
                            HOME=temp_dir))
3656
122
        else:
249
        else:
3662
123
            patcher = mock.patch.dict('os.environ', {'HOME': temp_dir})
250
            temp_dir_fixture = fixtures.TempDir()
3663
124
            patcher.start()
251
            self.useFixture(temp_dir_fixture)
3664
125
            self.addCleanup(patcher.stop)
252
            temp_dir = temp_dir_fixture.path
3665
126
253
3666
127
        logger.debug("Patched home to fake home directory " + temp_dir)
254
            #before we set fixture, copy xauthority if needed
3667
255
            self._copy_xauthority_file(temp_dir)
3668
256
            self.useFixture(fixtures.EnvironmentVariable('HOME',
3669
257
                                                         newvalue=temp_dir))
3670
258
3671
259
        logger.debug("Patched home to fake home directory %s" % temp_dir)
3672
128
        return temp_dir
260
        return temp_dir
3673
129
261
3674
130
    def _create_music_library(self):
262
    def _create_music_library(self):
3675
@@ -132,8 +264,10 @@
3676
132
        logger.debug("Home set to %s" % self.home_dir)
264
        logger.debug("Home set to %s" % self.home_dir)
3677
133
        musicpath = os.path.join(self.home_dir, 'Music')
265
        musicpath = os.path.join(self.home_dir, 'Music')
3678
134
        logger.debug("Music path set to %s" % musicpath)
266
        logger.debug("Music path set to %s" % musicpath)
3681
135
        mediascannerpath = os.path.join(self.home_dir, '.cache/mediascanner')
267
        mediascannerpath = os.path.join(self.home_dir,
3682
136
        os.mkdir(musicpath)
268
                                        '.cache/mediascanner-2.0')
3683
269
        if not os.path.exists(musicpath):
3684
270
            os.makedirs(musicpath)
3685
137
        logger.debug("Mediascanner path set to %s" % mediascannerpath)
271
        logger.debug("Mediascanner path set to %s" % mediascannerpath)
3686
138
272
3687
139
        #set content path
273
        #set content path
3688
@@ -147,11 +281,12 @@
3689
147
        shutil.copy(os.path.join(content_dir, '2.ogg'), musicpath)
281
        shutil.copy(os.path.join(content_dir, '2.ogg'), musicpath)
3690
148
        shutil.copy(os.path.join(content_dir, '3.mp3'), musicpath)
282
        shutil.copy(os.path.join(content_dir, '3.mp3'), musicpath)
3691
149
        shutil.copytree(
283
        shutil.copytree(
3693
150
            os.path.join(content_dir, 'mediascanner'), mediascannerpath)
284
            os.path.join(content_dir, 'mediascanner-2.0'), mediascannerpath)
3694
151
285
3695
152
        logger.debug("Music copied, files " + str(os.listdir(musicpath)))
286
        logger.debug("Music copied, files " + str(os.listdir(musicpath)))
3696
153
287
3697
154
        self._patch_mediascanner_home(mediascannerpath)
288
        self._patch_mediascanner_home(mediascannerpath)
3698
289
3699
155
        logger.debug(
290
        logger.debug(
3700
156
            "Mediascanner database copied, files " +
291
            "Mediascanner database copied, files " +
3701
157
            str(os.listdir(mediascannerpath)))
292
            str(os.listdir(mediascannerpath)))
3702
@@ -160,18 +295,24 @@
3703
160
        #do some inline db patching
295
        #do some inline db patching
3704
161
        #patch mediaindex to proper home
296
        #patch mediaindex to proper home
3705
162
        #these values are dependent upon our sampled db
297
        #these values are dependent upon our sampled db
3707
163
        logger.debug("Patching fake mediascanner database")
298
        logger.debug("Patching fake mediascanner database in %s" %
3708
299
                     mediascannerpath)
3709
300
        logger.debug(
3710
301
            "Mediascanner database files " +
3711
302
            str(os.listdir(mediascannerpath)))
3712
303
3713
164
        relhome = self.home_dir[1:]
304
        relhome = self.home_dir[1:]
3716
165
        dblocation = "home/autopilot-music-app"
305
        dblocation = "home/phablet"
3715
166
        dbfoldername = "d15682c3-89f1-4e41-abfc-531e4740e5a7"
3717
167
        #patch mediaindex
306
        #patch mediaindex
3718
168
        self._file_find_replace(mediascannerpath +
307
        self._file_find_replace(mediascannerpath +
3720
169
                                "/mediaindex", dblocation, relhome)
308
                                "/mediastore.sql", dblocation, relhome)
3721
170
309
3726
171
        #patch file indexes
310
        con = sqlite3.connect(mediascannerpath + "/mediastore.db")
3727
172
        index_template = '%s/%s/_%%s.cfs' % (mediascannerpath, dbfoldername)
311
        f = open(mediascannerpath + "/mediastore.sql", 'r')
3728
173
        for i in range(5):
312
        sql = f.read()
3729
174
            self._file_find_replace(index_template % i, dblocation, relhome)
313
        cur = con.cursor()
3730
314
        cur.executescript(sql)
3731
315
        con.close()
3732
175
316
3733
176
    def _file_find_replace(self, in_filename, find, replace):
317
    def _file_find_replace(self, in_filename, find, replace):
3734
177
        #replace all occurences of string find with string replace
318
        #replace all occurences of string find with string replace
3735
@@ -188,6 +329,55 @@
3736
188
        os.remove(in_filename)
329
        os.remove(in_filename)
3737
189
        os.rename(out_filename, in_filename)
330
        os.rename(out_filename, in_filename)
3738
190
331
3739
332
    def backup_folder(self, folder):
3740
333
        backup_dir = os.path.join(self.backup_root, os.path.basename(folder))
3741
334
        logger.debug('Backup dir set to %s' % backup_dir)
3742
335
        try:
3743
336
            shutil.rmtree(backup_dir)
3744
337
        except:
3745
338
            pass
3746
339
        else:
3747
340
            logger.warning("Prexisting backup found and removed")
3748
341
3749
342
        try:
3750
343
            shutil.move(folder, backup_dir)
3751
344
        except shutil.Error as e:
3752
345
            logger.error('Backup error for %s: %s' % (folder, e))
3753
346
        except IOError as e:
3754
347
            logger.error('Backup error for %s: %s' % (folder, e.strerror))
3755
348
        except:
3756
349
            logger.error("Unknown error backing up %s" % folder)
3757
350
        else:
3758
351
            logger.debug('Backed up %s to %s' % (folder, backup_dir))
3759
352
3760
353
    def restore_folder(self, folder):
3761
354
        backup_dir = os.path.join(self.backup_root, os.path.basename(folder))
3762
355
        logger.debug('Backup dir set to %s' % backup_dir)
3763
356
        if os.path.exists(backup_dir):
3764
357
            if os.path.exists(folder):
3765
358
                try:
3766
359
                    shutil.rmtree(folder)
3767
360
                except shutil.Error as e:
3768
361
                    logger.error('Restore error for %s: %s' % (folder, e))
3769
362
                except IOError as e:
3770
363
                    logger.error('Restore error for %s: %s' %
3771
364
                                 (folder, e.strerror))
3772
365
                except:
3773
366
                    logger.error("Failed to remove test data for %s" % folder)
3774
367
                    return
3775
368
            try:
3776
369
                shutil.move(backup_dir, folder)
3777
370
            except shutil.Error as e:
3778
371
                logger.error('Restore error for %s: %s' % (folder, e))
3779
372
            except IOError as e:
3780
373
                logger.error('Restore error for %s: %s' % (folder, e.strerror))
3781
374
            except:
3782
375
                logger.error('Unknown error restoring %s' % folder)
3783
376
            else:
3784
377
                logger.debug('Restored %s from %s' % (folder, backup_dir))
3785
378
        else:
3786
379
            logger.warn('No backup found to restore for %s' % folder)
3787
380
3788
191
    @property
381
    @property
3789
192
    def player(self):
382
    def player(self):
3790
193
        return self.main_view.get_player()
383
        return self.main_view.get_player()
3791
194
384
3792
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
3793
--- tests/autopilot/music_app/tests/test_music.py	2014-05-21 07:23:35 +0000
3794
+++ tests/autopilot/music_app/tests/test_music.py	2014-06-19 01:49:30 +0000
3795
@@ -1,5 +1,5 @@
3796
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3798
2
# Copyright 2013 Canonical
2
# Copyright 2013, 2014 Canonical
3799
3
#
3
#
3800
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
3801
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
3802
@@ -21,25 +21,35 @@
3803
21
21
3804
22
22
3805
23
class TestMainWindow(MusicTestCase):
23
class TestMainWindow(MusicTestCase):
3806
24
    FIRST_TITLE = "Foss Yeaaaah! (Radio Edit)"
3807
25
    LAST_TITLE = "TestMP3Title"
3808
26
24
3809
27
    def setUp(self):
25
    def setUp(self):
3810
28
        super(TestMainWindow, self).setUp()
26
        super(TestMainWindow, self).setUp()
3811
29
        self.assertThat(
27
        self.assertThat(
3812
30
            self.main_view.visible, Eventually(Equals(True)))
28
            self.main_view.visible, Eventually(Equals(True)))
3813
29
3814
31
        #wait for activity indicator to stop spinning
30
        #wait for activity indicator to stop spinning
3815
32
        spinner = lambda: self.main_view.get_spinner().running
31
        spinner = lambda: self.main_view.get_spinner().running
3816
33
        self.assertThat(spinner, Eventually(Equals(False)))
32
        self.assertThat(spinner, Eventually(Equals(False)))
3817
33
        self.trackTitle = u"Gran Vals"
3818
34
        self.artistName = u"Francisco Tárrega"
3819
35
        self.lastTrackTitle = u"TestMP3Title"
3820
34
36
3821
35
    def populate_and_play_queue(self):
37
    def populate_and_play_queue(self):
3822
36
        first_genre_item = self.main_view.get_first_genre_item()
38
        first_genre_item = self.main_view.get_first_genre_item()
3823
37
        self.pointing_device.click_object(first_genre_item)
39
        self.pointing_device.click_object(first_genre_item)
3824
38
40
3827
39
        title = self.FIRST_TITLE
41
        song = self.main_view.get_album_sheet_listview_tracktitle(
3828
40
        song = self.main_view.get_album_sheet_listview_tracktitle(title)
42
            self.trackTitle)
3829
41
        self.pointing_device.click_object(song)
43
        self.pointing_device.click_object(song)
3830
42
44
3831
45
    def populate_and_play_queue_from_songs_tab(self):
3832
46
        # switch to songs tab
3833
47
        self.main_view.switch_to_tab("trackstab")
3834
48
3835
49
        # get track item to add to queue
3836
50
        trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
3837
51
        self.pointing_device.click_object(trackitem)
3838
52
3839
43
    def turn_shuffle_off(self):
53
    def turn_shuffle_off(self):
3840
44
        if self.player.shuffle:
54
        if self.player.shuffle:
3841
45
            shufflebutton = self.main_view.get_shuffle_button()
55
            shufflebutton = self.main_view.get_shuffle_button()
3842
@@ -81,55 +91,63 @@
3843
81
        fake mediascanner database"""
91
        fake mediascanner database"""
3844
82
92
3845
83
        # populate queue
93
        # populate queue
3851
84
        first_genre_item = self.main_view.get_first_genre_item()
94
        self.populate_and_play_queue_from_songs_tab()
3847
85
        self.pointing_device.click_object(first_genre_item)
3848
86
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
3849
87
        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
3850
88
        self.pointing_device.click_object(song)
3852
89
95
3853
90
        title = lambda: self.player.currentMetaTitle
96
        title = lambda: self.player.currentMetaTitle
3854
91
        artist = lambda: self.player.currentMetaArtist
97
        artist = lambda: self.player.currentMetaArtist
3858
92
        self.assertThat(title,
98
        self.assertThat(title, Eventually(Equals(self.trackTitle)))
3859
93
                        Eventually(Equals("Foss Yeaaaah! (Radio Edit)")))
99
        self.assertThat(artist, Eventually(Equals(self.artistName)))
3857
94
        self.assertThat(artist, Eventually(Equals("Benjamin Kerensa")))
3860
95
100
3861
96
    def test_play_pause_library(self):
101
    def test_play_pause_library(self):
3862
97
        """ Test playing and pausing a track (Music Library must exist) """
102
        """ Test playing and pausing a track (Music Library must exist) """
3863
98
103
3871
99
        # populate queue
104
        # get number of tracks in queue before queuing a track
3872
100
        first_genre_item = self.main_view.get_first_genre_item()
105
        initialtracksCount = self.main_view.get_queue_track_count()
3873
101
        self.pointing_device.click_object(first_genre_item)
106
3874
102
        button = self.main_view.get_add_to_queue_button()
107
        self.main_view.add_to_queue_from_albums_tab_album_sheet(
3875
103
        self.pointing_device.click_object(button)
108
            self.artistName, self.trackTitle)
3876
104
109
3877
105
        # click on close button to close genre sheet
110
        # verify track queue has added one to initial value
3878
111
        endtracksCount = self.main_view.get_queue_track_count()
3879
112
        self.assertThat(endtracksCount, Equals(initialtracksCount + 1))
3880
113
3881
114
        #Assert that the song added to the list is not playing
3882
115
        self.assertThat(self.player.currentIndex,
3883
116
                        Eventually(NotEquals(endtracksCount)))
3884
117
        self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
3885
118
3886
119
        #verify song's metadata matches the item added to the Now Playing view
3887
120
        queueArtistName = self.main_view.get_queue_now_playing_artist(
3888
121
            self.artistName)
3889
122
        self.assertThat(queueArtistName.text, Equals(self.artistName))
3890
123
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
3891
124
            self.trackTitle)
3892
125
        self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
3893
126
3894
127
        # click on close button to close album sheet
3895
106
        closebutton = self.main_view.get_album_sheet_close_button()
128
        closebutton = self.main_view.get_album_sheet_close_button()
3896
107
        self.pointing_device.click_object(closebutton)
129
        self.pointing_device.click_object(closebutton)
3897
130
        self.assertThat(self.main_view.get_albumstab(), Not(Is(None)))
3898
108
131
3899
109
        if self.main_view.wideAspect:
132
        if self.main_view.wideAspect:
3901
110
            playbutton = self.main_view.get_now_playing_play_button()
133
            play_button = self.main_view.get_now_playing_play_button()
3902
111
        else:
134
        else:
3906
112
            playbutton = self.main_view.get_play_button()
135
            play_button = self.main_view.get_play_button()
3907
113
136
            self.main_view.show_toolbar()
3905
114
        self.main_view.show_toolbar()
3908
115
137
3909
116
        """ Track is playing"""
138
        """ Track is playing"""
3911
117
        self.pointing_device.click_object(playbutton)
139
        self.pointing_device.click_object(play_button)
3912
118
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
140
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
3913
119
141
3914
120
        """ Track is not playing"""
142
        """ Track is not playing"""
3916
121
        self.pointing_device.click_object(playbutton)
143
        self.pointing_device.click_object(play_button)
3917
122
        self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
144
        self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
3918
123
145
3919
124
    def test_play_pause_now_playing(self):
146
    def test_play_pause_now_playing(self):
3920
125
        """ Test playing and pausing a track (Music Library must exist) """
147
        """ Test playing and pausing a track (Music Library must exist) """
3921
126
148
3922
127
        # populate queue
149
        # populate queue
3928
128
        first_genre_item = self.main_view.get_first_genre_item()
150
        self.populate_and_play_queue_from_songs_tab()
3924
129
        self.pointing_device.click_object(first_genre_item)
3925
130
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
3926
131
        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
3927
132
        self.pointing_device.click_object(song)
3929
133
151
3930
134
        playbutton = self.main_view.get_now_playing_play_button()
152
        playbutton = self.main_view.get_now_playing_play_button()
3931
135
153
3932
@@ -148,11 +166,7 @@
3933
148
        """ Test going to next track (Music Library must exist) """
166
        """ Test going to next track (Music Library must exist) """
3934
149
167
3935
150
        # populate queue
168
        # populate queue
3941
151
        first_genre_item = self.main_view.get_first_genre_item()
169
        self.populate_and_play_queue_from_songs_tab()
3937
152
        self.pointing_device.click_object(first_genre_item)
3938
153
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
3939
154
        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
3940
155
        self.pointing_device.click_object(song)
3942
156
170
3943
157
        playbutton = self.main_view.get_now_playing_play_button()
171
        playbutton = self.main_view.get_now_playing_play_button()
3944
158
172
3945
@@ -206,11 +220,7 @@
3946
206
        """ Test that mp3 "plays" or at least doesn't crash on load """
220
        """ Test that mp3 "plays" or at least doesn't crash on load """
3947
207
221
3948
208
        # populate queue
222
        # populate queue
3954
209
        first_genre_item = self.main_view.get_first_genre_item()
223
        self.populate_and_play_queue_from_songs_tab()
3950
210
        self.pointing_device.click_object(first_genre_item)
3951
211
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
3952
212
        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
3953
213
        self.pointing_device.click_object(song)
3955
214
224
3956
215
        playbutton = self.main_view.get_now_playing_play_button()
225
        playbutton = self.main_view.get_now_playing_play_button()
3957
216
226
3958
@@ -253,11 +263,7 @@
3959
253
        """ Test shuffle (Music Library must exist) """
263
        """ Test shuffle (Music Library must exist) """
3960
254
264
3961
255
        # populate queue
265
        # populate queue
3967
256
        first_genre_item = self.main_view.get_first_genre_item()
266
        self.populate_and_play_queue_from_songs_tab()
3963
257
        self.pointing_device.click_object(first_genre_item)
3964
258
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
3965
259
        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
3966
260
        self.pointing_device.click_object(song)
3968
261
267
3969
262
        """ Track is playing, shuffle is turned on"""
268
        """ Track is playing, shuffle is turned on"""
3970
263
        forwardbutton = self.main_view.get_forward_button()
269
        forwardbutton = self.main_view.get_forward_button()
3971
@@ -326,18 +332,16 @@
3972
326
    def test_show_albums_sheet(self):
332
    def test_show_albums_sheet(self):
3973
327
        """tests navigating to the Albums tab and displaying the album sheet"""
333
        """tests navigating to the Albums tab and displaying the album sheet"""
3974
328
334
3975
329
        artistName = "Benjamin Kerensa"
3976
330
3977
331
        # switch to albums tab
335
        # switch to albums tab
3978
332
        self.main_view.switch_to_tab("albumstab")
336
        self.main_view.switch_to_tab("albumstab")
3979
333
337
3980
334
        #select album
338
        #select album
3982
335
        albumartist = self.main_view.get_albums_albumartist(artistName)
339
        albumartist = self.main_view.get_albums_albumartist(self.artistName)
3983
336
        self.pointing_device.click_object(albumartist)
340
        self.pointing_device.click_object(albumartist)
3984
337
341
3985
338
        #get album sheet album artist
342
        #get album sheet album artist
3986
339
        sheet_albumartist = self.main_view.get_album_sheet_artist()
343
        sheet_albumartist = self.main_view.get_album_sheet_artist()
3988
340
        self.assertThat(sheet_albumartist.text, Equals(artistName))
344
        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
3989
341
345
3990
342
        # click on close button to close album sheet
346
        # click on close button to close album sheet
3991
343
        closebutton = self.main_view.get_album_sheet_close_button()
347
        closebutton = self.main_view.get_album_sheet_close_button()
3992
@@ -347,31 +351,11 @@
3993
347
    def test_add_song_to_queue_from_albums_sheet(self):
351
    def test_add_song_to_queue_from_albums_sheet(self):
3994
348
        """tests navigating to the Albums tab and adding a song to queue"""
352
        """tests navigating to the Albums tab and adding a song to queue"""
3995
349
353
3996
350
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
3997
351
        artistName = "Benjamin Kerensa"
3998
352
3999
353
        # get number of tracks in queue before queuing a track
354
        # get number of tracks in queue before queuing a track
4000
354
        initialtracksCount = self.main_view.get_queue_track_count()
355
        initialtracksCount = self.main_view.get_queue_track_count()
4001
355
356
4021
356
        # switch to albums tab
357
        self.main_view.add_to_queue_from_albums_tab_album_sheet(
4022
357
        self.main_view.switch_to_tab("albumstab")
358
            self.artistName, self.trackTitle)
4004
358
4005
359
        #select album
4006
360
        albumartist = self.main_view.get_albums_albumartist(artistName)
4007
361
        self.pointing_device.click_object(albumartist)
4008
362
4009
363
        #get album sheet album artist
4010
364
        sheet_albumartist = self.main_view.get_album_sheet_artist()
4011
365
        self.assertThat(sheet_albumartist.text, Equals(artistName))
4012
366
4013
367
        #get track item to add to queue
4014
368
        trackicon = self.main_view.get_album_sheet_listview_trackicon(
4015
369
            trackTitle)
4016
370
        self.pointing_device.click_object(trackicon)
4017
371
4018
372
        #click on Add to queue
4019
373
        queueTrackLabel = self.main_view.get_album_sheet_queuetrack_label()
4020
374
        self.pointing_device.click_object(queueTrackLabel)
4023
375
359
4024
376
        # verify track queue has added one to initial value
360
        # verify track queue has added one to initial value
4025
377
        endtracksCount = self.main_view.get_queue_track_count()
361
        endtracksCount = self.main_view.get_queue_track_count()
4026
@@ -384,11 +368,11 @@
4027
384
368
4028
385
        #verify song's metadata matches the item added to the Now Playing view
369
        #verify song's metadata matches the item added to the Now Playing view
4029
386
        queueArtistName = self.main_view.get_queue_now_playing_artist(
370
        queueArtistName = self.main_view.get_queue_now_playing_artist(
4032
387
            artistName)
371
            self.artistName)
4033
388
        self.assertThat(str(queueArtistName.text), Equals(artistName))
372
        self.assertThat(queueArtistName.text, Equals(self.artistName))
4034
389
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
373
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
4037
390
            trackTitle)
374
            self.trackTitle)
4038
391
        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
375
        self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
4039
392
376
4040
393
        # click on close button to close album sheet
377
        # click on close button to close album sheet
4041
394
        closebutton = self.main_view.get_album_sheet_close_button()
378
        closebutton = self.main_view.get_album_sheet_close_button()
4042
@@ -399,18 +383,11 @@
4043
399
        """tests navigating to the Songs tab and adding the library to the
383
        """tests navigating to the Songs tab and adding the library to the
4044
400
           queue with the selected item being played. """
384
           queue with the selected item being played. """
4045
401
385
4046
402
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
4047
403
        artistName = "Benjamin Kerensa"
4048
404
4049
405
        # get number of tracks in queue before queuing a track
386
        # get number of tracks in queue before queuing a track
4050
406
        initialtracksCount = self.main_view.get_queue_track_count()
387
        initialtracksCount = self.main_view.get_queue_track_count()
4051
407
388
4058
408
        # switch to songs tab
389
        # populate queue
4059
409
        self.main_view.switch_to_tab("trackstab")
390
        self.populate_and_play_queue_from_songs_tab()
4054
410
4055
411
        # get track item to add to queue
4056
412
        trackitem = self.main_view.get_songs_tab_tracktitle(trackTitle)
4057
413
        self.pointing_device.click_object(trackitem)
4060
414
391
4061
415
        # verify track queue has added all songs to initial value
392
        # verify track queue has added all songs to initial value
4062
416
        endtracksCount = self.main_view.get_queue_track_count()
393
        endtracksCount = self.main_view.get_queue_track_count()
4063
@@ -423,19 +400,16 @@
4064
423
400
4065
424
        # verify song's metadata matches the item added to the Now Playing view
401
        # verify song's metadata matches the item added to the Now Playing view
4066
425
        queueArtistName = self.main_view.get_queue_now_playing_artist(
402
        queueArtistName = self.main_view.get_queue_now_playing_artist(
4069
426
            artistName)
403
            self.artistName)
4070
427
        self.assertThat(str(queueArtistName.text), Equals(artistName))
404
        self.assertThat(queueArtistName.text, Equals(self.artistName))
4071
428
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
405
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
4074
429
            trackTitle)
406
            self.trackTitle)
4075
430
        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
407
        self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
4076
431
408
4077
432
    def test_add_song_to_queue_from_songs_tab(self):
409
    def test_add_song_to_queue_from_songs_tab(self):
4078
433
        """tests navigating to the Songs tab and adding a song from the library
410
        """tests navigating to the Songs tab and adding a song from the library
4079
434
           to the queue via the expandable list view item. """
411
           to the queue via the expandable list view item. """
4080
435
412
4081
436
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
4082
437
        artistName = "Benjamin Kerensa"
4083
438
4084
439
        # get number of tracks in queue before queuing a track
413
        # get number of tracks in queue before queuing a track
4085
440
        initialtracksCount = self.main_view.get_queue_track_count()
414
        initialtracksCount = self.main_view.get_queue_track_count()
4086
441
415
4087
@@ -443,7 +417,7 @@
4088
443
        self.main_view.switch_to_tab("trackstab")
417
        self.main_view.switch_to_tab("trackstab")
4089
444
418
4090
445
        # get track item to add to queue
419
        # get track item to add to queue
4092
446
        trackitem = self.main_view.get_songs_tab_trackimage(trackTitle)
420
        trackitem = self.main_view.get_songs_tab_trackimage(self.trackTitle)
4093
447
        self.pointing_device.click_object(trackitem)
421
        self.pointing_device.click_object(trackitem)
4094
448
        addtoqueueLabel = self.main_view.get_songs_tab_add_to_queue_label()
422
        addtoqueueLabel = self.main_view.get_songs_tab_add_to_queue_label()
4095
449
        self.pointing_device.click_object(addtoqueueLabel)
423
        self.pointing_device.click_object(addtoqueueLabel)
4096
@@ -459,23 +433,21 @@
4097
459
433
4098
460
        # verify song's metadata matches the item added to the Now Playing view
434
        # verify song's metadata matches the item added to the Now Playing view
4099
461
        queueArtistName = self.main_view.get_queue_now_playing_artist(
435
        queueArtistName = self.main_view.get_queue_now_playing_artist(
4102
462
            artistName)
436
            self.artistName)
4103
463
        self.assertThat(str(queueArtistName.text), Equals(artistName))
437
        self.assertThat(queueArtistName.text, Equals(self.artistName))
4104
464
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
438
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
4107
465
            trackTitle)
439
            self.trackTitle)
4108
466
        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
440
        self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
4109
467
441
4110
468
    def test_create_playlist_from_songs_tab(self):
442
    def test_create_playlist_from_songs_tab(self):
4111
469
        """tests navigating to the Songs tab and creating a playlist by
443
        """tests navigating to the Songs tab and creating a playlist by
4112
470
           selecting a song to add it to a new playlist. """
444
           selecting a song to add it to a new playlist. """
4113
471
445
4114
472
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
4115
473
4116
474
        # switch to songs tab
446
        # switch to songs tab
4117
475
        self.main_view.switch_to_tab("trackstab")
447
        self.main_view.switch_to_tab("trackstab")
4118
476
448
4119
477
        # get track item to add to queue
449
        # get track item to add to queue
4121
478
        trackitem = self.main_view.get_songs_tab_trackimage(trackTitle)
450
        trackitem = self.main_view.get_songs_tab_trackimage(self.trackTitle)
4122
479
        self.pointing_device.click_object(trackitem)
451
        self.pointing_device.click_object(trackitem)
4123
480
        addtoplaylistLbl = self.main_view.get_songs_tab_add_to_playlist_label()
452
        addtoplaylistLbl = self.main_view.get_songs_tab_add_to_playlist_label()
4124
481
        self.pointing_device.click_object(addtoplaylistLbl)
453
        self.pointing_device.click_object(addtoplaylistLbl)
4125
@@ -513,9 +485,6 @@
4126
513
    def test_artists_tab_album(self):
485
    def test_artists_tab_album(self):
4127
514
        """tests navigating to the Artists tab and playing an album"""
486
        """tests navigating to the Artists tab and playing an album"""
4128
515
487
4129
516
        artistName = "Benjamin Kerensa"
4130
517
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
4131
518
4132
519
        # get number of tracks in queue before queuing a track
488
        # get number of tracks in queue before queuing a track
4133
520
        initialtracksCount = self.main_view.get_queue_track_count()
489
        initialtracksCount = self.main_view.get_queue_track_count()
4134
521
490
4135
@@ -523,12 +492,12 @@
4136
523
        self.main_view.switch_to_tab("artiststab")
492
        self.main_view.switch_to_tab("artiststab")
4137
524
493
4138
525
        #select artist
494
        #select artist
4140
526
        artist = self.main_view.get_artists_artist(artistName)
495
        artist = self.main_view.get_artists_artist(self.artistName)
4141
527
        self.pointing_device.click_object(artist)
496
        self.pointing_device.click_object(artist)
4142
528
497
4143
529
        #get album sheet album artist
498
        #get album sheet album artist
4144
530
        sheet_albumartist = self.main_view.get_artist_sheet_artist()
499
        sheet_albumartist = self.main_view.get_artist_sheet_artist()
4146
531
        self.assertThat(sheet_albumartist.text, Equals(artistName))
500
        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
4147
532
501
4148
533
        # click on album to shows the artists
502
        # click on album to shows the artists
4149
534
        sheet_albumartist = self.main_view.get_artist_sheet_artist_cover()
503
        sheet_albumartist = self.main_view.get_artist_sheet_artist_cover()
4150
@@ -536,13 +505,14 @@
4151
536
505
4152
537
        #get song sheet album artist
506
        #get song sheet album artist
4153
538
        sheet_albumartist = self.main_view.get_album_sheet_artist()
507
        sheet_albumartist = self.main_view.get_album_sheet_artist()
4155
539
        self.assertThat(sheet_albumartist.text, Equals(artistName))
508
        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
4156
540
509
4157
541
        # click on song to populate queue and start playing
510
        # click on song to populate queue and start playing
4158
542
        self.pointing_device.click_object(sheet_albumartist)
511
        self.pointing_device.click_object(sheet_albumartist)
4159
543
512
4160
544
        #select artist
513
        #select artist
4162
545
        track = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
514
        track = self.main_view.get_album_sheet_listview_tracktitle(
4163
515
            self.trackTitle)
4164
546
        self.pointing_device.click_object(track)
516
        self.pointing_device.click_object(track)
4165
547
517
4166
548
        # verify track queue has added all songs to initial value
518
        # verify track queue has added all songs to initial value
4167
@@ -556,31 +526,25 @@
4168
556
526
4169
557
        # verify song's metadata matches the item added to the Now Playing view
527
        # verify song's metadata matches the item added to the Now Playing view
4170
558
        queueArtistName = self.main_view.get_queue_now_playing_artist(
528
        queueArtistName = self.main_view.get_queue_now_playing_artist(
4173
559
            artistName)
529
            self.artistName)
4174
560
        self.assertThat(str(queueArtistName.text), Equals(artistName))
530
        self.assertThat(queueArtistName.text, Equals(self.artistName))
4175
561
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
531
        queueTrackTitle = self.main_view.get_queue_now_playing_title(
4178
562
            trackTitle)
532
            self.trackTitle)
4179
563
        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
533
        self.assertThat(queueTrackTitle.text, Equals(self.trackTitle))
4180
564
534
4181
565
    def test_swipe_to_delete_song(self):
535
    def test_swipe_to_delete_song(self):
4182
566
        """tests navigating to the Now Playing queue, swiping to delete a
536
        """tests navigating to the Now Playing queue, swiping to delete a
4183
567
        track, and confirming the delete action. """
537
        track, and confirming the delete action. """
4184
568
538
4185
569
        artistName = "Benjamin Kerensa"
4186
570
4187
571
        # populate queue
539
        # populate queue
4193
572
        first_genre_item = self.main_view.get_first_genre_item()
540
        self.populate_and_play_queue_from_songs_tab()
4189
573
        self.pointing_device.click_object(first_genre_item)
4190
574
        trackTitle = "Foss Yeaaaah! (Radio Edit)"
4191
575
        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
4192
576
        self.pointing_device.click_object(song)
4194
577
541
4195
578
        # get initial queue count
542
        # get initial queue count
4196
579
        initialqueueCount = self.main_view.get_queue_track_count()
543
        initialqueueCount = self.main_view.get_queue_track_count()
4197
580
544
4198
581
        # get song to delete
545
        # get song to delete
4199
582
        artistToDelete = self.main_view.get_queue_now_playing_artist(
546
        artistToDelete = self.main_view.get_queue_now_playing_artist(
4201
583
            artistName)
547
            self.artistName)
4202
584
        musicnowplayingpage = self.main_view.get_MusicNowPlaying_page()
548
        musicnowplayingpage = self.main_view.get_MusicNowPlaying_page()
4203
585
549
4204
586
        # get coordinates to delete song
550
        # get coordinates to delete song
4205
@@ -604,7 +568,10 @@
4206
604
568
4207
605
    def test_playback_stops_when_last_song_ends_and_repeat_off(self):
569
    def test_playback_stops_when_last_song_ends_and_repeat_off(self):
4208
606
        """Check that playback stops when the last song in the queue ends"""
570
        """Check that playback stops when the last song in the queue ends"""
4210
607
        self.populate_and_play_queue()
571
4211
572
        # populate queue
4212
573
        self.populate_and_play_queue_from_songs_tab()
4213
574
4214
608
        self.turn_shuffle_off()
575
        self.turn_shuffle_off()
4215
609
        self.turn_repeat_off()
576
        self.turn_repeat_off()
4216
610
577
4217
@@ -620,7 +587,10 @@
4218
620
587
4219
621
    def test_playback_repeats_when_last_song_ends_and_repeat_on(self):
588
    def test_playback_repeats_when_last_song_ends_and_repeat_on(self):
4220
622
        """With repeat on, the 1st song should play after the last one ends"""
589
        """With repeat on, the 1st song should play after the last one ends"""
4222
623
        self.populate_and_play_queue()
590
4223
591
        # populate queue
4224
592
        self.populate_and_play_queue_from_songs_tab()
4225
593
4226
624
        self.turn_shuffle_off()
594
        self.turn_shuffle_off()
4227
625
        self.turn_repeat_on()
595
        self.turn_repeat_on()
4228
626
596
4229
@@ -632,12 +602,15 @@
4230
632
602
4231
633
        #Make sure we loop back to first song after last song ends
603
        #Make sure we loop back to first song after last song ends
4232
634
        actual_title = lambda: self.player.currentMetaTitle
604
        actual_title = lambda: self.player.currentMetaTitle
4234
635
        self.assertThat(actual_title, Eventually(Equals(self.FIRST_TITLE)))
605
        self.assertThat(actual_title, Eventually(Equals(self.trackTitle)))
4235
636
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
606
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
4236
637
607
4237
638
    def test_pressing_next_from_last_song_plays_first_when_repeat_on(self):
608
    def test_pressing_next_from_last_song_plays_first_when_repeat_on(self):
4238
639
        """With repeat on, skipping the last song jumps to the first track"""
609
        """With repeat on, skipping the last song jumps to the first track"""
4240
640
        self.populate_and_play_queue()
610
4241
611
        # populate queue
4242
612
        self.populate_and_play_queue_from_songs_tab()
4243
613
4244
641
        self.turn_shuffle_off()
614
        self.turn_shuffle_off()
4245
642
        self.turn_repeat_on()
615
        self.turn_repeat_on()
4246
643
616
4247
@@ -648,12 +621,15 @@
4248
648
            self.pointing_device.click_object(forward_button)
621
            self.pointing_device.click_object(forward_button)
4249
649
622
4250
650
        actual_title = lambda: self.player.currentMetaTitle
623
        actual_title = lambda: self.player.currentMetaTitle
4252
651
        self.assertThat(actual_title, Eventually(Equals(self.FIRST_TITLE)))
624
        self.assertThat(actual_title, Eventually(Equals(self.trackTitle)))
4253
652
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
625
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
4254
653
626
4255
654
    def test_pressing_prev_from_first_song_plays_last_when_repeat_on(self):
627
    def test_pressing_prev_from_first_song_plays_last_when_repeat_on(self):
4256
655
        """With repeat on, 'previous' from the 1st song plays the last one."""
628
        """With repeat on, 'previous' from the 1st song plays the last one."""
4258
656
        self.populate_and_play_queue()
629
4259
630
        # populate queue
4260
631
        self.populate_and_play_queue_from_songs_tab()
4261
632
4262
657
        self.turn_shuffle_off()
633
        self.turn_shuffle_off()
4263
658
        self.turn_repeat_on()
634
        self.turn_repeat_on()
4264
659
635
4265
@@ -667,5 +643,5 @@
4266
667
            self.pointing_device.click_object(prev_button)
643
            self.pointing_device.click_object(prev_button)
4267
668
644
4268
669
        actual_title = lambda: self.player.currentMetaTitle
645
        actual_title = lambda: self.player.currentMetaTitle
4270
670
        self.assertThat(actual_title, Eventually(Equals(self.LAST_TITLE)))
646
        self.assertThat(actual_title, Eventually(Equals(self.lastTrackTitle)))
4271
671
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
647
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
4272
672
648
4273
=== modified file 'worker-library-loader.js'
4274
--- worker-library-loader.js	2013-12-05 00:23:08 +0000
4275
+++ worker-library-loader.js	2014-06-19 01:49:30 +0000
4276
@@ -1,7 +1,8 @@
4277
1
/*
1
/*
4281
2
 * Copyright (C) 2013 Andrew Hayzen <ahayzen@gmail.com>
2
 * Copyright (C) 2013, 2014
4282
3
 *                    Daniel Holm <d.holmen@gmail.com>
3
 *      Andrew Hayzen <ahayzen@gmail.com>
4283
4
 *                    Victor Thompson <victor.thompson@gmail.com>
4
 *      Daniel Holm <d.holmen@gmail.com>
4284
5
 *      Victor Thompson <victor.thompson@gmail.com>
4285
5
 *
6
 *
4286
6
 * This program is free software; you can redistribute it and/or modify
7
 * This program is free software; you can redistribute it and/or modify
4287
7
 * it under the terms of the GNU General Public License as published by
8
 * it under the terms of the GNU General Public License as published by
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-06-19
David Planella		2014-04-04	Needs Information on 2014-05-13
Review via email: mp+214140@code.launchpad.net