1
=== modified file 'data/CMakeLists.txt'
2
--- data/CMakeLists.txt	2015-05-22 03:13:47 +0000
3
+++ data/CMakeLists.txt	2016-01-12 09:29:54 +0000
4
@@ -4,14 +4,6 @@
5
4
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
4
execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
6
5
execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_CURRENT_SOURCE_DIR} --targetdir=${CMAKE_CURRENT_BINARY_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
5
execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_CURRENT_SOURCE_DIR} --targetdir=${CMAKE_CURRENT_BINARY_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
7
6
6
8
7
install(
9
8
  FILES
10
9
    album_missing.png
11
10
    video_missing.png
12
11
  DESTINATION
13
12
    ${CMAKE_INSTALL_DATADIR}/thumbnailer/icons
14
13
)
15
14
16
15
configure_file(
7
configure_file(
17
16
  thumbnailer.in
8
  thumbnailer.in
18
17
  thumbnailer
9
  thumbnailer
19
18
10
20
=== removed file 'data/album_missing.png'
21
19
Binary files data/album_missing.png	2014-09-25 09:47:05 +0000 and data/album_missing.png	1970-01-01 00:00:00 +0000 differ
11
Binary files data/album_missing.png	2014-09-25 09:47:05 +0000 and data/album_missing.png	1970-01-01 00:00:00 +0000 differ
22
=== modified file 'data/thumbnailer.in'
23
--- data/thumbnailer.in	2014-09-26 11:24:27 +0000
24
+++ data/thumbnailer.in	2016-01-12 09:29:54 +0000
25
@@ -1,6 +1,1 @@
32
1
@CMAKE_INSTALL_PREFIX@/lib/x86_64-linux-gnu/thumbnailer/vs-thumb
1
@CMAKE_INSTALL_FULL_LIBDIR@/thumbnailer/vs-thumb
27
2
@CMAKE_INSTALL_PREFIX@/lib/i386-linux-gnu/thumbnailer/vs-thumb
28
3
@CMAKE_INSTALL_PREFIX@/lib/powerpc-linux-gnu/thumbnailer/vs-thumb
29
4
@CMAKE_INSTALL_PREFIX@/lib/powerpc64le-linux-gnu/thumbnailer/vs-thumb
30
5
@CMAKE_INSTALL_PREFIX@/lib/arm-linux-gnueabihf/thumbnailer/vs-thumb
31
6
@CMAKE_INSTALL_PREFIX@/lib/aarch64-linux-gnu/thumbnailer/vs-thumb
33
7
2
34
=== removed file 'data/video_missing.png'
35
8
Binary files data/video_missing.png	2014-09-25 09:47:05 +0000 and data/video_missing.png	1970-01-01 00:00:00 +0000 differ
3
Binary files data/video_missing.png	2014-09-25 09:47:05 +0000 and data/video_missing.png	1970-01-01 00:00:00 +0000 differ
36
=== modified file 'debian/control'
37
--- debian/control	2015-12-21 07:07:46 +0000
38
+++ debian/control	2016-01-12 09:29:54 +0000
39
@@ -47,8 +47,8 @@
40
47
Pre-Depends: ${misc:Pre-Depends},
47
Pre-Depends: ${misc:Pre-Depends},
41
48
Depends: ${misc:Depends},
48
Depends: ${misc:Depends},
42
49
         ${shlibs:Depends},
49
         ${shlibs:Depends},
45
50
Conflicts: libthumbnailer0
50
Conflicts: libthumbnailer0, thumbnailer-common
46
51
Replaces: libthumbnailer0
51
Replaces: libthumbnailer0, thumbnailer-common
47
52
Description: D-Bus service for out of process thumbnailing
52
Description: D-Bus service for out of process thumbnailing
48
53
 This package provides a D-Bus service that can provide thumbnails on
53
 This package provides a D-Bus service that can provide thumbnails on
49
54
 behalf of another process.
54
 behalf of another process.
50
@@ -73,7 +73,6 @@
51
73
Depends: ${misc:Depends},
73
Depends: ${misc:Depends},
52
74
         ${shlibs:Depends},
74
         ${shlibs:Depends},
53
75
         libthumbnailer-qt1.0 (= ${binary:Version}),
75
         libthumbnailer-qt1.0 (= ${binary:Version}),
54
76
         thumbnailer-common (= ${source:Version}),
55
77
Provides: ubuntu-thumbnailer-impl,
76
Provides: ubuntu-thumbnailer-impl,
56
78
          ubuntu-thumbnailer-impl-0,
77
          ubuntu-thumbnailer-impl-0,
57
79
Recommends: thumbnailer-service (= ${binary:Version}),
78
Recommends: thumbnailer-service (= ${binary:Version}),
58
@@ -83,14 +82,6 @@
59
83
 This package provides image providers that allow access to the
82
 This package provides image providers that allow access to the
60
84
 thumbnailer from Qt Quick 2 / QML applications.
83
 thumbnailer from Qt Quick 2 / QML applications.
61
85
84
62
86
Package: thumbnailer-common
63
87
Architecture: all
64
88
Multi-Arch: foreign
65
89
Depends: ${misc:Depends},
66
90
Description: Common files for the thumbnailer service.
67
91
 This package provides common files for the thumbnailer service, such
68
92
 as default icons.
69
93
70
94
Package: libthumbnailer-qt1.0
85
Package: libthumbnailer-qt1.0
71
95
Architecture: any
86
Architecture: any
72
96
Multi-Arch: same
87
Multi-Arch: same
73
97
88
74
=== removed file 'debian/thumbnailer-common.install'
75
--- debian/thumbnailer-common.install	2014-09-26 11:24:27 +0000
76
+++ debian/thumbnailer-common.install	1970-01-01 00:00:00 +0000
77
@@ -1,2 +0,0 @@
78
1
usr/share/thumbnailer/icons/*
79
2
etc/apport/blacklist.d/thumbnailer
80
3
0
81
=== modified file 'debian/thumbnailer-service.install'
82
--- debian/thumbnailer-service.install	2015-08-06 05:08:47 +0000
83
+++ debian/thumbnailer-service.install	2016-01-12 09:29:54 +0000
84
@@ -1,3 +1,4 @@
85
1
etc/apport/blacklist.d/thumbnailer
86
1
usr/bin/thumbnailer-admin
2
usr/bin/thumbnailer-admin
87
2
usr/lib/*/thumbnailer/thumbnailer-service
3
usr/lib/*/thumbnailer/thumbnailer-service
88
3
usr/lib/*/thumbnailer/vs-thumb
4
usr/lib/*/thumbnailer/vs-thumb
89
4
5
90
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp'
91
--- plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp	2015-12-09 02:39:32 +0000
92
+++ plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp	2016-01-12 09:29:54 +0000
93
@@ -24,13 +24,6 @@
94
24
24
95
25
#include "thumbnailerimageresponse.h"
25
#include "thumbnailerimageresponse.h"
96
26
26
97
27
namespace
98
28
{
99
29
100
30
const char DEFAULT_ALBUM_ART[] = "/usr/share/thumbnailer/icons/album_missing.png";
101
31
102
32
}  // namespace
103
33
104
34
namespace unity
27
namespace unity
105
35
{
28
{
106
36
29
107
@@ -48,19 +41,18 @@
108
48
41
109
49
QQuickImageResponse* AlbumArtGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
42
QQuickImageResponse* AlbumArtGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
110
50
{
43
{
111
51
    QSize size = requestedSize;
112
52
    QUrlQuery query(id);
44
    QUrlQuery query(id);
113
53
    if (!query.hasQueryItem(QStringLiteral("artist")) || !query.hasQueryItem(QStringLiteral("album")))
45
    if (!query.hasQueryItem(QStringLiteral("artist")) || !query.hasQueryItem(QStringLiteral("album")))
114
54
    {
46
    {
115
55
        qWarning() << "AlbumArtGenerator::requestImageResponse(): Invalid albumart uri:" << id;
47
        qWarning() << "AlbumArtGenerator::requestImageResponse(): Invalid albumart uri:" << id;
117
56
        return new ThumbnailerImageResponse(requestedSize, DEFAULT_ALBUM_ART);
48
        return new ThumbnailerImageResponse("Invalid albumart ID: " + id);
118
57
    }
49
    }
119
58
50
120
59
    const QString artist = query.queryItemValue(QStringLiteral("artist"), QUrl::FullyDecoded);
51
    const QString artist = query.queryItemValue(QStringLiteral("artist"), QUrl::FullyDecoded);
121
60
    const QString album = query.queryItemValue(QStringLiteral("album"), QUrl::FullyDecoded);
52
    const QString album = query.queryItemValue(QStringLiteral("album"), QUrl::FullyDecoded);
122
61
53
125
62
    auto request = thumbnailer->getAlbumArt(artist, album, size);
54
    auto request = thumbnailer->getAlbumArt(artist, album, requestedSize);
126
63
    return new ThumbnailerImageResponse(size, DEFAULT_ALBUM_ART, request);
55
    return new ThumbnailerImageResponse(request);
127
64
}
56
}
128
65
57
129
66
}  // namespace qml
58
}  // namespace qml
130
67
59
131
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp'
132
--- plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp	2015-11-04 07:16:12 +0000
133
+++ plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp	2016-01-12 09:29:54 +0000
134
@@ -25,13 +25,6 @@
135
25
25
136
26
#include "thumbnailerimageresponse.h"
26
#include "thumbnailerimageresponse.h"
137
27
27
138
28
namespace
139
29
{
140
30
141
31
const char DEFAULT_ARTIST_ART[] = "/usr/share/thumbnailer/icons/album_missing.png";
142
32
143
33
}  // namespace
144
34
145
35
namespace unity
28
namespace unity
146
36
{
29
{
147
37
30
148
@@ -49,19 +42,18 @@
149
49
42
150
50
QQuickImageResponse* ArtistArtGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
43
QQuickImageResponse* ArtistArtGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
151
51
{
44
{
152
52
    QSize size = requestedSize;
153
53
    QUrlQuery query(id);
45
    QUrlQuery query(id);
154
54
    if (!query.hasQueryItem(QStringLiteral("artist")) || !query.hasQueryItem(QStringLiteral("album")))
46
    if (!query.hasQueryItem(QStringLiteral("artist")) || !query.hasQueryItem(QStringLiteral("album")))
155
55
    {
47
    {
156
56
        qWarning() << "ArtistArtGenerator::requestImageResponse(): Invalid artistart uri:" << id;
48
        qWarning() << "ArtistArtGenerator::requestImageResponse(): Invalid artistart uri:" << id;
158
57
        return new ThumbnailerImageResponse(requestedSize, DEFAULT_ARTIST_ART);
49
        return new ThumbnailerImageResponse("Invalid artistart ID: " + id);
159
58
    }
50
    }
160
59
51
161
60
    const QString artist = query.queryItemValue(QStringLiteral("artist"), QUrl::FullyDecoded);
52
    const QString artist = query.queryItemValue(QStringLiteral("artist"), QUrl::FullyDecoded);
162
61
    const QString album = query.queryItemValue(QStringLiteral("album"), QUrl::FullyDecoded);
53
    const QString album = query.queryItemValue(QStringLiteral("album"), QUrl::FullyDecoded);
163
62
54
166
63
    auto request = thumbnailer->getArtistArt(artist, album, size);
55
    auto request = thumbnailer->getArtistArt(artist, album, requestedSize);
167
64
    return new ThumbnailerImageResponse(size, DEFAULT_ARTIST_ART, request);
56
    return new ThumbnailerImageResponse(request);
168
65
}
57
}
169
66
58
170
67
}  // namespace qml
59
}  // namespace qml
171
68
60
172
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp'
173
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp	2015-12-17 00:25:10 +0000
174
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp	2016-01-12 09:29:54 +0000
175
@@ -31,21 +31,15 @@
176
31
namespace qml
31
namespace qml
177
32
{
32
{
178
33
33
185
34
ThumbnailerImageResponse::ThumbnailerImageResponse(QSize const& requested_size,
34
ThumbnailerImageResponse::ThumbnailerImageResponse(QSharedPointer<thumb_qt::Request> const& request)
186
35
                                                   QString const& default_image,
35
    : request_(request)
181
36
                                                   QSharedPointer<thumb_qt::Request> const& request)
182
37
    : requested_size_(requested_size)
183
38
    , request_(request)
184
39
    , default_image_(default_image)
187
40
{
36
{
188
41
    Q_ASSERT(request);
37
    Q_ASSERT(request);
189
42
    connect(request_.data(), &thumb_qt::Request::finished, this, &ThumbnailerImageResponse::requestFinished);
38
    connect(request_.data(), &thumb_qt::Request::finished, this, &ThumbnailerImageResponse::requestFinished);
190
43
}
39
}
191
44
40
196
45
ThumbnailerImageResponse::ThumbnailerImageResponse(QSize const& requested_size,
41
ThumbnailerImageResponse::ThumbnailerImageResponse(QString const& error_message)
197
46
                                                   QString const& default_image)
42
    : error_message_(error_message)
194
47
    : requested_size_(requested_size)
195
48
    , default_image_(default_image)
198
49
{
43
{
199
50
    // Queue the signal emission so there is time for the caller to connect.
44
    // Queue the signal emission so there is time for the caller to connect.
200
51
    QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
45
    QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
201
@@ -58,22 +52,22 @@
202
58
52
203
59
QQuickTextureFactory* ThumbnailerImageResponse::textureFactory() const
53
QQuickTextureFactory* ThumbnailerImageResponse::textureFactory() const
204
60
{
54
{
205
61
    // TODO: Once we remove fallback image support, this test for request_ != nullptr
206
62
    //       (here and elsewhere) needs to be removed because request_ is nullptr
207
63
    //       only if the default image constructor above was called.
208
64
    if (request_ && request_->isValid())
55
    if (request_ && request_->isValid())
209
65
    {
56
    {
210
66
        return QQuickTextureFactory::textureFactoryForImage(request_->image());
57
        return QQuickTextureFactory::textureFactoryForImage(request_->image());
211
67
    }
58
    }
212
68
    else
59
    else
213
69
    {
60
    {
218
70
        char const* env_default = getenv("THUMBNAILER_TEST_DEFAULT_IMAGE");
61
        qWarning() << "ThumbnailerImageResponse::textureFactory(): method called without valid request.";
219
71
        QImage aux;
62
        return nullptr;
216
72
        aux.load(env_default ? QString(env_default) : default_image_);
217
73
        return QQuickTextureFactory::textureFactoryForImage(aux);
220
74
    }
63
    }
221
75
}
64
}
222
76
65
223
66
QString ThumbnailerImageResponse::errorString() const
224
67
{
225
68
    return error_message_;
226
69
}
227
70
228
77
void ThumbnailerImageResponse::cancel()
71
void ThumbnailerImageResponse::cancel()
229
78
{
72
{
230
79
    if (request_ && !request_->isFinished() && !request_->isCancelled())
73
    if (request_ && !request_->isFinished() && !request_->isCancelled())
231
@@ -84,9 +78,9 @@
232
84
78
233
85
void ThumbnailerImageResponse::requestFinished()
79
void ThumbnailerImageResponse::requestFinished()
234
86
{
80
{
236
87
    if (!request_->isValid() && !request_->isCancelled())
81
    if (!request_->isValid())
237
88
    {
82
    {
239
89
        qWarning() << "ThumbnailerImageResponse::dbusCallFinished(): D-Bus error: " << request_->errorMessage();
83
        error_message_ = request_->errorMessage();
240
90
    }
84
    }
241
91
    Q_EMIT finished();
85
    Q_EMIT finished();
242
92
}
86
}
243
93
87
244
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h'
245
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h	2015-09-30 10:08:20 +0000
246
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h	2016-01-12 09:29:54 +0000
247
@@ -20,8 +20,6 @@
248
20
20
249
21
#include <QQuickImageProvider>
21
#include <QQuickImageProvider>
250
22
22
251
23
#include <memory>
252
24
253
25
#include <unity/thumbnailer/qt/thumbnailer-qt.h>
23
#include <unity/thumbnailer/qt/thumbnailer-qt.h>
254
26
24
255
27
namespace unity
25
namespace unity
256
@@ -46,24 +44,20 @@
257
46
public:
44
public:
258
47
    Q_DISABLE_COPY(ThumbnailerImageResponse)
45
    Q_DISABLE_COPY(ThumbnailerImageResponse)
259
48
46
265
49
    ThumbnailerImageResponse(QSize const& requested_size,
47
    ThumbnailerImageResponse(QSharedPointer<unity::thumbnailer::qt::Request> const& request);
266
50
                             QString const& default_image,
48
    ThumbnailerImageResponse(QString const& error_message);
262
51
                             QSharedPointer<unity::thumbnailer::qt::Request> const& request);
263
52
    ThumbnailerImageResponse(QSize const& requested_size,
264
53
                             QString const& default_image);
267
54
    ~ThumbnailerImageResponse();
49
    ~ThumbnailerImageResponse();
268
55
50
269
56
    QQuickTextureFactory* textureFactory() const override;
51
    QQuickTextureFactory* textureFactory() const override;
270
52
    QString errorString() const override;
271
57
    void cancel() override;
53
    void cancel() override;
272
58
54
273
59
private Q_SLOTS:
55
private Q_SLOTS:
274
60
    void requestFinished();
56
    void requestFinished();
275
61
57
276
62
private:
58
private:
277
63
    QString id_;
278
64
    QSize requested_size_;
279
65
    QSharedPointer<unity::thumbnailer::qt::Request> request_;
59
    QSharedPointer<unity::thumbnailer::qt::Request> request_;
281
66
    QString default_image_;
60
    QString error_message_;
282
67
};
61
};
283
68
62
284
69
}  // namespace qml
63
}  // namespace qml
285
70
64
286
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp'
287
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp	2015-11-04 07:16:12 +0000
288
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp	2016-01-12 09:29:54 +0000
289
@@ -19,36 +19,11 @@
290
19
#include "thumbnailgenerator.h"
19
#include "thumbnailgenerator.h"
291
20
20
292
21
#include <QDebug>
21
#include <QDebug>
293
22
#include <QMimeDatabase>
294
23
#include <QUrl>
22
#include <QUrl>
295
24
23
296
25
#include <settings.h>
24
#include <settings.h>
297
26
#include "thumbnailerimageresponse.h"
25
#include "thumbnailerimageresponse.h"
298
27
26
299
28
namespace
300
29
{
301
30
302
31
const char* DEFAULT_VIDEO_ART = "/usr/share/thumbnailer/icons/video_missing.png";
303
32
const char* DEFAULT_ALBUM_ART = "/usr/share/thumbnailer/icons/album_missing.png";
304
33
305
34
QString default_image_based_on_mime(QString const &id)
306
35
{
307
36
    QMimeDatabase db;
308
37
    QMimeType mime = db.mimeTypeForFile(id);
309
38
310
39
    if (mime.name().contains(QStringLiteral("audio")))
311
40
    {
312
41
        return DEFAULT_ALBUM_ART;
313
42
    }
314
43
    else if (mime.name().contains(QStringLiteral("video")))
315
44
    {
316
45
        return DEFAULT_VIDEO_ART;  // LCOV_EXCL_LINE  // Being lazy here: default art is about to go away.
317
46
    }
318
47
    return DEFAULT_ALBUM_ART;
319
48
}
320
49
321
50
}  // namespace
322
51
323
52
namespace unity
27
namespace unity
324
53
{
28
{
325
54
29
326
@@ -66,8 +41,6 @@
327
66
41
328
67
QQuickImageResponse* ThumbnailGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
42
QQuickImageResponse* ThumbnailGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
329
68
{
43
{
330
69
    QSize size = requestedSize;
331
70
332
71
    /* Allow appending a query string (e.g. ?something=timestamp)
44
    /* Allow appending a query string (e.g. ?something=timestamp)
333
72
     * to the id and then ignore it.
45
     * to the id and then ignore it.
334
73
     * This is workaround to force reloading a thumbnail when it has
46
     * This is workaround to force reloading a thumbnail when it has
335
@@ -79,8 +52,8 @@
336
79
     * is the only way around the issue for now. */
52
     * is the only way around the issue for now. */
337
80
    QString src_path = QUrl(id).path();
53
    QString src_path = QUrl(id).path();
338
81
54
341
82
    auto request = thumbnailer->getThumbnail(src_path, size);
55
    auto request = thumbnailer->getThumbnail(src_path, requestedSize);
342
83
    return new ThumbnailerImageResponse(size, default_image_based_on_mime(id), request);
56
    return new ThumbnailerImageResponse(request);
343
84
}
57
}
344
85
58
345
86
}  // namespace qml
59
}  // namespace qml
346
87
60
347
=== modified file 'tests/image-provider/image-provider_test.cpp'
348
--- tests/image-provider/image-provider_test.cpp	2015-12-23 03:04:01 +0000
349
+++ tests/image-provider/image-provider_test.cpp	2016-01-12 09:29:54 +0000
350
@@ -99,6 +99,7 @@
351
99
    ASSERT_EQ("", response->errorString());
