Merge lp:~jamesh/thumbnailer/dbus-service into lp:thumbnailer

[James Henstridge]

Add a D-Bus service that uses libthumbnailer to download cover art and then provides that art to the client via a read only file descriptor. This allows confined applications to safely access a shared media art cache.

Add a D-Bus service that uses libthumbnailer to download cover art and then provides that art to the client via a read only file descriptor. This allows confined applications to safely access a shared media art cache.

I've put the service in its own binary package marked "Multi-Arch: foreign", since we only need one copy installed on multi-arch systems, and the D-Bus interface should be usable by all architectures on the system.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/35/console

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

review: Needs Fixing (continuous-integration)

[lp:~jamesh/thumbnailer/dbus-service]

98. By James Henstridge on 2014-03-24

Fix up installation of service file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/36

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

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

> catch (std::exception &e)

The recommended practice is to catch exceptions by const ref rather than plain ref.

> std::thread t(&getCoverArt,

This may throw, please wrap in try/catch.

> // This should be replaced with actual lookup code.

I think it has been. :)

> /**
> + * A class that sends a broadcast signal that the state of media
> + * files has changed.
> + */

This is still from InvalidationSender and thus not accurate.

review: Needs Fixing

[Jussi Pakkanen (jpakkane)]

The code talks about album art but the method is called GetCoverArt. We should use one term consistently here, I vote for AlbumArt.

[James Henstridge (jamesh)]

Good catch. It looks like I introduced that discrepancy when cleaning up the ubuntu-ui-toolkit branch (looking at the strings in the .so I was testing shows GetCoverArt). I've updated this branch in favour of GetAlbumArt, to match the C++ API name.

[lp:~jamesh/thumbnailer/dbus-service]

99. By James Henstridge on 2014-03-24

Update per Jussi's review comments.

[James Henstridge (jamesh)]

I've done fresh builds of thumbnailer and ubuntu-ui-toolkit packages, and verified that they talk to each other correctly with these changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/38

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

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Here's something that bothers me:

