Merge lp:~music-app-dev/music-app/basic-user-metrics into lp:music-app/trusty

[Daniel Holm]

Added basic user metrics functionality.

Added basic user metrics functionality.
Should later use the recently played database.

[lp:~music-app-dev/music-app/basic-user-metrics]

231. By Daniel Holm on 2013-10-25

Forgot to add the function to when track is ended.

[Daniel Holm (danielholm)]

Why is the manifest and stuff always changed? How do I keep that from happening?

[Daniel Holm (danielholm)]

Also usermetrics has to be added to the manifest

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

FAILED: Continuous integration, rev:231
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~danielholm/music-app/basic-user-metrics/+merge/192624/+edit-commit-message

http://91.189.93.70:8080/job/music-app-ci/280/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1210
    FAILURE: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/280/console
    FAILURE: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/280/console
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/280
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/282
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/1

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Please fix to not add .excludes, not modify manifest.json, and not add a music-app.json. Also, how do metrics rollover from day to day? There aren't any changes here that would seem to create anything more than a running total of all tracks ever played.

review: Needs Fixing

[Victor Thompson (vthompson)]

I think the API takes care of data reset from day to day for us. Daniel, could you confirm?

[Andrew Hayzen (ahayzen)]

Why can you not query the database for anything within the last 24 hours, should be pretty simple to do?

I'll confirm tomorrow, when I get back to my machine, in the logs with Lisette whether songs or tracks was chosen.

review: Needs Information

[Victor Thompson (vthompson)]

I wrote the recent db table to support just that--querying for items in the last day. However, I think what we have now automatically does this as part of the API.

We might want to think of what data to display. Minutes of music listened to? Number of songs/tracks? Playlists? Albums? Items added to playlists?

[Victor Thompson (vthompson)]

I also think we need to add a call to updateMetrics() in the same places we call trackClicked() or inside trackClicked()--otherwise the first song played when added to the queue isn't counted.

[Andrew Hayzen (ahayzen)]

But the number of tracks played 'today' is just stored in a variable. So what happens if you open the app, play some tracks, close the app and then open again and start playing other tracks.

From my understanding of the current code the counter for 'today' would be reset?

Whereas asking the database for how many have been played today would be a much more reliable solution. Except IIRC currently the recent table only stores info about playing tracks in an album or playlist? But this could easily be extended to a more generic solution if that is the case.

I talked to Lisette about what they wanted data they wanted to show, they liked the idea of showing the number of tracks played but I'll ask on Monday if they want/would like any other information.

[Victor Thompson (vthompson)]

It updates the Metric component of id tracksMetric. If I were to vote, I'd prefer we 1) change it to read "songs played today" and 2) make the number bold like the camera app does [1]:

format: "<b>%1</b> songs played today"

[1] http://bazaar.launchpad.net/~phablet-team/camera-app/trunk/view/head:/camera-app.qml

[lp:~music-app-dev/music-app/basic-user-metrics]

232. By Daniel Holm on 2013-10-26

Removed .execludes and music-app.json

233. By Daniel Holm on 2013-10-26

Restored manifest.

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

FAILED: Continuous integration, rev:233
http://91.189.93.70:8080/job/music-app-ci/285/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1217
    FAILURE: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/285/console
    FAILURE: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/285/console
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/285
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/287
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/6

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:233
http://91.189.93.70:8080/job/music-app-ci/289/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1228
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/289
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/291
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/10

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I strongly suggest we both make the metrics read "songs" for both the emptyFormat and format (to match the terminology we use elsewhere), as well as making the numerical value bold. I want these changes made before we merge.

[Daniel Holm (danielholm)]

I'm having an exam on friday so I'm kinda off. But I'll try to fix this just after I've handed in this report that's due today.

[lp:~music-app-dev/music-app/basic-user-metrics]

234. By Daniel Holm on 2013-10-28

Changed to songs played is handled incremently by API; added support for minutes as well.

235. By Daniel Holm on 2013-10-28

Changed back manifest file.

236. By Daniel Holm on 2013-10-28

Changed back manifest file.

