1
=== modified file 'data/com.canonical.Unity.Thumbnailer.gschema.xml'
2
--- data/com.canonical.Unity.Thumbnailer.gschema.xml	2016-01-07 01:21:03 +0000
3
+++ data/com.canonical.Unity.Thumbnailer.gschema.xml	2016-01-13 07:08:16 +0000
4
@@ -77,7 +77,7 @@
5
77
      <default>10</default>
77
      <default>10</default>
6
78
      <summary>Maximum number of pending DBus requests before the thumbnailer starts queuing them.</summary>
78
      <summary>Maximum number of pending DBus requests before the thumbnailer starts queuing them.</summary>
7
79
      <description>
79
      <description>
9
80
        This parameter limits the number of pending DBus requests to the thumbnailer service. If there are more requests than this currently in progress, additional requests are queued and sent once the backlog drops below the limit.
80
        This parameter limits the number of pending DBus requests to the thumbnailer service. If the number of concurrent requests exceeds the backlog, additional requests are queued and sent once the backlog drops below the limit.
10
81
     </description>
81
     </description>
11
82
    </key>
82
    </key>
12
83
83
13
84
84
14
=== modified file 'debian/changelog'
15
--- debian/changelog	2016-01-09 03:22:11 +0000
16
+++ debian/changelog	2016-01-13 07:08:16 +0000
17
@@ -10,6 +10,7 @@
18
10
  [ Michi Henning ]
10
  [ Michi Henning ]
19
11
  * Fixed incorrect display of cache policy by "thumbnailer-admin stats".
11
  * Fixed incorrect display of cache policy by "thumbnailer-admin stats".