static void getAlbumArt(unique_gobj<TNThumbnailer> iface,
  unique_gobj<GDBusMethodInvocation> invocation,

This function takes a unique_gobj by value but unique_gobj does not have a copy constructor or operator=. Maybe it invokes the move constructor because it is called with a temporary object?

Anyhow, it works so if no-one can give a feasible case why this would break I'm fine with merging this.

review: Approve

[James Henstridge (jamesh)]

The move constructor is the only way this could work, yes.

That said, there isn't much reason the type couldn't have a copy constructor: it's holding a reference counted object after all.

[lp:~jamesh/thumbnailer/dbus-service]

100. By James Henstridge on 2014-03-28

Copy over the libthumbnailer QML image providers over from
ubuntu-ui-toolkit.

101. By James Henstridge on 2014-03-28

Add packaging for thumbnailer QML plugin.

102. By James Henstridge on 2014-03-28

Register a bogus type so the QML module can be imported.

[James Henstridge (jamesh)]

MP updated with QML plugin code. Note that the bogus qmlRegisterType call is necessary for the plugin to be recognised: plugins that don't register any types are considered broken.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/52/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/40/console

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

review: Needs Fixing (continuous-integration)

[lp:~jamesh/thumbnailer/dbus-service]

103. By James Henstridge on 2014-03-28

Merge from trunk, fixing conflicts.

104. By James Henstridge on 2014-03-28

Merge lp:~jpakkane/thumbnailer/lastfmtest

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/41

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/42

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

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

The main issue seems to be that the service is called thumbnailer-service. It implies that it would provide thumbnailing services for all files. However it must not do that because that would open a way for confined applications to access files outside its sandbox. For album art this is not an issue because album art images are fully public data. Maybe we should call this albumart-service or alternatively develop a confinement security policy (which is a lot of work).

That being said, here are a few minor things:

"__ThumbnailerIngoreMe" has a typo.

#ifndef PLUGIN_H is a bit too generic and may clash, should be THUMBNAILERPLUGIN_H or somesuch.

review: Needs Information

[lp:~jamesh/thumbnailer/dbus-service]

105. By James Henstridge on 2014-03-28

Add a test for the image provider. Not currently hooked up as an
automated test, since it can't run headless.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/43

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

review: Approve (continuous-integration)

[lp:~jamesh/thumbnailer/dbus-service]

106. By James Henstridge on 2014-03-28

Add a note to the D-Bus interface definition file warning about security
considerations when adding new methods to the service.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/44

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

review: Approve (continuous-integration)

[lp:~jamesh/thumbnailer/dbus-service]

107. By James Henstridge on 2014-03-28

Other fixes from Jussi's review comments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/45

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

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Looks good.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-28 10:11:10 +0000
+++ CMakeLists.txt	2014-03-28 10:11:10 +0000
@@ -29,9 +29,10 @@
 set(SHARE_PRIV_ABS ${CMAKE_INSTALL_PREFIX}/${SHARE_PRIV_DIR})
 
 find_package(Threads REQUIRED)
+find_package(Qt5Core REQUIRED)
 include(FindPkgConfig)
 pkg_check_modules(GST_DEPS REQUIRED gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-app-1.0)
-pkg_check_modules(GIO_DEPS REQUIRED gio-2.0)
+pkg_check_modules(GIO_DEPS REQUIRED gio-2.0 gio-unix-2.0)
 pkg_check_modules(IMG_DEPS REQUIRED gdk-pixbuf-2.0 libexif)
 pkg_check_modules(SOUP_DEPS REQUIRED libsoup-2.4)
 pkg_check_modules(XML_DEPS REQUIRED libxml-2.0)
@@ -46,6 +47,7 @@
 
 enable_testing()
 add_subdirectory(src)
+add_subdirectory(plugins/Ubuntu/Thumbnailer)
 add_subdirectory(tests)
 add_subdirectory(tools)
 add_subdirectory(include)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-28 10:11:10 +0000
+++ debian/changelog	2014-03-28 10:11:10 +0000
@@ -1,4 +1,9 @@
-<<<<<<< TREE
+thumbnailer (1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New minor release.
+
+ -- Jussi Pakkanen <[e-mail]>  Mon, 10 Mar 2014 15:15:28 +0200
+
 thumbnailer (1.0+14.04.20140327-0ubuntu1) trusty; urgency=low
 
   [ Jussi Pakkanen ]
@@ -13,14 +18,6 @@
 
  -- Ubuntu daily release <[e-mail]>  Wed, 19 Mar 2014 20:16:40 +0000
 
-=======
-thumbnailer (1.1-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New minor release.
-
- -- Jussi Pakkanen <[e-mail]>  Mon, 10 Mar 2014 15:15:28 +0200
-
->>>>>>> MERGE-SOURCE
 thumbnailer (1.0+14.04.20140307-0ubuntu1) trusty; urgency=low
 
   [ Jussi Pakkanen ]

=== modified file 'debian/control'
--- debian/control	2014-03-28 10:11:10 +0000
+++ debian/control	2014-03-28 10:11:10 +0000
@@ -6,14 +6,18 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                gstreamer1.0-plugins-good,
+               libexif-dev,
                libgdk-pixbuf2.0-dev,
+               libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
-               libgstreamer1.0-dev,
-               shared-mime-info,
                libgtest-dev,
+               libsoup2.4-dev,
                libxml2-dev,
-               libsoup2.4-dev,
-               libexif-dev,
+               qt5-default,
+               qtbase5-dev,
+               qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               shared-mime-info,
 Homepage: https://launchpad.net/thumbnailer
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
@@ -43,3 +47,26 @@
 Description: development files for thumbnailer
  This package contains development files
  for the thumbnailer package.
+
+Package: thumbnailer-service
+Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libthumbnailer0 (= ${binary:Version}),
+Description: D-Bus service for out of process thumbnailing
+ This package provides a D-Bus service that can provide thumbnails on
+ behalf of another process.
+
+Package: qtdeclarative5-ubuntu-thumbnailer0.1
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libthumbnailer0 (= ${binary:Version}),
+Recommends: thumbnailer-service (= ${binary:Version}),
+Description: QML interface for the thumbnailer.
+ This package provides image providers that allow access to the
+ thumbnailer from Qt Quick 2 / QML applications.

=== added file 'debian/qtdeclarative5-ubuntu-thumbnailer0.1.install'
--- debian/qtdeclarative5-ubuntu-thumbnailer0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-thumbnailer0.1.install	2014-03-28 10:11:10 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/Ubuntu/Thumbnailer.0.1/*

=== added file 'debian/thumbnailer-service.install'
--- debian/thumbnailer-service.install	1970-01-01 00:00:00 +0000
+++ debian/thumbnailer-service.install	2014-03-28 10:11:10 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/thumbnailer/thumbnailer-service
+usr/share/dbus-1/services/com.canonical.Thumbnailer.service

=== added directory 'plugins'
=== added directory 'plugins/Ubuntu'
=== added directory 'plugins/Ubuntu/Thumbnailer'
=== added file 'plugins/Ubuntu/Thumbnailer/CMakeLists.txt'
--- plugins/Ubuntu/Thumbnailer/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/CMakeLists.txt	2014-03-28 10:11:10 +0000
@@ -0,0 +1,22 @@
+
+set(QML_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml/Ubuntu/Thumbnailer.0.1")
+
+add_library(thumbnailer-qml MODULE
+  plugin.cpp
+  albumartgenerator.cpp
+  thumbnailgenerator.cpp
+)
+
+set_target_properties(thumbnailer-qml PROPERTIES AUTOMOC TRUE)
+qt5_use_modules(thumbnailer-qml Qml Quick DBus)
+target_link_libraries(thumbnailer-qml thumbnailer)
+
+install(
+  TARGETS thumbnailer-qml
+  LIBRARY DESTINATION ${QML_PLUGIN_DIR}
+)
+
+install(
+  FILES qmldir
+  DESTINATION ${QML_PLUGIN_DIR}
+)

=== added file 'plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp'
--- plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp	2014-03-28 10:11:10 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 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/>.
+ *
+ * Authors: Jussi Pakkanen <[e-mail]>
+ *          James Henstridge <[e-mail]>
+*/
+
+#include "albumartgenerator.h"
+#include <stdexcept>
+#include <QDebug>
+#include <QFile>
+#include <QUrlQuery>
+#include <QDBusUnixFileDescriptor>
+#include <QDBusReply>
+
+static const char DEFAULT_ALBUM_ART[] = "/usr/share/unity/icons/album_missing.png";
+
+static const char BUS_NAME[] = "com.canonical.Thumbnailer";
+static const char BUS_PATH[] = "/com/canonical/Thumbnailer";
+static const char THUMBNAILER_IFACE[] = "com.canonical.Thumbnailer";
+static const char GET_ALBUM_ART[] = "GetAlbumArt";
+
+AlbumArtGenerator::AlbumArtGenerator()
+    : QQuickImageProvider(QQuickImageProvider::Image, QQmlImageProviderBase::ForceAsynchronousImageLoading),
+      iface(BUS_NAME, BUS_PATH, THUMBNAILER_IFACE) {
+}
+
+static QImage fallbackImage(QSize *realSize) {
+    QImage fallback;
+    fallback.load(DEFAULT_ALBUM_ART);
+    *realSize = fallback.size();
+    return fallback;
+}
+
+QImage AlbumArtGenerator::requestImage(const QString &id, QSize *realSize,
+        const QSize &requestedSize) {
+    QUrlQuery query(id);
+    if (!query.hasQueryItem("artist") || !query.hasQueryItem("album")) {
+        qWarning() << "Invalid albumart uri:" << id;
+        return fallbackImage(realSize);
+    }
+
+    const QString artist = query.queryItemValue("artist", QUrl::FullyDecoded);
+    const QString album = query.queryItemValue("album", QUrl::FullyDecoded);
+
+    QString desiredSize = "original";
+    int size = requestedSize.width() > requestedSize.height() ? requestedSize.width() : requestedSize.height();
+    if (size < 128) {
+        desiredSize = "small";
+    } else if (size < 256) {
+        desiredSize = "large";
+    } else if (size < 512) {
+        desiredSize = "xlarge";
+    }
+
+    // perform dbus call
+    QDBusReply<QDBusUnixFileDescriptor> reply = iface.call(
+        GET_ALBUM_ART, artist, album, desiredSize);
+    if (!reply.isValid()) {
+        qWarning() << "D-Bus error: " << reply.error().message();
+        return fallbackImage(realSize);
+    }
+
+    try {
+        QFile file;
+        file.open(reply.value().fileDescriptor(), QIODevice::ReadOnly);
+        QImage image;
+        image.load(&file, NULL);
+        *realSize = image.size();
+        return image;
+    } catch (const std::exception &e) {
+        qDebug() << "Album art loader failed: " << e.what();
+    } catch (...) {
+        qDebug() << "Unknown error when generating image.";
+    }
+
+    return fallbackImage(realSize);
+}

=== added file 'plugins/Ubuntu/Thumbnailer/albumartgenerator.h'
--- plugins/Ubuntu/Thumbnailer/albumartgenerator.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/albumartgenerator.h	2014-03-28 10:11:10 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 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/>.
+ *
+ * Authors: Jussi Pakkanen <[e-mail]>
+ *          James Henstridge <[e-mail]>
+*/
+
+#ifndef ALBUMART_GENERATOR_H
+#define ALBUMART_GENERATOR_H
+
+#include <QDBusInterface>
+#include <QQuickImageProvider>
+
+class AlbumArtGenerator: public QQuickImageProvider
+{
+private:
+    QDBusInterface iface;
+
+public:
+    AlbumArtGenerator();
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
+};
+
+#endif

=== added file 'plugins/Ubuntu/Thumbnailer/plugin.cpp'
--- plugins/Ubuntu/Thumbnailer/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/plugin.cpp	2014-03-28 10:11:10 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 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/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+*/
+
+#include "plugin.h"
+#include "albumartgenerator.h"
+#include "thumbnailgenerator.h"
+
+void ThumbnailerPlugin::registerTypes(const char *uri) {
+    qmlRegisterTypeNotAvailable(
+        uri, 0, 1, "__ThumbnailerIgnoreMe",
+        "Ignore this: QML plugins must contain at least one type");
+}
+
+void ThumbnailerPlugin::initializeEngine(QQmlEngine *engine, const char *uri) {
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+
+    try {
+        engine->addImageProvider("albumart", new AlbumArtGenerator());
+    } catch (const std::exception &e) {
+        qWarning() << "Failed to register albumart image provider:" << e.what();
+    } catch (...) {
+        qWarning() << "Failed to register albumart image provider.";
+    }
+
+    try {
+        engine->addImageProvider("thumbnailer", new ThumbnailGenerator());
+    } catch (const std::exception &e) {
+        qWarning() << "Failed to register thumbnailer image provider:" << e.what();
+    } catch (...) {
+        qWarning() << "Failed to register thumbnailer image provider.";
+    }
+}

=== added file 'plugins/Ubuntu/Thumbnailer/plugin.h'
--- plugins/Ubuntu/Thumbnailer/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/plugin.h	2014-03-28 10:11:10 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 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/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+*/
+
+#ifndef THUMBNAILER_PLUGIN_H
+#define THUMBNAILER_PLUGIN_H
+
+#include <QtQml>
+
+class ThumbnailerPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    virtual void registerTypes(const char *uri) override;
+    virtual void initializeEngine(QQmlEngine *engine, const char *uri) override;
+};
+
+#endif

=== added file 'plugins/Ubuntu/Thumbnailer/qmldir'
--- plugins/Ubuntu/Thumbnailer/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/qmldir	2014-03-28 10:11:10 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.Thumbnailer
+plugin thumbnailer-qml

=== added file 'plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp'
--- plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp	2014-03-28 10:11:10 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 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/>.
+ *
+ * Authors: Jussi Pakkanen <[e-mail]>
+*/
+
+#include "thumbnailgenerator.h"
+#include <stdexcept>
+#include <QDebug>
+#include <QMimeDatabase>
+#include <QUrl>
+
+static const char *DEFAULT_VIDEO_ART = "/usr/share/unity/icons/video_missing.png";
+static const char *DEFAULT_ALBUM_ART = "/usr/share/unity/icons/album_missing.png";
+
+ThumbnailGenerator::ThumbnailGenerator() : QQuickImageProvider(QQuickImageProvider::Image,
+        QQmlImageProviderBase::ForceAsynchronousImageLoading) {
+
+}
+
+QImage ThumbnailGenerator::requestImage(const QString &id, QSize *realSize,
+        const QSize &requestedSize) {
+    /* Allow appending a query string (e.g. ?something=timestamp)
+     * to the id and then ignore it.
+     * This is workaround to force reloading a thumbnail when it has
+     * the same file name on disk but we know the content has changed.
+     * It is necessary because in such a situation the QML image cache
+     * will kick in and this ImageProvider will never get called.
+     * The only "solution" is setting Image.cache = false, but in some
+     * cases we don't want to do that for performance reasons, so this
+     * is the only way around the issue for now. */
+    std::string src_path(QUrl(id).path().toUtf8().data());
+    std::string tgt_path;
+    try {
+        ThumbnailSize desiredSize;
+        const int xlarge_cutoff = 512;
+        const int large_cutoff = 256;
+        const int small_cutoff = 128;
+        if(requestedSize.width() > xlarge_cutoff || requestedSize.height() > xlarge_cutoff) {
+            desiredSize = TN_SIZE_ORIGINAL;
+        } if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+                desiredSize = TN_SIZE_XLARGE;
+        } else if(requestedSize.width() > small_cutoff || requestedSize.height() > small_cutoff) {
+            desiredSize = TN_SIZE_LARGE;
+        } else {
+            desiredSize = TN_SIZE_SMALL;
+        }
+        tgt_path = tn.get_thumbnail(src_path, desiredSize);
+        if(!tgt_path.empty()) {
+            QString tgt(tgt_path.c_str());
+            QImage image;
+            image.load(tgt);
+            *realSize = image.size();
+            return image;
+        }
+    } catch(std::runtime_error &e) {
+        qDebug() << "Thumbnail generator failed: " << e.what();
+    }
+    return getFallbackImage(id, realSize, requestedSize);
+}
+
+QImage ThumbnailGenerator::getFallbackImage(const QString &id, QSize *size,
+        const QSize &requestedSize) {
+    Q_UNUSED(requestedSize);
+    QMimeDatabase db;
+    QMimeType mime = db.mimeTypeForFile(id);
+    QImage result;
+    if(mime.name().contains("audio")) {
+        result.load(DEFAULT_ALBUM_ART);
+    } else if(mime.name().contains("video")) {
+        result.load(DEFAULT_VIDEO_ART);
+    }
+    *size = result.size();
+    return result;
+}

=== added file 'plugins/Ubuntu/Thumbnailer/thumbnailgenerator.h'
--- plugins/Ubuntu/Thumbnailer/thumbnailgenerator.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Thumbnailer/thumbnailgenerator.h	2014-03-28 10:11:10 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 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/>.
+ *
+ * Authors: Jussi Pakkanen <[e-mail]>
+*/
+
+#ifndef THUMBNAIL_GENERATOR_H
+#define THUMBNAIL_GENERATOR_H
+
+#include <QQuickImageProvider>
+#include <thumbnailer.h>
+
+class ThumbnailGenerator: public QQuickImageProvider
+{
+private:
+    Thumbnailer tn;
+
+public:
+    ThumbnailGenerator();
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
+    QImage getFallbackImage(const QString &id, QSize *size, const QSize &requestedSize);
+};
+
+#endif

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-28 10:11:10 +0000
+++ src/CMakeLists.txt	2014-03-28 10:11:10 +0000
@@ -37,3 +37,5 @@
   RUNTIME DESTINATION ${SHARE_PRIV_DIR}
   LIBRARY DESTINATION ${SHARE_PRIV_DIR}
 )