237. By Daniel Holm on 2013-10-28

Changed back manifest file.

[Daniel Holm (danielholm)]

Done. Also added music played in minutes. Take a look - we dont have to keep that one.

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

FAILED: Continuous integration, rev:237
http://91.189.93.70:8080/job/music-app-ci/290/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1232
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/290
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/292
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/11

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I think your recent updates makes both the number of songs and the total minutes of music not work. I don't know if it's because both Metrics have the same name? I say we remove the total minutes of music out for the time being--unless you can figure out the issue. Also, "Haven't listening to any music today" should read "Haven't listened to any music today" (preferably something like "No time spent listening to music").

I think we need to have the number of songs played increment when a song starts playing when added to the queue. But I guess we could wait on that since you're busy.

[Victor Thompson (vthompson)]

Daniel, you'll also need to add a dependency upon qtdeclarative5-usermetrics0.1 for music-app (not music-app-autopilot) to resolve the AP test failures.

[Victor Thompson (vthompson)]

Daniel-
If you want, you can assign branch ownership to the team and I'll fix this up tonight.

[Daniel Holm (danielholm)]

Thanks a lot, mate! I changed the ownership.

[lp:~music-app-dev/music-app/basic-user-metrics]

238. By Victor Thompson on 2013-10-30

Fix AP tests

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

PASSED: Continuous integration, rev:238
http://91.189.93.70:8080/job/music-app-ci/293/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1243
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/293
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/295
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/14

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

review: Approve (continuous-integration)

[lp:~music-app-dev/music-app/basic-user-metrics]

239. By Victor Thompson on 2013-10-30

Increment songs metrics when track is clicked and remove minutes of music for now

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

PASSED: Continuous integration, rev:239
http://91.189.93.70:8080/job/music-app-ci/294/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1244
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/294
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/296
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/15

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good now

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-09-26 06:41:26 +0000
+++ .bzrignore	2013-10-30 00:52:01 +0000
@@ -2,3 +2,5 @@
 
 .build
 po/Makefile
+.excludes
+music-app.json

=== modified file 'debian/control'
--- debian/control	2013-10-18 07:05:29 +0000
+++ debian/control	2013-10-30 00:52:01 +0000
@@ -21,6 +21,7 @@
          qtdeclarative5-qtmultimedia-plugin,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         qtdeclarative5-usermetrics0.1,
          qtdeclarative5-window-plugin,
          qtdeclarative5-xmllistmodel-plugin,
          qmlscene

=== modified file 'music-app.qml'
--- music-app.qml	2013-10-22 04:56:27 +0000
+++ music-app.qml	2013-10-30 00:52:01 +0000
@@ -28,6 +28,7 @@
 import QtQuick.LocalStorage 2.0
 import QtQuick.XmlListModel 2.0
 import QtGraphicalEffects 1.0
+import UserMetrics 0.1
 import "settings.js" as Settings
 import "meta-database.js" as Library
 import "scrobble.js" as Scrobble
@@ -152,12 +153,21 @@
         }
     }
 
+    // UserMetrics to show Music stuff on welcome screen
+    Metric {
+        id: songsMetric
+        name: "music-metrics"
+        format: "<b>%1</b> songs played today"
+        emptyFormat: "No songs played today"
+        domain: "com.ubuntu.music"
+    }
+
     // Design stuff
     Style { id: styleMusic }
     width: units.gu(50)
     height: units.gu(75)
 
-    // RUn on startup
+    // Run on startup
     Component.onCompleted: {
         customdebug("Version "+appVersion) // print the curren version
         customdebug("Arguments on startup: Debug: "+args.values.debug)
@@ -347,6 +357,7 @@
         else {
             console.debug("Debug: no scrobbling")
         }
+        songsMetric.increment() // Increment song count on Welcome screen
     }
 
     // Add items from a stored query in libraryModel into the queue
@@ -449,6 +460,7 @@
         if (play === true)
         {
             player.play()
+            songsMetric.increment() // Increment song count on Welcome screen
         }
 
         console.log("Source: " + player.source.toString())