99
    ASSERT_EQ("", response->errorString());
352
100
100
353
101
    unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
101
    unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
354
102
    ASSERT_NE(nullptr, factory.get());
355
102
    QImage image = factory->image();
103
    QImage image = factory->image();
356
103
104
357
104
    EXPECT_EQ(128, image.width());
105
    EXPECT_EQ(128, image.width());
358
@@ -118,6 +119,87 @@
359
118
        provider.requestImageResponse(filename, QSize(128, 128)));
119
        provider.requestImageResponse(filename, QSize(128, 128)));
360
119
    response->cancel();
120
    response->cancel();
361
120
    wait(response.get());
121
    wait(response.get());
362
122
    EXPECT_EQ("Request cancelled", response->errorString());
363
123
}
364
124
365
125
TEST_F(ProviderTest, thumbnail_missing)
366
126
{
367
127
    const char* filename = TESTDATADIR "/no-such-file.jpg";
368
128
369
129
    ThumbnailGenerator provider(thumbnailer_);
370
130
    unique_ptr<QQuickImageResponse> response(
371
131
        provider.requestImageResponse(filename, QSize(128, 128)));
372
132
    wait(response.get());
373
133
    string error = response->errorString().toStdString();
374
134
    EXPECT_NE(string::npos, error.find("No such file or directory")) << error;
375
135
}
376
136
377
137
TEST_F(ProviderTest, albumart)
378
138
{
379
139
    const char* id = "artist=metallica&album=load";
380
140
381
141
    AlbumArtGenerator provider(thumbnailer_);
382
142
    unique_ptr<QQuickImageResponse> response(
383
143
        provider.requestImageResponse(id, QSize(128, 128)));
384
144
    wait(response.get());
385
145
    EXPECT_EQ("", response->errorString());
386
146
387
147
    unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
388
148
    ASSERT_NE(nullptr, factory.get());
389
149
    QImage image = factory->image();
390
150
391
151
    EXPECT_EQ(48, image.width());
392
152
    EXPECT_EQ(48, image.height());
393
153
    EXPECT_EQ(QColor("#C80000").rgb(), image.pixel(0, 0));
394
154
    EXPECT_EQ(QColor("#00D200").rgb(), image.pixel(47, 0));
395
155
    EXPECT_EQ(QColor("#0000DC").rgb(), image.pixel(0, 47));
396
156
    EXPECT_EQ(QColor("#646E78").rgb(), image.pixel(47, 47));
397
157
}
398
158
399
159
TEST_F(ProviderTest, albumart_missing)
400
160
{
401
161
    const char* id = "artist=no-such-artist&album=no-such-album";
402
162
403
163
    AlbumArtGenerator provider(thumbnailer_);
404
164
    unique_ptr<QQuickImageResponse> response(
405
165
        provider.requestImageResponse(id, QSize(128, 128)));
406
166
    wait(response.get());
407
167
    string error = response->errorString().toStdString();
408
168
    EXPECT_NE(string::npos, error.find("could not get thumbnail for album")) << error;
409
169
}
410
170
411
171
TEST_F(ProviderTest, artistart)
412
172
{
413
173
    const char* id = "artist=beck&album=odelay";
414
174
415
175
    ArtistArtGenerator provider(thumbnailer_);
416
176
    unique_ptr<QQuickImageResponse> response(
417
177
        provider.requestImageResponse(id, QSize(128, 128)));
418
178
    wait(response.get());
419
179
    EXPECT_EQ("", response->errorString());
420
180
421
181
    unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
422
182
    ASSERT_NE(nullptr, factory.get());
423
183
    QImage image = factory->image();
424
184
425
185
    EXPECT_EQ(128, image.width());
426
186
    EXPECT_EQ(96, image.height());
427
187
    EXPECT_EQ(QColor("#FE0000").rgb(), image.pixel(0, 0));
428
188
    EXPECT_EQ(QColor("#FFFF00").rgb(), image.pixel(127, 0));
429
189
    EXPECT_EQ(QColor("#0000FE").rgb(), image.pixel(0, 95));
430
190
    EXPECT_EQ(QColor("#00FF01").rgb(), image.pixel(127, 95));
431
191
}
432
192
433
193
TEST_F(ProviderTest, artistart_missing)
434
194
{
435
195
    const char* id = "artist=no-such-artist&album=no-such-album";
436
196
437
197
    ArtistArtGenerator provider(thumbnailer_);
438
198
    unique_ptr<QQuickImageResponse> response(
439
199
        provider.requestImageResponse(id, QSize(128, 128)));
440
200
    wait(response.get());
441
201
    string error = response->errorString().toStdString();
442
202
    EXPECT_NE(string::npos, error.find("could not get thumbnail for artist")) << error;
443
121
}
203
}
444
122
204
445
123
int main(int argc, char **argv)
205
int main(int argc, char **argv)
446
124
206
447
=== modified file 'tests/qml/CMakeLists.txt'
448
--- tests/qml/CMakeLists.txt	2015-12-18 02:09:49 +0000
449
+++ tests/qml/CMakeLists.txt	2016-01-12 09:29:54 +0000
450
@@ -9,3 +9,7 @@
451
9
)
9
)
452
10
add_dependencies(qml_test thumbnailer-service thumbnailer-qml)
10
add_dependencies(qml_test thumbnailer-service thumbnailer-qml)
453
11
add_test(qml ${CMAKE_SOURCE_DIR}/tools/run-xvfb.sh ./qml_test -import ${CMAKE_BINARY_DIR}/plugins)
11
add_test(qml ${CMAKE_SOURCE_DIR}/tools/run-xvfb.sh ./qml_test -import ${CMAKE_BINARY_DIR}/plugins)
454
12
# Clear some environment variables that can interfere with the tests
455
13
set_tests_properties(qml PROPERTIES
456
14
  ENVIRONMENT "DBUS_SESSION_BUS_ADDRESS=;QT_QPA_PLATFORMTHEME="
457
15
)
458
12
16
459
=== modified file 'tests/qml/Fixture.qml'
460
--- tests/qml/Fixture.qml	2015-12-12 00:25:57 +0000
461
+++ tests/qml/Fixture.qml	2016-01-12 09:29:54 +0000
462
@@ -69,16 +69,6 @@
463
69
                   encodeURIComponent(album));
