Merge lp:~jpakkane/ubuntu-ui-toolkit/removethumbnailer into lp:ubuntu-ui-toolkit

[Jussi Pakkanen]

Remove the thumbnailer image provider here, because thumbnailer provides it by itself.

Remove the thumbnailer image provider here, because thumbnailer provides it by itself.

This change has big regression potential and needs to be thoroughly manually tested. Nothing _should_ break (because the other image providers in the thumbnailer package provably work just fine) but these things are always finicky. Testing by several different people is required.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1110
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2164/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5645
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/110/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6897
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6897/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14314
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4313/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2164/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Good to go from my side.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1110
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2167/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5860
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/113/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7112
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14575
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4381
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4381/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2167/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

This won't autoland because it was proposed against trunk, not staging.

=== modified file 'debian/control'
--- debian/control	2014-09-11 17:24:38 +0000
+++ debian/control	2014-10-08 07:01:30 +0000
@@ -35,7 +35,6 @@
                libqt5organizer5,
                qtpim5-dev,
                language-pack-en-base,
-               libthumbnailer-dev,
                libdbus-1-dev,
                libnih-dbus-dev,
                xvfb,

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-09-07 16:42:47 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-10-08 07:01:30 +0000
@@ -35,7 +35,6 @@
 #include "inversemouseareatype.h"
 #include "qquickclipboard.h"
 #include "qquickmimedata.h"
-#include "thumbnailgenerator.h"
 #include "ucubuntuanimation.h"
 #include "ucfontutils.h"
 #include "ucarguments.h"
@@ -214,12 +213,6 @@
     // register icon provider
     engine->addImageProvider(QLatin1String("theme"), new UnityThemeIconProvider);
 
-    try {
-        engine->addImageProvider(QLatin1String("thumbnailer"), new ThumbnailGenerator);
-    } catch(std::runtime_error &e) {
-        qDebug() << "Could not create thumbnailer: " << e.what();
-    }
-
     // Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
     QGuiApplication::primaryScreen()->setOrientationUpdateMask(
             Qt::PortraitOrientation |

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-09-07 16:42:47 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-10-08 07:01:30 +0000
@@ -1,6 +1,6 @@
 unix {
     CONFIG += link_pkgconfig
-    PKGCONFIG += gio-2.0 thumbnailer dbus-1 libnih-dbus
+    PKGCONFIG += gio-2.0 dbus-1 libnih-dbus
 }
 
 TEMPLATE = lib
@@ -50,7 +50,6 @@
     alarmmanager_p.h \
     ucalarmmodel.h \
     unitythemeiconprovider.h \
-    thumbnailgenerator.h \
     alarmrequest_p.h \
     alarmrequest_p_p.h \
     adapters/alarmsadapter_p.h \
@@ -93,7 +92,6 @@
     alarmmanager_p.cpp \
     ucalarmmodel.cpp \
     unitythemeiconprovider.cpp \
-    thumbnailgenerator.cpp \
     alarmrequest_p.cpp \
     ucstatesaver.cpp \
     sortbehavior.cpp \

=== removed file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-05-27 14:07:00 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * 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>
-
-const char *DEFAULT_VIDEO_ART = "/usr/share/unity/icons/video_missing.png";
-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;
-    const int xlarge_cutoff = 512;
-    const int large_cutoff = 256;
-    const int small_cutoff = 128;
-    try {
-        ThumbnailSize desiredSize;
-        if(requestedSize.width() > xlarge_cutoff || requestedSize.height() > xlarge_cutoff) {
-            desiredSize = TN_SIZE_ORIGINAL;
-        } else 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;
-}

=== removed file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.h'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.h	2013-10-10 10:56:22 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * 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