20
12
  * Limit GIF file size to 2 MB (LP: #1527315).
12
  * Limit GIF file size to 2 MB (LP: #1527315).
21
13
  * Fix non-working config settings for client-side API (LP: #1528058).
22
13
14
23
14
  [ CI Train Bot ]
15
  [ CI Train Bot ]
24
15
  * No-change rebuild.
16
  * No-change rebuild.
25
16
17
26
=== renamed file 'include/settings.h' => 'include/internal/settings.h'
27
--- include/settings.h	2016-01-04 06:09:41 +0000
28
+++ include/internal/settings.h	2016-01-13 07:08:16 +0000
29
@@ -32,6 +32,9 @@
30
32
namespace thumbnailer
32
namespace thumbnailer
31
33
{
33
{
32
34
34
33
35
namespace internal
34
36
{
35
37
36
35
class Settings
38
class Settings
37
36
{
39
{
38
37
public:
40
public:
39
@@ -66,6 +69,8 @@
40
66
    internal::gobj_ptr<GSettings> settings_;
69
    internal::gobj_ptr<GSettings> settings_;
41
67
};
70
};
42
68
71
43
72
}  // namespace internal
44
73
45
69
}  // namespace thumbnailer
74
}  // namespace thumbnailer
46
70
75
47
71
}  // namespace unity
76
}  // namespace unity
48
72
77
49
=== modified file 'man/thumbnailer-settings.5'
50
--- man/thumbnailer-settings.5	2016-01-07 01:21:03 +0000
51
+++ man/thumbnailer-settings.5	2016-01-13 07:08:16 +0000
52
@@ -59,7 +59,7 @@
53
59
.TP
59
.TP
54
60
.B max\-backlog \fR(int)\fP
60
.B max\-backlog \fR(int)\fP
55
61
Controls the number of DBus requests that will be sent before queueing the requests internally.
61
Controls the number of DBus requests that will be sent before queueing the requests internally.
57
62
The default is 10 requests.
62
The default is 10.
58
63
.TP
63
.TP
59
64
.B trace\-client \fR(bool)\fP
64
.B trace\-client \fR(bool)\fP
60
65
If true, thumbnail and cancel requests are logged. Log messages are written to the calling application's log
65
If true, thumbnail and cancel requests are logged. Log messages are written to the calling application's log
61
66
66
62
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/plugin.cpp'
63
--- plugins/Ubuntu/Thumbnailer.0.1/plugin.cpp	2015-09-30 10:08:20 +0000
64
+++ plugins/Ubuntu/Thumbnailer.0.1/plugin.cpp	2016-01-13 07:08:16 +0000
65
@@ -18,7 +18,6 @@
66
18
18
67
19
#include "plugin.h"
19
#include "plugin.h"
68
20
20
69
21
#include <settings.h>
70
22
#include "albumartgenerator.h"
21
#include "albumartgenerator.h"
71
23
#include "artistartgenerator.h"
22
#include "artistartgenerator.h"
72
24
#include "thumbnailgenerator.h"
23
#include "thumbnailgenerator.h"
73
25
24
74
=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp'
75
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp	2015-11-04 07:16:12 +0000
76
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp	2016-01-13 07:08:16 +0000
77
@@ -22,7 +22,6 @@
78
22
#include <QMimeDatabase>
22
#include <QMimeDatabase>
79
23
#include <QUrl>
23
#include <QUrl>
80
24
24
81
25
#include <settings.h>
82
26
#include "thumbnailerimageresponse.h"
25
#include "thumbnailerimageresponse.h"
83
27
26
84
28
namespace
27
namespace
85
29
28
86
=== modified file 'src/libthumbnailer-qt/CMakeLists.txt'
87
--- src/libthumbnailer-qt/CMakeLists.txt	2015-11-30 06:36:53 +0000
88
+++ src/libthumbnailer-qt/CMakeLists.txt	2016-01-13 07:08:16 +0000
89
@@ -9,6 +9,8 @@
90
9
  ${interface_files}
9
  ${interface_files}
91
10
)
10
)
92
11
11
93
12
include_directories(${CMAKE_BINARY_DIR}/src)
94
13
95
12
set_target_properties(${LIBTHUMBNAILER_QT} PROPERTIES
14
set_target_properties(${LIBTHUMBNAILER_QT} PROPERTIES
96
13
    VERSION "${LIBTHUMBNAILER_QT_SO_VERSION_MAJOR}.${LIBTHUMBNAILER_QT_SO_VERSION_MINOR}.${LIBTHUMBNAILER_QT_SO_VERSION_MICRO}"
15
    VERSION "${LIBTHUMBNAILER_QT_SO_VERSION_MAJOR}.${LIBTHUMBNAILER_QT_SO_VERSION_MINOR}.${LIBTHUMBNAILER_QT_SO_VERSION_MICRO}"
97
14
    SOVERSION ${LIBTHUMBNAILER_QT_SO_VERSION}
16
    SOVERSION ${LIBTHUMBNAILER_QT_SO_VERSION}
98
15
17
99
=== modified file 'src/libthumbnailer-qt/libthumbnailer-qt.cpp'
100
--- src/libthumbnailer-qt/libthumbnailer-qt.cpp	2015-12-21 05:46:02 +0000
101
+++ src/libthumbnailer-qt/libthumbnailer-qt.cpp	2016-01-13 07:08:16 +0000
102
@@ -19,8 +19,8 @@
103
19
19
104
20
#include <unity/thumbnailer/qt/thumbnailer-qt.h>
20
#include <unity/thumbnailer/qt/thumbnailer-qt.h>
105
21
21
106
22
#include <settings-defaults.h>
107
22
#include <ratelimiter.h>
23
#include <ratelimiter.h>
108
23
#include <settings.h>
109
24
#include <thumbnailerinterface.h>
24
#include <thumbnailerinterface.h>
110
25
#include <service/dbus_names.h>
25
#include <service/dbus_names.h>
111
26
26
112
@@ -132,8 +132,8 @@
113
132
                                          QSize const& requested_size,
132
                                          QSize const& requested_size,
114
133
                                          std::function<QDBusPendingReply<QByteArray>()> const& job);
133
                                          std::function<QDBusPendingReply<QByteArray>()> const& job);
115
134
    std::unique_ptr<ThumbnailerInterface> iface_;
134
    std::unique_ptr<ThumbnailerInterface> iface_;
116
135
    RateLimiter limiter_;
117
136
    bool trace_client_;
135
    bool trace_client_;
118
136
    std::unique_ptr<RateLimiter> limiter_;
119
137
};
137
};
120
138
138
121
139
RequestImpl::RequestImpl(QString const& details,
139
RequestImpl::RequestImpl(QString const& details,
122
@@ -316,10 +316,51 @@
123
316
}
316
}
124
317
317
125
318
ThumbnailerImpl::ThumbnailerImpl(QDBusConnection const& connection)
318
ThumbnailerImpl::ThumbnailerImpl(QDBusConnection const& connection)
126
319
    : limiter_(Settings().max_backlog())