69
                   encodeURIComponent(album));
464
70
    }
70
    }
465
71
71
466
72
    function loadBadAlbumUrl(artist) {
467
73
        load("image://albumart/artist=" +
468
74
                   encodeURIComponent(artist));
469
75
    }
470
76
471
77
    function loadBadArtistUrl(album) {
472
78
        load("image://artistart/album=" +
473
79
                   encodeURIComponent(album));
474
80
    }
475
81
476
82
    function load(url) {
72
    function load(url) {
477
83
        // Have the image component load the image
73
        // Have the image component load the image
478
84
        image.source = url;
74
        image.source = url;
479
@@ -109,6 +99,14 @@
480
109
        imageData = canvas.context.createImageData(dumpfile);
99
        imageData = canvas.context.createImageData(dumpfile);
481
110
    }
100
    }
482
111
101
483
102
    function expectLoadError(url) {
484
103
        image.source = url;
485
104
        while (image.status === Image.Loading) {
486
105
            statusSpy.wait();
487
106
        }
488
107
        compare(image.status, Image.Error);
489
108
    }
490
109
491
112
    function pixel(x, y) {
110
    function pixel(x, y) {
492
113
        var pos = (imageData.width * y + x) * 4;
111
        var pos = (imageData.width * y + x) * 4;
493
114
        var data = imageData.data;
112
        var data = imageData.data;
494
115
113
495
=== modified file 'tests/qml/tst_albumart.qml'
496
--- tests/qml/tst_albumart.qml	2015-12-09 02:32:38 +0000
497
+++ tests/qml/tst_albumart.qml	2016-01-12 09:29:54 +0000
498
@@ -22,22 +22,21 @@
499
22
    }
22
    }
