Merge lp:~schwann/camera-app/camera-update-today-user-metric into lp:camera-app

[Günter Schwann]

Update user metric for every captured photo/video

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/662

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/67/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/662

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/743/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/745
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/745/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/668/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/68/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/22
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/748
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/748/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/671

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/680

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/70/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/680

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/70/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/761
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/761/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/684

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/71/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/25
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/762/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/764/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/687/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/72/rebuild

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/camera-app-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/768
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/690

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/73/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/camera-app-autolanding/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-autolanding/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-autolanding/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-autolanding/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-autolanding/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/774
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/774/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/695

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Already implemented in QML.

review: Disapprove

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-27 00:31:29 +0000
+++ CMakeLists.txt	2013-07-05 06:34:27 +0000
@@ -12,6 +12,9 @@
 find_package(Qt5Quick)
 find_package(Qt5Multimedia)
 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(UserMetrics REQUIRED libusermetricsinput-1)
+
 # Standard install paths
 include(GNUInstallDirs)
 
@@ -25,6 +28,7 @@
     ${Qt5Core_INCLUDE_DIRS}
     ${Qt5Quick_INCLUDE_DIRS}
     ${Qt5Multimedia_INCLUDE_DIRS}
+    ${UserMetrics_INCLUDE_DIRS}
     )
 
 set(CAMERA_APP camera-app)
@@ -45,6 +49,7 @@
     ${Qt5Core_LIBRARIES}
     ${Qt5Quick_LIBRARIES}
     ${Qt5Multimedia_LIBRARIES}
+    ${UserMetrics_LIBRARIES}
     )
 
 install(TARGETS ${CAMERA_APP}

=== modified file 'camera-app.qml'
--- camera-app.qml	2013-06-19 08:43:30 +0000
+++ camera-app.qml	2013-07-05 06:34:27 +0000
@@ -94,9 +94,18 @@
                 snapshot.source = preview;
             }
             onImageSaved: {
+                application.increaseTodaysPhotoMetrics();
                 console.log("Picture saved as " + path)
             }
         }
+
+        videoRecorder {
+            onRecorderStateChanged: {
+                if (videoRecorder.recorderState === CameraRecorder.StoppedState)
+                    application.increaseTodaysVideoMetrics()
+            }
+
+        }
     }
 
     Connections {

=== modified file 'cameraapplication.cpp'
--- cameraapplication.cpp	2013-03-27 12:08:07 +0000
+++ cameraapplication.cpp	2013-07-05 06:34:27 +0000
@@ -24,15 +24,25 @@
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
 #include <QtCore/QLibrary>
+#include <QDate>
 #include <QQmlContext>
 #include <QQmlEngine>
-#include <QtQuick/QQuickItem>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusConnectionInterface>
 #include <QScreen>
+#include <QSettings>
+
+#include <libusermetricsinput/MetricManager.h>
+
 #include "config.h"
 
+const QString APP_ID = QString("camera-app");
+const int MAX_STATISTICS_DAYS = 10;
+const QString PHOTO_STATISTICS_ID = QString("camera-photos");
+const QString VIDEO_STATISTICS_ID = QString("camera-videos");
+const QString PHOTO_KEY_SUFFIX = QString("Photos");
+const QString VIDEO_KEY_SUFFIX = QString("Videos");
+
+using namespace UserMetricsInput;
+
 static void printUsage(const QStringList& arguments)
 {
     qDebug() << "usage:"
@@ -41,7 +51,7 @@
 }
 
 CameraApplication::CameraApplication(int &argc, char **argv)
-    : QGuiApplication(argc, argv), m_view(0)
+    : QGuiApplication(argc, argv),m_view(0), m_settings(0)
 {
 
     // The testability driver is only loaded by QApplication but not by QGuiApplication.
@@ -60,6 +70,17 @@
             qCritical("Library qttestability load failed!");
         }
     }
+
+    m_settings = new QSettings("ubuntu", APP_ID, this);
+}
+
+CameraApplication::~CameraApplication()
+{
+    clearOldStatictics();
+
+    if (m_view) {
+        delete m_view;
+    }
 }
 
 bool CameraApplication::setup()
@@ -70,7 +91,6 @@
                 Qt::InvertedLandscapeOrientation);
 
     m_view = new QQuickView();
-    QObject::connect(m_view, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(onViewStatusChanged(QDeclarativeView::Status)));
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
     m_view->setTitle("Camera");
     m_view->rootContext()->setContextProperty("application", this);
@@ -83,9 +103,86 @@
     return true;
 }
 