127
320
    , trace_client_(Settings().trace_client())
128
321
{
319
{
129
322
    iface_.reset(new ThumbnailerInterface(service::BUS_NAME, service::THUMBNAILER_BUS_PATH, connection));
320
    iface_.reset(new ThumbnailerInterface(service::BUS_NAME, service::THUMBNAILER_BUS_PATH, connection));
130
321
131
322
    // We need to retrieve config parameters from the server because, when an app runs confined,
132
323
    // it cannot read gsettings. We do this synchronously because we can't do anything else until
133
324
    // after we get the settings anyway.
134
325
135
326
    auto trace_client_call = iface_->TraceClient();
136
327
    auto max_backlog_call = iface_->MaxBacklog();
137
328
138
329
    {
139
330
        trace_client_call.waitForFinished();
140
331
        if (trace_client_call.isValid())
141
332
        {
142
333
            trace_client_ = trace_client_call.value();
143
334
        }
144
335
        // LCOV_EXCL_START
145
336
        else
146
337
        {
147
338
            bool const dflt = TRACE_CLIENT_DEFAULT;
148
339
            trace_client_ = dflt;
149
340
            qCritical().nospace() << "could not retrieve trace-client setting: " << trace_client_call.error().message()
150
341
                                  << " (using default value of " << dflt << ")";
151
342
152
343
        }
153
344
        // LCOV_EXCL_STOP
154
345
    }
155
346
156
347
    {
157
348
        int constexpr dflt_backlog = MAX_BACKLOG_DEFAULT;
158
349
        max_backlog_call.waitForFinished();
159
350
        if (max_backlog_call.isValid())
160
351
        {
161
352
            int backlog = max_backlog_call.value();
162
353
            limiter_.reset(new RateLimiter(backlog));
163
354
        }
164
355
        // LCOV_EXCL_START
165
356
        else
166
357
        {
167
358
            limiter_.reset(new RateLimiter(dflt_backlog));
168
359
            qCritical().nospace() << "could not retrieve max-backlog setting: " << max_backlog_call.error().message()
169
360
                                  << " (using default value of " << dflt_backlog << ")";
170
361
        }
171
362
        // LCOV_EXCL_STOP
172
363
    }
173
323
}
364
}
174
324
365
175
325
QSharedPointer<Request> ThumbnailerImpl::getAlbumArt(QString const& artist,
366
QSharedPointer<Request> ThumbnailerImpl::getAlbumArt(QString const& artist,
176
@@ -384,12 +425,12 @@
177
384
425
178
385
RateLimiter& ThumbnailerImpl::limiter()
426
RateLimiter& ThumbnailerImpl::limiter()
179
386
{
427
{
181
387
    return limiter_;
428
    return *limiter_;
182
388
}
429
}
183
389
430
184
390
void ThumbnailerImpl::pump_limiter()
431
void ThumbnailerImpl::pump_limiter()
185
391
{
432
{
187
392
    return limiter_.done();
433
    return limiter_->done();
188
393
}
434
}
189
394
435
190
395
}  // namespace internal
436
}  // namespace internal
191
396
437
192
=== modified file 'src/service/dbusinterface.cpp'
193
--- src/service/dbusinterface.cpp	2016-01-10 07:00:47 +0000
194
+++ src/service/dbusinterface.cpp	2016-01-13 07:08:16 +0000
195
@@ -19,7 +19,6 @@
196
19
#include "dbusinterface.h"
19
#include "dbusinterface.h"
197
20
20
198
21
#include <internal/file_io.h>
21
#include <internal/file_io.h>
199
22
#include <settings.h>
200
23
22
201
24
#include <boost/algorithm/string.hpp>
23
#include <boost/algorithm/string.hpp>
202
25
#include <boost/regex.hpp>
24
#include <boost/regex.hpp>
203
@@ -94,8 +93,9 @@
204
94
93
205
95
    extraction_limiter_ = make_shared<RateLimiter>(limit);
94
    extraction_limiter_ = make_shared<RateLimiter>(limit);
206
96
95
209
97
    Settings s;