500
23
23
501
24
    function test_artistart_not_found() {
24
    function test_artistart_not_found() {
505
25
        loadArtistArt("beck2", "odelay")
25
        expectLoadError("image://artistart/artist=beck2&album=odelay");
503
26
        compare(size.width, 96);
504
27
        compare(size.height, 96);
506
28
    }
26
    }
507
29
27
508
30
    function test_albumart_not_found() {
28
    function test_albumart_not_found() {
520
31
        loadAlbumArt("beck2", "odelay")
29
        expectLoadError("image://albumart/artist=beck2&album=odelay");
521
32
        compare(size.width, 96);
30
    }
522
33
        compare(size.height, 96);
31
523
34
    }
32
    function test_missing_parameter() {
524
35
33
        expectLoadError("image://albumart/");
525
36
    function test_bad_artist_art_url() {
34
        expectLoadError("image://albumart/foo");
526
37
        loadBadArtistUrl("load")
35
        expectLoadError("image://albumart/artist=X");
527
38
    }
36
        expectLoadError("image://albumart/album=Y");
528
39
37
        expectLoadError("image://artistart/");
529
40
    function test_bad_album_art_url() {
38
        expectLoadError("image://artistart/foo");
530
41
        loadBadAlbumUrl("metallica")
39
        expectLoadError("image://artistart/artist=X");
531
40
        expectLoadError("image://artistart/album=Y");
532
42
    }
41
    }