+
+add_subdirectory(service)

=== added directory 'src/service'
=== added file 'src/service/CMakeLists.txt'
--- src/service/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/service/CMakeLists.txt	2014-03-28 10:11:10 +0000
@@ -0,0 +1,34 @@
+add_definitions(${THUMBNAILER_CFLAGS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_executable(thumbnailer-service
+  main.cpp
+  dbusinterface.cpp
+  dbus-generated.c
+)
+
+target_link_libraries(thumbnailer-service thumbnailer)
+
+install(
+  TARGETS thumbnailer-service
+  RUNTIME DESTINATION ${SHARE_PRIV_DIR}
+)
+
+find_program(gdbus_codegen gdbus-codegen)
+if(NOT gdbus_codegen)
+  msg(FATAL_ERROR "Could not locate gdbus-codegen")
+endif()
+
+add_custom_command(
+  OUTPUT dbus-generated.c dbus-generated.h
+  COMMAND ${gdbus_codegen} --interface-prefix=com.canonical. --generate-c-code dbus-generated --c-namespace TN ${CMAKE_CURRENT_SOURCE_DIR}/dbus-interface.xml
+  MAIN_DEPENDENCY dbus-interface.xml
+)
+
+# Install the service file.
+configure_file(com.canonical.Thumbnailer.service.in com.canonical.Thumbnailer.service)
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Thumbnailer.service
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
+)

=== added file 'src/service/com.canonical.Thumbnailer.service.in'
--- src/service/com.canonical.Thumbnailer.service.in	1970-01-01 00:00:00 +0000
+++ src/service/com.canonical.Thumbnailer.service.in	2014-03-28 10:11:10 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.canonical.Thumbnailer
+Exec=@SHARE_PRIV_ABS@/thumbnailer-service
+

=== added file 'src/service/dbus-interface.xml'
--- src/service/dbus-interface.xml	1970-01-01 00:00:00 +0000
+++ src/service/dbus-interface.xml	2014-03-28 10:11:10 +0000
@@ -0,0 +1,17 @@
+<node>
+  <interface name="com.canonical.Thumbnailer">
+    <method name="GetAlbumArt">
+      <arg direction="in" type="s" name="artist" />
+      <arg direction="in" type="s" name="album" />
+      <!-- possible values are "small", "large", "xlarge" and "original" -->
+      <arg direction="in" type="s" name="desiredSize" />
+      <arg direction="out" type="h" name="fd" />
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true" />
+    </method>
+
+    <!-- Note: if adding additional thumbnailing methods that take a
+         file name as input, ensure that the calling process has
+         permission to read said file.  Otherwise we will leak
+         information to confined applications. -->
+  </interface>
+</node>

=== added file 'src/service/dbusinterface.cpp'
--- src/service/dbusinterface.cpp	1970-01-01 00:00:00 +0000
+++ src/service/dbusinterface.cpp	2014-03-28 10:11:10 +0000
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU 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 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/>.
+ */
+
+#include "dbusinterface.h"
+
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <thread>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <gio/gunixfdlist.h>
+#include <thumbnailer.h>
+
+#include <internal/gobj_memory.h>
+#include "dbus-generated.h"
+
+using namespace std;
+
+static const char BUS_NAME[] = "com.canonical.MediaScanner2";
+static const char ART_ERROR[] = "com.canonical.MediaScanner2.Error.Failed";
+
+static const char MISSING_ALBUM_ART[] = "/usr/share/unity/icons/album_missing.png";
+
+struct DBusInterfacePrivate {
+    const std::string bus_path;
+    unique_gobj<GDBusConnection> bus;
+    unique_gobj<TNThumbnailer> iface;
+    unsigned int handler_id;
+    std::shared_ptr<Thumbnailer> thumbnailer;
+
+    DBusInterfacePrivate(GDBusConnection *g_bus, const std::string& bus_path)
+        : bus_path(bus_path),
+          bus(static_cast<GDBusConnection*>(g_object_ref(g_bus))),
+          iface(tn_thumbnailer_skeleton_new()),
+          handler_id(0),
+          thumbnailer(std::make_shared<Thumbnailer>()) {
+        handler_id = g_signal_connect(
+            iface.get(), "handle-get-album-art",
+            G_CALLBACK(&DBusInterfacePrivate::handleGetAlbumArt), this);
+
+        GError *error = nullptr;
+        if (!g_dbus_interface_skeleton_export(
+                G_DBUS_INTERFACE_SKELETON(iface.get()), bus.get(),
+                bus_path.c_str(), &error)) {
+            string errortxt(error->message);
+            g_error_free(error);
+
+            string msg = "Failed to export interface: ";
+            msg += errortxt;
+            throw runtime_error(msg);
+        }
+    }
+
+    ~DBusInterfacePrivate() {
+        g_dbus_interface_skeleton_unexport(
+            G_DBUS_INTERFACE_SKELETON(iface.get()));
+        g_signal_handler_disconnect(iface.get(), handler_id);
+    }
+
+    static gboolean handleGetAlbumArt(TNThumbnailer *iface, GDBusMethodInvocation *invocation, GUnixFDList *, const char *artist, const char *album, const char *size, void *user_data) {
+        auto p = static_cast<DBusInterfacePrivate*>(user_data);
+        fprintf(stderr, "Look up cover art for %s/%s at size %s\n", artist, album, size);
+
+        ThumbnailSize desiredSize;
+        if (!strcmp(size, "small")) {
+            desiredSize = TN_SIZE_SMALL;
+        } else if (!strcmp(size, "large")) {
+            desiredSize = TN_SIZE_LARGE;
+        } else if (!strcmp(size, "xlarge")) {
+            desiredSize = TN_SIZE_XLARGE;
+        } else if (!strcmp(size, "original")) {
+            desiredSize = TN_SIZE_ORIGINAL;
+        } else {
+            std::string error("Unknown size: ");
+            error += size;
+            g_dbus_method_invocation_return_dbus_error(
+                invocation, ART_ERROR, error.c_str());
+            return TRUE;
+        }
+
+        try {
+            std::thread t(&getAlbumArt,
+                          unique_gobj<TNThumbnailer>(static_cast<TNThumbnailer*>(g_object_ref(iface))),
+                          unique_gobj<GDBusMethodInvocation>(static_cast<GDBusMethodInvocation*>(g_object_ref(invocation))),
+                          p->thumbnailer,
+                          std::string(artist), std::string(album), desiredSize);
+            t.detach();
+        } catch (const std::exception &e) {
+            g_dbus_method_invocation_return_dbus_error(
+                invocation, ART_ERROR, e.what());
+        }
+        return TRUE;
+    }
+
+    static void getAlbumArt(unique_gobj<TNThumbnailer> iface,
+                            unique_gobj<GDBusMethodInvocation> invocation,
+                            std::shared_ptr<Thumbnailer> thumbnailer,
+                            const std::string artist, const std::string album,
+                            ThumbnailSize desiredSize) {
+        std::string art;
+        try {
+            art = thumbnailer->get_album_art(
+                artist, album, desiredSize, TN_REMOTE);
+        } catch (const std::exception &e) {
+            g_dbus_method_invocation_return_dbus_error(
+                invocation.get(), ART_ERROR, e.what());
+            return;
+        }
+
+        if (art.empty()) {
+            g_dbus_method_invocation_return_dbus_error(
+                invocation.get(), ART_ERROR, "Could not get thumbnail");
+            return;
+        }
+        int fd = open(art.c_str(), O_RDONLY);
+        if (fd < 0) {
+            g_dbus_method_invocation_return_dbus_error(
+                invocation.get(), ART_ERROR, strerror(errno));
+            return;
+        }
+
+        unique_gobj<GUnixFDList> fd_list(g_unix_fd_list_new());
+        GError *error = nullptr;
+        g_unix_fd_list_append(fd_list.get(), fd, &error);
+        close(fd);
+        if (error != nullptr) {
+            g_dbus_method_invocation_return_dbus_error(
+                invocation.get(), ART_ERROR, error->message);
+            g_error_free(error);
+            return;
+        }
+
+        tn_thumbnailer_complete_get_album_art(
+            iface.get(), invocation.get(), fd_list.get(), g_variant_new_handle(0));
+    }
+
+};
+
+DBusInterface::DBusInterface(GDBusConnection *bus, const std::string& bus_path)
+    : p(new DBusInterfacePrivate(bus, bus_path)) {
+}
+
+DBusInterface::~DBusInterface() {
+    delete p;
+}

=== added file 'src/service/dbusinterface.h'
--- src/service/dbusinterface.h	1970-01-01 00:00:00 +0000
+++ src/service/dbusinterface.h	2014-03-28 10:11:10 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU 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 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/>.
+ */
+
+#ifndef DBUSINTERFACE_H
+#define DBUSINTERFACE_H
+
+#include <string>
+
+struct DBusInterfacePrivate;
+typedef struct _GDBusConnection GDBusConnection;
+
+class DBusInterface final {
+public:
+    DBusInterface(GDBusConnection *bus, const std::string& bus_path);
+    ~DBusInterface();
+
+    DBusInterface(const DBusInterface&) = delete;
+    DBusInterface& operator=(DBusInterface&) = delete;
+
+private:
+    DBusInterfacePrivate *p;
+};
+
+#endif

=== added file 'src/service/main.cpp'
--- src/service/main.cpp	1970-01-01 00:00:00 +0000
+++ src/service/main.cpp	2014-03-28 10:11:10 +0000
@@ -0,0 +1,44 @@
+#include <cstdio>
+#include <memory>
+#include <stdexcept>
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "dbusinterface.h"
+
+static const char BUS_NAME[] = "com.canonical.Thumbnailer";
+static const char BUS_PATH[] = "/com/canonical/Thumbnailer";
+
+static std::unique_ptr<GMainLoop,void(*)(GMainLoop*)> main_loop(
+    g_main_loop_new(nullptr, FALSE), g_main_loop_unref);
+
+static void nameLost(GDBusConnection *, const char *, void *) {
+    fprintf(stderr, "Could no acquire D-Bus name %s.  Quitting.\n", BUS_NAME);
+    g_main_loop_quit(main_loop.get());
+}
+
+int main(int argc, char **argv) {
+    GError *error = nullptr;
+    std::unique_ptr<GDBusConnection, void(*)(void*)> bus(
+        g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error),
+        g_object_unref);
+    if (error != nullptr) {
+        fprintf(stderr, "Failed to connect to session bus: %s\n", error->message);
+        g_error_free(error);
+        return 1;
+    }
+
+    DBusInterface dbus(bus.get(), BUS_PATH);
+
+    unsigned int name_id = g_bus_own_name_on_connection(
+        bus.get(), BUS_NAME, G_BUS_NAME_OWNER_FLAGS_NONE,
+        nullptr, &nameLost, nullptr, nullptr);
+
+    g_main_loop_run(main_loop.get());
+
+    if (name_id != 0) {
+        g_bus_unown_name(name_id);
+    }
+
+    return 0;
+}