96
    log_level_ = settings_.log_level();
210
98
    log_level_ = s.log_level();
97
    trace_client_ = settings_.trace_client();
211
98
    max_backlog_ = settings_.max_backlog();
212
99
}
99
}
213
100
100
214
101
DBusInterface::~DBusInterface()
101
DBusInterface::~DBusInterface()
215
@@ -305,6 +305,16 @@
216
305
    }
305
    }
217
306
}
306
}
218
307
307
219
308
bool DBusInterface::TraceClient()
220
309
{
221
310
    return trace_client_;
222
311
}
223
312
224
313
int DBusInterface::MaxBacklog()
225
314
{
226
315
    return max_backlog_;
227
316
}
228
317
229
308
}  // namespace service
318
}  // namespace service
230
309
319
231
310
}  // namespace thumbnailer
320
}  // namespace thumbnailer
232
311
321
233
=== modified file 'src/service/dbusinterface.h'
234
--- src/service/dbusinterface.h	2015-12-14 04:43:11 +0000
235
+++ src/service/dbusinterface.h	2016-01-13 07:08:16 +0000
236
@@ -22,7 +22,7 @@
237
22
#include "handler.h"
22
#include "handler.h"
238
23
23
239
24
#include <ratelimiter.h>
24
#include <ratelimiter.h>
241
25
#include <settings.h>
25
#include <internal/settings.h>
242
26
26
243
27
#include <QDBusContext>
27
#include <QDBusContext>
244
28
#include <QThreadPool>
28
#include <QThreadPool>
245
@@ -53,6 +53,11 @@
246
53
    QByteArray GetArtistArt(QString const& artist, QString const& album, QSize const& requestedSize);
53
    QByteArray GetArtistArt(QString const& artist, QString const& album, QSize const& requestedSize);
247
54
    QByteArray GetThumbnail(QString const& filename, QSize const& requestedSize);
54
    QByteArray GetThumbnail(QString const& filename, QSize const& requestedSize);
248
55
55
249
56
    // These methods return the value of the corresponding gsettings key. We need to do this on the server
250
57
    // side because the client-side API runs under confinement, which disallows access to gsettings.
251
58
    bool TraceClient();
252
59
    int MaxBacklog();
253
60
254
56
private:
61
private:
255
57
    void queueRequest(Handler* handler);
62
    void queueRequest(Handler* handler);
256
58
63
257
@@ -72,10 +77,12 @@
258
72
    std::shared_ptr<QThreadPool> create_thread_pool_;
77
    std::shared_ptr<QThreadPool> create_thread_pool_;
259
73
    std::map<Handler*, std::unique_ptr<Handler>> requests_;
78
    std::map<Handler*, std::unique_ptr<Handler>> requests_;
260
74
    std::map<std::string, std::vector<Handler*>> request_keys_;
79
    std::map<std::string, std::vector<Handler*>> request_keys_;
262
75
    unity::thumbnailer::Settings settings_;
80
    unity::thumbnailer::internal::Settings settings_;
263
76
    std::shared_ptr<RateLimiter> download_limiter_;
81
    std::shared_ptr<RateLimiter> download_limiter_;
264
77
    std::shared_ptr<RateLimiter> extraction_limiter_;
82
    std::shared_ptr<RateLimiter> extraction_limiter_;
265
78
    int log_level_;
83
    int log_level_;
266
84
    bool trace_client_;
267
85
    int max_backlog_;
268
79
};
86
};
269
80
87
270
81
}  // namespace service
88
}  // namespace service
271
82
89
272
=== modified file 'src/service/dbusinterface.xml'
273
--- src/service/dbusinterface.xml	2015-12-03 02:01:47 +0000
274
+++ src/service/dbusinterface.xml	2016-01-13 07:08:16 +0000
275
@@ -20,5 +20,11 @@
276
20
      <arg direction="out" type="ay" name="thumbnail" />
20
      <arg direction="out" type="ay" name="thumbnail" />
277
21
      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSize" />
21
      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSize" />
278
22
    </method>
22
    </method>
279
23
    <method name="TraceClient">
280
24
      <arg direction="out" type="b" name="traceClient" />
281
25
    </method>
282
26
    <method name="MaxBacklog">
283
27
      <arg direction="out" type="i" name="maxBacklog" />