533
43
}
42
}
534
44
43
535
=== modified file 'tests/qml/tst_photo.qml'
536
--- tests/qml/tst_photo.qml	2015-12-12 00:25:57 +0000
537
+++ tests/qml/tst_photo.qml	2016-01-12 09:29:54 +0000
538
@@ -54,6 +54,6 @@
539
54
    }
54
    }
540
55
55
541
56
    function test_no_such_photo() {
56
    function test_no_such_photo() {
543
57
        loadThumbnail("no_such_photo.jpg");
57
        expectLoadError("image://thumbnailer/file:///no_such_photo.jpg");
544
58
    }
58
    }
545
59
}
59
}
546
60
60
547
=== modified file 'tests/testsetup.h.in'
548
--- tests/testsetup.h.in	2015-10-14 03:57:29 +0000
549
+++ tests/testsetup.h.in	2016-01-12 09:29:54 +0000
550
@@ -29,6 +29,5 @@
551
29
29
552
30
#define THUMBNAILER_SERVICE "@CMAKE_BINARY_DIR@/src/service/thumbnailer-service"
30
#define THUMBNAILER_SERVICE "@CMAKE_BINARY_DIR@/src/service/thumbnailer-service"
553
31
#define FAKE_ART_SERVER "@CMAKE_CURRENT_SOURCE_DIR@/server/server.py"
31
#define FAKE_ART_SERVER "@CMAKE_CURRENT_SOURCE_DIR@/server/server.py"
554
32
#define THUMBNAILER_TEST_DEFAULT_IMAGE "@CMAKE_SOURCE_DIR@/data/album_missing.png"
555
33
32
556
34
#define THUMBNAILER_ADMIN "@CMAKE_BINARY_DIR@/src/thumbnailer-admin/thumbnailer-admin"
33
#define THUMBNAILER_ADMIN "@CMAKE_BINARY_DIR@/src/thumbnailer-admin/thumbnailer-admin"
557
35
34
558
=== modified file 'tests/utils/artserver.cpp'
559
--- tests/utils/artserver.cpp	2015-12-12 02:06:41 +0000
560
+++ tests/utils/artserver.cpp	2016-01-12 09:29:54 +0000
561
@@ -69,7 +69,6 @@
562
69
    }
