1
=== modified file 'plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp'
2
--- plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp	2014-03-28 04:08:24 +0000
3
+++ plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp	2014-05-14 07:15:45 +0000
4
@@ -25,8 +25,6 @@
5
25
#include <QDBusUnixFileDescriptor>
25
#include <QDBusUnixFileDescriptor>
6
26
#include <QDBusReply>
26
#include <QDBusReply>
7
27
27
8
28
static const char DEFAULT_ALBUM_ART[] = "/usr/share/unity/icons/album_missing.png";
9
29
10
30
static const char BUS_NAME[] = "com.canonical.Thumbnailer";
28
static const char BUS_NAME[] = "com.canonical.Thumbnailer";
11
31
static const char BUS_PATH[] = "/com/canonical/Thumbnailer";
29
static const char BUS_PATH[] = "/com/canonical/Thumbnailer";
12
32
static const char THUMBNAILER_IFACE[] = "com.canonical.Thumbnailer";
30
static const char THUMBNAILER_IFACE[] = "com.canonical.Thumbnailer";
13
@@ -37,19 +35,12 @@
14
37
      iface(BUS_NAME, BUS_PATH, THUMBNAILER_IFACE) {
35
      iface(BUS_NAME, BUS_PATH, THUMBNAILER_IFACE) {
15
38
}
36
}
16
39
37
17
40
static QImage fallbackImage(QSize *realSize) {
18
41
    QImage fallback;
19
42
    fallback.load(DEFAULT_ALBUM_ART);
20
43
    *realSize = fallback.size();
21
44
    return fallback;
22
45
}
23
46
24
47
QImage AlbumArtGenerator::requestImage(const QString &id, QSize *realSize,
38
QImage AlbumArtGenerator::requestImage(const QString &id, QSize *realSize,
25
48
        const QSize &requestedSize) {
39
        const QSize &requestedSize) {
26
49
    QUrlQuery query(id);
40
    QUrlQuery query(id);
27
50
    if (!query.hasQueryItem("artist") || !query.hasQueryItem("album")) {
41
    if (!query.hasQueryItem("artist") || !query.hasQueryItem("album")) {
28
51
        qWarning() << "Invalid albumart uri:" << id;
42
        qWarning() << "Invalid albumart uri:" << id;
30
52
        return fallbackImage(realSize);
43
        return QImage();
31
53
    }
44
    }
32
54
45
33
55
    const QString artist = query.queryItemValue("artist", QUrl::FullyDecoded);
46
    const QString artist = query.queryItemValue("artist", QUrl::FullyDecoded);
34
@@ -70,7 +61,7 @@
35
70
        GET_ALBUM_ART, artist, album, desiredSize);
61
        GET_ALBUM_ART, artist, album, desiredSize);
36
71
    if (!reply.isValid()) {
62
    if (!reply.isValid()) {
37
72
        qWarning() << "D-Bus error: " << reply.error().message();
63
        qWarning() << "D-Bus error: " << reply.error().message();
39
73
        return fallbackImage(realSize);
64
        return QImage();
40
74
    }
65
    }
41
75
66
42
76
    try {
67
    try {
43
@@ -86,5 +77,5 @@
44
86
        qDebug() << "Unknown error when generating image.";
77
        qDebug() << "Unknown error when generating image.";
45
87
    }
78
    }
46
88
79
48
89
    return fallbackImage(realSize);
80
    return QImage();
49
90
}
81
}
50
91
82
51
=== modified file 'tests/qml/tst_image_provider.qml'
52
--- tests/qml/tst_image_provider.qml	2014-03-28 08:35:04 +0000
53
+++ tests/qml/tst_image_provider.qml	2014-05-14 07:15:45 +0000
54
@@ -33,6 +33,14 @@
55
33
            comparePixel(ctx, 0, 0, 242, 228, 209, 255);
33
            comparePixel(ctx, 0, 0, 242, 228, 209, 255);
56
34
        }
34
        }
57
35
35
58
36
        function test_notfound() {
59
37
            image.source = "image://albumart/artist=notfound&album=notfound";
60
38
            while (image.status == Image.Loading) {
61
39
                spy.wait();
62
40
            }
63
41
            compare(image.status, Image.Error);
64
42
        }
65
43
66
36
        function loadImage(uri) {
44
        function loadImage(uri) {
67
37
            image.source = uri
45
            image.source = uri
68
38
            while (image.status == Image.Loading) {
46
            while (image.status == Image.Loading) {
Reviewer	Review Type	Date Requested	Status
James Henstridge			Needs Fixing on 2014-05-14
Jussi Pakkanen (community)		2014-05-14	Approve on 2014-05-14
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-05-14
Review via email: mp+219460@code.launchpad.net