Merge lp:~unity-team/libusermetrics/end-to-end into lp:~unity-team/libusermetrics/file-based-infographics

[Pete Woods]

Checking what Jenkins thinks

Checking what Jenkins thinks

[lp:~unity-team/libusermetrics/end-to-end]

170. By Pete Woods on 2014-03-11

Don't know what these are for

171. By Pete Woods on 2014-03-11

Dead file

172. By Pete Woods on 2014-03-11

Suppress leaks in Qt

173. By Pete Woods on 2014-03-11

Merge Qt 5.2 branch

174. By Pete Woods on 2014-03-11

Fix up the symbols files

[Michał Sawicz (saviq)]

Hey, this is looking good, I'll try and skim through this for a code review, but I've a few comments looking at the API:

- there's no reason for the separate infographics property, just make InfographicsList a QAbstractListModel (any reason for using *ItemModel instead, btw?) with just a "source" role

- as discussed on IRC, the filesUpdated() signal feels like a dirty API, I'd rather see timestamped file names and dataChanged on the "source" role when applicable; ideally both files would be available at the same time for a while (old files periodically garbage collected, basically?), in case we're still loading the old file while a new one got added

- the timeout logic feels unnecessary, we'll only be loading a single file (two at most during transitions); throttling should probably happen on the visualizer side, though?

- should we be (are we?) running the visualizers whenever data changes, or only when greeter is shown? on one hand that would mean they're ready when greeter is shown, on the other they might never be shown at all (in case user never switches between images)

BTW, what's the plan for i18n? Are we ok with the SVGs only updating the language on next update, or should we maybe kick the visualisers on locale change?

review: Needs Information

[lp:~unity-team/libusermetrics/end-to-end]

175. By Pete Woods on 2014-03-13

Infographic service writes files with timestamps that get aged off

176. By Pete Woods on 2014-03-16

This check breaks things when using atomic file writes

177. By Pete Woods on 2014-03-16

Disabling Valgrind until someone fixes the rules for Qt 5.2

[Pete Woods (pete-woods)]

> Hey, this is looking good, I'll try and skim through this for a code review,
> but I've a few comments looking at the API:
>
> - there's no reason for the separate infographics property, just make
> InfographicsList a QAbstractListModel (any reason for using *ItemModel
> instead, btw?) with just a "source" role
>
> - as discussed on IRC, the filesUpdated() signal feels like a dirty API, I'd
> rather see timestamped file names and dataChanged on the "source" role when
> applicable; ideally both files would be available at the same time for a while
> (old files periodically garbage collected, basically?), in case we're still
> loading the old file while a new one got added

I have made these changes now. :)

>
> - the timeout logic feels unnecessary, we'll only be loading a single file
> (two at most during transitions); throttling should probably happen on the
> visualizer side, though?
>

I have found the QFileSystemWatcher API to be "noisy", and it sometimes emits duplicate events. Similar throttling occurs in response to the data changes for the visualisers, too, though.

> - should we be (are we?) running the visualizers whenever data changes, or
> only when greeter is shown? on one hand that would mean they're ready when
> greeter is shown, on the other they might never be shown at all (in case user
> never switches between images)
>

We're currently running them whenever data changes. There is only one-way communication to libusermetricsoutput / the greeter, in the form of filesystem changes. So at present there's no way to signal when the Greeter is shown.

> BTW, what's the plan for i18n? Are we ok with the SVGs only updating the
> language on next update, or should we maybe kick the visualisers on locale
> change?

At the moment, it's just the locale that the user was last logged in as. On login we do refresh all the SVGs, however.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/unity8-ci/2729/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4493/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1599/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1254/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4602/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2729/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

224 -libusermetrics (2.0.0-0ubuntu1) UNRELEASED; urgency=medium
225 +libusermetrics (1.2.0-0ubuntu1) UNRELEASED; urgency=medium

That looks wrong?

=====

1656 +static QRegularExpression CLICK_REGEX(
1657 + "^[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*$");
1658 +

1815 +static QRegularExpression CLICK_REGEX(
1816 + "^[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*$");

Seeing a regex like that makes me twinge already, but having it twice!

=====

2086 + return new InfographicListImpl("/var/lib/usermetrics/");

Do we want that hardcoded? Isn't there somewhere we could request the /var/lib/ part from?

=====

2132 + * Given a user ID, this class watches the corresponding
2133 + *

You fell asleep there, did you?

=====

2139 + * @brief The current username selected.
2140 + */
2141 +Q_PROPERTY(unsigned int uid READ uid WRITE setUid NOTIFY uidChanged FINAL)

User Id, not username.

review: Approve (api)

[lp:~unity-team/libusermetrics/end-to-end]

178. By Pete Woods on 2014-04-03

Respond to Saviq's review comments

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-03 12:54:25 +0000
+++ CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -16,12 +16,18 @@
 find_package(Qt5Core REQUIRED)
 include_directories(${Qt5Core_INCLUDE_DIRS})
 
+find_package(Qt5DBus REQUIRED)
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+
 find_package(Qt5Gui REQUIRED)
 include_directories(${Qt5Gui_INCLUDE_DIRS})
 
 find_package(Qt5XmlPatterns REQUIRED)
 include_directories(${Qt5XmlPatterns_INCLUDE_DIRS})
 
+pkg_check_modules(APPARMOR REQUIRED libapparmor REQUIRED)
+include_directories(${APPARMOR_INCLUDE_DIRS})
+
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt REQUIRED)
 include_directories(${GSETTINGS_QT_INCLUDE_DIRS})
 
@@ -35,6 +41,7 @@
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/data")
+set(INFOGRAPHIC_SERVICE_XML "${DATA_DIR}/com.canonical.Infographics.xml")
 
 set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
 set(INCLUDE_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ data/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -14,6 +14,22 @@
 )
 
 ###########################
+# Default infographic
+###########################
+
+configure_file(
+	"default.json.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/default.json" @ONLY
+)
+
+install(
+	FILES
+		"${CMAKE_CURRENT_BINARY_DIR}/default.json"
+	DESTINATION
+		"${CMAKE_INSTALL_DATADIR}/libusermetrics/infographics/"
+)	
+
+###########################
 # Policy
 ###########################
 
@@ -24,7 +40,60 @@
 
 install(
 	FILES
-	"com.canonical.UserMetrics.conf"
+	"com.canonical.Infographics.conf"
 	DESTINATION ${DBUSCONFDIR}
 )
 
+###########################
+# Dbus Interfaces
+###########################
+
+set(
+	DBUSIFACEDIR
+	"${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/"
+)
+
+install(
+	FILES
+	com.canonical.Infographics.xml
+	DESTINATION ${DBUSIFACEDIR}
+)
+
+###########################
+# Dbus Services
+###########################
+
+set(
+	DBUSSERVICEDIR
+	"${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/"
+)
+
+set(INFOGRAPHICS_SERVICE
+	"${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Infographics.service"
+)
+
+configure_file(
+	"com.canonical.Infographics.service.in"
+	${INFOGRAPHICS_SERVICE}
+	@ONLY
+)
+
+install(
+	FILES
+	${INFOGRAPHICS_SERVICE}
+	DESTINATION ${DBUSSERVICEDIR}
+)
+
+##############################
+# Usermetrics session service
+##############################
+
+configure_file(
+	"usermetricsservice.conf.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/usermetricsservice.conf" @ONLY
+)
+
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/usermetricsservice.conf"
+	DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions"
+)

=== added file 'data/com.canonical.Infographics.conf'
--- data/com.canonical.Infographics.conf	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Infographics.conf	2014-04-03 13:02:15 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+	<policy user="usermetrics">
+		<allow own="com.canonical.Infographics"/>
+	</policy>
+
+	<policy context="default">
+		<allow send_destination="com.canonical.Infographics"/>
+		<allow receive_sender="com.canonical.Infographics"/>
+	</policy>
+
+</busconfig>

=== added file 'data/com.canonical.Infographics.service.in'
--- data/com.canonical.Infographics.service.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Infographics.service.in	2014-04-03 13:02:15 +0000
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=com.canonical.Infographics
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/libusermetrics/infographicservice
+User=usermetrics
+StandardOutput=syslog

=== added file 'data/com.canonical.Infographics.xml'
--- data/com.canonical.Infographics.xml	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Infographics.xml	2014-04-03 13:02:15 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+	<interface name="com.canonical.Infographics">
+		<method name="update">
+			<!-- in -->
+			<arg type="s" name="visualizer" direction="in"/>
+			<arg type="as" name="sources" direction="in"/>
+			<arg type="s" name="file" direction="in"/>
+		</method>
+		
+		<method name="clear">
+		</method>
+	</interface>
+</node>

=== removed file 'data/com.canonical.UserMetrics.conf'
--- data/com.canonical.UserMetrics.conf	2013-07-01 17:13:45 +0000
+++ data/com.canonical.UserMetrics.conf	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-	<policy user="usermetrics">
-		<allow own="com.canonical.UserMetrics"/>
-	</policy>
-
-	<policy context="default">
-		<allow send_destination="com.canonical.UserMetrics"/>
-		<allow receive_sender="com.canonical.UserMetrics"/>
-	</policy>
-
-</busconfig>
\ No newline at end of file

=== added file 'data/default.json.in'
--- data/default.json.in	1970-01-01 00:00:00 +0000
+++ data/default.json.in	2014-04-03 13:02:15 +0000
@@ -0,0 +1,9 @@
+{
+    "exec": "@CMAKE_INSTALL_FULL_LIBEXECDIR@/libusermetrics/infographic",
+    "type": "iterate",
+    "input": {
+        "*": [
+            ".*.libusermetrics.json"
+        ]
+    }
+}