69
    }
563
70
    blocked_server_url_ = "http://127.0.0.1:" + std::to_string(addr.sin_port);
70
    blocked_server_url_ = "http://127.0.0.1:" + std::to_string(addr.sin_port);
564
71
71
565
72
    setenv("THUMBNAILER_TEST_DEFAULT_IMAGE", THUMBNAILER_TEST_DEFAULT_IMAGE, true);
566
73
    update_env();
72
    update_env();
567
74
}
73
}
568
75
74
569
76
75
570
=== modified file 'tests/utils/testutils.cpp'
571
--- tests/utils/testutils.cpp	2015-12-14 01:27:29 +0000
572
+++ tests/utils/testutils.cpp	2016-01-12 09:29:54 +0000
573
@@ -19,6 +19,7 @@
574
19
#include "testutils.h"
19
#include "testutils.h"
575
20
20
576
21
#include <QString>
21
#include <QString>
577
22
#include <ostream>
578
22
23
579
23
using namespace std;
24
using namespace std;
580
24
25
581
@@ -26,3 +27,13 @@
582
26
{
27
{
583
27
    return stream << s.toUtf8().constData();
28
    return stream << s.toUtf8().constData();
584
28
}
29
}
585
30
586
31
ostream& operator<<(ostream& stream, const char* s)
587
32
{
588
33
    return std::operator<<(stream, s);
589
34
}
590
35
591
36
void PrintTo(const QString& s, ostream* stream)
592
37
{
593
38
    *stream << s;
594
39
}
595
29
40
596
=== modified file 'tests/utils/testutils.h'
597
--- tests/utils/testutils.h	2015-12-14 01:27:29 +0000
598
+++ tests/utils/testutils.h	2016-01-12 09:29:54 +0000
599
@@ -24,3 +24,7 @@
600
24
24
601
25
// Helper for gtest to allow us to insert QString into a stream.
25
// Helper for gtest to allow us to insert QString into a stream.
602
26
std::ostream& operator<<(std::ostream& stream, const QString& s);
26
std::ostream& operator<<(std::ostream& stream, const QString& s);
603
27
// Needed because the QString version will take precedence over the std:: one
604
28
std::ostream& operator<<(std::ostream& stream, const char* s);
605
29
606
30
void PrintTo(const QString& s, std::ostream* stream);
Reviewer	Review Type	Date Requested	Status
Michi Henning (community)		2015-06-29	Approve on 2016-01-13
PS Jenkins bot (community)	continuous-integration	2015-06-29	Approve on 2016-01-12
James Henstridge			Pending
Review via email: mp+263216@code.launchpad.net