284
28
    </method>
285
23
  </interface>
29
  </interface>
286
24
</node>
30
</node>
287
25
31
288
=== modified file 'src/settings.cpp'
289
--- src/settings.cpp	2016-01-04 06:09:41 +0000
290
+++ src/settings.cpp	2016-01-13 07:08:16 +0000
291
@@ -16,7 +16,7 @@
292
16
 * Authored by: James Henstridge <james.henstridge@canonical.com>
16
 * Authored by: James Henstridge <james.henstridge@canonical.com>
293
17
 */
17
 */
294
18
18
296
19
#include <settings.h>
19
#include <internal/settings.h>
297
20
20
298
21
#include <internal/env_vars.h>
21
#include <internal/env_vars.h>
299
22
#include "settings-defaults.h"
22
#include "settings-defaults.h"
300
@@ -39,6 +39,9 @@
301
39
namespace thumbnailer
39
namespace thumbnailer
302
40
{
40
{
303
41
41
304
42
namespace internal
305
43
{
306
44
307
42
Settings::Settings()
45
Settings::Settings()
308
43
    : Settings("com.canonical.Unity.Thumbnailer")
46
    : Settings("com.canonical.Unity.Thumbnailer")
309
44
{
47
{
310
@@ -220,6 +223,8 @@
311
220
    return g_settings_get_boolean(settings_.get(), key);
223
    return g_settings_get_boolean(settings_.get(), key);
312
221
}
224
}
313
222
225
314
226
}  // namespace internal
315
227
316
223
}  // namespace thumbnailer
228
}  // namespace thumbnailer
317
224
229
318
225
}  // namespace unity
230
}  // namespace unity
319
226
231
320
=== modified file 'src/thumbnailer.cpp'
321
--- src/thumbnailer.cpp	2016-01-08 09:22:07 +0000
322
+++ src/thumbnailer.cpp	2016-01-13 07:08:16 +0000
323
@@ -28,8 +28,8 @@
324
28
#include <internal/make_directories.h>
28
#include <internal/make_directories.h>
325
29
#include <internal/raii.h>
29
#include <internal/raii.h>
326
30
#include <internal/safe_strerror.h>
30
#include <internal/safe_strerror.h>
327
31
#include <internal/settings.h>
328
31
#include <internal/ubuntuserverdownloader.h>
32
#include <internal/ubuntuserverdownloader.h>
329
32
#include <settings.h>
330
33
33
331
34
#include <boost/filesystem.hpp>
34
#include <boost/filesystem.hpp>
332
35
35
333
36
36
334
=== modified file 'src/ubuntuserverdownloader.cpp'
335
--- src/ubuntuserverdownloader.cpp	2015-12-29 23:04:19 +0000
336
+++ src/ubuntuserverdownloader.cpp	2016-01-13 07:08:16 +0000
337
@@ -22,7 +22,7 @@
338
22
22
339
23
#include <internal/artreply.h>
23
#include <internal/artreply.h>
340
24
#include <internal/env_vars.h>
24
#include <internal/env_vars.h>
342
25
#include <settings.h>
25
#include <internal/settings.h>
343
26
26
344
27
#include <QNetworkReply>
27
#include <QNetworkReply>
345
28
#include <QTimer>
28
#include <QTimer>
346
29
29
347
=== modified file 'tests/settings/settings_test.cpp'
348
--- tests/settings/settings_test.cpp	2016-01-07 01:21:03 +0000
349
+++ tests/settings/settings_test.cpp	2016-01-13 07:08:16 +0000
350
@@ -18,7 +18,7 @@
351
18
18
352
19
#include <internal/env_vars.h>
19
#include <internal/env_vars.h>
353
20
#include <internal/gobj_memory.h>
20
#include <internal/gobj_memory.h>
355
21
#include <settings.h>
21
#include <internal/settings.h>
356
22
#include <testsetup.h>
22
#include <testsetup.h>
357
23
#include <utils/env_var_guard.h>
23
#include <utils/env_var_guard.h>
358
24
24
Reviewer	Review Type	Date Requested	Status
James Henstridge		2016-01-05	Approve on 2016-01-13
PS Jenkins bot (community)	continuous-integration		Approve on 2016-01-11
Review via email: mp+281580@code.launchpad.net