Merge lp:~vthompson/music-app/recent-items into lp:music-app/trusty

[Victor Thompson]

* Add database schema to track recent items
* Change models to query selected playlist or album
* Update recent list when an album or playlist is selected from either its tab or the recent list

* Add database schema to track recent items
* Change models to query selected playlist or album
* Update recent list when an album or playlist is selected from either its tab or the recent list

Note, that this change does not implement the sheet pattern for the items in the Recent list. That will need to be implemented at a later time.

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

PASSED: Continuous integration, rev:222
http://91.189.93.70:8080/job/music-app-ci/272/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1153
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/272
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/272
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/272
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/274

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/recent-items]

223. By Victor Thompson on 2013-10-18

Show recent list as empty instead of hiding it when it is empty

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

PASSED: Continuous integration, rev:223
http://91.189.93.70:8080/job/music-app-ci/273/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1154
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/273
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/273
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/273
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/275

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Could I get someone to review this? If you want to toggle back to the empty state with no recent items do the following:
1) uncomment L222 of meta-database.js in the reset function.
2) start the app and then kill it
3) re-comment L222

[lp:~vthompson/music-app/recent-items]

224. By Victor Thompson on 2013-10-19

Add a button to clear history.

225. By Victor Thompson on 2013-10-19

Fix button visibility

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

PASSED: Continuous integration, rev:225
http://91.189.93.70:8080/job/music-app-ci/276/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1164
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/276
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/276
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/276
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/278

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I implemented a clear button (not in the design spec) that I found useful.

[Andrew Hayzen (ahayzen)]

Looks good, I think we need to talk to design regarding the clear button (I guess if we had the setting page it could go in there? but we don't at the moment).

Also on the first run I noticed I got this error.
meta-database.js:329: Error: no such table: recent Unable to execute statement

[lp:~vthompson/music-app/recent-items]

226. By Victor Thompson on 2013-10-20

Resolve warning upon initialization.

[Victor Thompson (vthompson)]

I see that error as well, but when the app starts to load content and isRecentEmpty() is called before the table exists it was designed to return true in all cases but when entries were found. I've fixed the issue, however.

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

PASSED: Continuous integration, rev:226
http://91.189.93.70:8080/job/music-app-ci/277/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1165
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/277
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/277
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/277
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/279

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Awesome! I approve assuming design agree on the clear button.

review: Approve

=== modified file 'LibraryListModel.qml'
--- LibraryListModel.qml	2013-09-15 03:03:04 +0000
+++ LibraryListModel.qml	2013-10-20 07:13:40 +0000
@@ -159,6 +159,25 @@
         }
     }
 
+    function filterRecent() {
+        worker.sendMessage({'clear': true, 'model': libraryModel})
+
+        console.log("called LibraryListModel::filterRecent()")
+
+        // Save query for queue
+        query = Library.getRecent
+        param = null
+
+        var library = Library.getRecent()
+
+        for ( var key in library ) {
+            var add = library[key];
+            console.log("add.recent: "+add.recent)
+            console.log(JSON.stringify(add))
+            worker.sendMessage({'add': add, 'model': libraryModel})
+        }
+    }
+
     function filterGenres() {
         worker.sendMessage({'clear': true, 'model': libraryModel})
 

=== modified file 'MusicAlbums.qml'
--- MusicAlbums.qml	2013-10-18 07:05:29 +0000
+++ MusicAlbums.qml	2013-10-20 07:13:40 +0000
@@ -251,6 +251,10 @@
                                     focus = true
                                 }
                                 trackClicked(albumTracksModel, index)  // play track
+                                Library.addRecent(album, artist, cover, album, "album")
+                                mainView.hasRecent = true
+                                recentModel.filterRecent()
+
                                 // TODO: This closes the SDK defined sheet
                                 //       component. It should be able to close
                                 //       albumSheet.

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2013-10-18 07:05:29 +0000
+++ MusicPlaylists.qml	2013-10-20 07:13:40 +0000
@@ -289,8 +289,8 @@
                                   expandable.visible = true
                                   playlist.height = styleMusic.playlists.expandedHeight
                               }