=== modified file 'src/thumbnailer.cpp'
--- src/thumbnailer.cpp	2014-03-28 10:11:10 +0000
+++ src/thumbnailer.cpp	2014-03-28 10:11:10 +0000
@@ -53,16 +53,12 @@
 
     ThumbnailerPrivate() {};
 
-<<<<<<< TREE
-    string create_thumbnail(const string &abspath, ThumbnailSize desired_size);
+    string create_thumbnail(const string &abspath, ThumbnailSize desired_size,
+            ThumbnailPolicy policy);
     string create_random_filename();
-=======
-    string create_thumbnail(const string &abspath, ThumbnailSize desired_size,
-            ThumbnailPolicy policy);
->>>>>>> MERGE-SOURCE
 };
 
-<<<<<<< TREE
+
 string ThumbnailerPrivate::create_random_filename() {
     string fname;
     char *dirbase = getenv("TMPDIR"); // Set when in a confined application.
@@ -77,8 +73,6 @@
     return fname;
 }
 
-string ThumbnailerPrivate::create_thumbnail(const string &abspath, ThumbnailSize desired_size) {
-=======
 string ThumbnailerPrivate::create_audio_thumbnail(const string &/*abspath*/,
         ThumbnailSize /*desired_size*/, ThumbnailPolicy /*policy*/) {
     // There was a symbol clash between 1.0 and 0.10 versions of
@@ -101,14 +95,8 @@
     return "";
 }
 string ThumbnailerPrivate::create_generic_thumbnail(const string &abspath, ThumbnailSize desired_size) {
->>>>>>> MERGE-SOURCE
     int tmpw, tmph;
     string tnfile = cache.get_cache_file_name(abspath, desired_size);
-<<<<<<< TREE
-    string tmpname = create_random_filename();
-
-=======
->>>>>>> MERGE-SOURCE
     // Special case: full size image files are their own preview.
     if(desired_size == TN_SIZE_ORIGINAL &&
        gdk_pixbuf_get_file_info(abspath.c_str(), &tmpw, &tmph)) {
@@ -123,9 +111,8 @@
 }
 
 string ThumbnailerPrivate::create_video_thumbnail(const string &abspath, ThumbnailSize desired_size) {
-    char filebuf[] = "/tmp/some/long/text/here/so/path/will/fit";
     string tnfile = cache.get_cache_file_name(abspath, desired_size);
-    string tmpname = tmpnam(filebuf);
+    string tmpname = create_random_filename();
     if(video.extract(abspath, tmpname)) {
         scaler.scale(tmpname, tnfile, desired_size, abspath);
         unlink(tmpname.c_str());

=== added directory 'tests/qml'
=== added file 'tests/qml/tst_image_provider.qml'
--- tests/qml/tst_image_provider.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_image_provider.qml	2014-03-28 10:11:10 +0000
@@ -0,0 +1,62 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Thumbnailer 0.1
+
+Item {
+    Image {
+        id: image
+        width: 200
+        height: 200
+
+        SignalSpy {
+            id: spy
+            target: image
+            signalName: "statusChanged"
+        }
+    }
+
+    Canvas {
+        id: canvas
+        width: 200
+        height: 200
+        renderStrategy: Canvas.Immediate
+        renderTarget: Canvas.Image
+    }
+
+    TestCase {
+        name: "ThumbnailerProviderTests"
+        when: windowShown
+
+        function test_albumart() {
+            var ctx = loadImage(
+                "image://albumart/artist=Gotye&album=Making%20Mirrors");
+            comparePixel(ctx, 0, 0, 242, 228, 209, 255);
+        }
+
+        function loadImage(uri) {
+            image.source = uri
+            while (image.status == Image.Loading) {
+                spy.wait();
+            }
+            compare(image.status, Image.Ready);
+
+            var ctx = canvas.getContext("2d");
+            ctx.drawImage(image, 0, 0);
+            return ctx;
+        }
+
+        function comparePixel(ctx,x,y,r,g,b,a, d) {
+            var c = ctx.getImageData(x,y,1,1).data;
+            if (d === undefined)
+                d = 0;
+            r = Math.round(r);
+            g = Math.round(g);
+            b = Math.round(b);
+            a = Math.round(a);
+            var notSame = Math.abs(c[0]-r)>d || Math.abs(c[1]-g)>d || Math.abs(c[2]-b)>d || Math.abs(c[3]-a)>d;
+            if (notSame)
+                qtest_fail('Pixel compare fail:\nactual :[' + c[0]+','+c[1]+','+c[2]+','+c[3] + ']\nexpected:['+r+','+g+','+b+','+a+'] +/- '+d, 1);
+
+        }
+    }
+}