-CameraApplication::~CameraApplication()
-{
-    if (m_view) {
-        delete m_view;
+/*!
+ * \brief CameraApplication::increaseTodaysPhotoMetrics increase the number of
+ * Photos taken pictures today. Or reset it to 1 if it's a new day.
+ * And update the data in the MetricManager
+ */
+void CameraApplication::increaseTodaysPhotoMetrics()
+{
+    MetricManagerPtr manager(MetricManager::getInstance());
+    MetricPtr metric(manager->add(PHOTO_STATISTICS_ID, "<b>%1</b> photos captured today",
+                        "No photo captured today", APP_ID));
+    MetricUpdatePtr update(metric->update());
+
+    QString todayPhotoKey = keyForToday(PHOTO_KEY_SUFFIX);
+    int todaysPhotoNumber = m_settings->value(todayPhotoKey, 0).toInt();
+    ++todaysPhotoNumber;
+    m_settings->setValue(todayPhotoKey, todaysPhotoNumber);
+
+    update->addData(todaysPhotoNumber);
+}
+
+/*!
+ * \brief CameraApplication::increaseTodaysVideoMetrics increase the number of
+ * Videos taken pictures today. Or reset it to 1 if it's a new day.
+ * And update the data in the MetricManager
+ */
+void CameraApplication::increaseTodaysVideoMetrics()
+{
+    MetricManagerPtr manager(MetricManager::getInstance());
+    MetricPtr metric(manager->add(VIDEO_STATISTICS_ID, "<b>%1</b> photos captured today",
+                        "No photo captured today", APP_ID));
+    MetricUpdatePtr update(metric->update());
+
+    QString todayVideoKey = keyForToday(VIDEO_KEY_SUFFIX);
+    int todaysVideoNumber = m_settings->value(todayVideoKey, 0).toInt();
+    ++todaysVideoNumber;
+    m_settings->setValue(todayVideoKey, todaysVideoNumber);
+
+    update->addData(todaysVideoNumber);
+}
+
+/*!
+ * \brief CameraApplication::clearOldStatictics removes all statistics that is
+ * older then some days
+ */
+void CameraApplication::clearOldStatictics()
+{
+    QStringList allKeys = m_settings->allKeys();
+    foreach (const QString& key, allKeys) {
+        if (key.endsWith(PHOTO_KEY_SUFFIX) || key.endsWith(VIDEO_KEY_SUFFIX)) {
+            QDate date = dateOfKey(key);
+            if (date.isValid() && date.daysTo(QDate::currentDate()) > MAX_STATISTICS_DAYS) {
+                m_settings->remove(key);
+            }
+        }
     }
 }
+
+/*!
+ * \brief CameraApplication::keyForToday generates the key for the statistics
+ * for today, for given medium (use Photos or Videos)
+ * \param medium
+ * \return key conaining the current day and the medium (photo/video)
+ */
+QString CameraApplication::keyForToday(const QString &medium)
+{
+    if (medium != PHOTO_KEY_SUFFIX && medium != VIDEO_KEY_SUFFIX)
+        return QString();
+
+    return QDate::currentDate().toString(Qt::ISODate) + medium;
+}
+
+/*!
+ * \brief CameraApplication::dateOfKey returns the date of the key, used for
+ * storing the number of photos/videos captured at one day
+ * \param key
+ * \return date of the key. Or an invalid date if the key is not a statistics key
+ */
+QDate CameraApplication::dateOfKey(const QString &key) const
+{
+    QString dateString = key;
+    dateString.chop(6);
+    return QDate::fromString(dateString, Qt::ISODate);
+}

=== modified file 'cameraapplication.h'
--- cameraapplication.h	2012-10-04 10:04:57 +0000
+++ cameraapplication.h	2013-07-05 06:34:27 +0000
@@ -23,6 +23,9 @@
 #include <QtQuick/QQuickView>
 #include <QGuiApplication>
 
+class QDate;
+class QSettings;
+
 class CameraApplication : public QGuiApplication
 {
     Q_OBJECT
@@ -33,8 +36,16 @@
 
     bool setup();
 
+    Q_INVOKABLE void increaseTodaysPhotoMetrics();
+    Q_INVOKABLE void increaseTodaysVideoMetrics();
+
 private:
+    void clearOldStatictics();
+    QDate dateOfKey(const QString& key) const;
+    QString keyForToday(const QString& medium);
+
     QQuickView *m_view;
+    QSettings *m_settings;
 };
 
 #endif // CAMERAAPPLICATION_H

=== modified file 'debian/control'
--- debian/control	2013-06-13 22:36:48 +0000
+++ debian/control	2013-07-05 06:34:27 +0000
@@ -15,6 +15,7 @@
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtmultimedia5-dev,
+               libusermetricsinput1-dev,
                gettext,
                dh-translations,
 Standards-Version: 3.9.4