-                          }
-                      }
+                           }
+                       }
 
                        Rectangle {
                            id: expandable
@@ -837,6 +837,9 @@
                         onClicked: {
                             customdebug("File: " + file) // debugger
                             trackClicked(playlisttracksModel, index) // play track
+                            Library.addRecent(oldPlaylistName, "Playlist", cover, oldPlaylistName, "playlist")
+                            mainView.hasRecent = true
+                            recentModel.filterRecent()
                         }
 
                         onMouseXChanged: {

=== modified file 'MusicStart.qml'
--- MusicStart.qml	2013-10-18 07:05:29 +0000
+++ MusicStart.qml	2013-10-20 07:13:40 +0000
@@ -42,23 +42,57 @@
         id: recentlyPlayed
         text: i18n.tr("Recent")
     }
+    Item {
+        id: recentlistempty
+        anchors.top: recentlyPlayed.bottom
+        anchors.topMargin: units.gu(1)
+        height: units.gu(22)
+        width: parent.width
+        visible: !mainView.hasRecent
+
+        Label {
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            color: styleMusic.nowPlaying.labelSecondaryColor
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            fontSize: "large"
+            text: i18n.tr("No recent albums or playlists")
+        }
+    }
 
     ListView {
         id: recentlist
         width: parent.width
         anchors.top: recentlyPlayed.bottom
         anchors.topMargin: units.gu(1)
-        //anchors.bottom: genres.top
         spacing: units.gu(2)
         height: units.gu(22)
         // TODO: Update when view counts are collected
-        model: albumModel.model
+        model: recentModel.model
         delegate: recentDelegate
         header: Item {
             id: spacer
             width: units.gu(1)
         }
+        footer: Item {
+            id: clearRecent
+            width: units.gu(20)
+            height: units.gu(20)
+            visible: mainView.hasRecent && !loading.visible
+            Button {
+                id: clearRecentButton
+                anchors.centerIn: parent
+                text: "Clear History"
+                onClicked: {
+                    Library.clearRecentHistory()
+                    mainView.hasRecent = false
+                    recentModel.filterRecent()
+                }
+            }
+        }
         orientation: ListView.Horizontal
+        visible: mainView.hasRecent
 
         Component {
             id: recentDelegate
@@ -73,13 +107,12 @@
                     image: Image {
                         id: icon
                         fillMode: Image.Stretch
-                        property string artist: model.artist
-                        property string album: model.album
                         property string title: model.title
+                        property string title2: model.title2
                         property string cover: model.cover
-                        property string length: model.length
-                        property string file: model.file
-                        property string year: model.year
+                        property string type: model.type
+                        property string time: model.time
+                        property string key: model.key
                         source: cover !== "" ? cover : "images/cover_default.png"
                     }
                 }
@@ -98,10 +131,10 @@
                         anchors.leftMargin: units.gu(1)
                         anchors.right: parent.right
                         anchors.rightMargin: units.gu(1)
-                        color: styleMusic.nowPlaying.labelSecondaryColor
+                        color: styleMusic.common.white
                         elide: Text.ElideRight
-                        text: artist
-                        fontSize: "x-small"
+                        text: title
+                        fontSize: "small"
                     }
                 }
                 UbuntuShape {  // Background so can see text in current state
@@ -118,21 +151,33 @@
                         anchors.bottomMargin: units.gu(1)
                         anchors.right: parent.right
                         anchors.rightMargin: units.gu(1)
-                        color: styleMusic.common.white
+                        color: styleMusic.nowPlaying.labelSecondaryColor
                         elide: Text.ElideRight
-                        text: album
-                        fontSize: "small"
+                        text: title2
+                        fontSize: "x-small"
                     }
                 }
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
-                        recentAlbumTracksModel.filterAlbumTracks(album)
-                        trackQueue.model.clear()
-                        addQueueFromModel(recentAlbumTracksModel)
-                        currentModel = recentAlbumTracksModel
-                        currentQuery = recentAlbumTracksModel.query
-                        currentParam = recentAlbumTracksModel.param
+                        if (type === "album") {
+                            recentAlbumTracksModel.filterAlbumTracks(key)
+                            trackQueue.model.clear()
+                            addQueueFromModel(recentAlbumTracksModel)
+                            currentModel = recentAlbumTracksModel
+                            currentQuery = recentAlbumTracksModel.query
+                            currentParam = recentAlbumTracksModel.param
+                        } else if (type === "playlist") {
+                            recentPlaylistTracksModel.filterPlaylistTracks(key)
+                            trackQueue.model.clear()
+                            addQueueFromModel(recentPlaylistTracksModel)
+                            currentModel = recentPlaylistTracksModel
+                            currentQuery = recentPlaylistTracksModel.query
+                            currentParam = recentPlaylistTracksModel.param
+                        }
+                        Library.addRecent(title, title2, cover, key, type)
+                        mainView.hasRecent = true
+                        recentModel.filterRecent()
                         var file = trackQueue.model.get(0).file
                         currentIndex = trackQueue.indexOf(file)
                         queueChanged = true