=== added file 'data/usermetricsservice.conf.in'
--- data/usermetricsservice.conf.in	1970-01-01 00:00:00 +0000
+++ data/usermetricsservice.conf.in	2014-04-03 13:02:15 +0000
@@ -0,0 +1,10 @@
+description "Service to connect infographic data sources to infographic visualizations"
+
+start on desktop-start
+stop on desktop-end
+
+respawn
+respawn limit 5 10
+
+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/libusermetrics/usermetricsservice
+

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-06 09:37:47 +0000
+++ debian/changelog	2014-04-03 13:02:15 +0000
@@ -1,4 +1,4 @@
-libusermetrics (2.0.0-0ubuntu1) UNRELEASED; urgency=medium
+libusermetrics (1.2.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Remove the usermetrics database and store metrics in json files
     inside the ~/.cache directory.

=== modified file 'debian/control'
--- debian/control	2014-01-06 10:08:27 +0000
+++ debian/control	2014-04-03 13:02:15 +0000
@@ -1,12 +1,14 @@
 Source: libusermetrics
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake,
+Build-Depends: click-dev (>= 0.2.2), 
+               cmake,
                dbus,
                debhelper (>= 9),
                doxygen,
                gettext,
                google-mock (>= 1.6.0+svn437),
+               libapparmor-dev,
                libgsettings-qt-dev,
                libgtest-dev,
                libqt5xmlpatterns5-dev,

=== modified file 'debian/libusermetricsinput1.symbols'
--- debian/libusermetricsinput1.symbols	2014-01-06 10:00:38 +0000
+++ debian/libusermetricsinput1.symbols	2014-04-03 13:02:15 +0000
@@ -17,25 +17,25 @@
  (c++)"UserMetricsInput::MetricParameters::maximum(double)@Base" 1.1.1
  (c++)"UserMetricsInput::MetricParameters::minimum(double)@Base" 1.1.1
  (c++)"UserMetricsInput::MetricParameters::MetricParameters(QString const&)@Base" 1.1.1
- (c++)"UserMetricsInput::MetricParameters::MetricParameters(UserMetricsInput::MetricParameters const&)@Base" 2.0.0
+ (c++)"UserMetricsInput::MetricParameters::MetricParameters(UserMetricsInput::MetricParameters const&)@Base" 0replaceme
  (c++)"UserMetricsInput::MetricParameters::MetricParameters(QString const&)@Base" 1.1.1
- (c++)"UserMetricsInput::MetricParameters::MetricParameters(UserMetricsInput::MetricParameters const&)@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::~MetricParameters()@Base" 1.1.1
- (c++)"UserMetricsInput::MetricParameters::~MetricParameters()@Base" 1.1.1
- (c++)"UserMetricsInput::MetricParameters::~MetricParameters()@Base" 1.1.1
- (c++)"UserMetricsInput::MetricParameters::operator=(UserMetricsInput::MetricParameters const&)@Base" 2.0.0
- (c++)"UserMetricsInput::Metric::Metric(QObject*)@Base" 1.0.1
- (c++)"UserMetricsInput::Metric::Metric(QObject*)@Base" 1.0.1
- (c++)"UserMetricsInput::Metric::~Metric()@Base" 1.0.1
- (c++)"UserMetricsInput::Metric::~Metric()@Base" 1.0.1
- (c++)"UserMetricsInput::Metric::~Metric()@Base" 1.0.1
- (c++)"UserMetricsInput::MetricParameters::textDomain() const@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::formatString() const@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::emptyDataString() const@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::id() const@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::type() const@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::options() const@Base" 2.0.0
- (c++)"UserMetricsInput::MetricParameters::operator==(UserMetricsInput::MetricParameters const&) const@Base" 2.0.0
+ (c++)"UserMetricsInput::MetricParameters::MetricParameters(UserMetricsInput::MetricParameters const&)@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::~MetricParameters()@Base" 1.1.1
+ (c++)"UserMetricsInput::MetricParameters::~MetricParameters()@Base" 1.1.1
+ (c++)"UserMetricsInput::MetricParameters::~MetricParameters()@Base" 1.1.1
+ (c++)"UserMetricsInput::MetricParameters::operator=(UserMetricsInput::MetricParameters const&)@Base" 0replaceme
+ (c++)"UserMetricsInput::Metric::Metric(QObject*)@Base" 1.0.1
+ (c++)"UserMetricsInput::Metric::Metric(QObject*)@Base" 1.0.1
+ (c++)"UserMetricsInput::Metric::~Metric()@Base" 1.0.1
+ (c++)"UserMetricsInput::Metric::~Metric()@Base" 1.0.1
+ (c++)"UserMetricsInput::Metric::~Metric()@Base" 1.0.1
+ (c++)"UserMetricsInput::MetricParameters::textDomain() const@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::formatString() const@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::emptyDataString() const@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::id() const@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::type() const@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::options() const@Base" 0replaceme
+ (c++)"UserMetricsInput::MetricParameters::operator==(UserMetricsInput::MetricParameters const&) const@Base" 0replaceme
  (c++)"typeinfo for UserMetricsInput::MetricUpdate@Base" 1.0.1
  (c++)"typeinfo for UserMetricsInput::MetricManager@Base" 1.0.1
  (c++)"typeinfo for UserMetricsInput::MetricParameters@Base" 1.1.1

=== modified file 'debian/libusermetricsoutput1.symbols'
--- debian/libusermetricsoutput1.symbols	2013-06-20 15:59:31 +0000
+++ debian/libusermetricsoutput1.symbols	2014-04-03 13:02:15 +0000
@@ -34,11 +34,22 @@
  (c++)"UserMetricsOutput::UserMetrics::~UserMetrics()@Base" 1.0.1
  (c++)"UserMetricsOutput::UserMetrics::~UserMetrics()@Base" 1.0.1
  (c++)"UserMetricsOutput::UserMetrics::~UserMetrics()@Base" 1.0.1
+ (c++)"UserMetricsOutput::InfographicList::uidChanged(unsigned int)@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::getInstance()@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::qt_metacall(QMetaObject::Call, int, void**)@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::qt_metacast(char const*)@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::staticMetaObject@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::InfographicList(QObject*)@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::~InfographicList()@Base" 0replaceme
+ (c++)"UserMetricsOutput::InfographicList::metaObject() const@Base" 0replaceme
  (c++)"UserMetricsOutput::ColorTheme::metaObject() const@Base" 1.0.1
  (c++)"UserMetricsOutput::UserMetrics::metaObject() const@Base" 1.0.1
  (c++)"typeinfo for UserMetricsOutput::ColorTheme@Base" 1.0.1
  (c++)"typeinfo for UserMetricsOutput::UserMetrics@Base" 1.0.1
  (c++)"typeinfo name for UserMetricsOutput::ColorTheme@Base" 1.0.1
  (c++)"typeinfo name for UserMetricsOutput::UserMetrics@Base" 1.0.1
+ (c++)"typeinfo for UserMetricsOutput::InfographicList@Base" 0replaceme
+ (c++)"typeinfo name for UserMetricsOutput::InfographicList@Base" 0replaceme
  (c++)"vtable for UserMetricsOutput::ColorTheme@Base" 1.0.1
+ (c++)"vtable for UserMetricsOutput::InfographicList@Base" 0replaceme
  (c++)"vtable for UserMetricsOutput::UserMetrics@Base" 1.0.1

=== modified file 'debian/rules'
--- debian/rules	2013-07-04 10:30:17 +0000
+++ debian/rules	2014-04-03 13:02:15 +0000
@@ -3,11 +3,21 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+ifeq ($(DEB_HOST_ARCH),armhf)
+        ENABLE_MEMCHECK_OPTION = OFF
+else
+        ENABLE_MEMCHECK_OPTION = OFF
+endif
+
 %:
-	dh $@ --parallel --fail-missing
+	dh $@ --parallel --fail-missing --with click
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=YES
+	dh_auto_configure -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V
+
+override_dh_click:
+		dh_click --name infographic
+		dh_click --name usermetrics

=== added file 'debian/usermetricsservice.infographic.click-hook'
--- debian/usermetricsservice.infographic.click-hook	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.infographic.click-hook	2014-04-03 13:02:15 +0000
@@ -0,0 +1,3 @@
+Pattern: ${home}/.cache/usermetrics/infographics/${id}.json
+User-Level: yes
+Hook-Name: infographic

=== modified file 'debian/usermetricsservice.install'
--- debian/usermetricsservice.install	2014-01-03 16:58:40 +0000
+++ debian/usermetricsservice.install	2014-04-03 13:02:15 +0000
@@ -1,5 +1,7 @@
 etc
 usr/lib/*/libusermetrics
+usr/share/dbus-1
 usr/share/glib-2.0
 usr/share/libusermetrics
 usr/share/locale
+usr/share/upstart

=== added file 'debian/usermetricsservice.postinst'
--- debian/usermetricsservice.postinst	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.postinst	2014-04-03 13:02:15 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+dbus-send --system --print-reply                        \
+        --dest=org.freedesktop.DBus                     \
+        /org/freedesktop/DBus                           \
+        org.freedesktop.DBus.StartServiceByName         \
+        string:"com.canonical.Infographics" uint32:0     \
+        || true
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/usermetricsservice.postrm'
--- debian/usermetricsservice.postrm	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.postrm	2014-04-03 13:02:15 +0000
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ] ; then
+        if getent passwd usermetrics >/dev/null; then
+                if [ -x /usr/sbin/deluser ]; then
+                        deluser --system usermetrics
+                fi
+        fi
+
+        if getent group usermetrics >/dev/null; then
+                if [ -x /usr/sbin/delgroup ]; then
+                        delgroup --system usermetrics
+                fi
+        fi
+
+        # we cannot use the --remove-home option when we delete the user above
+        # because it will refuse to remove things in /var, so clean it up this
+        # way
+        if [ -d /var/lib/usermetrics ]; then
+                rm -r /var/lib/usermetrics
+        fi
+
+fi
+#DEBHELPER#
+exit 0

=== added file 'debian/usermetricsservice.preinst'
--- debian/usermetricsservice.preinst	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.preinst	2014-04-03 13:02:15 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=usermetricsservice
+
+# creating usermetrics group if he isn't already there
+if ! getent group usermetrics >/dev/null; then
+        addgroup --system usermetrics
+fi
+
+# creating usermetrics user if he isn't already there
+if ! getent passwd usermetrics >/dev/null; then
+        adduser --system --ingroup usermetrics --home /var/lib/usermetrics usermetrics
+        usermod -c "User Metrics" usermetrics
+        usermod -d "/var/lib/usermetrics"  usermetrics
+        usermod -g "usermetrics"           usermetrics
+        usermod -s "/bin/false"            usermetrics
+fi
+
+if [ -d /var/lib/usermetrics ]; then
+  chown -R usermetrics:usermetrics /var/lib/usermetrics
+  chmod 0755 /var/lib/usermetrics
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/usermetricsservice.prerm'
--- debian/usermetricsservice.prerm	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.prerm	2014-04-03 13:02:15 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+pkill -U usermetrics 2>/dev/null || true
+
+#DEBHELPER#
\ No newline at end of file

=== added file 'debian/usermetricsservice.usermetrics.click-hook'
--- debian/usermetricsservice.usermetrics.click-hook	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.usermetrics.click-hook	2014-04-03 13:02:15 +0000
@@ -0,0 +1,3 @@
+Pattern: ${home}/.cache/usermetrics/sources/${id}.json
+User-Level: yes
+Hook-Name: usermetrics

=== added file 'doc/Infographic Architecture.svg'
--- doc/Infographic Architecture.svg	1970-01-01 00:00:00 +0000
+++ doc/Infographic Architecture.svg	2014-04-03 13:02:15 +0000
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="671.98975"
+   height="413.13217"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="infographics version 2.svg">
+  <defs
+     id="defs4">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4676"
+       is_visible="true" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend"
+       style="overflow:visible">
+      <path
+         id="path3951"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-5"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-8"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4676-5"
+       is_visible="true" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-7"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-2"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-1"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-3"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-4"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-2"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-80"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-9"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-19"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-3"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3-24"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3951-3-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4676-6"
+       is_visible="true" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.7277049"
+     inkscape:cx="335.99487"
+     inkscape:cy="206.56609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="20"
+     fit-margin-left="20"
+     fit-margin-right="20"
+     fit-margin-bottom="20" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(9.1737344,-608.13043)">
+    <g
+       id="g3761"
+       transform="translate(9.0102463,20.5802)">
+      <rect
+         transform="translate(0,572.36218)"
+         y="170.37543"
+         x="244.09557"
+         height="78.088745"
+         width="133.78838"
+         id="rect2985"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3755"
+         y="778.51001"
+         x="310.46051"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         xml:space="preserve"><tspan
+           y="778.51001"
+           x="310.46051"
+           id="tspan3757"
+           sodipodi:role="line">Infographic</tspan><tspan
+           id="tspan3759"
+           y="794.51001"
+           x="310.46051"
+           sodipodi:role="line">Helper</tspan></text>
+    </g>
+    <g
+       id="g3803"
+       transform="translate(-8.12897,0)">
+      <rect
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3767"
+         width="159.58728"
+         height="87.497849"
+         x="430.33533"
+         y="56.268272"
+         transform="translate(0,572.36218)" />
+      <text
+         xml:space="preserve"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         x="436.38864"
+         y="677.60724"
+         id="text3769"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan3771"
+           x="436.38864"
+           y="677.60724"
+           style="font-size:14px"
+           dy="-4.9527082">Infographic Source</tspan><tspan
+           sodipodi:role="line"
+           x="436.38864"
+           y="691.60724"
+           id="tspan3773"
+           style="font-size:14px"><tspan
+   style="font-size:14px;font-weight:bold"
+   id="tspan3777"
+   dy="-0.55030096">type:</tspan>  foo</tspan><tspan
+           sodipodi:role="line"
+           x="436.38864"
+           y="705.60724"
+           id="tspan3775"
+           dx="0 0 0 0 0 0 0 0 0 0 -1.1006019"
+           style="font-size:14px"><tspan
+   style="font-size:14px;font-weight:bold"
+   id="tspan3779">file:</tspan>     infographic.foo</tspan></text>
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3767-6"
+         width="159.03699"
+         height="26.414476"
+         x="430.33533"
+         y="628.63043" />
+      <text
+         xml:space="preserve"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         x="442.82819"
+         y="647.92566"
+         id="text3799"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan3801"
+           x="442.82819"
+           y="647.92566">Foo Click Manifest</tspan></text>
+    </g>
+    <g
+       id="g3918"
+       transform="translate(-360,-2.1289061e-6)">
+      <rect
+         y="628.63043"
+         x="418.20636"
+         height="87.497849"
+         width="159.58728"
+         id="rect3767-7"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3769-5"
+         y="677.60724"
+         x="424.25967"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         xml:space="preserve"><tspan
+           dy="-4.9527082"
+           style="font-size:14px"
+           y="677.60724"
+           x="424.25967"
+           id="tspan3771-4"
+           sodipodi:role="line">Infographic Sink</tspan><tspan
+           style="font-size:14px"
+           id="tspan3773-2"
+           y="691.60724"
+           x="424.25967"
+           sodipodi:role="line"><tspan
+   dy="-0.55030096"
+   id="tspan3777-3"
+   style="font-size:14px;font-weight:bold">type:</tspan>  foo</tspan><tspan
+           style="font-size:14px"
+           dx="0 0 0 0 0 0 0 0 0 0 -1.1006019"
+           id="tspan3775-4"
+           y="705.60724"
+           x="424.25967"
+           sodipodi:role="line"><tspan
+   id="tspan3779-2"
+   style="font-size:14px;font-weight:bold">file:</tspan>     infographic.svg</tspan></text>
+      <rect
+         y="628.63043"
+         x="418.20636"
+         height="26.414476"
+         width="159.03699"
+         id="rect3767-6-7"
+         style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3799-8"
+         y="647.92566"
+         x="431.91797"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         xml:space="preserve"><tspan
+           y="647.92566"
+           x="431.91797"
+           id="tspan3801-6"
+           sodipodi:role="line">Bar Click Manifest</tspan></text>
+    </g>
+    <text
+       sodipodi:linespacing="100%"
+       id="text3930"
+       y="701.8205"
+       x="319.61853"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       xml:space="preserve"><tspan
+         y="701.8205"
+         x="319.61853"
+         id="tspan3932"
+         sodipodi:role="line">Install</tspan><tspan
+         id="tspan3934"
+         y="717.8205"
+         x="319.61853"
+         sodipodi:role="line">Hooks</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3936"
+       d="m 226.17369,685.31145 c 45.12468,-1.1006 52.27859,36.31986 52.82889,67.13671"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3936-1"
+       d="m 414.31778,685.49855 c -45.12468,-1.10061 -52.27859,36.31985 -52.82889,67.13671"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+    <g
+       id="g4893">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4425"
+         width="95.752365"
+         height="95.752365"
+         x="441.74377"
+         y="751.89789" />
+      <text
+         xml:space="preserve"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         x="489.69073"
+         y="796.50208"
+         id="text4427"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan4429"
+           x="489.69073"
+           y="796.50208">foo</tspan><tspan
+           sodipodi:role="line"
+           x="489.69073"
+           y="812.50208"
+           id="tspan4431">app</tspan></text>
+    </g>
+    <g
+       id="g4469"
+       transform="translate(-13.207223,24.763543)">
+      <rect
+         y="887.29889"
+         x="403.61313"
+         height="35.715553"
+         width="192.67056"
+         id="rect2985-1"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3755-5"
+         y="908.72668"
+         x="500.00146"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         xml:space="preserve"><tspan
+           id="tspan3759-8"
+           y="908.72668"
+           x="500.00146"
+           sodipodi:role="line">~/.cache/$(appid)/infographic.foo</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-3)"
+       d="M 383.55976,356.18229 C 353.84351,354.53139 348.8908,331.96904 347.7902,280.79106"
+       id="path4474"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Italic"
+       x="361.54773"
+       y="876.81616"
+       id="text4660"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan4662"
+         x="361.54773"
+         y="876.81616">File</tspan><tspan
+         sodipodi:role="line"
+         x="361.54773"
+         y="890.81616"
+         id="tspan4664">Watch</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:112.00000047999999708%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;opacity:0.75"
+       x="571.7627"
+       y="755.19965"
+       id="text4666"
+       sodipodi:linespacing="112%"><tspan
+         sodipodi:role="line"
+         id="tspan4668"
+         x="571.7627"
+         y="755.19965">Foo</tspan><tspan
+         sodipodi:role="line"
+         x="571.7627"
+         y="768.63965"
+         id="tspan4670">AppArmor</tspan><tspan
+         sodipodi:role="line"
+         x="571.7627"
+         y="782.07965"
+         id="tspan4672">Confinement</tspan></text>
+    <path
+       style="opacity:0.75;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-3)"
+       d="m 567.36028,192.74291 c -2.53774,-0.0622 -5.08926,0.61223 -7.26478,1.92031 -0.81305,0.48887 -1.57239,1.06245 -2.381,1.55863 -0.8086,0.49619 -1.68153,0.91914 -2.61893,1.06514 -1.39269,0.2169 -2.80076,-0.19097 -4.13805,-0.63627 -1.33729,-0.44531 -2.69883,-0.93906 -4.10774,-0.89876 -1.25072,0.0358 -2.44503,0.49048 -3.65682,0.80213 -0.33784,0.0869 -0.67847,0.16288 -1.0212,0.22784"
+       id="path4674"
+       inkscape:path-effect="#path-effect4676"
+       inkscape:original-d="m 567.36028,192.74291 c -2.05099,4.0056 -2.57986,1.777 -7.26478,1.92031 -10.78275,0 -8.1675,12.44489 -4.99993,2.62377 3.3427,-11.96353 -5.33958,-3.07508 -8.24579,-1.53503 -2.9062,1.54005 -3.37007,1.24208 -3.65682,0.80213 -0.28674,-0.43995 -0.39635,-1.02187 -1.0212,0.22784"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)"
+       sodipodi:nodetypes="ccczsc" />
+    <g
+       transform="translate(-341.88525,60.753484)"
+       id="g4893-5">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4425-0"
+         width="95.752365"
+         height="95.752365"
+         x="441.74377"
+         y="751.89789" />
+      <text
+         xml:space="preserve"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         x="489.69073"
+         y="796.50208"
+         id="text4427-5"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan4429-8"
+           x="489.69073"
+           y="796.50208">bar</tspan><tspan
+           sodipodi:role="line"
+           x="489.69073"
+           y="812.50208"
+           id="tspan4929">visual</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:112.00000047999999708%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;opacity:0.75"
+       x="10.730266"
+       y="836.82312"
+       id="text4666-3"
+       sodipodi:linespacing="112%"><tspan
+         sodipodi:role="line"
+         id="tspan4668-4"
+         x="10.730266"
+         y="836.82312">Bar</tspan><tspan
+         sodipodi:role="line"
+         x="10.730266"
+         y="850.26312"
+         id="tspan4670-0">AppArmor</tspan><tspan
+         sodipodi:role="line"
+         x="10.730266"
+         y="863.70312"
+         id="tspan4672-9">Confinement</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend-3);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 118.51852,723.61908 c 0,0 0,-0.55125 0,78.82859"
+       id="path4987"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend-3);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 490.06029,150.90439 c 0,22.60121 0,22.60121 0,22.60121"
+       id="path4989"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend-3);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 466.90784,282.65289 c 0,47.95865 0,47.95865 0,47.95865"
+       id="path4991"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend-3);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 206.1671,306.90784 c 36.38243,1.1025 65.04737,-4.40999 65.59862,-28.1137"
+       id="path4993"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend-3);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 245.30577,201.06804 c -47.89942,-1.36388 -68.53183,-2.05014 -70.55986,30.3187"
+       id="path4995"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Italic"
+       x="478.94144"
+       y="875.39905"
+       id="text4660-6"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         x="478.94144"
+         y="875.39905"
+         id="tspan4664-5">Write</tspan><tspan
+         sodipodi:role="line"
+         x="478.94144"
+         y="889.39905"
+         id="tspan5086">Data</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Italic"
+       x="150.39708"
+       y="756.32922"
+       id="text4660-8"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan4662-9"
+         x="150.39708"
+         y="756.32922">Foo Type</tspan><tspan
+         sodipodi:role="line"
+         x="150.39708"
+         y="770.32922"
+         id="tspan4664-51">Data</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Italic"
+       x="228.12317"
+       y="896.3465"
+       id="text4660-5"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan4662-2"
+         x="228.12317"
+         y="896.3465">SVG</tspan><tspan
+         sodipodi:role="line"
+         x="228.12317"
+         y="910.3465"
+         id="tspan4664-2">Data</tspan></text>
+    <g
+       id="g4469-4"
+       transform="translate(-216.05521,77.196901)">
+      <rect
+         y="887.29889"
+         x="403.61313"
+         height="36.266827"
+         width="263.23044"
+         id="rect2985-1-7"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3755-5-0"
+         y="908.72668"
+         x="535.85309"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         xml:space="preserve"><tspan
+           id="tspan3759-8-1"
+           y="908.72668"
+           x="535.85309"
+           sodipodi:role="line">/var/cache/infographic/$(user)/bar-foo.svg</tspan></text>
+    </g>
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend-3);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 311.45565,849.40321 c 0,0 0,25.44875 0,104.82859"
+       id="path4987-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.75;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-3)"
+       d="m 70.370939,844.37253 c 2.166628,-1.32276 4.713537,-2.01444 7.251636,-1.96937 0.948556,0.0168 1.892954,0.13391 2.84132,0.15932 0.948365,0.0254 1.915816,-0.0448 2.800631,-0.38703 1.314563,-0.5085 2.330053,-1.56575 3.265528,-2.62004 0.935476,-1.0543 1.867729,-2.16266 3.108022,-2.83223 1.101035,-0.59439 2.362684,-0.79778 3.567965,-1.13375 0.336018,-0.0937 0.669019,-0.19815 0.998313,-0.31325"
+       id="path4674-2"
+       inkscape:path-effect="#path-effect4676-6"
+       inkscape:original-d="m 70.370939,844.37253 c 3.779008,2.44344 3.122725,0.24899 7.251636,-1.96937 9.338135,-5.39137 13.295708,6.69384 5.641951,-0.22771 -8.876629,-8.68938 3.086675,-5.33288 6.37355,-5.45227 3.286867,-0.11938 3.539607,-0.60936 3.567965,-1.13375 0.02835,-0.52438 -0.167688,-1.08314 0.998313,-0.31325"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccczsc" />
+  </g>
+</svg>

=== added symlink 'include/libusermetricsoutput/InfographicList.h'
=== target is u'../../src/libusermetricsoutput/InfographicList.h'
=== modified file 'po/en_GB.po'
--- po/en_GB.po	2014-01-09 10:17:16 +0000
+++ po/en_GB.po	2014-04-03 13:02:15 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libusermetrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 10:15+0000\n"
+"POT-Creation-Date: 2014-02-19 16:51+0000\n"
 "PO-Revision-Date: 2013-07-05 15:09+0100\n"
 "Last-Translator: Pete Woods <[e-mail]>\n"
 "Language-Team: British English <[e-mail]>\n"
@@ -90,6 +90,10 @@
 #~ msgid "Attempt to update data owned by another user"
 #~ msgstr "Attempt to update data owned by another user"
 
+#, fuzzy
+#~ msgid "Could not locate user data"
+#~ msgstr "Couldn't save user data"
+
 #~ msgid "Could not open database"
 #~ msgstr "Could not open database"
 
@@ -102,9 +106,6 @@
 #~ msgid "Could not save data source"
 #~ msgstr "Couldn't save data source"
 
-#~ msgid "Could not save user data"
-#~ msgstr "Couldn't save user data"
-
 #~ msgid "Data set query failed"
 #~ msgstr "Data set query failed"
 

=== modified file 'po/libusermetrics.pot'
--- po/libusermetrics.pot	2014-01-09 10:17:16 +0000
+++ po/libusermetrics.pot	2014-04-03 13:02:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libusermetrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 10:15+0000\n"
+"POT-Creation-Date: 2014-03-02 20:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-01-08 18:15:21 +0000
+++ src/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -7,6 +7,7 @@
 add_compiler_export_flags()
 
 add_subdirectory("infographic")
+add_subdirectory("infographicservice")
 add_subdirectory("libusermetricscommon")
 add_subdirectory("libusermetricsinput")
 add_subdirectory("libusermetricsoutput")

=== modified file 'src/infographic/CMakeLists.txt'
--- src/infographic/CMakeLists.txt	2014-01-08 18:15:21 +0000
+++ src/infographic/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -10,8 +10,8 @@
 )
 
 install(
-  TARGETS infographic
-  RUNTIME DESTINATION bin
+	TARGETS infographic
+	RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/libusermetrics"
 )
 
 qt5_use_modules(

=== modified file 'src/infographic/main.cpp'
--- src/infographic/main.cpp	2014-01-08 18:15:21 +0000
+++ src/infographic/main.cpp	2014-04-03 13:02:15 +0000
@@ -28,16 +28,21 @@
 int main(int argc, char *argv[]) {
 	QCoreApplication application(argc, argv);
 
-	if (argc != 3) {
-		qWarning() << "Usage: " << argv[0] << "INPUT_FILE OUTPUT_FILE";
+	if (argc < 2) {
+		qWarning() << "Usage: " << argv[0] << "INPUT_FILE [OUTPUT_FILE]";
 		return 1;
 	}
 
 	QFile inputFile(QString::fromUtf8(argv[1]));
-	QFile outputFile(QString::fromUtf8(argv[2]));
+	QFile outputFile;
+	if (argc == 3) {
+		outputFile.setFileName(QString::fromUtf8(argv[2]));
+		outputFile.open(QIODevice::WriteOnly);
+	} else {
+		outputFile.open(1, QIODevice::WriteOnly);
+	}
 
 	inputFile.open(QIODevice::ReadOnly);
-	outputFile.open(QIODevice::WriteOnly);
 
 	Infographic infographic(inputFile, outputFile);
 

=== added directory 'src/infographicservice'
=== added file 'src/infographicservice/CMakeLists.txt'
--- src/infographicservice/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/infographicservice/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -0,0 +1,58 @@
+
+set(INFOGRAPHICSERVICE_SOURCES
+	Service.cpp
+)
+
+qt5_add_dbus_adaptor(
+	INFOGRAPHICSERVICE_SOURCES
+	${INFOGRAPHIC_SERVICE_XML}
+	infographicservice/Service.h
+	InfographicService::Service
+	InfographicServiceAdaptor
+)
+
+add_library(
+	infographicservice
+	STATIC
+	${INFOGRAPHICSERVICE_SOURCES}
+)
+
+qt5_use_modules(
+	infographicservice
+	Core
+	DBus
+)
+
+############################
+# Service executable
+############################
+
+add_executable(
+	infographicservice-bin
+	main.cpp
+)
+
+set_target_properties(
+	infographicservice-bin
+	PROPERTIES
+	OUTPUT_NAME "infographicservice"
+)
+
+target_link_libraries(
+	infographicservice-bin
+	infographicservice
+)
+
+qt5_use_modules(
+	infographicservice-bin
+	Core
+)
+
+#########################
+# Installation
+#########################
+
+install(
+  TARGETS infographicservice-bin
+  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/libusermetrics"
+)

=== added file 'src/infographicservice/Service.cpp'
--- src/infographicservice/Service.cpp	1970-01-01 00:00:00 +0000
+++ src/infographicservice/Service.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,131 @@
+/*
+ * Service.cpp
+ *
+ *  Created on: 2 Mar 2014
+ *      Author: pete
+ */
+
+#include <infographicservice/InfographicServiceAdaptor.h>
+#include <infographicservice/Service.h>
+#include <libusermetricscommon/DBusPaths.h>
+
+#include <QDateTime>
+#include <QFile>
+#include <cstdio>
+
+using namespace InfographicService;
+using namespace UserMetricsCommon;
+
+Service::Service(const QDir &directory, const QDBusConnection &systemConnection) :
+		m_directory(directory), m_connection(systemConnection), m_adaptor(
+				new InfographicsAdaptor(this)), m_hash(QCryptographicHash::Sha1) {
+
+	m_dirtyTimer.setSingleShot(true);
+	m_dirtyTimer.setTimerType(Qt::VeryCoarseTimer);
+	connect(&m_dirtyTimer, &QTimer::timeout, this, &Service::timeout);
+
+	m_directory.mkpath("tmp");
+	m_tempFile.setFileName(
+			QDir(m_directory.filePath("tmp")).filePath("tmp.svg"));
+
+	if (!m_connection.registerObject(DBusPaths::INFOGRAPHIC_DBUS_PATH, this)) {
+		throw std::logic_error(
+				"Unable to register Infographics object on DBus");
+	}
+	if (!m_connection.registerService(DBusPaths::INFOGRAPHIC_DBUS_NAME)) {
+		throw std::logic_error(
+				"Unable to register Infographics service on DBus");
+	}
+}
+
+Service::~Service() {
+	m_connection.unregisterService(DBusPaths::INFOGRAPHIC_DBUS_NAME);
+	m_connection.unregisterObject(DBusPaths::INFOGRAPHIC_DBUS_PATH);
+}
+
+unsigned int Service::uid() {
+	if (!calledFromDBus()) {
+		return 0;
+	}
+
+	return m_connection.interface()->serviceUid(message().service());
+}
+
+QDir Service::userDirectory() {
+	return m_directory.filePath(QString::number(uid()));
+}
+
+void Service::clear() {
+	userDirectory().removeRecursively();
+}
+
+void Service::update(const QString &visualizer, const QStringList &sources,
+		const QString &filePath) {
+
+	m_hash.reset();
+	m_hash.addData(visualizer.toUtf8());
+	for (const QString &source : sources) {
+		m_hash.addData(source.toUtf8());
+	}
+
+	QString sha(m_hash.result().toHex());
+
+	QDir usersDirectory(userDirectory());
+	QDir infographicDirectory(usersDirectory.filePath(visualizer));
+	QString destination(infographicDirectory.filePath(sha));
+	destination.append("-");
+	destination.append(QString::number(QDateTime::currentMSecsSinceEpoch()));
+	destination.append(".svg");
+
+	QFile file(filePath);
+	QByteArray ba;
+	if (file.open(QIODevice::ReadOnly)) {
+		ba = file.readAll();
+		file.close();
+	} else {
+		qWarning() << "Failed to open file" << filePath;
+		return;
+	}
+
+	if (ba.isEmpty()) {
+		return;
+	}
+
+	usersDirectory.mkpath(visualizer);
+	if (m_tempFile.open(QIODevice::WriteOnly)) {
+		m_tempFile.write(ba);
+		m_tempFile.close();
+	} else {
+		qWarning() << "Failed to write file" << m_tempFile.fileName();
+	}
+
+	int result = std::rename(m_tempFile.fileName().toUtf8().constData(),
+			destination.toUtf8().constData());
+	if (result == -1) {
+		qWarning() << "Failed to move result" << m_tempFile.fileName()
+				<< "to destination" << destination;
+		return;
+	}
+
+	// clean up in one minute
+	m_dirty << qMakePair(infographicDirectory.path(), sha + "-*.svg");
+	m_dirtyTimer.start(60000);
+}
+
+void Service::timeout() {
+	for (const QPair<QString, QString> &result : m_dirty) {
+		QDir infographicDirectory(result.first);
+
+		QStringList entries = infographicDirectory.entryList(
+				QStringList() << result.second,
+				QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
+
+		// We don't want to delete the last entry
+		entries.pop_back();
+		for (const QString &entry : entries) {
+			QFile::remove(infographicDirectory.filePath(entry));
+		}
+	}
+
+	m_dirty.clear();
+}

=== added file 'src/infographicservice/Service.h'
--- src/infographicservice/Service.h	1970-01-01 00:00:00 +0000
+++ src/infographicservice/Service.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef INFOGRAPHICSERVICE_SERVICE_H_
+#define INFOGRAPHICSERVICE_SERVICE_H_
+
+#include <QCryptographicHash>
+#include <QDir>
+#include <QDBusContext>
+#include <QDBusConnection>
+#include <QObject>
+#include <QSet>
+#include <QSharedPointer>
+#include <QTimer>
+
+class InfographicsAdaptor;
+
+namespace InfographicService {
+
+class Service: public QObject, protected QDBusContext {
+Q_OBJECT
+
+public:
+	Service(const QDir &directory, const QDBusConnection &systemConnection);
+
+	virtual ~Service();
+
+public Q_SLOTS:
+	void clear();
+
+	void update(const QString &visualizer, const QStringList &sources,
+			const QString &file);
+
+protected Q_SLOTS:
+	void timeout();
+
+protected:
+	virtual unsigned int uid();
+
+	QDir userDirectory();
+
+	QDir m_directory;
+
+	QFile m_tempFile;
+
+	QDBusConnection m_connection;
+
+	QSharedPointer<InfographicsAdaptor> m_adaptor;
+
+	QTimer m_dirtyTimer;
+
+	QCryptographicHash m_hash;
+
+	QSet<QPair<QString, QString>> m_dirty;
+};
+
+}
+
+#endif /* INFOGRAPHICSERVICE_SERVICE_H_ */

=== added file 'src/infographicservice/main.cpp'
--- src/infographicservice/main.cpp	1970-01-01 00:00:00 +0000
+++ src/infographicservice/main.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <infographicservice/Service.h>
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <csignal>
+
+using namespace InfographicService;
+
+static void exitQt(int sig) {
+	Q_UNUSED(sig);
+	QCoreApplication::exit(0);
+}
+
+int main(int argc, char *argv[]) {
+	QCoreApplication application(argc, argv);
+
+	signal(SIGINT, &exitQt);
+	signal(SIGTERM, &exitQt);
+
+	try {
+		Service service(QDir("/var/lib/usermetrics"),
+				QDBusConnection::systemBus());
+		return application.exec();
+	} catch (std::exception &e) {
+		qWarning() << "Infographic Service:" << e.what();
+		return 1;
+	}
+}

=== modified file 'src/libusermetricscommon/CMakeLists.txt'
--- src/libusermetricscommon/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ src/libusermetricscommon/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -2,9 +2,16 @@
 set(USERMETRICS_COMMON_SOURCES
 	DateFactory.cpp
 	DateFactoryImpl.cpp
+	FileUtils.cpp
 	Localisation.cpp
 )
 
+qt5_add_dbus_interface(
+	USERMETRICS_COMMON_SOURCES
+	${INFOGRAPHIC_SERVICE_XML}
+	InfographicsInterface
+)
+
 add_library(
 	usermetricscommon
 	STATIC
@@ -14,5 +21,5 @@
 qt5_use_modules(
 	usermetricscommon
 	Core
+	DBus
 )
-

=== added file 'src/libusermetricscommon/DBusPaths.h'
--- src/libusermetricscommon/DBusPaths.h	1970-01-01 00:00:00 +0000
+++ src/libusermetricscommon/DBusPaths.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSCOMMON_DBUSPATHS_H_
+#define USERMETRICSCOMMON_DBUSPATHS_H_
+
+#include <QtCore/QString>
+
+namespace UserMetricsCommon {
+
+class DBusPaths {
+public:
+	constexpr static const char* INFOGRAPHIC_DBUS_NAME =
+			"com.canonical.Infographics";
+
+	constexpr static const char* INFOGRAPHIC_DBUS_PATH =
+			"/com/canonical/Infographics";
+};
+
+}
+
+#endif // USERMETRICSCOMMON_DBUSPATHS_H_

=== added file 'src/libusermetricscommon/FileUtils.cpp'
--- src/libusermetricscommon/FileUtils.cpp	1970-01-01 00:00:00 +0000
+++ src/libusermetricscommon/FileUtils.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <libusermetricscommon/FileUtils.h>
+
+#include <QRegularExpression>
+
+using namespace UserMetricsCommon;
+
+QRegularExpression FileUtils::CLICK_REGEX(
+        "^[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*$");
+
+FileUtils::FileUtils() {
+}
+
+FileUtils::~FileUtils() {
+}
+
+QStringList FileUtils::listDirectory(const QDir &directory,
+		QDir::Filters filters, QDir::SortFlags sort) {
+	QStringList names;
+	for (const QString& name : directory.entryList(
+			filters | QDir::NoDotAndDotDot, sort)) {
+		names << directory.filePath(name);
+	}
+	return names;
+}
+
+void FileUtils::shortApplicationId(QString &applicationId) {
+	QRegularExpressionMatch match = CLICK_REGEX.match(applicationId);
+	if (match.hasMatch()) {
+		int index = applicationId.indexOf('_');
+		if (index != -1) {
+			applicationId.remove(index, applicationId.size());
+		}
+	}
+}

=== added file 'src/libusermetricscommon/FileUtils.h'
--- src/libusermetricscommon/FileUtils.h	1970-01-01 00:00:00 +0000
+++ src/libusermetricscommon/FileUtils.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSCOMMON_FILEUTILS_H_
+#define USERMETRICSCOMMON_FILEUTILS_H_
+
+#include <QDir>
+#include <QSet>
+#include <QSharedPointer>
+#include <QStringList>
+
+namespace UserMetricsCommon {
+
+class FileUtils {
+public:
+	typedef QSharedPointer<FileUtils> Ptr;
+
+	FileUtils();
+
+	virtual ~FileUtils();
+
+	static QRegularExpression CLICK_REGEX;
+
+	virtual QStringList listDirectory(const QDir &directory,
+			QDir::Filters filters, QDir::SortFlags sort = QDir::NoSort);
+
+	void shortApplicationId(QString &applicationId);
+};
+
+}
+
+#endif /* USERMETRICSCOMMON_FILEUTILS_H_ */

=== modified file 'src/libusermetricsinput/MetricImpl.cpp'
--- src/libusermetricsinput/MetricImpl.cpp	2014-01-06 17:31:49 +0000
+++ src/libusermetricsinput/MetricImpl.cpp	2014-04-03 13:02:15 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <stdexcept>
+#include <cstdio>
 
 #include <libusermetricscommon/Localisation.h>
 #include <libusermetricsinput/MetricImpl.h>
@@ -183,7 +184,13 @@
 }
 
 QString MetricImpl::buildJsonFile() {
-	return m_metricDirectory.filePath(m_parameters.id() + ".json");
+	return m_metricDirectory.filePath(
+			m_parameters.id() + ".libusermetrics.json");
+}
+
+QString MetricImpl::buildTmpFile() {
+	return QDir(m_metricDirectory.filePath(".tmp")).filePath(
+			"." + m_parameters.id() + ".libusermetrics.json");
 }
 
 void MetricImpl::loadData() {
@@ -241,11 +248,21 @@
 
 	QJsonDocument document(QJsonDocument::fromVariant(root));
 
-	QFile jsonFile(buildJsonFile());
-	if (jsonFile.open(QIODevice::WriteOnly)) {
-		jsonFile.write(document.toJson());
-		jsonFile.close();
+	m_metricDirectory.mkpath(".tmp");
+	QFile tmpFile(buildTmpFile());
+	if (tmpFile.open(QIODevice::WriteOnly)) {
+		tmpFile.write(document.toJson());
+		tmpFile.close();
 	} else {
-		qWarning() << "Could not write usermetrics file" << jsonFile.fileName();
+		qWarning() << "Could not write usermetrics file" << tmpFile.fileName();
+		return;
+	}
+
+	QString jsonFile(buildJsonFile());
+	int result = std::rename(tmpFile.fileName().toUtf8().constData(),
+			jsonFile.toUtf8().constData());
+	if (result == -1) {
+		qWarning() << "Failed to move result" << tmpFile.fileName()
+				<< "to destination" << jsonFile;
 	}
 }

=== modified file 'src/libusermetricsinput/MetricImpl.h'
--- src/libusermetricsinput/MetricImpl.h	2014-01-06 11:25:07 +0000
+++ src/libusermetricsinput/MetricImpl.h	2014-04-03 13:02:15 +0000
@@ -63,6 +63,8 @@
 
 	QString buildJsonFile();
 
+	QString buildTmpFile();
+
 	QDir m_metricDirectory;
 
 	MetricParameters m_parameters;

=== modified file 'src/libusermetricsinput/MetricManagerImpl.cpp'
--- src/libusermetricsinput/MetricManagerImpl.cpp	2014-01-06 17:31:49 +0000
+++ src/libusermetricsinput/MetricManagerImpl.cpp	2014-04-03 13:02:15 +0000
@@ -16,14 +16,28 @@
  * Author: Pete Woods <[e-mail]>
  */
 
+#include <libusermetricscommon/FileUtils.h>
 #include <libusermetricsinput/MetricImpl.h>
 #include <libusermetricsinput/MetricManagerImpl.h>
 
 #include <stdexcept>
 #include <QDebug>
+#include <QRegularExpression>
+
 
 using namespace std;
 using namespace UserMetricsInput;
+using namespace UserMetricsCommon;
+
+static void shortApplicationId(QString &applicationId) {
+	QRegularExpressionMatch match = FileUtils::CLICK_REGEX.match(applicationId);
+	if (match.hasMatch()) {
+		int index = applicationId.indexOf('_');
+		if (index != -1) {
+			applicationId.remove(index, applicationId.size());
+		}
+	}
+}
 
 MetricManagerImpl::MetricManagerImpl(Factory::Ptr factory,
 		const QDir &cacheDirectory, const QString &applicationId,
@@ -32,7 +46,11 @@
 	if (applicationId.isEmpty()) {
 		throw logic_error("Invalid application ID");
 	}
-	QDir applicationDirectory(cacheDirectory.filePath(applicationId));
+
+	QString shortId(applicationId);
+	shortApplicationId(shortId);
+
+	QDir applicationDirectory(cacheDirectory.filePath(shortId));
 	if (!applicationDirectory.mkpath("usermetrics")) {
 		throw logic_error("Cannot write to cache directory");
 	}

=== modified file 'src/libusermetricsoutput/CMakeLists.txt'
--- src/libusermetricsoutput/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ src/libusermetricsoutput/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -12,6 +12,9 @@
 	GSettingsColorThemeProvider.cpp
 	DataSet.cpp
 	DataSource.cpp
+	DirectoryWatcher.cpp
+	InfographicList.cpp
+	InfographicListImpl.cpp
 	UserData.cpp
 	UserMetrics.cpp
 	UserMetricsImpl.cpp

=== added file 'src/libusermetricsoutput/DirectoryWatcher.cpp'
--- src/libusermetricsoutput/DirectoryWatcher.cpp	1970-01-01 00:00:00 +0000
+++ src/libusermetricsoutput/DirectoryWatcher.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <libusermetricsoutput/DirectoryWatcher.h>
+
+#include <QDebug>
+
+using namespace UserMetricsCommon;
+using namespace UserMetricsOutput;
+
+namespace {
+
+static bool nameCompare(const QString &a, const QString &b) {
+	int indexA = a.lastIndexOf('-');
+	int indexB = b.lastIndexOf('-');
+
+	if (indexA == -1 || indexB == -1) {
+		return false;
+	}
+
+	QStringRef startA = a.leftRef(indexA);
+	QStringRef startB = b.leftRef(indexB);
+
+	return !!startA.compare(startB);
+}
+
+}
+
+DirectoryWatcher::DirectoryWatcher(const QDir &path, unsigned int maxDepth,
+		FileUtils::Ptr fileUtils) :
+		m_path(path), m_maxDepth(maxDepth), m_fileUtils(fileUtils) {
+
+	m_watcher.addPath(path.path());
+
+	connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this,
+			&DirectoryWatcher::internalDirectoryChanged);
+}
+
+DirectoryWatcher::~DirectoryWatcher() {
+}
+
+void DirectoryWatcher::start() {
+	internalDirectoryChanged();
+}
+
+void DirectoryWatcher::internalDirectoryChanged() {
+	QStringList files(
+			m_fileUtils->listDirectory(m_path, QDir::Files, QDir::Name));
+
+	QStringList newestFiles;
+
+	const QString *previous(nullptr);
+	for (const QString &file : files) {
+		if (!previous) {
+			previous = &file;
+		} else if (nameCompare(*previous, file)) {
+			newestFiles << *previous;
+		}
+		previous = &file;
+	}
+
+	if (previous) {
+		newestFiles << *previous;
+	}
+
+	directoryChanged(m_path.path(), newestFiles);
+
+	if (m_maxDepth == 0) {
+		return;
+	}
+
+	QSet<QString> directories(
+			m_fileUtils->listDirectory(m_path, QDir::Dirs).toSet());
+
+	// Remove deleted files
+	QSet<QString> directoriesToRemove(
+			m_directories.keys().toSet().subtract(directories));
+	for (const QString &name : directoriesToRemove) {
+		m_directories.remove(name);
+		directoryRemoved(name);
+	}
+
+	// Work out the names we need to add
+	directories.subtract(m_directories.keys().toSet());
+	for (const QString &name : directories) {
+		DirectoryWatcher::Ptr watcher(
+				new DirectoryWatcher(name, m_maxDepth - 1, m_fileUtils));
+		m_directories.insert(name, watcher);
+		connect(watcher.data(), &DirectoryWatcher::directoryChanged, this,
+				&DirectoryWatcher::directoryChanged);
+		connect(watcher.data(), &DirectoryWatcher::directoryRemoved, this,
+				&DirectoryWatcher::directoryRemoved);
+		watcher->start();
+	}
+}
+
+QStringList DirectoryWatcher::files() {
+	return m_watcher.files();
+}

=== added file 'src/libusermetricsoutput/DirectoryWatcher.h'
--- src/libusermetricsoutput/DirectoryWatcher.h	1970-01-01 00:00:00 +0000
+++ src/libusermetricsoutput/DirectoryWatcher.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSOUTPUT_DIRECTORYWATCHER_H_
+#define USERMETRICSOUTPUT_DIRECTORYWATCHER_H_
+
+#include <libusermetricscommon/FileUtils.h>
+
+#include <QDir>
+#include <QMap>
+#include <QFileSystemWatcher>
+#include <QSharedPointer>
+
+namespace UserMetricsOutput {
+
+class DirectoryWatcher: public QObject {
+Q_OBJECT
+
+public:
+	typedef QSharedPointer<DirectoryWatcher> Ptr;
+
+	DirectoryWatcher(const QDir &path, unsigned int maxDepth,
+			UserMetricsCommon::FileUtils::Ptr fileUtils);
+
+	virtual ~DirectoryWatcher();
+
+	QStringList files();
+
+public Q_SLOTS:
+	void start();
+
+Q_SIGNALS:
+	void directoryChanged(const QString &directory, const QStringList &files);
+
+	void directoryRemoved(const QString &directory);
+
+protected Q_SLOTS:
+	void internalDirectoryChanged();
+
+protected:
+	QDir m_path;
+
+	unsigned int m_maxDepth;
+
+	UserMetricsCommon::FileUtils::Ptr m_fileUtils;
+
+	QFileSystemWatcher m_watcher;
+
+	QMap<QString, DirectoryWatcher::Ptr> m_directories;
+};
+
+}
+
+#endif /* USERMETRICSOUTPUT_DIRECTORYWATCHER_H_ */

=== added file 'src/libusermetricsoutput/InfographicList.cpp'
--- src/libusermetricsoutput/InfographicList.cpp	1970-01-01 00:00:00 +0000
+++ src/libusermetricsoutput/InfographicList.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <libusermetricsoutput/InfographicListImpl.h>
+
+using namespace UserMetricsOutput;
+
+InfographicList::InfographicList(QObject *parent) :
+		QStringListModel(parent) {
+}
+
+InfographicList::~InfographicList() {
+}
+
+InfographicList * InfographicList::getInstance(const QString &path) {
+	return new InfographicListImpl(path);
+}

=== added file 'src/libusermetricsoutput/InfographicList.h'
--- src/libusermetricsoutput/InfographicList.h	1970-01-01 00:00:00 +0000
+++ src/libusermetricsoutput/InfographicList.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSOUTPUT_INFOGRAPHICLIST_H_
+#define USERMETRICSOUTPUT_INFOGRAPHICLIST_H_
+
+#include <QtCore/QStringList>
+#include <QtCore/QStringListModel>
+
+/**
+ * @{
+ **/
+
+/**
+ * @brief The user metrics output library namespace
+ **/
+namespace UserMetricsOutput {
+
+/**
+ * @brief Presentation API for infographics.
+ *
+ * This class essentially provides a list of paths to
+ * infographic image files.
+ *
+ * Given a user ID, this class watches the corresponding
+ * directory in /var/lib/usermetrics/{userid}/ for changes
+ * to SVG files.
+ *
+ **/
+class Q_DECL_EXPORT InfographicList: public QStringListModel {
+Q_OBJECT
+
+/**
+ * @brief The current user ID selected.
+ */
+Q_PROPERTY(unsigned int uid READ uid WRITE setUid NOTIFY uidChanged FINAL)
+
+public:
+	/**
+	 * @brief Get a new instance of InfographicList.
+	 */
+	static InfographicList *getInstance(
+			const QString &path = QString("/var/lib/usermetrics/"));
+
+	/**
+	 * @brief Destructor.
+	 */
+	virtual ~InfographicList();
+
+	/**
+	 * @brief The current user ID selected.
+	 */
+	virtual unsigned int uid() const = 0;
+
+
+Q_SIGNALS:
+	/**
+	 * @brief The user ID has changed
+	 *
+	 * @param uid
+	 */
+	void uidChanged(unsigned int uid);
+
+public Q_SLOTS:
+	/**
+	 * @brief Change the current user ID.
+	 *
+	 * @param uid
+	 *
+	 * The data source will change to the first one available
+	 * for the given user ID.
+	 */
+	virtual void setUid(unsigned int uid) = 0;
+
+protected:
+	/**
+	 * @brief Unusable constructor - this class is pure-virtual.
+	 *
+	 * @param parent
+	 */
+	explicit InfographicList(QObject *parent = 0);
+
+	Q_DISABLE_COPY(InfographicList)
+
+};
+
+}
+
+/*@}*/
+
+#endif // USERMETRICSOUTPUT_INFOGRAPHICLIST_H_

=== added file 'src/libusermetricsoutput/InfographicListImpl.cpp'
--- src/libusermetricsoutput/InfographicListImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/libusermetricsoutput/InfographicListImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <libusermetricscommon/FileUtils.h>
+#include <libusermetricsoutput/InfographicListImpl.h>
+
+#include <QtCore/QDebug>
+#include <algorithm>
+
+using namespace UserMetricsCommon;
+using namespace UserMetricsOutput;
+
+InfographicListImpl::InfographicListImpl(const QString &path, QObject *parent) :
+		InfographicList(parent), m_path(path), m_uid(0) {
+
+	connect(&m_timer, &QTimer::timeout, this, &InfographicListImpl::timeout);
+	connect(&m_filesystemWatcher, &QFileSystemWatcher::directoryChanged, this,
+			&InfographicListImpl::internalDirectoryChanged);
+
+	m_timer.setSingleShot(true);
+	m_filesystemWatcher.addPath(path);
+	m_workerThread.start();
+}
+
+InfographicListImpl::~InfographicListImpl() {
+	m_workerThread.quit();
+	m_workerThread.wait();
+}
+
+unsigned int InfographicListImpl::uid() const {
+	return m_uid;
+}
+
+void InfographicListImpl::newDirectoryWatcher() {
+	m_directoryWatcher.reset(
+			new DirectoryWatcher(m_userDir, 1, FileUtils::Ptr(new FileUtils())),
+			&QObject::deleteLater);
+	m_directoryWatcher->moveToThread(&m_workerThread);
+	connect(m_directoryWatcher.data(), &DirectoryWatcher::directoryChanged,
+			this, &InfographicListImpl::directoryContentsChanged);
+	connect(m_directoryWatcher.data(), &DirectoryWatcher::directoryRemoved,
+			this, &InfographicListImpl::directoryRemoved);
+	QTimer::singleShot(0, m_directoryWatcher.data(), SLOT(start()));
+}
+
+void InfographicListImpl::setUid(unsigned int uid) {
+	if (uid == m_uid) {
+		return;
+	}
+
+	m_uid = uid;
+	m_userDir = m_path.filePath(QString::number(m_uid));
+
+	if (m_userDir.exists()) {
+		newDirectoryWatcher();
+	}
+}
+
+void InfographicListImpl::internalDirectoryChanged() {
+	if (m_uid == 0) {
+		return;
+	}
+
+	bool exists(m_userDir.exists());
+
+	if (m_directoryWatcher) {
+		if (!exists) {
+			m_directoryWatcher.reset();
+		}
+	} else {
+		newDirectoryWatcher();
+	}
+}
+
+void InfographicListImpl::directoryContentsChanged(const QString &directory,
+		const QStringList &files) {
+	m_files.remove(directory);
+	for (const QString &file : files) {
+		m_files.insert(directory, file);
+	}
+	m_timer.start(100);
+}
+
+void InfographicListImpl::directoryRemoved(const QString &name) {
+	m_files.remove(name);
+	m_timer.start(100);
+}
+
+void InfographicListImpl::timeout() {
+	if (!m_directoryWatcher) {
+		return;
+	}
+
+	int existingRows(rowCount());
+	int newRows(m_files.count());
+
+	// Special case the initial insert
+	if (existingRows == 0 && newRows > 0) {
+		setStringList(m_files.values());
+		return;
+	}
+
+	if (newRows > existingRows) {
+		// insert new rows
+		insertRows(existingRows, newRows - existingRows);
+	} else if (newRows < existingRows) {
+		// remove extra rows
+		removeRows(newRows, existingRows - newRows);
+	}
+
+	int row(0);
+	QMapIterator<QString, QString> it(m_files);
+	while (it.hasNext()) {
+		it.next();
+		const QString &file(it.value());
+
+		QString existing(data(index(row, 0), Qt::DisplayRole).toString());
+		if (existing != file) {
+			setData(index(row, 0), file);
+		}
+		++row;
+	}
+}
+

=== added file 'src/libusermetricsoutput/InfographicListImpl.h'
--- src/libusermetricsoutput/InfographicListImpl.h	1970-01-01 00:00:00 +0000
+++ src/libusermetricsoutput/InfographicListImpl.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSOUTPUT_INFOGRAPHICLISTIMPL_H_
+#define USERMETRICSOUTPUT_INFOGRAPHICLISTIMPL_H_
+
+#include <libusermetricsoutput/DirectoryWatcher.h>
+#include <libusermetricsoutput/InfographicList.h>
+
+#include <QtCore/QDir>
+#include <QtCore/QString>
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QMultiMap>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
+#include <QtCore/QScopedPointer>
+
+namespace UserMetricsOutput {
+
+class InfographicListImpl: public InfographicList {
+Q_OBJECT
+
+public:
+	InfographicListImpl(const QString &path, QObject *parent = 0);
+
+	virtual ~InfographicListImpl();
+
+	unsigned int uid() const override;
+
+	void setUid(unsigned int uid) override;
+
+protected Q_SLOTS:
+	void internalDirectoryChanged();
+
+	void directoryContentsChanged(const QString &directory,
+			const QStringList &files);
+
+	void directoryRemoved(const QString &directory);
+
+	void timeout();
+
+protected:
+	void newDirectoryWatcher();
+
+	QThread m_workerThread;
+
+	QTimer m_timer;
+
+	QDir m_path;
+
+	QDir m_userDir;
+
+	unsigned int m_uid;
+
+	QFileSystemWatcher m_filesystemWatcher;
+
+	DirectoryWatcher::Ptr m_directoryWatcher;
+
+	QMultiMap<QString, QString> m_files;
+};
+
+}
+
+#endif /* USERMETRICSOUTPUT_INFOGRAPHICLISTIMPL_H_ */

=== modified file 'src/usermetricsservice/CMakeLists.txt'
--- src/usermetricsservice/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ src/usermetricsservice/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -1,17 +1,34 @@
 
-#set(USERMETRICSSERVICE_SOURCES
-#)
-
-#add_library(
-#	usermetricsservice
-#	STATIC
-#	${USERMETRICSSERVICE_SOURCES}
-#)
-
-#target_link_libraries(
-#	usermetricsservice
-#	${APPARMOR_LIBRARIES}
-#)
+set(USERMETRICSSERVICE_SOURCES
+	Executor.cpp
+	Factory.cpp
+	Infographic.cpp
+	InfographicImpl.cpp
+	QProcessExecutor.cpp
+	ResultTransport.cpp
+	ResultTransportImpl.cpp
+	SourceDirectory.cpp
+	SourceDirectoryImpl.cpp
+	Service.cpp
+	ServiceImpl.cpp
+)
+
+add_library(
+	usermetricsservice
+	STATIC
+	${USERMETRICSSERVICE_SOURCES}
+)
+
+target_link_libraries(
+	usermetricsservice
+	usermetricscommon
+)
+
+qt5_use_modules(
+	usermetricsservice
+	Core
+	DBus
+)
 
 ############################
 # Service executable
@@ -28,16 +45,42 @@
 	OUTPUT_NAME "usermetricsservice"
 )
 
-#target_link_libraries(
-#	usermetricsservice-bin
-#	usermetricsservice
-#)
+target_link_libraries(
+	usermetricsservice-bin
+	usermetricsservice
+)
+
+qt5_use_modules(
+	usermetricsservice-bin
+	Core
+)
+
+#########################
+# Sandbox executable
+#########################
+
+add_executable(
+	aa-exec
+	aa-exec.cpp
+)
+
+target_link_libraries(
+	aa-exec
+	${APPARMOR_LDFLAGS}
+)
+
+add_definitions(
+	-DAA_EXEC_PATH="${CMAKE_INSTALL_FULL_LIBEXECDIR}/libusermetrics/aa-exec"
+)
 
 #########################
 # Installation
 #########################
 
 install(
-  TARGETS usermetricsservice-bin
-  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/libusermetrics"
+	TARGETS
+		usermetricsservice-bin
+		aa-exec
+	RUNTIME DESTINATION
+		"${CMAKE_INSTALL_FULL_LIBEXECDIR}/libusermetrics"
 )

=== removed file 'src/usermetricsservice/DBusUserData.cpp'
--- src/usermetricsservice/DBusUserData.cpp	2014-01-20 10:33:36 +0000
+++ src/usermetricsservice/DBusUserData.cpp	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Pete Woods <[e-mail]>
- */
-
-#include <stdexcept>
-
-#include <usermetricsservice/Authentication.h>
-#include <usermetricsservice/DBusUserMetrics.h>
-#include <usermetricsservice/DBusUserData.h>
-#include <usermetricsservice/DBusDataSet.h>
-#include <usermetricsservice/DBusDataSource.h>
-#include <usermetricsservice/UserDataAdaptor.h>
-#include <usermetricsservice/database/DataSet.h>
-#include <usermetricsservice/database/DataSource.h>
-#include <usermetricsservice/database/UserData.h>
-#include <libusermetricscommon/DateFactory.h>
-#include <libusermetricscommon/DBusPaths.h>
-#include <libusermetricscommon/Localisation.h>
-
-#include <QDjangoQuerySet.h>
-
-using namespace std;
-using namespace UserMetricsCommon;
-using namespace UserMetricsService;
-
-DBusUserData::DBusUserData(int id, const QString &username,
-		DBusUserMetrics &userMetrics, QDBusConnection &dbusConnection,
-		QSharedPointer<DateFactory> dateFactory,
-		QSharedPointer<Authentication> authentication, QObject *parent) :
-		QObject(parent), m_dbusConnection(dbusConnection), m_adaptor(
-				new UserDataAdaptor(this)), m_dateFactory(dateFactory), m_authentication(
-				authentication), m_userMetrics(userMetrics), m_id(id), m_path(
-				DBusPaths::userData(m_id)), m_username(username) {
-
-	// DBus setup
-	if (!m_dbusConnection.registerObject(m_path, this)) {
-		throw logic_error(_("Could not register user data object with DBus"));
-	}
-
-// Database setup
-	syncDatabase();
-}
-
-DBusUserData::~DBusUserData() {
-	QDBusConnection connection(QDBusConnection::sessionBus());
-	connection.unregisterObject(m_path);
-}
-
-QString DBusUserData::path() const {
-	return m_path;
-}
-
-QString DBusUserData::username() const {
-	return m_username;
-}
-
-QList<QDBusObjectPath> DBusUserData::dataSets() const {
-	QList<QDBusObjectPath> dataSets;
-	for (DBusDataSetPtr dataSet : m_dataSets.values()) {
-		dataSets << QDBusObjectPath(dataSet->path());
-	}
-	return dataSets;
-}
-
-QDBusObjectPath DBusUserData::createDataSet(const QString &dataSourceName) {
-	if (!DataSource::exists(dataSourceName)) {
-		qWarning() << _("Unknown data source") << ": [" << dataSourceName
-				<< "]";
-		return QDBusObjectPath();
-	}
-
-	QString dbusUsername(m_authentication->getUsername(*this));
-	if (!dbusUsername.isEmpty() && !m_username.isEmpty()
-			&& dbusUsername != m_username) {
-		m_authentication->sendErrorReply(*this, QDBusError::AccessDenied,
-				_("Attempt to create data set owned by another user"));
-		return QDBusObjectPath();
-	}
-
-	QString confinementContext(m_authentication->getConfinementContext(*this));
-	DataSource dataSource;
-	DataSource::findByNameAndSecret(dataSourceName, confinementContext,
-			&dataSource);
-	if (!dataSource.isValid()) {
-		m_authentication->sendErrorReply(*this, QDBusError::InternalError,
-				_("Could not locate user data"));
-		return QDBusObjectPath();
-	}
-	if (dataSource.secret() != "unconfined"
-			&& dataSource.secret() != confinementContext) {
-		m_authentication->sendErrorReply(*this, QDBusError::AccessDenied,
-				_("Attempt to create data set owned by another application"));
-		return QDBusObjectPath();
-	}
-
-	QDjangoQuerySet<DataSet> dataSets;
-	QDjangoQuerySet<DataSet> query = dataSets.filter(
-			QDjangoWhere("userData_id", QDjangoWhere::Equals, m_id)).filter(
-			QDjangoWhere("dataSource__name", QDjangoWhere::Equals,
-					dataSourceName));
-
-	if (query.size() == -1) {
-		throw logic_error(_("Data set query failed"));
-	}
-
-	DataSet dataSet;
-
-	if (query.size() == 0) {
-		UserData userData;
-		UserData::findById(m_id, &userData);
-		dataSet.setUserData(&userData);
-
-		dataSet.setDataSource(&dataSource);
-
-		if (!dataSet.save()) {
-			throw logic_error(_("Could not save data set"));
-		}
-
-		syncDatabase();
-	} else {
-		query.at(0, &dataSet);
-	}
-
-	DBusDataSetPtr dataSetPtr(m_dataSets.value(dataSet.id()));
-	if (dataSetPtr.isNull()) {
-		throw logic_error(_("New data set could not be found"));
-	}
-	return QDBusObjectPath(dataSetPtr->path());
-}
-
-void DBusUserData::syncDatabase() {
-	QSet<int> dataSetIds;
-	QDjangoQuerySet<DataSet> dataSets;
-	QDjangoQuerySet<DataSet> query(
-			dataSets.filter(
-					QDjangoWhere("userData_id", QDjangoWhere::Equals, m_id)));
-	for (const DataSet &dataSet : query.selectRelated()) {
-		const int id(dataSet.id());
-		dataSetIds << id;
-		// if we don't have a local cache
-		if (!m_dataSets.contains(id)) {
-			DBusDataSourcePtr dbusDataSource(
-					m_userMetrics.dataSource(dataSet.dataSource()->name(),
-							dataSet.dataSource()->secret()));
-			DBusDataSetPtr dbusDataSet(
-					new DBusDataSet(id, dbusDataSource->path(),
-							m_dbusConnection, m_dateFactory, m_authentication));
-			m_dataSets.insert(id, dbusDataSet);
-			m_adaptor->dataSetAdded(QDBusObjectPath(dbusDataSet->dataSource()),
-					QDBusObjectPath(dbusDataSet->path()));
-		}
-	}
-	// remove any cached references to deleted data sets
-	QSet<int> cachedDataSetIds(QSet<int>::fromList(m_dataSets.keys()));
-	QSet<int> &toRemove(cachedDataSetIds.subtract(dataSetIds));
-	for (int id : toRemove) {
-		DBusDataSetPtr dataSet = m_dataSets.take(id);
-		m_adaptor->dataSetRemoved(QDBusObjectPath(dataSet->dataSource()),
-				QDBusObjectPath(dataSet->path()));
-	}
-}
-
-DBusDataSetPtr DBusUserData::dataSet(const QString &dataSource) const {
-	QDjangoQuerySet<DataSet> dataSets;
-	QScopedPointer<DataSet> dataSet(
-			dataSets.filter(
-					QDjangoWhere("userData_id", QDjangoWhere::Equals, m_id)).get(
-					QDjangoWhere("dataSource__name", QDjangoWhere::Equals,
-							dataSource)));
-
-	return m_dataSets.value(dataSet->id());
-}

=== added file 'src/usermetricsservice/Executor.cpp'
--- src/usermetricsservice/Executor.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Executor.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/Executor.h>
+
+using namespace UserMetricsService;
+
+Executor::Executor() {
+}
+
+Executor::~Executor() {
+}

=== added file 'src/usermetricsservice/Executor.h'
--- src/usermetricsservice/Executor.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Executor.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_EXECUTOR_H_
+#define USERMETRICSSERVICE_EXECUTOR_H_
+
+#include <QByteArray>
+#include <QSharedPointer>
+#include <QStringList>
+
+namespace UserMetricsService {
+
+class Executor {
+public:
+	typedef QSharedPointer<Executor> Ptr;
+
+	Executor();
+
+	virtual ~Executor();
+
+	virtual QByteArray execute(const QString &program,
+			const QStringList &arguments) = 0;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_EXECUTOR_H_ */

=== added file 'src/usermetricsservice/Factory.cpp'
--- src/usermetricsservice/Factory.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Factory.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <libusermetricscommon/DBusPaths.h>
+#include <usermetricsservice/Factory.h>
+#include <usermetricsservice/InfographicImpl.h>
+#include <usermetricsservice/QProcessExecutor.h>
+#include <usermetricsservice/ResultTransportImpl.h>
+#include <usermetricsservice/SourceDirectoryImpl.h>
+#include <usermetricsservice/ServiceImpl.h>
+
+using namespace UserMetricsCommon;
+using namespace UserMetricsService;
+
+Factory::Factory() {
+}
+
+Factory::~Factory() {
+}
+
+Service::Ptr Factory::singletonService() {
+	if (!m_service) {
+		m_service.reset(
+				new ServiceImpl(QDir::home().filePath(".cache"),
+						QDir("/usr/share/libusermetrics/infographics"),
+						singletonFileUtils(), singletonResultTransport(),
+						*this));
+	}
+	return m_service;
+}
+
+FileUtils::Ptr Factory::singletonFileUtils() {
+	if (!m_fileUtils) {
+		m_fileUtils.reset(new FileUtils());
+	}
+	return m_fileUtils;
+}
+
+Executor::Ptr Factory::singletonExecutor() {
+	if (!m_executor) {
+		m_executor.reset(new QProcessExecutor(QDir::home().filePath(".cache"),
+		AA_EXEC_PATH));
+	}
+	return m_executor;
+}
+
+QSharedPointer<ComCanonicalInfographicsInterface> Factory::singletonInfographicService() {
+	if (!m_infographicService) {
+		m_infographicService.reset(
+				new ComCanonicalInfographicsInterface(
+						DBusPaths::INFOGRAPHIC_DBUS_NAME,
+						DBusPaths::INFOGRAPHIC_DBUS_PATH,
+						QDBusConnection::systemBus()));
+	}
+	return m_infographicService;
+}
+
+ResultTransport::Ptr Factory::singletonResultTransport() {
+	if (!m_resultTransport) {
+		m_resultTransport.reset(
+				new ResultTransportImpl(singletonInfographicService()));
+	}
+	return m_resultTransport;
+}
+
+Infographic::Ptr Factory::newInfographic(const QFile &path) {
+	return Infographic::Ptr(
+			new InfographicImpl(path, singletonExecutor(),
+					singletonResultTransport()));
+}
+
+SourceDirectory::Ptr Factory::newSourceDirectory(const QDir &path) {
+	return SourceDirectory::Ptr(
+			new SourceDirectoryImpl(path, singletonFileUtils()));
+}

=== added file 'src/usermetricsservice/Factory.h'
--- src/usermetricsservice/Factory.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Factory.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_FACTORY_H_
+#define USERMETRICSSERVICE_FACTORY_H_
+
+#include <libusermetricscommon/FileUtils.h>
+#include <libusermetricscommon/InfographicsInterface.h>
+#include <usermetricsservice/Executor.h>
+#include <usermetricsservice/Infographic.h>
+#include <usermetricsservice/ResultTransport.h>
+#include <usermetricsservice/Service.h>
+#include <usermetricsservice/SourceDirectory.h>
+
+#include <QFile>
+#include <QDir>
+
+namespace UserMetricsService {
+
+class Factory {
+public:
+	Factory();
+
+	virtual ~Factory();
+
+	virtual Service::Ptr singletonService();
+
+	virtual UserMetricsCommon::FileUtils::Ptr singletonFileUtils();
+
+	virtual Executor::Ptr singletonExecutor();
+
+	virtual QSharedPointer<ComCanonicalInfographicsInterface> singletonInfographicService();
+
+	virtual ResultTransport::Ptr singletonResultTransport();
+
+	virtual Infographic::Ptr newInfographic(const QFile &path);
+
+	virtual SourceDirectory::Ptr newSourceDirectory(const QDir &path);
+
+protected:
+	Service::Ptr m_service;
+
+	UserMetricsCommon::FileUtils::Ptr m_fileUtils;
+
+	Executor::Ptr m_executor;
+
+	QSharedPointer<ComCanonicalInfographicsInterface> m_infographicService;
+
+	ResultTransport::Ptr m_resultTransport;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_FACTORY_H_ */

=== added file 'src/usermetricsservice/Infographic.cpp'
--- src/usermetricsservice/Infographic.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Infographic.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/Infographic.h>
+
+using namespace UserMetricsService;
+
+Infographic::Infographic() {
+}
+
+Infographic::~Infographic() {
+}

=== added file 'src/usermetricsservice/Infographic.h'
--- src/usermetricsservice/Infographic.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Infographic.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_INFOGRAPHIC_H_
+#define USERMETRICSSERVICE_INFOGRAPHIC_H_
+
+#include <QSharedPointer>
+
+namespace UserMetricsService {
+
+class Infographic: public QObject {
+Q_OBJECT
+
+public:
+	typedef QSharedPointer<Infographic> Ptr;
+
+	enum class Type {
+		INVALID, ITERATE, AGGREGATE,
+	};
+
+	Infographic();
+
+	virtual ~Infographic();
+
+	virtual bool isValid() const = 0;
+
+	virtual Type type() const = 0;
+
+public Q_SLOTS:
+	virtual void sourcesChanged(
+			const QMultiMap<QString, QString> &changedSources,
+			const QMultiMap<QString, QString> &allSources) = 0;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_INFOGRAPHIC_H_ */

=== added file 'src/usermetricsservice/InfographicImpl.cpp'
--- src/usermetricsservice/InfographicImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/InfographicImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/InfographicImpl.h>
+#include <usermetricsservice/Service.h>
+
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QJsonDocument>
+#include <QJsonParseError>
+#include <QTemporaryFile>
+
+using namespace UserMetricsService;
+
+InfographicImpl::InfographicImpl(const QFile &path, Executor::Ptr executor,
+		ResultTransport::Ptr resultTransport) :
+		m_path(path.fileName()), m_executor(executor), m_resultTransport(
+				resultTransport), m_type(Type::INVALID), m_ruleCount(0) {
+
+	if (!m_path.open(QIODevice::ReadOnly)) {
+		qWarning() << "Failed to open path:" << m_path.fileName();
+		return;
+	}
+
+	QByteArray ba(m_path.readAll());
+	m_path.close();
+
+	QJsonParseError error;
+	QJsonDocument document(QJsonDocument::fromJson(ba, &error));
+	if (error.error != QJsonParseError::NoError) {
+		qWarning() << "Failed to parse infographic JSON document:"
+				<< m_path.fileName() << error.errorString();
+		return;
+	}
+
+	if (document.isNull() || document.isEmpty()) {
+		return;
+	}
+
+	QFileInfo fileInfo(m_path);
+	m_id = fileInfo.completeBaseName();
+
+	QVariantMap map(document.toVariant().toMap());
+
+	m_exec = map["exec"].toString();
+
+	QString type = map["type"].toString().toLower();
+	if (type == "iterate") {
+		m_type = Type::ITERATE;
+	} else if (type == "aggregate") {
+		m_type = Type::AGGREGATE;
+	}
+
+	QVariantMap input(map["input"].toMap());
+	QMapIterator<QString, QVariant> i(input);
+	while (i.hasNext()) {
+		i.next();
+		QStringList rules(i.value().toStringList());
+		auto list = m_rules.insert(i.key(), QList<QRegularExpression>());
+		for (const QString &rule : rules) {
+			*list << QRegularExpression(rule);
+		}
+		m_ruleCount += rules.size();
+	}
+}
+
+InfographicImpl::~InfographicImpl() {
+}
+
+bool InfographicImpl::isValid() const {
+	return QFile::exists(m_exec) && m_type != Type::INVALID;
+}
+
+Infographic::Type InfographicImpl::type() const {
+	return m_type;
+}
+
+void InfographicImpl::sourcesChanged(
+		const QMultiMap<QString, QString> &changedSources,
+		const QMultiMap<QString, QString> &allSources) {
+	switch (m_type) {
+	case Type::INVALID:
+		break;
+	case Type::ITERATE:
+		iterate(changedSources);
+		break;
+	case Type::AGGREGATE:
+		aggregate(changedSources, allSources);
+		break;
+	}
+}
+
+QStringList InfographicImpl::match(
+		const QMultiMap<QString, QString>& changedSources) {
+
+	QStringList output;
+
+	QMapIterator<QString, QList<QRegularExpression>> iter(m_rules);
+	while (iter.hasNext()) {
+		iter.next();
+		const QString& sourceName(iter.key());
+		QStringList changedFiles;
+		if (sourceName == "*") {
+			changedFiles = changedSources.values();
+		} else if (changedSources.contains(sourceName)) {
+			changedFiles = changedSources.values(sourceName);
+		}
+
+		const QList<QRegularExpression> &watchedFiles(iter.value());
+		for (const QRegularExpression &watchedFile : watchedFiles) {
+			for (const QString &changedFile : changedFiles) {
+				QString changedFileName(QFileInfo(changedFile).fileName());
+				if (watchedFile.match(changedFileName).hasMatch()) {
+					output << changedFile;
+				}
+			}
+		}
+	}
+	return output;
+}
+
+void InfographicImpl::iterate(
+		const QMultiMap<QString, QString> &changedSources) {
+
+	for (const QString &changedFile : match(changedSources)) {
+		execute(QStringList() << changedFile);
+	}
+}
+
+void InfographicImpl::aggregate(
+		const QMultiMap<QString, QString> &changedSources,
+		const QMultiMap<QString, QString> &allSources) {
+
+	if (match(changedSources).isEmpty()) {
+		return;
+	}
+
+	// If we get a match for every rule
+	QStringList matches(match(allSources));
+	if (m_ruleCount == matches.size()) {
+		execute(matches);
+	}
+}
+
+void InfographicImpl::execute(const QStringList &arguments) {
+	QByteArray ba(m_executor->execute(m_exec, arguments));
+
+	if (ba.isEmpty()) {
+		qWarning() << "No data provided by infographic" << m_exec;
+		return;
+	}
+
+	m_resultTransport->send(m_id, arguments, ba);
+}

=== added file 'src/usermetricsservice/InfographicImpl.h'
--- src/usermetricsservice/InfographicImpl.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/InfographicImpl.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_INFOGRAPHICIMPL_H_
+#define USERMETRICSSERVICE_INFOGRAPHICIMPL_H_
+
+#include <usermetricsservice/Executor.h>
+#include <usermetricsservice/Infographic.h>
+#include <usermetricsservice/ResultTransport.h>
+
+#include <QFile>
+#include <QMap>
+#include <QRegularExpression>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+namespace UserMetricsService {
+
+class InfographicImpl: public Infographic {
+public:
+	InfographicImpl(const QFile &path, Executor::Ptr executor,
+			ResultTransport::Ptr resultTransport);
+
+	virtual ~InfographicImpl();
+
+	bool isValid() const;
+
+	Type type() const;
+
+	void sourcesChanged(const QMultiMap<QString, QString> &changedSources,
+			const QMultiMap<QString, QString> &allSources);
+
+protected:
+	void iterate(const QMultiMap<QString, QString> &changedSources);
+
+	void aggregate(const QMultiMap<QString, QString> &changedSources,
+			const QMultiMap<QString, QString> &allSources);
+
+	void execute(const QStringList &args);
+
+	QStringList match(const QMultiMap<QString, QString>& changedSources);
+
+	QFile m_path;
+
+	Executor::Ptr m_executor;
+
+	ResultTransport::Ptr m_resultTransport;
+
+	QString m_exec;
+
+	Type m_type;
+
+	QMap<QString, QList<QRegularExpression>> m_rules;
+
+	int m_ruleCount;
+
+	QString m_id;
+
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_INFOGRAPHICIMPL_H_ */

=== added file 'src/usermetricsservice/QProcessExecutor.cpp'
--- src/usermetricsservice/QProcessExecutor.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/QProcessExecutor.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/QProcessExecutor.h>
+
+#include <QDebug>
+#include <QProcess>
+#include <QThread>
+
+using namespace UserMetricsService;
+
+QProcessExecutor::QProcessExecutor(const QDir &cacheDirectory,
+		const QString &aaExec) :
+		m_aaExec(aaExec) {
+
+	m_usermetricsDirectory = cacheDirectory.filePath("usermetrics");
+	m_tempDirectory = m_usermetricsDirectory.filePath("tmp");
+}
+
+QProcessExecutor::~QProcessExecutor() {
+}
+
+QByteArray QProcessExecutor::execute(const QString &program,
+		const QStringList &arguments) {
+
+	m_tempDirectory.removeRecursively();
+	m_usermetricsDirectory.mkpath("tmp");
+
+	QByteArray output;
+
+	QStringList finalArguments;
+	finalArguments << program;
+	for (int i(0); i < arguments.size(); ++i) {
+		const QString &argument(arguments[i]);
+		QString destination(
+				m_tempDirectory.filePath(QString::number(i) + ".svg"));
+		if (!QFile::copy(argument, destination)) {
+			qWarning() << "Failed to copy file" << argument << destination;
+			return output;
+		}
+		finalArguments << destination;
+	}
+
+	QProcess process;
+
+	process.start(m_aaExec, finalArguments);
+
+	if (process.waitForFinished(5000)) {
+		output = process.readAllStandardOutput();
+		QByteArray error(process.readAllStandardError());
+		if (!error.isEmpty()) {
+			qWarning() << error;
+		}
+	} else {
+		process.kill();
+	}
+
+	return output;
+}
+

=== added file 'src/usermetricsservice/QProcessExecutor.h'
--- src/usermetricsservice/QProcessExecutor.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/QProcessExecutor.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_QPROCESSEXECUTOR_H_
+#define USERMETRICSSERVICE_QPROCESSEXECUTOR_H_
+
+#include <usermetricsservice/Executor.h>
+
+#include <QDir>
+
+namespace UserMetricsService {
+
+class QProcessExecutor: public Executor {
+public:
+	QProcessExecutor(const QDir &cacheDirectory, const QString &aaExec);
+
+	virtual ~QProcessExecutor();
+
+	QByteArray execute(const QString &program, const QStringList &arguments);
+
+protected:
+	QDir m_usermetricsDirectory;
+
+	QDir m_tempDirectory;
+
+	QString m_aaExec;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_QPROCESSEXECUTOR_H_ */

=== added file 'src/usermetricsservice/ResultTransport.cpp'
--- src/usermetricsservice/ResultTransport.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/ResultTransport.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/ResultTransport.h>
+
+using namespace UserMetricsService;
+
+ResultTransport::ResultTransport() {
+}
+
+ResultTransport::~ResultTransport() {
+}

=== added file 'src/usermetricsservice/ResultTransport.h'
--- src/usermetricsservice/ResultTransport.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/ResultTransport.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_RESULTTRANSPORT_H_
+#define USERMETRICSSERVICE_RESULTTRANSPORT_H_
+
+#include <QByteArray>
+#include <QString>
+#include <QStringList>
+#include <QSharedPointer>
+
+namespace UserMetricsService {
+
+class ResultTransport {
+public:
+	typedef QSharedPointer<ResultTransport> Ptr;
+
+	ResultTransport();
+
+	virtual ~ResultTransport();
+
+	virtual void clear() = 0;
+
+	virtual void send(const QString &id, const QStringList &arguments,
+			const QByteArray &ba) = 0;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_RESULTTRANSPORT_H_ */

=== added file 'src/usermetricsservice/ResultTransportImpl.cpp'
--- src/usermetricsservice/ResultTransportImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/ResultTransportImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/ResultTransportImpl.h>
+
+#include <QDebug>
+#include <sys/stat.h>
+
+using namespace UserMetricsService;
+
+ResultTransportImpl::ResultTransportImpl(
+		QSharedPointer<ComCanonicalInfographicsInterface> infographicService) :
+		m_infographicService(infographicService) {
+}
+
+ResultTransportImpl::~ResultTransportImpl() {
+}
+
+void ResultTransportImpl::clear() {
+	m_infographicService->clear().waitForFinished();
+}
+
+void ResultTransportImpl::send(const QString &id, const QStringList &arguments,
+		const QByteArray &ba) {
+	QFile fifo;
+	{
+		QTemporaryFile tempFile;
+		tempFile.open();
+		tempFile.close();
+		fifo.setFileName(tempFile.fileName());
+	}
+
+	int err = mkfifo(fifo.fileName().toUtf8().constData(), 0644);
+	if (err != 0) {
+		// someone is trying something naughty
+		qWarning() << "FIFO path already existed" << fifo.fileName();
+		return;
+	}
+
+	QDBusPendingReply<> reply(
+			m_infographicService->update(id, arguments, fifo.fileName()));
+
+	if (fifo.open(QIODevice::WriteOnly)) {
+		fifo.write(ba);
+		fifo.close();
+	}
+
+	reply.waitForFinished();
+
+	fifo.remove();
+}

=== added file 'src/usermetricsservice/ResultTransportImpl.h'
--- src/usermetricsservice/ResultTransportImpl.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/ResultTransportImpl.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_RESULTTRANSPORTIMPL_H_
+#define USERMETRICSSERVICE_RESULTTRANSPORTIMPL_H_
+
+#include <libusermetricscommon/InfographicsInterface.h>
+#include <usermetricsservice/ResultTransport.h>
+
+namespace UserMetricsService {
+
+class ResultTransportImpl: public ResultTransport {
+public:
+	ResultTransportImpl(
+			QSharedPointer<ComCanonicalInfographicsInterface> infographicService);
+
+	virtual ~ResultTransportImpl();
+
+	void clear();
+
+	void send(const QString &id, const QStringList &arguments,
+			const QByteArray &ba);
+
+protected:
+	QSharedPointer<ComCanonicalInfographicsInterface> m_infographicService;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_RESULTTRANSPORTIMPL_H_ */

=== added file 'src/usermetricsservice/Service.cpp'
--- src/usermetricsservice/Service.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Service.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/Service.h>
+
+using namespace UserMetricsService;
+
+Service::Service() {
+}
+
+Service::~Service() {
+}

=== added file 'src/usermetricsservice/Service.h'
--- src/usermetricsservice/Service.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/Service.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_SERVICE_H_
+#define USERMETRICSSERVICE_SERVICE_H_
+
+#include <QObject>
+#include <QMultiMap>
+#include <QSharedPointer>
+#include <QString>
+
+namespace UserMetricsService {
+
+class Service: public QObject {
+Q_OBJECT
+public:
+	typedef QSharedPointer<Service> Ptr;
+
+	Service();
+
+	virtual ~Service();
+
+Q_SIGNALS:
+	void sourcesChanged(const QMultiMap<QString, QString> &changedSources,
+			const QMultiMap<QString, QString> &allSources);
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_SERVICE_H_ */

=== added file 'src/usermetricsservice/ServiceImpl.cpp'
--- src/usermetricsservice/ServiceImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/ServiceImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/ServiceImpl.h>
+
+#include <QDebug>
+#include <QStringList>
+#include <stdexcept>
+
+using namespace UserMetricsCommon;
+using namespace UserMetricsService;
+using namespace std;
+
+ServiceImpl::ServiceImpl(const QDir &cacheDirectory,
+		const QDir &packageInfographics, FileUtils::Ptr fileUtils,
+		ResultTransport::Ptr resultTransport, Factory &factory) :
+		m_cacheDirectory(cacheDirectory), m_fileUtils(fileUtils), m_resultTransport(
+				resultTransport), m_factory(factory) {
+	QDir usermetricsDirectory(cacheDirectory.filePath("usermetrics"));
+
+	if (!usermetricsDirectory.mkpath("infographics")) {
+		throw logic_error("Cannot create infographics directory");
+	}
+
+	if (!usermetricsDirectory.mkpath("sources")) {
+		throw logic_error("Cannot create sources directory");
+	}
+
+	m_infographicDirectories << usermetricsDirectory.filePath("infographics");
+	m_infographicDirectories << packageInfographics.path();
+	m_sourcesDirectory = usermetricsDirectory.filePath("sources");
+
+	m_timer.setSingleShot(true);
+
+	connect(&m_infographicWatcher, &QFileSystemWatcher::directoryChanged, this,
+			&ServiceImpl::updateInfographicList);
+	connect(&m_sourcesWatcher, &QFileSystemWatcher::directoryChanged, this,
+			&ServiceImpl::updateSourcesList);
+
+	connect(&m_timer, &QTimer::timeout, this, &ServiceImpl::flushQueue);
+
+	updateInfographicList();
+	updateSourcesList();
+
+	m_infographicWatcher.addPaths(m_infographicDirectories);
+	m_sourcesWatcher.addPath(m_sourcesDirectory.path());
+
+	m_resultTransport->clear();
+
+	QMultiMap<QString, QString> sources(allSources());
+	sourcesChanged(sources, sources);
+}
+
+ServiceImpl::~ServiceImpl() {
+}
+
+void ServiceImpl::updateInfographicList() {
+	QSet<QString> names;
+
+	for (const QString &directory : m_infographicDirectories) {
+		names.unite(m_fileUtils->listDirectory(directory, QDir::Files).toSet());
+	}
+
+	// Remove deleted infographics
+	QSet<QString> toRemove(m_infographics.keys().toSet().subtract(names));
+	for (const QString &name : toRemove) {
+		m_infographics.take(name);
+	}
+
+	// Work out the names we need to add
+	names.subtract(m_infographics.keys().toSet());
+	for (const QString &name : names) {
+		Infographic::Ptr infographic(m_factory.newInfographic(name));
+		m_infographics.insert(name, infographic);
+		if (infographic->isValid()) {
+			connect(this, &Service::sourcesChanged, infographic.data(),
+					&Infographic::sourcesChanged);
+		}
+	}
+}
+
+void ServiceImpl::updateSourcesList() {
+	QSet<QString> fullNames(
+			m_fileUtils->listDirectory(m_sourcesDirectory, QDir::Files).toSet());
+
+	QSet<QString> names;
+	for (const QString &name : fullNames) {
+		QFileInfo fileInfo(name);
+		QString shortName(fileInfo.completeBaseName());
+		m_fileUtils->shortApplicationId(shortName);
+		QDir applicationDirectory(m_cacheDirectory.filePath(shortName));
+		applicationDirectory.mkpath("usermetrics");
+		names << applicationDirectory.filePath("usermetrics");
+	}
+
+	// Remove deleted sources
+	QSet<QString> toRemove(m_sources.keys().toSet().subtract(names));
+	for (const QString &name : toRemove) {
+		m_sources.take(name);
+	}
+
+	// Work out the names we need to add
+	names.subtract(m_sources.keys().toSet());
+	for (const QString &name : names) {
+		SourceDirectory::Ptr sourceDirectory(
+				m_factory.newSourceDirectory(name));
+		connect(sourceDirectory.data(), &SourceDirectory::sourceChanged, this,
+				&ServiceImpl::sourceChanged);
+		m_sources.insert(name, sourceDirectory);
+	}
+}
+
+void ServiceImpl::sourceChanged(const QDir &directory,
+		const QString &fileName) {
+	QFileInfo directoryInfo(directory.path());
+	QString applicationId(directoryInfo.dir().dirName());
+	m_fileUtils->shortApplicationId(applicationId);
+
+	if (m_changedSources.constFind(applicationId, fileName)
+			== m_changedSources.constEnd()) {
+		m_changedSources.insert(applicationId, fileName);
+	}
+	m_timer.start(100);
+}
+
+QMultiMap<QString, QString> ServiceImpl::allSources() {
+	QMultiMap<QString, QString> sources;
+
+	QMapIterator<QString, SourceDirectory::Ptr> iter(m_sources);
+	while (iter.hasNext()) {
+		iter.next();
+
+		QFileInfo directoryInfo(iter.key());
+		QString applicationId(directoryInfo.dir().dirName());
+		m_fileUtils->shortApplicationId(applicationId);
+
+		for (const QString &filePath : iter.value()->files()) {
+			sources.insert(applicationId, filePath);
+		}
+	}
+
+	return sources;
+}
+
+void ServiceImpl::flushQueue() {
+	sourcesChanged(m_changedSources, allSources());
+	m_changedSources.clear();
+}

=== added file 'src/usermetricsservice/ServiceImpl.h'
--- src/usermetricsservice/ServiceImpl.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/ServiceImpl.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_SERVICEIMPL_H_
+#define USERMETRICSSERVICE_SERVICEIMPL_H_
+
+#include <usermetricsservice/Factory.h>
+
+#include <QFileSystemWatcher>
+#include <QDir>
+#include <QMap>
+#include <QMultiMap>
+#include <QString>
+#include <QTimer>
+
+namespace UserMetricsService {
+
+class ServiceImpl: public Service {
+Q_OBJECT
+
+public:
+	ServiceImpl(const QDir &cacheDirectory, const QDir &packageInfographics,
+			UserMetricsCommon::FileUtils::Ptr fileUtils,
+			ResultTransport::Ptr resultTransport, Factory &factory);
+
+	virtual ~ServiceImpl();
+
+protected Q_SLOTS:
+	void updateInfographicList();
+
+	void updateSourcesList();
+
+	void sourceChanged(const QDir &directory, const QString &fileName);
+
+	void flushQueue();
+
+	QMultiMap<QString, QString> allSources();
+
+protected:
+	QDir m_cacheDirectory;
+
+	UserMetricsCommon::FileUtils::Ptr m_fileUtils;
+
+	ResultTransport::Ptr m_resultTransport;
+
+	Factory &m_factory;
+
+	QTimer m_timer;
+
+	QList<QString> m_infographicDirectories;
+
+	QFileSystemWatcher m_infographicWatcher;
+
+	QDir m_sourcesDirectory;
+
+	QFileSystemWatcher m_sourcesWatcher;
+
+	QMap<QString, Infographic::Ptr> m_infographics;
+
+	QMap<QString, SourceDirectory::Ptr> m_sources;
+
+	QMultiMap<QString, QString> m_changedSources;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_SERVICEIMPL_H_ */

=== added file 'src/usermetricsservice/SourceDirectory.cpp'
--- src/usermetricsservice/SourceDirectory.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/SourceDirectory.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/SourceDirectory.h>
+
+using namespace UserMetricsService;
+
+SourceDirectory::SourceDirectory() {
+}
+
+SourceDirectory::~SourceDirectory() {
+}

=== added file 'src/usermetricsservice/SourceDirectory.h'
--- src/usermetricsservice/SourceDirectory.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/SourceDirectory.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_SOURCEDIRECTORY_H_
+#define USERMETRICSSERVICE_SOURCEDIRECTORY_H_
+
+#include <QDir>
+#include <QObject>
+#include <QSharedPointer>
+
+namespace UserMetricsService {
+
+class SourceDirectory: public QObject {
+Q_OBJECT
+public:
+	typedef QSharedPointer<SourceDirectory> Ptr;
+
+	SourceDirectory();
+
+	virtual ~SourceDirectory();
+
+	virtual QStringList files() = 0;
+
+Q_SIGNALS:
+	void sourceChanged(const QDir &directory, const QString &file);
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_SOURCEDIRECTORY_H_ */

=== added file 'src/usermetricsservice/SourceDirectoryImpl.cpp'
--- src/usermetricsservice/SourceDirectoryImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/SourceDirectoryImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/SourceDirectoryImpl.h>
+
+#include <QDebug>
+
+using namespace UserMetricsCommon;
+using namespace UserMetricsService;
+
+SourceDirectoryImpl::SourceDirectoryImpl(const QDir &path,
+		FileUtils::Ptr fileUtils) :
+		m_path(path), m_fileUtils(fileUtils) {
+
+	m_watcher.addPath(path.path());
+
+	connect(&m_watcher, &QFileSystemWatcher::fileChanged, this,
+			&SourceDirectoryImpl::fileChanged);
+	connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this,
+			&SourceDirectoryImpl::updateFileList);
+
+	updateFileList();
+}
+
+SourceDirectoryImpl::~SourceDirectoryImpl() {
+}
+
+void SourceDirectoryImpl::fileChanged(const QString &path) {
+	sourceChanged(m_path, path);
+}
+
+void SourceDirectoryImpl::updateFileList() {
+	QSet<QString> names(
+			m_fileUtils->listDirectory(m_path, QDir::Files).toSet());
+
+	// Remove deleted files
+	QSet<QString> toRemove(m_watcher.files().toSet().subtract(names));
+	if (!toRemove.isEmpty()) {
+		m_watcher.removePaths(toRemove.toList());
+	}
+
+	// Work out the names we need to add
+	names.subtract(m_watcher.files().toSet());
+	for (const QString &name : names) {
+		m_watcher.addPath(name);
+		sourceChanged(m_path, name);
+	}
+}
+
+QStringList SourceDirectoryImpl::files() {
+	return m_watcher.files();
+}

=== added file 'src/usermetricsservice/SourceDirectoryImpl.h'
--- src/usermetricsservice/SourceDirectoryImpl.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/SourceDirectoryImpl.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_SOURCEDIRECTORYIMPL_H_
+#define USERMETRICSSERVICE_SOURCEDIRECTORYIMPL_H_
+
+#include <libusermetricscommon/FileUtils.h>
+#include <usermetricsservice/SourceDirectory.h>
+
+#include <QDir>
+#include <QFile>
+#include <QFileSystemWatcher>
+
+namespace UserMetricsService {
+
+class SourceDirectoryImpl: public SourceDirectory {
+Q_OBJECT
+
+public:
+	SourceDirectoryImpl(const QDir &path,
+			UserMetricsCommon::FileUtils::Ptr fileUtils);
+
+	virtual ~SourceDirectoryImpl();
+
+	QStringList files();
+
+protected Q_SLOTS:
+	void fileChanged(const QString &path);
+
+	void updateFileList();
+
+protected:
+	QDir m_path;
+
+	UserMetricsCommon::FileUtils::Ptr m_fileUtils;
+
+	QFileSystemWatcher m_watcher;
+};
+
+}
+
+#endif /* USERMETRICSSERVICE_SOURCEDIRECTORYIMPL_H_ */

=== added file 'src/usermetricsservice/aa-exec.cpp'
--- src/usermetricsservice/aa-exec.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/aa-exec.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <unistd.h>
+#include <sys/apparmor.h>
+
+int main(int argc, char **argv) {
+	if (argc < 2) {
+		return 1;
+	}
+
+	// Shift off the first argument
+	++argv;
+
+//	TODO Enable the profile switching
+//	aa_change_onexec("infographic");
+
+	return execv(*argv, argv);
+}

=== modified file 'src/usermetricsservice/main.cpp'
--- src/usermetricsservice/main.cpp	2014-02-04 12:07:58 +0000
+++ src/usermetricsservice/main.cpp	2014-04-03 13:02:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,31 @@
  * Author: Pete Woods <[e-mail]>
  */
 
+#include <usermetricsservice/Factory.h>
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <csignal>
+
+using namespace UserMetricsService;
+
+static void exitQt(int sig) {
+	Q_UNUSED(sig);
+	QCoreApplication::exit(0);
+}
+
 int main(int argc, char *argv[]) {
-	return 0;
+	QCoreApplication application(argc, argv);
+
+	signal(SIGINT, &exitQt);
+	signal(SIGTERM, &exitQt);
+
+	try {
+		Factory factory;
+		factory.singletonService();
+		return application.exec();
+	} catch (std::exception &e) {
+		qWarning() << "Usermetrics Service:" << e.what();
+		return 1;
+	}
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ tests/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -15,6 +15,11 @@
 add_definitions(-DTEST_LOCALEDIR="${CMAKE_CURRENT_BINARY_DIR}/data")
 add_definitions(-DTEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
 
+set(TEST_INFOGRAPHICS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/data/infographics")
+add_definitions(-DTEST_INFOGRAPHICS_DIR="${TEST_INFOGRAPHICS_DIR}")
+add_definitions(-DTEST_AGGREGATE_INFOGRAPHIC="${TEST_INFOGRAPHICS_DIR}/test-aggregate.json")
+add_definitions(-DTEST_ITERATE_INFOGRAPHIC="${TEST_INFOGRAPHICS_DIR}/test-iterate.json")
+
 add_definitions(-DDATA_DIR="${DATA_DIR}")
 
 add_subdirectory(data)

=== added directory 'tests/data/infographics'
=== added file 'tests/data/infographics/test-aggregate.json'
--- tests/data/infographics/test-aggregate.json	1970-01-01 00:00:00 +0000
+++ tests/data/infographics/test-aggregate.json	2014-04-03 13:02:15 +0000
@@ -0,0 +1,13 @@
+{
+    "exec": "/bin/cat",
+    "type": "aggregate",
+    "input": {
+        "com.ubuntu.camera": [
+            "camera-photos.libusermetrics.json",
+            "camera-videos.libusermetrics.json"
+        ],
+        "foo": [
+            "source-id.libusermetrics.json"
+        ]
+    }
+}
\ No newline at end of file

=== added file 'tests/data/infographics/test-iterate.json'
--- tests/data/infographics/test-iterate.json	1970-01-01 00:00:00 +0000
+++ tests/data/infographics/test-iterate.json	2014-04-03 13:02:15 +0000
@@ -0,0 +1,9 @@
+{
+    "exec": "/bin/echo",
+    "type": "iterate",
+    "input": {
+        "*": [
+            ".*.libusermetrics.json"
+        ]
+    }
+}

=== modified file 'tests/data/valgrind.suppression'
--- tests/data/valgrind.suppression	2014-01-03 15:51:12 +0000
+++ tests/data/valgrind.suppression	2014-04-03 13:02:15 +0000
@@ -61,6 +61,25 @@
 ###################
 
 {
+   QThread seems to leak here
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:_Znwm
+   fun:_ZN14QThreadPrivateC1EP11QThreadData
+   fun:_ZN7QThreadC1EP7QObject
+}
+
+{
+   QThread seems to leak here
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:_Znwj
+   fun:_ZN14QThreadPrivateC1EP11QThreadData
+   fun:_ZN7QThreadC1EP7QObject
+}
+
+
+{
    See bug report <https://bugreports.qt-project.org/browse/QTBUG-33677>
    Memcheck:Leak
    fun:_Znwm

=== modified file 'tests/unit/libusermetricsinput/TestMetricImpl.cpp'
--- tests/unit/libusermetricsinput/TestMetricImpl.cpp	2014-01-06 13:24:12 +0000
+++ tests/unit/libusermetricsinput/TestMetricImpl.cpp	2014-04-03 13:02:15 +0000
@@ -70,7 +70,7 @@
 
 	QVariantMap readData(const QString &id) {
 		QVariantMap map;
-		QFile file(metricDir.filePath(id + ".json"));
+		QFile file(metricDir.filePath(id + ".libusermetrics.json"));
 		EXPECT_TRUE(file.open(QIODevice::ReadOnly));
 		QJsonDocument doc(QJsonDocument::fromJson(file.readAll()));
 		file.close();

=== modified file 'tests/unit/libusermetricsinput/TestMetricManagerImpl.cpp'
--- tests/unit/libusermetricsinput/TestMetricManagerImpl.cpp	2014-01-06 17:31:49 +0000
+++ tests/unit/libusermetricsinput/TestMetricManagerImpl.cpp	2014-04-03 13:02:15 +0000
@@ -21,6 +21,7 @@
 #include <testutils/QStringPrinter.h>
 #include <unit/libusermetricsinput/Mocks.h>
 
+#include <QtCore/QDebug>
 #include <QtCore/QTemporaryDir>
 
 #include <gtest/gtest.h>
@@ -49,6 +50,7 @@
 				"usermetrics");
 
 		applicationIdTwo = "app-id-2";
+		applicationIdTwoFull = "app-id-2_app_1.2.12345";
 		metricDirTwo = QDir(cacheDir.filePath(applicationIdTwo)).filePath(
 				"usermetrics");
 	}
@@ -77,6 +79,8 @@
 
 	QString applicationIdTwo;
 
+	QString applicationIdTwoFull;
+
 	QDir metricDirTwo;
 };
 
@@ -85,8 +89,7 @@
 	params.formatString("format string %1");
 
 	MetricManagerPtr manager(
-			new MetricManagerImpl(factory, temporaryDir.path(),
-					applicationIdOne));
+			new MetricManagerImpl(factory, cacheDir, applicationIdOne));
 	EXPECT_CALL(*factory, newMetric(metricDirOne,
 					params, _)).WillOnce(Return(metric));
 	MetricPtr newMetric(manager->add(params));
@@ -95,9 +98,9 @@
 	newMetric = manager->add(params);
 	EXPECT_EQ(metric, newMetric);
 
-	EXPECT_DIR_CONTAINS(QDir(cacheDir.filePath(applicationIdOne)),
+	EXPECT_DIR_CONTAINS(cacheDir, QStringList() << applicationIdOne);
+	EXPECT_DIR_CONTAINS(cacheDir.filePath(applicationIdOne),
 			QStringList() << "usermetrics");
-	EXPECT_DIR_CONTAINS(cacheDir, QStringList() << applicationIdOne);
 }
 
 TEST_F(TestMetricManagerImpl, CreateTwoDifferentApplications) {
@@ -106,8 +109,7 @@
 
 	{
 		MetricManagerPtr manager(
-				new MetricManagerImpl(factory, temporaryDir.path(),
-						applicationIdOne));
+				new MetricManagerImpl(factory, cacheDir, applicationIdOne));
 		EXPECT_CALL(*factory, newMetric(metricDirOne,
 						params, _)).WillOnce(Return(metric));
 		MetricPtr newMetric(manager->add(params));
@@ -116,18 +118,19 @@
 
 	{
 		MetricManagerPtr manager(
-				new MetricManagerImpl(factory, temporaryDir.path(),
-						applicationIdTwo));
+				new MetricManagerImpl(factory, cacheDir, applicationIdTwoFull));
 		EXPECT_CALL(*factory, newMetric(metricDirTwo,
 						params, _)).WillOnce(Return(metric));
 		MetricPtr newMetric(manager->add("data-source-id", "format string %1"));
 		EXPECT_EQ(metric, newMetric);
 	}
 
-	EXPECT_DIR_CONTAINS(QDir(cacheDir.filePath(applicationIdTwo)),
-			QStringList() << "usermetrics");
 	EXPECT_DIR_CONTAINS(cacheDir,
 			QStringList() << applicationIdOne << applicationIdTwo);
+	EXPECT_DIR_CONTAINS(cacheDir.filePath(applicationIdOne),
+			QStringList() << "usermetrics");
+	EXPECT_DIR_CONTAINS(cacheDir.filePath(applicationIdTwo),
+			QStringList() << "usermetrics");
 }
 
 TEST_F(TestMetricManagerImpl, TestCanAddDataSourceMultipleTimes) {
@@ -154,9 +157,9 @@
 		EXPECT_EQ(metric, newMetric);
 	}
 
-	EXPECT_DIR_CONTAINS(QDir(cacheDir.filePath(applicationIdOne)),
+	EXPECT_DIR_CONTAINS(cacheDir, QStringList() << applicationIdOne);
+	EXPECT_DIR_CONTAINS(cacheDir.filePath(applicationIdOne),
 			QStringList() << "usermetrics");
-	EXPECT_DIR_CONTAINS(cacheDir, QStringList() << applicationIdOne);
 }
 
 } // namespace

=== modified file 'tests/unit/libusermetricsinput/TestUserMetricInputCAPI.cpp'
--- tests/unit/libusermetricsinput/TestUserMetricInputCAPI.cpp	2014-01-06 17:31:49 +0000
+++ tests/unit/libusermetricsinput/TestUserMetricInputCAPI.cpp	2014-04-03 13:02:15 +0000
@@ -48,9 +48,9 @@
 	QVariantMap readData(const QString &id) {
 		QDir cacheDir(QDir(m_temporaryDir.path()).filePath(".cache"));
 		QDir applicationDir(cacheDir.filePath("test-app"));
-		QDir metricDir(applicationDir.filePath("usermetrics"));
+		QDir usermetricsDir(applicationDir.filePath("usermetrics"));
 
-		QFile file(metricDir.filePath(id + ".json"));
+		QFile file(usermetricsDir.filePath(id + ".libusermetrics.json"));
 		EXPECT_TRUE(file.open(QIODevice::ReadOnly));
 		QJsonDocument doc(QJsonDocument::fromJson(file.readAll()));
 		file.close();

=== modified file 'tests/unit/libusermetricsoutput/CMakeLists.txt'
--- tests/unit/libusermetricsoutput/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ tests/unit/libusermetricsoutput/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -5,6 +5,7 @@
 	TestColorThemeImpl.cpp
 	TestDataSet.cpp
 	TestGSettingsColorThemeProvider.cpp
+	TestInfographicListImpl.cpp
 	TestQVariantListModel.cpp
 	TestUserMetricsImpl.cpp
 )

=== added file 'tests/unit/libusermetricsoutput/TestInfographicListImpl.cpp'
--- tests/unit/libusermetricsoutput/TestInfographicListImpl.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/libusermetricsoutput/TestInfographicListImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <libusermetricsoutput/InfographicListImpl.h>
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+using namespace std;
+using namespace UserMetricsOutput;
+using namespace testing;
+
+namespace {
+
+class TestInfographicListImpl: public Test {
+protected:
+	void SetUp() {
+		qRegisterMetaType<QVector<int>>("QVector<int>");
+		usermetricsDir = tempDir.path();
+	}
+
+	QDir createUserDir(unsigned int uid) {
+		QString name(QString::number(uid));
+		usermetricsDir.mkpath(name);
+		return QDir(usermetricsDir.filePath(name));
+	}
+
+	QString createInfographic(unsigned int uid, const QString &visualizer,
+			const QString &name, const QByteArray &contents) {
+		QDir userDir(createUserDir(uid));
+
+		userDir.mkpath(visualizer);
+		QDir visualizerDir(userDir.filePath(visualizer));
+
+		QFile output(visualizerDir.filePath(name));
+		output.open(QIODevice::WriteOnly);
+		output.write(contents);
+		output.close();
+
+		return output.fileName();
+	}
+
+	QStringList contents(QAbstractItemModel &model) {
+		QStringList contents;
+		for (int i(0); i < model.rowCount(); ++i) {
+			contents << model.data(model.index(i, 0)).toString();
+		}
+		contents.sort();
+		return contents;
+	}
+
+	QTemporaryDir tempDir;
+
+	QDir usermetricsDir;
+};
+
+TEST_F(TestInfographicListImpl, ModelUpdated) {
+	InfographicListImpl list(tempDir.path());
+	EXPECT_EQ(QStringList(), contents(list));
+
+	QSignalSpy resetSpy(&list, SIGNAL(modelReset()));
+	QSignalSpy dataChangedSpy(&list,
+			SIGNAL(
+					dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));
+
+	list.setUid(1234);
+
+	createInfographic(1234, "com.ubuntu.camera", "apple-1234.svg", "<apple/>");
+	QString appleFile = createInfographic(1234, "com.ubuntu.camera",
+			"apple-2345.svg", "<apple/>");
+
+	createInfographic(1234, "com.ubuntu.camera", "banana-1234.svg",
+			"<oldBanana/>");
+	createInfographic(1234, "com.ubuntu.camera", "banana-2345.svg",
+			"<oldBanana/>");
+	QString bananaFile = createInfographic(1234, "com.ubuntu.camera",
+			"banana-3456.svg", "<banana/>");
+
+	createInfographic(1234, "com.ubuntu.camera", "cherry-1234.svg",
+			"<oldCherry/>");
+	createInfographic(1234, "com.ubuntu.camera", "cherry-2345.svg",
+			"<oldCherry/>");
+	QString cherryFile = createInfographic(1234, "com.ubuntu.camera",
+			"cherry-3456.svg", "<cherry/>");
+
+	resetSpy.wait();
+	ASSERT_EQ(1, resetSpy.size());
+	resetSpy.clear();
+
+	EXPECT_EQ(QStringList() << appleFile << bananaFile << cherryFile,
+			contents(list));
+
+	QString fooFile = createInfographic(1234, "com.ubuntu.foo", "foo-1234.svg",
+			"<foo/>");
+
+	dataChangedSpy.wait();
+	ASSERT_EQ(1, dataChangedSpy.size());
+
+	EXPECT_EQ(QStringList() << appleFile << bananaFile << cherryFile << fooFile,
+			contents(list));
+}
+
+} // namespace

=== modified file 'tests/unit/qml/UserMetricsTest/DBusQuery.cpp'
--- tests/unit/qml/UserMetricsTest/DBusQuery.cpp	2014-01-06 17:31:49 +0000
+++ tests/unit/qml/UserMetricsTest/DBusQuery.cpp	2014-04-03 13:02:15 +0000
@@ -30,10 +30,10 @@
 static QVariantMap fileContents(int index) {
 	QDir cacheDir(TEST_CACHE_DIR);
 	QDir applicationDir(cacheDir.filePath("test-app"));
-	QDir metricDir(applicationDir.filePath("usermetrics"));
+	QDir usermetricsDir(applicationDir.filePath("usermetrics"));
 
 	QFileInfoList list(
-			metricDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot,
+			usermetricsDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot,
 					QDir::Reversed));
 	if (index - 1 >= list.length()) {
 		return QVariantMap();

=== modified file 'tests/unit/qml/UserMetricsTest/TestPlugin.cpp'
--- tests/unit/qml/UserMetricsTest/TestPlugin.cpp	2014-01-06 17:31:49 +0000
+++ tests/unit/qml/UserMetricsTest/TestPlugin.cpp	2014-04-03 13:02:15 +0000
@@ -28,8 +28,9 @@
 void Components::initializeEngine(QQmlEngine *engine, const char *uri) {
 	QDir cacheDir(TEST_CACHE_DIR);
 	QDir applicationDir(cacheDir.filePath(qgetenv("APP_ID")));
-	if (applicationDir.exists()) {
-		applicationDir.removeRecursively();
+	QDir usermetricsDir(applicationDir.filePath("usermetrics"));
+	if (usermetricsDir.exists()) {
+		usermetricsDir.removeRecursively();
 	}
 
 	m_dbusQuery.reset(new DBusQuery());

=== modified file 'tests/unit/usermetricsservice/CMakeLists.txt'
--- tests/unit/usermetricsservice/CMakeLists.txt	2014-01-03 11:40:22 +0000
+++ tests/unit/usermetricsservice/CMakeLists.txt	2014-04-03 13:02:15 +0000
@@ -0,0 +1,25 @@
+
+set(
+	USERMETRICSSERVICE_UNIT_TESTS_SRC
+	TestServiceImpl.cpp
+	TestInfographicImpl.cpp
+)
+
+add_executable(
+	usermetricsservice-unit-tests
+	${USERMETRICSSERVICE_UNIT_TESTS_SRC}
+)
+
+target_link_libraries(
+	usermetricsservice-unit-tests
+	usermetricsservice
+	usermetrics-test-utils
+	${GSETTINGS_QT_LIBRARIES}
+	${GTEST_LIBRARIES}
+	${GMOCK_LIBRARIES}
+)
+
+add_valgrind_test(
+	usermetricsservice-unit-tests
+	usermetricsservice-unit-tests
+)

=== added file 'tests/unit/usermetricsservice/Mocks.h'
--- tests/unit/usermetricsservice/Mocks.h	1970-01-01 00:00:00 +0000
+++ tests/unit/usermetricsservice/Mocks.h	2014-04-03 13:02:15 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef USERMETRICSSERVICE_TEST_MOCKS_H_
+#define USERMETRICSSERVICE_TEST_MOCKS_H_
+
+#include <usermetricsservice/Factory.h>
+
+#include <gmock/gmock.h>
+
+namespace UserMetricsService {
+namespace Mocks {
+
+class MockFactory: public Factory {
+public:
+
+	MOCK_METHOD0(singletonService, Service::Ptr());
+
+	MOCK_METHOD0(singletonFileUtils, UserMetricsCommon::FileUtils::Ptr());
+
+	MOCK_METHOD0(singletonExecutor, Executor::Ptr());
+
+	MOCK_METHOD0(singletonInfographicService, QSharedPointer<ComCanonicalInfographicsInterface>());
+
+	MOCK_METHOD0(singletonResultTransport, ResultTransport::Ptr());
+
+	MOCK_METHOD1(newInfographic, Infographic::Ptr(const QFile &));
+
+	MOCK_METHOD1(newSourceDirectory, SourceDirectory::Ptr(const QDir &));
+};
+
+class MockExecutor: public Executor {
+public:
+
+	MOCK_METHOD2(execute, QByteArray(const QString &,
+					const QStringList &));
+};
+
+class MockInfographic: public Infographic {
+public:
+
+	MOCK_CONST_METHOD0(isValid, bool());
+
+	MOCK_CONST_METHOD0(type, Infographic::Type());
+
+	MOCK_METHOD2(sourcesChanged, void(const QMultiMap<QString, QString> &,
+					const QMultiMap<QString, QString> &));
+};
+
+class MockFileUtils: public UserMetricsCommon::FileUtils {
+public:
+
+	MOCK_METHOD2(listDirectory, QSet<QString>(const QDir &,
+					QDir::Filters));
+};
+
+class MockResultTransport: public ResultTransport {
+public:
+
+	MOCK_METHOD0(clear, void());
+
+	MOCK_METHOD3(send, void(const QString &, const QStringList &,
+					const QByteArray &));
+};
+
+}
+}
+
+#endif /* USERMETRICSSERVICE_TEST_MOCKS_H_ */

=== added file 'tests/unit/usermetricsservice/TestInfographicImpl.cpp'
--- tests/unit/usermetricsservice/TestInfographicImpl.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/usermetricsservice/TestInfographicImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <stdexcept>
+
+#include <usermetricsservice/InfographicImpl.h>
+
+#include <unit/usermetricsservice/Mocks.h>
+#include <testutils/QStringPrinter.h>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+using namespace std;
+using namespace testing;
+using namespace UserMetricsService;
+using namespace UserMetricsService::Mocks;
+
+namespace {
+
+class TestInfographicImpl: public Test {
+protected:
+	void SetUp() {
+		executor.reset(new StrictMock<MockExecutor>);
+
+		resultTransport.reset(new StrictMock<MockResultTransport>);
+	}
+
+	QSharedPointer<MockExecutor> executor;
+
+	QSharedPointer<MockResultTransport> resultTransport;
+
+	Infographic::Ptr newInfographic(const QString &path) {
+		return Infographic::Ptr(
+				new InfographicImpl(path, executor, resultTransport));
+	}
+};
+
+TEST_F(TestInfographicImpl, Iterate) {
+	Infographic::Ptr infographic(newInfographic (TEST_ITERATE_INFOGRAPHIC));
+
+	EXPECT_TRUE(infographic->isValid());
+	EXPECT_EQ(Infographic::Type::ITERATE, infographic->type());
+
+	QMultiMap<QString, QString> changedSources;
+	changedSources.insert("apple", "/path/orchard.libusermetrics.json");
+	changedSources.insert("apple", "/path/grove.json");
+	changedSources.insert("banana", "/path/tree.libusermetrics.json");
+
+	QMultiMap<QString, QString> allSources;
+
+	QByteArray orchardBa("orchard");
+	QStringList orchard;
+	orchard << "/path/orchard.libusermetrics.json";
+	EXPECT_CALL(*executor,
+			execute(QString("/bin/echo"), orchard)).WillOnce(Return(orchardBa));
+	EXPECT_CALL(*resultTransport,
+			send(QString("test-iterate"), orchard, orchardBa));
+
+	QByteArray treeBa("tree blah");
+	QStringList tree;
+	tree << "/path/tree.libusermetrics.json";
+	EXPECT_CALL(*executor,
+			execute(QString("/bin/echo"), tree)).WillOnce(Return(treeBa));
+	EXPECT_CALL(*resultTransport, send(QString("test-iterate"), tree, treeBa));
+
+	infographic->sourcesChanged(changedSources, allSources);
+}
+
+TEST_F(TestInfographicImpl, Aggregate) {
+	Infographic::Ptr infographic(newInfographic (TEST_AGGREGATE_INFOGRAPHIC));
+
+	EXPECT_TRUE(infographic->isValid());
+	EXPECT_EQ(Infographic::Type::AGGREGATE, infographic->type());
+
+	QMultiMap<QString, QString> changedSources;
+	QMultiMap<QString, QString> allSources;
+
+	// Only two of the 3 requires sources are present
+	allSources.insert("foo", "/path/source-1.libusermetrics.json");
+	allSources.insert("foo", "/path/source-2.libusermetrics.json");
+	allSources.insert("com.ubuntu.camera",
+			"/path/camera-photos.libusermetrics.json");
+	allSources.insert("com.ubuntu.camera",
+			"/path/camera-videos.libusermetrics.json");
+	allSources.insert("bar", "/path/bar.libusermetrics.json");
+
+	changedSources.insert("com.ubuntu.camera",
+			"/path/camera-videos.libusermetrics.json");
+
+	// Nothing should happen
+	infographic->sourcesChanged(changedSources, allSources);
+
+	// Now all of the required sources are present
+	allSources.insert("foo", "/path/source-id.libusermetrics.json");
+
+	QByteArray ba("stuff in the byte array");
+	QStringList files;
+	files << "/path/camera-photos.libusermetrics.json"
+			<< "/path/camera-videos.libusermetrics.json"
+			<< "/path/source-id.libusermetrics.json";
+	EXPECT_CALL(*executor,
+			execute(QString("/bin/cat"), files)).WillOnce(Return(ba));
+	EXPECT_CALL(*resultTransport, send(QString("test-aggregate"), files, ba));
+
+	infographic->sourcesChanged(changedSources, allSources);
+}
+
+} // namespace

=== added file 'tests/unit/usermetricsservice/TestServiceImpl.cpp'
--- tests/unit/usermetricsservice/TestServiceImpl.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/usermetricsservice/TestServiceImpl.cpp	2014-04-03 13:02:15 +0000
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <usermetricsservice/ServiceImpl.h>
+#include <usermetricsservice/SourceDirectoryImpl.h>
+#include <unit/usermetricsservice/Mocks.h>
+#include <testutils/QStringPrinter.h>
+
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <stdexcept>
+
+using namespace std;
+using namespace testing;
+using namespace UserMetricsCommon;
+using namespace UserMetricsService;
+using namespace UserMetricsService::Mocks;
+
+MATCHER_P(HasPath, value, ""){ return arg.fileName() == value;}
+
+namespace {
+
+class TestServiceImpl: public Test {
+protected:
+	void SetUp() {
+		qRegisterMetaType<QMultiMap<QString, QString>>(
+				"QMultiMap<QString, QString>");
+
+		cacheDir = tempDir.path();
+		usermetricsDir = cacheDir.filePath("usermetrics");
+		sourcesDir = usermetricsDir.filePath("sources");
+		ASSERT_TRUE(usermetricsDir.mkpath("sources"));
+
+		factory.reset(new NiceMock<MockFactory>);
+		fileUtils.reset(new FileUtils);
+		resultTransport.reset(new StrictMock<MockResultTransport>);
+	}
+
+	Service::Ptr newService() {
+		return Service::Ptr(
+				new ServiceImpl(cacheDir.path(), QDir(TEST_INFOGRAPHICS_DIR),
+						fileUtils, resultTransport, *factory));
+	}
+
+	QDir applicationDir(const QString &sourceName) {
+		QDir applicationDir = cacheDir.filePath(sourceName);
+		return applicationDir.filePath("usermetrics");
+	}
+
+	void createSource(const QString &name) {
+		QFile source(sourcesDir.filePath(name));
+		ASSERT_TRUE(source.open(QIODevice::WriteOnly));
+		ASSERT_TRUE(source.write("blah"));
+		source.close();
+	}
+
+	QString metricPath(const QString &sourceName, const QString &metricName) {
+		QDir applicationDir = cacheDir.filePath(sourceName);
+		QDir applicationUsermetricsDir = applicationDir.filePath("usermetrics");
+		return applicationUsermetricsDir.filePath(metricName);
+	}
+
+	void createMetric(const QString &sourceName, const QString &metricName) {