@@ -149,7 +194,7 @@
 
     ListItem.ThinDivider {
         id: divider
-        anchors.top: recentlist.bottom
+        anchors.top: recentlist.visible ? recentlist.bottom : recentlistempty.bottom
     }
     ListItem.Standard {
         id: genres

=== modified file 'meta-database.js'
--- meta-database.js	2013-10-10 22:49:31 +0000
+++ meta-database.js	2013-10-20 07:13:40 +0000
@@ -32,6 +32,7 @@
             // If the table exists, this is skipped
             //tx.executeSql('DROP TABLE metadata');
             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)');
+            createRecent();
       });
 }
 function reset() {
@@ -42,7 +43,27 @@
             // If the table exists, this is skipped
             tx.executeSql('DROP TABLE IF EXISTS metadata');
             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)');
-            //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)');
+            createRecent();
+      });
+}
+
+function createRecent() {
+    var db = getDatabase();
+    db.transaction(
+        function(tx) {
+            // "key" is the search criteria for the type.
+            // album title for album, and playlist title for playlist
+            //tx.executeSql('DROP TABLE recent');
+            tx.executeSql("CREATE TABLE IF NOT EXISTS recent(time DATETIME, title TEXT, title2 TEXT, cover TEXT, key TEXT UNIQUE, type TEXT)");
+      });
+}
+
+function clearRecentHistory() {
+    var db = getDatabase();
+    db.transaction(
+        function(tx) {
+            tx.executeSql('DROP TABLE IF EXISTS recent');
+            tx.executeSql("CREATE TABLE IF NOT EXISTS recent(time DATETIME, title TEXT, title2 TEXT, cover TEXT, key TEXT UNIQUE, type TEXT)");
       });
 }
 
@@ -269,3 +290,56 @@
     });
     return res;
 }
+
+// This function is used to insert a recent item into the database
+function addRecent(title, title2, cover, key, type) {
+    var db = getDatabase();
+    var res="";
+
+    console.log("RECENT " + key + title + title2 + cover)
+
+    db.transaction(function(tx) {
+        var rs = tx.executeSql('INSERT OR REPLACE INTO recent (time, title, title2, cover, key, type) VALUES (?,?,?,?,?,?);', [new Date(), title, title2, cover, key, type]);
+              if (rs.rowsAffected > 0) {
+                console.log("RECENT add OK")
+                res = "OK";
+              } else {
+                console.log("RECENT add Fail")
+                res = "Error";
+              }
+        }
+    );
+}
+
+function getRecent() {
+    var res = [];
+    var db = getDatabase();
+    db.transaction( function(tx) {
+        var rs = tx.executeSql("SELECT * FROM recent ORDER BY time DESC LIMIT 15");
+        for(var i = 0; i < rs.rows.length; i++) {
+            var dbItem = rs.rows.item(i);
+            console.log("Time:"+ dbItem.time + ", Key:"+dbItem.key + ", Title:"+dbItem.title + ", Title2:"+dbItem.title2 + ", Cover:"+dbItem.cover + ", Type:"+dbItem.type);
+            res.push({time:dbItem.time, title:dbItem.title, title2:dbItem.title2, cover:dbItem.cover, key:dbItem.key, type:dbItem.type});
+        }
+    });
+    return res;
+}
+
+function isRecentEmpty() {
+    var db = getDatabase();
+    var res = 0;
+
+    db.transaction( function(tx) {
+        createRecent();
+        var rs = tx.executeSql("SELECT count(*) as value FROM recent")
+        if (rs.rows.item(0).value > 0) {
+            res = rs.rows.item(0).value;
+        } else {
+            console.log("RECENT does not exist")
+            res = 0;
+        }
+    }
+    );
+    return res === 0;
+}
+

=== modified file 'music-app.qml'
--- music-app.qml	2013-10-18 07:05:29 +0000
+++ music-app.qml	2013-10-20 07:13:40 +0000
@@ -209,6 +209,7 @@
     property string musicName: i18n.tr("Music")
     property string appVersion: '1.0'
     property bool isPlaying: false
+    property bool hasRecent: !Library.isRecentEmpty()
     property bool random: false
     property bool scrobble: false
     property string lastfmusername
@@ -685,8 +686,14 @@
     }
 
     LibraryListModel {
+        id: recentModel
+    }
+    LibraryListModel {
         id: recentAlbumTracksModel
     }
+    LibraryListModel {
+        id: recentPlaylistTracksModel
+    }
 
     LibraryListModel {
         id: genreModel
@@ -757,6 +764,7 @@
                 libraryModel.populate()
                 albumModel.filterAlbums()
                 artistModel.filterArtists()
+                recentModel.filterRecent()
                 genreModel.filterGenres()
                 timer.stop()
                 loading.visible = false