1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-09-03 00:53:43 +0000
3
+++ CMakeLists.txt	2016-09-21 05:03:46 +0000
4
@@ -5,13 +5,13 @@
5
5
endif()
5
endif()
6
6
6
7
7
cmake_minimum_required(VERSION 3.0.2)
7
cmake_minimum_required(VERSION 3.0.2)
9
8
project(storage-framework VERSION "0.1" LANGUAGES C CXX)
8
project(storage-framework VERSION "0.2" LANGUAGES C CXX)
10
9
9
11
10
# These variables should be incremented when we wish to create a new
10
# These variables should be incremented when we wish to create a new
12
11
# source incompatible version of the the library where users of the
11
# source incompatible version of the the library where users of the
14
12
# old API could will not compile against the new one.  It is not
12
# old API will not compile against the new one.  It is not
15
13
# necessary to increment this for ABI breaks that are source compatible.
13
# necessary to increment this for ABI breaks that are source compatible.
17
14
set(SF_CLIENT_API_VERSION "1")
14
set(SF_CLIENT_API_VERSION "2")
18
15
set(SF_PROVIDER_API_VERSION "1")
15
set(SF_PROVIDER_API_VERSION "1")
19
16
16
20
17
# These two should be incremented when the ABI changes.
17
# These two should be incremented when the ABI changes.
21
@@ -132,6 +132,7 @@
22
132
        qt-client-lib-common
132
        qt-client-lib-common
23
133
        storage-framework-common-internal
133
        storage-framework-common-internal
24
134
        storage-framework-qt-client
134
        storage-framework-qt-client
25
135
        storage-framework-qt-client-v2
26
135
        storage-framework-qt-local-client
136
        storage-framework-qt-local-client
27
136
        sf-provider-objects
137
        sf-provider-objects
28
137
        storage-framework-provider
138
        storage-framework-provider
29
138
139
30
=== modified file 'debian/changelog'
31
--- debian/changelog	2016-08-04 07:20:09 +0000
32
+++ debian/changelog	2016-09-21 05:03:46 +0000
33
@@ -1,3 +1,10 @@
34
1
storage-framework (0.2) UNRELEASED; urgency=medium
35
2
36
3
  [ Michi Henning ]
37
4
  * Added v2 of the client-side API.
38
5
39
6
 -- Michi Henning <michi.henning@canonical.com>  Wed, 21 Sep 2016 14:36:15 +1000
40
7
41
1
storage-framework (0.1+16.10.20160804.1-0ubuntu1) yakkety; urgency=medium
8
storage-framework (0.1+16.10.20160804.1-0ubuntu1) yakkety; urgency=medium
42
2
9
43
3
  [ Michi Henning ]
10
  [ Michi Henning ]
44
4
11
45
=== modified file 'debian/control'
46
--- debian/control	2016-08-04 07:20:09 +0000
47
+++ debian/control	2016-09-21 05:03:46 +0000
48
@@ -49,6 +49,15 @@
49
49
Pre-Depends: ${misc:Pre-Depends},
49
Pre-Depends: ${misc:Pre-Depends},
50
50
Depends: ${misc:Depends},
50
Depends: ${misc:Depends},
51
51
         ${shlibs:Depends},
51
         ${shlibs:Depends},
52
52
Description: Client library for the Storage Framework (API v1, soon to be removed)
53
53
 Runtime support for storage framework clients.
54
54
55
55
Package: libstorage-framework-qt-client-2-0
56
56
Architecture: any
57
57
Multi-Arch: same
58
58
Pre-Depends: ${misc:Pre-Depends},
59
59
Depends: ${misc:Depends},
60
60
         ${shlibs:Depends},
61
52
Description: Client library for the Storage Framework
61
Description: Client library for the Storage Framework
62
53
 Runtime support for storage framework clients.
62
 Runtime support for storage framework clients.
63
54
63
64
@@ -70,6 +79,7 @@
65
70
Multi-Arch: same
79
Multi-Arch: same
66
71
Pre-Depends: ${misc:Pre-Depends},
80
Pre-Depends: ${misc:Pre-Depends},
67
72
Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
81
Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
68
82
         libstorage-framework-qt-client-2-0 (= ${binary:Version}),
69
73
         libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
83
         libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
70
74
         qtbase5-dev,
84
         qtbase5-dev,
71
75
         ${misc:Depends},
85
         ${misc:Depends},
72
76
86
73
=== modified file 'debian/control.in'
74
--- debian/control.in	2016-08-02 03:36:58 +0000
75
+++ debian/control.in	2016-09-21 05:03:46 +0000
76
@@ -44,6 +44,15 @@
77
44
Pre-Depends: ${misc:Pre-Depends},
44
Pre-Depends: ${misc:Pre-Depends},
78
45
Depends: ${misc:Depends},
45
Depends: ${misc:Depends},
79
46
         ${shlibs:Depends},
46
         ${shlibs:Depends},
80
47
Description: Client library for the Storage Framework (API v1, soon to be removed)
81
48
 Runtime support for storage framework clients.
82
49
83
50
Package: libstorage-framework-qt-client-2-0
84
51
Architecture: any
85
52
Multi-Arch: same
86
53
Pre-Depends: ${misc:Pre-Depends},
87
54
Depends: ${misc:Depends},
88
55
         ${shlibs:Depends},
89
47
Description: Client library for the Storage Framework
56
Description: Client library for the Storage Framework
90
48
 Runtime support for storage framework clients.
57
 Runtime support for storage framework clients.
91
49
58
92
50
59
93
=== modified file 'debian/libstorage-framework-qt-client-1-0.install'
94
--- debian/libstorage-framework-qt-client-1-0.install	2016-07-11 04:06:04 +0000
95
+++ debian/libstorage-framework-qt-client-1-0.install	2016-09-21 05:03:46 +0000
96
@@ -1,1 +1,1 @@
98
1
usr/lib/*/libstorage-framework-qt-client-*.so.*
1
usr/lib/*/libstorage-framework-qt-client-1.so.*
99
2
2
100
=== added file 'debian/libstorage-framework-qt-client-2-0.install'
101
--- debian/libstorage-framework-qt-client-2-0.install	1970-01-01 00:00:00 +0000
102
+++ debian/libstorage-framework-qt-client-2-0.install	2016-09-21 05:03:46 +0000
103
@@ -0,0 +1,1 @@
104
1
usr/lib/*/libstorage-framework-qt-client-2.so.*
105
0
2
106
=== modified file 'include/unity/storage/CMakeLists.txt'
107
--- include/unity/storage/CMakeLists.txt	2016-07-11 03:28:40 +0000
108
+++ include/unity/storage/CMakeLists.txt	2016-09-21 05:03:46 +0000
109
@@ -7,5 +7,9 @@
110
7
install(FILES ${common_headers}
7
install(FILES ${common_headers}
111
8
  DESTINATION ${provider_base_includedir}/${includeprefix})
8
  DESTINATION ${provider_base_includedir}/${includeprefix})
112
9
9
113
10
# Deprecated client API v1 install
114
11
install(FILES ${common_headers}
115
12
  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-client-1/${includeprefix})
116
13
117
10
add_subdirectory(provider)
14
add_subdirectory(provider)
118
11
add_subdirectory(qt)
15
add_subdirectory(qt)
119
12
16
120
=== modified file 'include/unity/storage/internal/ItemMetadata.h'
121
--- include/unity/storage/internal/ItemMetadata.h	2016-08-25 23:56:02 +0000
122
+++ include/unity/storage/internal/ItemMetadata.h	2016-09-21 05:03:46 +0000
123
@@ -49,3 +49,6 @@
124
49
}  // namespace internal
49
}  // namespace internal
125
50
}  // namespace storage
50
}  // namespace storage
126
51
}  // namespace unity
51
}  // namespace unity
127
52
128
53
Q_DECLARE_METATYPE(unity::storage::internal::ItemMetadata)
129
54
Q_DECLARE_METATYPE(QList<unity::storage::internal::ItemMetadata>)
130
52
55
131
=== modified file 'include/unity/storage/internal/dbusmarshal.h'
132
--- include/unity/storage/internal/dbusmarshal.h	2016-08-11 06:53:25 +0000
133
+++ include/unity/storage/internal/dbusmarshal.h	2016-09-21 05:03:46 +0000
134
@@ -39,6 +39,3 @@
135
39
}  // namespace internal
39
}  // namespace internal
136
40
}  // storage
40
}  // storage
137
41
}  // unity
41
}  // unity
138
42
139
43
Q_DECLARE_METATYPE(unity::storage::internal::ItemMetadata)
140
44
Q_DECLARE_METATYPE(QList<unity::storage::internal::ItemMetadata>)
141
45
42
142
=== added file 'include/unity/storage/qt/Account.h'
143
--- include/unity/storage/qt/Account.h	1970-01-01 00:00:00 +0000
144
+++ include/unity/storage/qt/Account.h	2016-09-21 05:03:46 +0000
145
@@ -0,0 +1,103 @@
146
1
/*
147
2
 * Copyright (C) 2016 Canonical Ltd
148
3
 *
149
4
 * This program is free software: you can redistribute it and/or modify
150
5
 * it under the terms of the GNU Lesser General Public License version 3 as
151
6
 * published by the Free Software Foundation.
152
7
 *
153
8
 * This program is distributed in the hope that it will be useful,
154
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
155
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
156
11
 * GNU Lesser General Public License for more details.
157
12
 *
158
13
 * You should have received a copy of the GNU Lesser General Public License
159
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
160
15
 *
161
16
 * Authors: Michi Henning <michi.henning@canonical.com>
162
17
 */
163
18
164
19
#pragma once
165
20
166
21
#include <QMetaType>
167
22
168
23
#include <memory>
169
24
170
25
namespace unity
171
26
{
172
27
namespace storage
173
28
{
174
29
namespace qt
175
30
{
176
31
namespace internal
177
32
{
178
33
179
34
class AccountImpl;
180
35
class ItemImpl;
181
36
182
37
}
183
38
184
39
class ItemJob;
185
40
class ItemListJob;
186
41
187
42
class Q_DECL_EXPORT Account final
188
43
{
189
44
    Q_GADGET
190
45
    Q_PROPERTY(bool READ isValid CONSTANT FINAL)
191
46
    Q_PROPERTY(QString READ owner CONSTANT FINAL)
192
47
    Q_PROPERTY(QString READ ownerId CONSTANT FINAL)
193
48
    Q_PROPERTY(QString READ description CONSTANT FINAL)
194
49
195
50
public:
196
51
    Account();
197
52
    Account(Account const&);
198
53
    Account(Account&&);
199
54
    ~Account();
200
55
    Account& operator=(Account const&);
201
56
    Account& operator=(Account&&);
202
57
203
58
    bool isValid() const;
204
59
    QString owner() const;
205
60
    QString ownerId() const;
206
61
    QString description() const;
207
62
208
63
    Q_INVOKABLE ItemListJob* roots() const;
209
64
    Q_INVOKABLE ItemJob* get(QString const& itemId) const;
210
65
211
66
    bool operator==(Account const&) const;
212
67
    bool operator!=(Account const&) const;
213
68
    bool operator<(Account const&) const;
214
69
    bool operator<=(Account const&) const;
215
70
    bool operator>(Account const&) const;
216
71
    bool operator>=(Account const&) const;
217
72
218
73
    size_t hash() const;
219
74
220
75
private:
221
76
    Account(std::shared_ptr<internal::AccountImpl> const& p);
222
77
223
78
    std::shared_ptr<internal::AccountImpl> p_;
224
79
225
80
    friend class internal::AccountImpl;
226
81
    friend class internal::ItemImpl;
227
82
};
228
83
229
84
}  // namespace qt
230
85
}  // namespace storage
231
86
}  // namespace unity
232
87
233
88
namespace std
234
89
{
235
90
236
91
template<> struct Q_DECL_EXPORT hash<unity::storage::qt::Account>
237
92
{
238
93
    std::size_t operator()(unity::storage::qt::Account const& a)
239
94
    {
240
95
        return a.hash();
241
96
    }
242
97
};
243
98
244
99
}  // namespace std
245
100
246
101
// Note: qHash(Account) does *not* return the same hash value is std::hash<Account> because
247
102
//       std:hash() returns size_t (typically 64 bits), but qHash() returns uint (typically 32 bits).
248
103
uint Q_DECL_EXPORT qHash(unity::storage::qt::Account const& acc);
249
0
104
250
=== added file 'include/unity/storage/qt/AccountsJob.h'
251
--- include/unity/storage/qt/AccountsJob.h	1970-01-01 00:00:00 +0000
252
+++ include/unity/storage/qt/AccountsJob.h	2016-09-21 05:03:46 +0000
253
@@ -0,0 +1,80 @@
254
1
/*
255
2
 * Copyright (C) 2016 Canonical Ltd
256
3
 *
257
4
 * This program is free software: you can redistribute it and/or modify
258
5
 * it under the terms of the GNU Lesser General Public License version 3 as
259
6
 * published by the Free Software Foundation.
260
7
 *
261
8
 * This program is distributed in the hope that it will be useful,
262
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
263
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
264
11
 * GNU Lesser General Public License for more details.
265
12
 *
266
13
 * You should have received a copy of the GNU Lesser General Public License
267
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
268
15
 *
269
16
 * Authors: Michi Henning <michi.henning@canonical.com>
270
17
 */
271
18
272
19
#pragma once
273
20
274
21
#include <unity/storage/qt/Account.h>
275
22
#include <unity/storage/qt/StorageError.h>
276
23
277
24
#include <QMetaType>
278
25
#include <QObject>
279
26
280
27
namespace unity
281
28
{
282
29
namespace storage
283
30
{
284
31
namespace qt
285
32
{
286
33
namespace internal
287
34
{
288
35
289
36
class AccountsJobImpl;
290
37
class RuntimeImpl;
291
38
292
39
}  // namespace internal
293
40
294
41
class Account;
295
42
class Runtime;
296
43
class StorageError;
297
44
298
45
class Q_DECL_EXPORT AccountsJob final : public QObject
299
46
{
300
47
    Q_OBJECT
301
48
    Q_PROPERTY(bool isValid READ isValid FINAL)
302
49
    Q_PROPERTY(unity::storage::qt::AccountsJob::Status status READ status NOTIFY statusChanged FINAL)
303
50
    Q_PROPERTY(unity::storage::qt::StorageError error READ error FINAL)
304
51
    Q_PROPERTY(QList<unity::storage::qt::Account> accounts READ accounts FINAL)
305
52
306
53
public:
307
54
    enum Status { Loading, Finished, Error };
308
55
    Q_ENUMS(Status)
309
56
310
57
    virtual ~AccountsJob();
311
58
312
59
    bool isValid() const;
313
60
    Status status() const;
314
61
    StorageError error() const;
315
62
    QList<Account> accounts() const;
316
63
317
64
Q_SIGNALS:
318
65
    void statusChanged(unity::storage::qt::AccountsJob::Status status) const;
319
66
320
67
private:
321
68
    AccountsJob(std::shared_ptr<internal::RuntimeImpl> const& runtime);
322
69
    AccountsJob(StorageError const& error);
323
70
324
71
    std::unique_ptr<internal::AccountsJobImpl> const p_;
325
72
326
73
    friend class internal::RuntimeImpl;
327
74
};
328
75
329
76
}  // namespace qt
330
77
}  // namespace storage
331
78
}  // namespace unity
332
79
333
80
Q_DECLARE_METATYPE(unity::storage::qt::AccountsJob::Status)
334
0
81
335
=== modified file 'include/unity/storage/qt/CMakeLists.txt'
336
--- include/unity/storage/qt/CMakeLists.txt	2016-05-23 02:27:16 +0000
337
+++ include/unity/storage/qt/CMakeLists.txt	2016-09-21 05:03:46 +0000
338
@@ -1,1 +1,17 @@
340
1
add_subdirectory(client)
1
add_subdirectory(client)  # Old (v1) API
341
2
342
3
set(includeprefix unity/storage/qt)
343
4
file(GLOB public_hdrs *.h)
344
5
set(convenience_hdr ${CMAKE_CURRENT_BINARY_DIR}/client-api.h)
345
6
346
7
add_custom_command(
347
8
    OUTPUT ${convenience_hdr}
348
9
    COMMAND ${CMAKE_SOURCE_DIR}/tools/create_globalheader.py
349
10
        ${convenience_hdr} ${includeprefix} ${CMAKE_CURRENT_SOURCE_DIR}
350
11
    DEPENDS ${public_hdrs})
351
12
352
13
add_custom_target(qt-client-all-headers ALL DEPENDS ${convenience_hdr})
353
14
354
15
install(
355
16
    FILES ${public_hdrs} ${convenience_hdr}
356
17
    DESTINATION ${client_base_includedir}/${includeprefix})
357
2
18
358
=== added file 'include/unity/storage/qt/ConflictPolicy.h'
359
--- include/unity/storage/qt/ConflictPolicy.h	1970-01-01 00:00:00 +0000
360
+++ include/unity/storage/qt/ConflictPolicy.h	2016-09-21 05:03:46 +0000
361
@@ -0,0 +1,32 @@
362
1
/*
363
2
 * Copyright (C) 2016 Canonical Ltd
364
3
 *
365
4
 * This program is free software: you can redistribute it and/or modify
366
5
 * it under the terms of the GNU Lesser General Public License version 3 as
367
6
 * published by the Free Software Foundation.
368
7
 *
369
8
 * This program is distributed in the hope that it will be useful,
370
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
371
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
372
11
 * GNU Lesser General Public License for more details.
373
12
 *
374
13
 * You should have received a copy of the GNU Lesser General Public License
375
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
376
15
 *
377
16
 * Authors: Michi Henning <michi.henning@canonical.com>
378
17
 */
379
18
380
19
#pragma once
381
20
382
21
namespace unity
383
22
{
384
23
namespace storage
385
24
{
386
25
namespace qt
387
26
{
388
27
389
28
enum class ConflictPolicy { ErrorIfConflict, Overwrite };
390
29
391
30
}  // namespace qt
392
31
}  // namespace storage
393
32
}  // namespace unity
394
0
33
395
=== added file 'include/unity/storage/qt/Downloader.h'
396
--- include/unity/storage/qt/Downloader.h	1970-01-01 00:00:00 +0000
397
+++ include/unity/storage/qt/Downloader.h	2016-09-21 05:03:46 +0000
398
@@ -0,0 +1,68 @@
399
1
/*
400
2
 * Copyright (C) 2016 Canonical Ltd
401
3
 *
402
4
 * This program is free software: you can redistribute it and/or modify
403
5
 * it under the terms of the GNU Lesser General Public License version 3 as
404
6
 * published by the Free Software Foundation.
405
7
 *
406
8
 * This program is distributed in the hope that it will be useful,
407
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
408
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
409
11
 * GNU Lesser General Public License for more details.
410
12
 *
411
13
 * You should have received a copy of the GNU Lesser General Public License
412
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
413
15
 *
414
16
 * Authors: Michi Henning <michi.henning@canonical.com>
415
17
 */
416
18
417
19
#pragma once
418
20
419
21
#include <QIODevice>
420
22
421
23
namespace unity
422
24
{
423
25
namespace storage
424
26
{
425
27
namespace qt
426
28
{
427
29
428
30
class Item;
429
31
class StorageError;
430
32
431
33
class Q_DECL_EXPORT Downloader final : public QIODevice
432
34
{
433
35
    Q_OBJECT
434
36
    Q_PROPERTY(bool isValid READ isValid FINAL) // TODO: Need notify and constant where appropriate
435
37
    Q_PROPERTY(unity::Storage::qt::Downloader::Status status READ status NOTIFY statusChanged FINAL)
436
38
    Q_PROPERTY(unity::Storage::qt::StorageError error READ error FINAL)
437
39
    Q_PROPERTY(unity::Storage::qt::Item item READ item FINAL)
438
40
439
41
public:
440
42
    enum Status { Loading, Ready, Cancelled, Finished, Error };
441
43
    Q_ENUMS(Status)
442
44
443
45
    Downloader();
444
46
    virtual ~Downloader();
445
47
446
48
    bool isValid();
447
49
    Status status() const;
448
50
    StorageError error() const;
449
51
    Item item() const;
450
52
451
53
    Q_INVOKABLE void finishDownload(); // TODO: finish()
452
54
    Q_INVOKABLE void cancel();
453
55
454
56
    // TODO: will probably need QML invokable methods for reading and writing to/from QIODevice
455
57
456
58
Q_SIGNALS:
457
59
    void statusChanged(unity::storage::qt::Downloader::Status status) const;
458
60
459
61
protected:
460
62
    virtual qint64 readData(char* data, qint64 maxSize) override;
461
63
    virtual qint64 writeData(char const* data, qint64 maxSize) override;
462
64
};
463
65
464
66
}  // namespace qt
465
67
}  // namespace storage
466
68
}  // namespace unity
467
0
69
468
=== added file 'include/unity/storage/qt/Item.h'
469
--- include/unity/storage/qt/Item.h	1970-01-01 00:00:00 +0000
470
+++ include/unity/storage/qt/Item.h	2016-09-21 05:03:46 +0000
471
@@ -0,0 +1,142 @@
472
1
/*
473
2
 * Copyright (C) 2016 Canonical Ltd
474
3
 *
475
4
 * This program is free software: you can redistribute it and/or modify
476
5
 * it under the terms of the GNU Lesser General Public License version 3 as
477
6
 * published by the Free Software Foundation.
478
7
 *
479
8
 * This program is distributed in the hope that it will be useful,
480
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
481
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
482
11
 * GNU Lesser General Public License for more details.
483
12
 *
484
13
 * You should have received a copy of the GNU Lesser General Public License
485
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
486
15
 *
487
16
 * Authors: Michi Henning <michi.henning@canonical.com>
488
17
 */
489
18
490
19
#pragma once
491
20
492
21
#include <unity/storage/qt/ConflictPolicy.h>
493
22
494
23
#pragma GCC diagnostic push
495
24
#pragma GCC diagnostic ignored "-Wcast-align"
496
25
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
497
26
#include <QDateTime>
498
27
#include <QVariantMap>
499
28
#pragma GCC diagnostic pop
500
29
501
30
#include <memory>
502
31
503
32
namespace unity
504
33
{
505
34
namespace storage
506
35
{
507
36
namespace qt
508
37
{
509
38
namespace internal
510
39
{
511
40
512
41
class ItemImpl;
513
42
514
43
}  // namespace internal
515
44
516
45
class Account;
517
46
class Downloader;
518
47
class IntJob;
519
48
class ItemJob;
520
49
class ItemListJob;
521
50
class Uploader;
522
51
class VoidJob;
523
52
524
53
class Q_DECL_EXPORT Item final
525
54
{
526
55
    Q_GADGET
527
56
    Q_PROPERTY(QString itemId READ itemId CONSTANT FINAL)
528
57
    Q_PROPERTY(QString name READ name CONSTANT FINAL)
529
58
    Q_PROPERTY(unity::storage::qt::Account account READ account CONSTANT FINAL)
530
59
    Q_PROPERTY(QString etag READ etag CONSTANT FINAL)
531
60
    Q_PROPERTY(unity::storage::qt::Item::Type type READ type CONSTANT FINAL)
532
61
    Q_PROPERTY(QVariantMap metadata READ metadata CONSTANT FINAL)
533
62
    Q_PROPERTY(QDateTime lastModifiedTime READ lastModifiedTime CONSTANT FINAL)
534
63
    Q_PROPERTY(QVector<QString> parentIds READ parentIds CONSTANT FINAL)
535
64
536
65
public:
537
66
    Item();
538
67
    Item(Item const&);
539
68
    Item(Item&&);
540
69
    ~Item();
541
70
    Item& operator=(Item const&);
542
71
    Item& operator=(Item&&);
543
72
544
73
    enum Type { File, Folder, Root };
545
74
    Q_ENUMS(Type)
546
75
547
76
    bool isValid() const;
548
77
    QString itemId() const;
549
78
    QString name() const;
550
79
    Account account() const;
551
80
    QString etag() const;
552
81
    Type type() const;
553
82
    QVariantMap metadata() const;
554
83
    QDateTime lastModifiedTime() const;
555
84
    QVector<QString> parentIds() const;  // TODO: should be QList
556
85
557
86
    Q_INVOKABLE ItemListJob* parents() const;
558
87
    Q_INVOKABLE ItemJob* copy(Item const& newParent, QString const& newName) const;
559
88
    Q_INVOKABLE ItemJob* move(Item const& newParent, QString const& newName) const;
560
89
    Q_INVOKABLE VoidJob* deleteItem() const;
561
90
562
91
    Q_INVOKABLE Uploader* createUploader(ConflictPolicy policy, qint64 sizeInBytes) const;
563
92
    Q_INVOKABLE Downloader* createDownloader() const;
564
93
565
94
    Q_INVOKABLE ItemListJob* list() const;
566
95
    Q_INVOKABLE ItemListJob* lookup(QString const& name) const;
567
96
    Q_INVOKABLE ItemJob* createFolder(QString const& name) const;
568
97
    Q_INVOKABLE Uploader* createFile(QString const& name) const;
569
98
570
99
    Q_INVOKABLE IntJob* freeSpaceBytes() const;
571
100
    Q_INVOKABLE IntJob* usedSpaceBytes() const;
572
101
573
102
    bool operator==(Item const&) const;
574
103
    bool operator!=(Item const&) const;
575
104
    bool operator<(Item const&) const;
576
105
    bool operator<=(Item const&) const;
577
106
    bool operator>(Item const&) const;
578
107
    bool operator>=(Item const&) const;
579
108
580
109
    size_t hash() const;
581
110
582
111
private:
583
112
    Item(std::shared_ptr<internal::ItemImpl> const&);
584
113
585
114
    std::shared_ptr<internal::ItemImpl> p_;
586
115
587
116
    friend class internal::ItemImpl;
588
117
};
589
118
590
119
}  // namespace qt
591
120
}  // namespace storage
592
121
}  // namespace unity
593
122
594
123
Q_DECLARE_METATYPE(unity::storage::qt::Item)
595
124
Q_DECLARE_METATYPE(QList<unity::storage::qt::Item>)
596
125
Q_DECLARE_METATYPE(unity::storage::qt::Item::Type)
597
126
598
127
namespace std
599
128
{
600
129
601
130
template<> struct Q_DECL_EXPORT hash<unity::storage::qt::Item>
602
131
{
603
132
    std::size_t operator()(unity::storage::qt::Item const& i)
604
133
    {
605
134
        return i.hash();
606
135
    }
607
136
};
608
137
609
138
}  // namespace std
610
139
611
140
// Note: qHash(Item) does *not* return the same hash value is std::hash<Item> because
612
141
//       std:hash() returns size_t (typically 64 bits), but qHash() returns uint (typically 32 bits).
613
142
uint Q_DECL_EXPORT qHash(unity::storage::qt::Item const& i);
614
0
143
615
=== added file 'include/unity/storage/qt/ItemJob.h'
616
--- include/unity/storage/qt/ItemJob.h	1970-01-01 00:00:00 +0000
617
+++ include/unity/storage/qt/ItemJob.h	2016-09-21 05:03:46 +0000
618
@@ -0,0 +1,75 @@
619
1
/*
620
2
 * Copyright (C) 2016 Canonical Ltd
621
3
 *
622
4
 * This program is free software: you can redistribute it and/or modify
623
5
 * it under the terms of the GNU Lesser General Public License version 3 as
624
6
 * published by the Free Software Foundation.
625
7
 *
626
8
 * This program is distributed in the hope that it will be useful,
627
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
628
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
629
11
 * GNU Lesser General Public License for more details.
630
12
 *
631
13
 * You should have received a copy of the GNU Lesser General Public License
632
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
633
15
 *
634
16
 * Authors: Michi Henning <michi.henning@canonical.com>
635
17
 */
636
18
637
19
#pragma once
638
20
639
21
#include <unity/storage/qt/Item.h>
640
22
641
23
#include <QObject>
642
24
643
25
namespace unity
644
26
{
645
27
namespace storage
646
28
{
647
29
namespace qt
648
30
{
649
31
namespace internal
650
32
{
651
33
652
34
class ItemJobImpl;
653
35
654
36
}  // namespace internal
655
37
656
38
class Item;
657
39
class StorageError;
658
40
659
41
class Q_DECL_EXPORT ItemJob final : public QObject
660
42
{
661
43
    Q_OBJECT
662
44
    Q_PROPERTY(bool isValid READ isValid FINAL)
663
45
    Q_PROPERTY(unity::storage::qt::ItemJob::Status status READ status NOTIFY statusChanged FINAL)
664
46
    Q_PROPERTY(unity::storage::qt::StorageError error READ error FINAL)
665
47
    Q_PROPERTY(unity::storage::qt::Item item READ item FINAL)
666
48
667
49
public:
668
50
    virtual ~ItemJob();
669
51
670
52
    enum Status { Loading, Finished, Error };
671
53
    Q_ENUMS(Status)
672
54
673
55
    bool isValid() const;
674
56
    Status status() const;
675
57
    StorageError error() const;
676
58
    Item item() const;
677
59
678
60
Q_SIGNALS:
679
61
    void statusChanged(unity::storage::qt::ItemJob::Status status) const;
680
62
681
63
private:
682
64
    ItemJob(std::unique_ptr<internal::ItemJobImpl> p);
683
65
684
66
    std::unique_ptr<internal::ItemJobImpl> const p_;
685
67
686
68
    friend class internal::ItemJobImpl;
687
69
};
688
70
689
71
}  // namespace qt
690
72
}  // namespace storage
691
73
}  // namespace unity
692
74
693
75
Q_DECLARE_METATYPE(unity::storage::qt::ItemJob::Status)
694
0
76
695
=== added file 'include/unity/storage/qt/ItemListJob.h'
696
--- include/unity/storage/qt/ItemListJob.h	1970-01-01 00:00:00 +0000
697
+++ include/unity/storage/qt/ItemListJob.h	2016-09-21 05:03:46 +0000
698
@@ -0,0 +1,77 @@
699
1
/*
700
2
 * Copyright (C) 2016 Canonical Ltd
701
3
 *
702
4
 * This program is free software: you can redistribute it and/or modify
703
5
 * it under the terms of the GNU Lesser General Public License version 3 as
704
6
 * published by the Free Software Foundation.
705
7
 *
706
8
 * This program is distributed in the hope that it will be useful,
707
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
708
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
709
11
 * GNU Lesser General Public License for more details.
710
12
 *
711
13
 * You should have received a copy of the GNU Lesser General Public License
712
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
713
15
 *
714
16
 * Authors: Michi Henning <michi.henning@canonical.com>
715
17
 */
716
18
717
19
#pragma once
718
20
719
21
#pragma GCC diagnostic push
720
22
#pragma GCC diagnostic ignored "-Wcast-align"
721
23
#include <QObject>
722
24
#pragma GCC diagnostic pop
723
25
724
26
#include <memory>
725
27
726
28
namespace unity
727
29
{
728
30
namespace storage
729
31
{
730
32
namespace qt
731
33
{
732
34
namespace internal
733
35
{
734
36
735
37
class ItemListJobImpl;
736
38
737
39
}  // namespace internal
738
40
739
41
class Item;
740
42
class StorageError;
741
43
742
44
class Q_DECL_EXPORT ItemListJob final : public QObject
743
45
{
744
46
    Q_OBJECT
745
47
    Q_PROPERTY(bool isValid READ isValid FINAL)
746
48
    Q_PROPERTY(unity::storage::qt::ItemListJob::Status status READ status NOTIFY statusChanged FINAL)
747
49
    Q_PROPERTY(unity::storage::qt::StorageError error READ error FINAL)
748
50
749
51
public:
750
52
    virtual ~ItemListJob();
751
53
752
54
    enum Status { Loading, Finished, Error };
753
55
    Q_ENUMS(Status)
754
56
755
57
    bool isValid() const;
756
58
    Status status() const;
757
59
    StorageError error() const;
758
60
759
61
Q_SIGNALS:
760
62
    void statusChanged(unity::storage::qt::ItemListJob::Status status) const;
761
63
    void itemsReady(QList<unity::storage::qt::Item> const& items) const;
762
64
763
65
private:
764
66
    ItemListJob(std::unique_ptr<internal::ItemListJobImpl> p);
765
67
766
68
    std::unique_ptr<internal::ItemListJobImpl> const p_;
767
69
768
70
    friend class internal::ItemListJobImpl;
769
71
};
770
72
771
73
}  // namespace qt
772
74
}  // namespace storage
773
75
}  // namespace unity
774
76
775
77
Q_DECLARE_METATYPE(unity::storage::qt::ItemListJob::Status)
776
0
78
777
=== added file 'include/unity/storage/qt/Runtime.h'
778
--- include/unity/storage/qt/Runtime.h	1970-01-01 00:00:00 +0000
779
+++ include/unity/storage/qt/Runtime.h	2016-09-21 05:03:46 +0000
780
@@ -0,0 +1,80 @@
781
1
/*
782
2
 * Copyright (C) 2016 Canonical Ltd
783
3
 *
784
4
 * This program is free software: you can redistribute it and/or modify
785
5
 * it under the terms of the GNU Lesser General Public License version 3 as
786
6
 * published by the Free Software Foundation.
787
7
 *
788
8
 * This program is distributed in the hope that it will be useful,
789
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
790
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
791
11
 * GNU Lesser General Public License for more details.
792
12
 *
793
13
 * You should have received a copy of the GNU Lesser General Public License
794
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
795
15
 *
796
16
 * Authors: Michi Henning <michi.henning@canonical.com>
797
17
 */
798
18
799
19
#pragma once
800
20
801
21
#include <unity/storage/qt/Account.h>
802
22
#include <unity/storage/qt/StorageError.h>
803
23
804
24
#pragma GCC diagnostic push
805
25
#pragma GCC diagnostic ignored "-Wcast-align"
806
26
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
807
27
#include <QDBusConnection>
808
28
#pragma GCC diagnostic pop
809
29
810
30
#include <memory>
811
31
812
32
class QDBusConnection;
813
33
814
34
namespace unity
815
35
{
816
36
namespace storage
817
37
{
818
38
namespace qt
819
39
{
820
40
namespace internal
821
41
{
822
42
823
43
class RuntimeImpl;
824
44
825
45
}  // namespace internal
826
46
827
47
class AccountsJob;
828
48
829
49
class Q_DECL_EXPORT Runtime final : public QObject
830
50
{
831
51
    Q_PROPERTY(bool isValid READ isValid FINAL)
832
52
    Q_PROPERTY(unity::storage::StorageError error READ FINAL)
833
53
    Q_PROPERTY(QDBusConnection connection READ connection FINAL)
834
54
public:
835
55
    Runtime(QObject* parent = nullptr);
836
56
    Runtime(QDBusConnection const& bus, QObject* parent = nullptr);
837
57
    virtual ~Runtime();
838
58
839
59
    bool isValid() const;
840
60
    StorageError error() const;
841
61
    QDBusConnection connection() const;
842
62
    StorageError shutdown();
843
63
    Q_INVOKABLE AccountsJob* accounts() const;
844
64
845
65
    // TODO: Get rid of two-argument version and default trailing params.
846
66
    // TODO: can be const methods.
847
67
    Account make_test_account(QString const& bus_name, QString const& object_path);
848
68
    Account make_test_account(QString const& bus_name,
849
69
                              QString const& object_path,
850
70
                              QString const& owner_id,
851
71
                              QString const& owner,
852
72
                              QString const& description);
853
73
854
74
private:
855
75
    std::shared_ptr<internal::RuntimeImpl> p_;
856
76
};
857
77
858
78
}  // namespace qt
859
79
}  // namespace storage
860
80
}  // namespace unity
861
0
81
862
=== added file 'include/unity/storage/qt/StorageError.h'
863
--- include/unity/storage/qt/StorageError.h	1970-01-01 00:00:00 +0000
864
+++ include/unity/storage/qt/StorageError.h	2016-09-21 05:03:46 +0000
865
@@ -0,0 +1,87 @@
866
1
/*
867
2
 * Copyright (C) 2016 Canonical Ltd
868
3
 *
869
4
 * This program is free software: you can redistribute it and/or modify
870
5
 * it under the terms of the GNU Lesser General Public License version 3 as
871
6
 * published by the Free Software Foundation.
872
7
 *
873
8
 * This program is distributed in the hope that it will be useful,
874
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
875
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
876
11
 * GNU Lesser General Public License for more details.
877
12
 *
878
13
 * You should have received a copy of the GNU Lesser General Public License
879
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
880
15
 *
881
16
 * Authors: Michi Henning <michi.henning@canonical.com>
882
17
 */
883
18
884
19
#pragma once
885
20
886
21
#include <QMetaType>
887
22
#include <QString>
888
23
889
24
#include <memory>
890
25
891
26
namespace unity
892
27
{
893
28
namespace storage
894
29
{
895
30
namespace qt
896
31
{
897
32
namespace internal
898
33
{
899
34
900
35
class StorageErrorImpl;
901
36
902
37
}
903
38
904
39
class Q_DECL_EXPORT StorageError final
905
40
{
906
41
    Q_GADGET
907
42
    Q_PROPERTY(unity::storage::qt::StorageError::Type type READ type FINAL)
908
43
    Q_PROPERTY(QString name READ name FINAL)
909
44
    Q_PROPERTY(QString message READ message FINAL)
910
45
    Q_PROPERTY(QString errorString READ errorString FINAL)
911
46
912
47
    Q_PROPERTY(QString itemId READ itemId FINAL)
913
48
    Q_PROPERTY(QString itemName READ itemName FINAL)
914
49
    Q_PROPERTY(int errorCode READ errorCode FINAL)
915
50
916
51
public:
917
52
    StorageError();
918
53
    StorageError(StorageError const&);
919
54
    StorageError(StorageError&&);
920
55
    ~StorageError();
921
56
    StorageError& operator=(StorageError const&);
922
57
    StorageError& operator=(StorageError&&);
923
58
924
59
    enum Type
925
60
    {
926
61
        NoError, LocalCommsError, RemoteCommsError, Deleted, RuntimeDestroyed, NotExists,
927
62
        Exists, Conflict, PermissionDenied, Cancelled, LogicError, InvalidArgument, ResourceError,
928
63
        QuotaExceeded,
929
64
        __LAST_STORAGE_ERROR
930
65
    };
931
66
    Q_ENUMS(Type)
932
67
933
68
    Type type() const;
934
69
    QString name() const;
935
70
    QString message() const;
936
71
    QString errorString() const;
937
72
938
73
    QString itemId() const;
939
74
    QString itemName() const;
940
75
    int errorCode() const;
941
76
942
77
private:
943
78
    StorageError(std::unique_ptr<internal::StorageErrorImpl>);
944
79
945
80
    std::unique_ptr<internal::StorageErrorImpl> p_;
946
81
947
82
    friend class internal::StorageErrorImpl;
948
83
};
949
84
950
85
}  // namespace qt
951
86
}  // namespace storage
952
87
}  // namespace unity
953
0
88
954
=== added file 'include/unity/storage/qt/Uploader.h'
955
--- include/unity/storage/qt/Uploader.h	1970-01-01 00:00:00 +0000
956
+++ include/unity/storage/qt/Uploader.h	2016-09-21 05:03:46 +0000
957
@@ -0,0 +1,72 @@
958
1
/*
959
2
 * Copyright (C) 2016 Canonical Ltd
960
3
 *
961
4
 * This program is free software: you can redistribute it and/or modify
962
5
 * it under the terms of the GNU Lesser General Public License version 3 as
963
6
 * published by the Free Software Foundation.
964
7
 *
965
8
 * This program is distributed in the hope that it will be useful,
966
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
967
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
968
11
 * GNU Lesser General Public License for more details.
969
12
 *
970
13
 * You should have received a copy of the GNU Lesser General Public License
971
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
972
15
 *
973
16
 * Authors: Michi Henning <michi.henning@canonical.com>
974
17
 */
975
18
976
19
#pragma once
977
20
978
21
#include <unity/storage/common.h>
979
22
980
23
#include <QIODevice>
981
24
982
25
namespace unity
983
26
{
984
27
namespace storage
985
28
{
986
29
namespace qt
987
30
{
988
31
989
32
class Item;
990
33
class StorageError;
991
34
992
35
class Q_DECL_EXPORT Uploader final : public QIODevice
993
36
{
994
37
    Q_OBJECT
995
38
    Q_PROPERTY(bool isValid READ isValid FINAL) // TODO: Need notify
996
39
    Q_PROPERTY(unity::storage::qt::Uploader::Status status READ status FINAL)
997
40
    Q_PROPERTY(unity::storage::qt::StorageError READ error FINAL)
998
41
    Q_PROPERTY(unity::storage::qt::ConflictPolicy policy READ policy FINAL)
999
42
    Q_PROPERTY(qint64 sizeInBytes READ sizeInBytes FINAL)
1000
43
    Q_PROPERTY(unity::storage::qt::Item item READ item FINAL)
1001
44
1002
45
public:
1003
46
    enum Status { Loading, Cancelled, Finished, Error };
1004
47
    Q_ENUMS(Status)
1005
48
1006
49
    Uploader();
1007
50
    virtual ~Uploader();
1008
51
1009
52
    bool isValid() const;
1010
53
    Status status() const;
1011
54
    StorageError error() const;
1012
55
    ConflictPolicy policy() const;
1013
56
    qint64 sizeInBytes() const;
1014
57
    Item item() const;
1015
58
1016
59
    Q_INVOKABLE void finishUpload();
1017
60
    Q_INVOKABLE void cancel();
1018
61
1019
62
Q_SIGNALS:
1020
63
    void statusChanged(unity::storage::qt::Uploader::Status status) const;
1021
64
1022
65
protected:
1023
66
    virtual qint64 readData(char* data, qint64 maxSize) override;
1024
67
    virtual qint64 writeData(char const* data, qint64 maxSize) override;
1025
68
};
1026
69
1027
70
}  // namespace qt
1028
71
}  // namespace storage
1029
72
}  // namespace unity
1030
0
73
1031
=== added file 'include/unity/storage/qt/VoidJob.h'
1032
--- include/unity/storage/qt/VoidJob.h	1970-01-01 00:00:00 +0000
1033
+++ include/unity/storage/qt/VoidJob.h	2016-09-21 05:03:46 +0000
1034
@@ -0,0 +1,56 @@
1035
1
/*
1036
2
 * Copyright (C) 2016 Canonical Ltd
1037
3
 *
1038
4
 * This program is free software: you can redistribute it and/or modify
1039
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1040
6
 * published by the Free Software Foundation.
1041
7
 *
1042
8
 * This program is distributed in the hope that it will be useful,
1043
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1044
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1045
11
 * GNU Lesser General Public License for more details.
1046
12
 *
1047
13
 * You should have received a copy of the GNU Lesser General Public License
1048
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1049
15
 *
1050
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1051
17
 */
1052
18
1053
19
#pragma once
1054
20
1055
21
#include <QObject>
1056
22
1057
23
namespace unity
1058
24
{
1059
25
namespace storage
1060
26
{
1061
27
namespace qt
1062
28
{
1063
29
1064
30
class StorageError;
1065
31
1066
32
class Q_DECL_EXPORT VoidJob final : public QObject
1067
33
{
1068
34
    // TODO: notify, CONSTANT where needed
1069
35
    Q_OBJECT
1070
36
    Q_PROPERTY(bool READ isValid FINAL)
1071
37
    Q_PROPERTY(unity::storage::qt::VoidJob::Status READ status NOTIFY statusChanged FINAL)
1072
38
    Q_PROPERTY(unity::storage::qt::StorageError READ error FINAL)
1073
39
1074
40
public:
1075
41
    virtual ~VoidJob();
1076
42
1077
43
    enum Status { Loading, Finished, Error };
1078
44
    Q_ENUMS(Status)
1079
45
1080
46
    bool isValid() const;
1081
47
    Status status() const;
1082
48
    StorageError error() const;
1083
49
1084
50
Q_SIGNALS:
1085
51
    void statusChanged(unity::storage::qt::VoidJob::Status status) const;
1086
52
};
1087
53
1088
54
}  // namespace qt
1089
55
}  // namespace storage
1090
56
}  // namespace unity
1091
0
57
1092
=== modified file 'include/unity/storage/qt/client/CMakeLists.txt'
1093
--- include/unity/storage/qt/client/CMakeLists.txt	2016-07-11 03:28:40 +0000
1094
+++ include/unity/storage/qt/client/CMakeLists.txt	2016-09-21 05:03:46 +0000
1095
@@ -8,8 +8,7 @@
1096
8
        ${convenience_hdr} ${includeprefix} ${CMAKE_CURRENT_SOURCE_DIR}
8
        ${convenience_hdr} ${includeprefix} ${CMAKE_CURRENT_SOURCE_DIR}
1097
9
    DEPENDS ${public_hdrs})
9
    DEPENDS ${public_hdrs})
1098
10
10
1100
11
add_custom_target(qt-client-all-headers ALL DEPENDS ${convenience_hdr})
11
add_custom_target(qt-client-all-headers-v1 ALL DEPENDS ${convenience_hdr})
1101
12
12
1105
13
install(
13
install(FILES ${public_hdrs} ${convenience_hdr}
1106
14
    FILES ${public_hdrs} ${convenience_hdr}
14
  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-client-1/${includeprefix})
1104
15
    DESTINATION ${client_base_includedir}/${includeprefix})
1107
16
15
1108
=== added directory 'include/unity/storage/qt/internal'
1109
=== added file 'include/unity/storage/qt/internal/AccountImpl.h'
1110
--- include/unity/storage/qt/internal/AccountImpl.h	1970-01-01 00:00:00 +0000
1111
+++ include/unity/storage/qt/internal/AccountImpl.h	2016-09-21 05:03:46 +0000
1112
@@ -0,0 +1,99 @@
1113
1
/*
1114
2
 * Copyright (C) 2016 Canonical Ltd
1115
3
 *
1116
4
 * This program is free software: you can redistribute it and/or modify
1117
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1118
6
 * published by the Free Software Foundation.
1119
7
 *
1120
8
 * This program is distributed in the hope that it will be useful,
1121
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1122
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1123
11
 * GNU Lesser General Public License for more details.
1124
12
 *
1125
13
 * You should have received a copy of the GNU Lesser General Public License
1126
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1127
15
 *
1128
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1129
17
 */
1130
18
1131
19
#pragma once
1132
20
1133
21
#include <unity/storage/qt/Item.h>
1134
22
1135
23
#include <QString>
1136
24
1137
25
#include <memory>
1138
26
1139
27
class ProviderInterface;
1140
28
1141
29
namespace unity
1142
30
{
1143
31
namespace storage
1144
32
{
1145
33
namespace qt
1146
34
{
1147
35
namespace internal
1148
36
{
1149
37
1150
38
class RuntimeImpl;
1151
39
1152
40
class AccountImpl : public std::enable_shared_from_this<AccountImpl>
1153
41
{
1154
42
public:
1155
43
    AccountImpl();
1156
44
    AccountImpl(AccountImpl const&) = default;
1157
45
    AccountImpl(AccountImpl&&) = default;
1158
46
    ~AccountImpl() = default;
1159
47
    AccountImpl& operator=(AccountImpl const&) = default;
1160
48
    AccountImpl& operator=(AccountImpl&&) = default;
1161
49
1162
50
    QString ownerId() const;
1163
51
    QString owner() const;
1164
52
    QString description() const;
1165
53
1166
54
    ItemListJob* roots() const;
1167
55
    ItemJob* get(QString const& itemId) const;
1168
56
1169
57
    bool operator==(AccountImpl const&) const;
1170
58
    bool operator!=(AccountImpl const&) const;
1171
59
    bool operator<(AccountImpl const&) const;
1172
60
    bool operator<=(AccountImpl const&) const;
1173
61
    bool operator>(AccountImpl const&) const;
1174
62
    bool operator>=(AccountImpl const&) const;
1175
63
1176
64
    size_t hash() const;
1177
65
1178
66
    //std::shared_ptr<RuntimeImpl> runtime() const;
1179
67
    std::shared_ptr<ProviderInterface> provider() const;
1180
68
1181
69
    static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime,
1182
70
                                QString const& bus_name,
1183
71
                                QString const& object_path,
1184
72
                                QString const& owner_id,
1185
73
                                QString const& owner,
1186
74
                                QString const& description);
1187
75
1188
76
private:
1189
77
    AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime,
1190
78
                QString const& bus_name,
1191
79
                QString const& object_path,
1192
80
                QString const& owner_id,
1193
81
                QString const& owner,
1194
82
                QString const& description);
1195
83
1196
84
    bool is_valid_;
1197
85
    QString bus_name_;
1198
86
    QString object_path_;
1199
87
    QString owner_id_;
1200
88
    QString owner_;
1201
89
    QString description_;
1202
90
    std::weak_ptr<RuntimeImpl> runtime_;
1203
91
    std::shared_ptr<ProviderInterface> provider_;
1204
92
1205
93
    friend class unity::storage::qt::Account;
1206
94
};
1207
95
1208
96
}  // namespace internal
1209
97
}  // namespace qt
1210
98
}  // namespace storage
1211
99
}  // namespace unity
1212
0
100
1213
=== added file 'include/unity/storage/qt/internal/AccountsJobImpl.h'
1214
--- include/unity/storage/qt/internal/AccountsJobImpl.h	1970-01-01 00:00:00 +0000
1215
+++ include/unity/storage/qt/internal/AccountsJobImpl.h	2016-09-21 05:03:46 +0000
1216
@@ -0,0 +1,70 @@
1217
1
/*
1218
2
 * Copyright (C) 2016 Canonical Ltd
1219
3
 *
1220
4
 * This program is free software: you can redistribute it and/or modify
1221
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1222
6
 * published by the Free Software Foundation.
1223
7
 *
1224
8
 * This program is distributed in the hope that it will be useful,
1225
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1226
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1227
11
 * GNU Lesser General Public License for more details.
1228
12
 *
1229
13
 * You should have received a copy of the GNU Lesser General Public License
1230
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1231
15
 *
1232
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1233
17
 */
1234
18
1235
19
#pragma once
1236
20
1237
21
#include <unity/storage/qt/AccountsJob.h>
1238
22
1239
23
#include <QTimer>
1240
24
1241
25
namespace unity
1242
26
{
1243
27
namespace storage
1244
28
{
1245
29
namespace qt
1246
30
{
1247
31
namespace internal
1248
32
{
1249
33
1250
34
class AccountsJobImpl : public QObject
1251
35
{
1252
36
    Q_OBJECT
1253
37
public:
1254
38
    AccountsJobImpl(AccountsJob* public_instance, std::shared_ptr<RuntimeImpl> const& runtime);
1255
39
    AccountsJobImpl(AccountsJob* public_instance, StorageError const& error);
1256
40
    virtual ~AccountsJobImpl() = default;
1257
41
1258
42
    bool isValid() const;
1259
43
    AccountsJob::Status status() const;
1260
44
    StorageError error() const;
1261
45
    QList<Account> accounts() const;
1262
46
1263
47
private Q_SLOTS:
1264
48
    void manager_ready();
1265
49
    void timeout();
1266
50
1267
51
private:
1268
52
    std::shared_ptr<RuntimeImpl> get_runtime(QString const& method) const;
1269
53
    void initialize_accounts();
1270
54
    AccountsJob::Status emit_status_changed(AccountsJob::Status new_status) const;
1271
55
1272
56
    AccountsJob* const public_instance_;
1273
57
1274
58
    AccountsJob::Status status_;
1275
59
    StorageError error_;
1276
60
    QList<unity::storage::qt::Account> accounts_;
1277
61
    std::weak_ptr<RuntimeImpl> const runtime_;
1278
62
    QTimer timer_;
1279
63
1280
64
    friend class unity::storage::qt::AccountsJob;
1281
65
};
1282
66
1283
67
}  // namespace internal
1284
68
}  // namespace qt
1285
69
}  // namespace storage
1286
70
}  // namespace unity
1287
0
71
1288
=== added file 'include/unity/storage/qt/internal/Handler.h'
1289
--- include/unity/storage/qt/internal/Handler.h	1970-01-01 00:00:00 +0000
1290
+++ include/unity/storage/qt/internal/Handler.h	2016-09-21 05:03:46 +0000
1291
@@ -0,0 +1,93 @@
1292
1
/*
1293
2
 * Copyright (C) 2016 Canonical Ltd
1294
3
 *
1295
4
 * This program is free software: you can redistribute it and/or modify
1296
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1297
6
 * published by the Free Software Foundation.
1298
7
 *
1299
8
 * This program is distributed in the hope that it will be useful,
1300
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1301
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1302
11
 * GNU Lesser General Public License for more details.
1303
12
 *
1304
13
 * You should have received a copy of the GNU Lesser General Public License
1305
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1306
15
 *
1307
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1308
17
 */
1309
18
1310
19
#pragma once
1311
20
1312
21
#include <unity/storage/qt/internal/HandlerBase.h>
1313
22
#include <unity/storage/qt/internal/StorageErrorImpl.h>
1314
23
#include <unity/storage/qt/internal/unmarshal_error.h>
1315
24
1316
25
#include <QDBusPendingReply>
1317
26
#include <QDebug>
1318
27
1319
28
#include <cassert>
1320
29
1321
30
namespace unity
1322
31
{
1323
32
namespace storage
1324
33
{
1325
34
namespace qt
1326
35
{
1327
36
namespace internal
1328
37
{
1329
38
1330
39
template<typename T>
1331
40
class Handler : public HandlerBase
1332
41
{
1333
42
public:
1334
43
    template<typename ... DBusArgs>
1335
44
    Handler(QObject* parent,
1336
45
            QDBusPendingReply<DBusArgs...> const& reply,
1337
46
            std::function<void(decltype(reply)&)> const& success_closure,
1338
47
            std::function<void(StorageError const&)> const& error_closure)
1339
48
        : HandlerBase(parent,
1340
49
                      reply,
1341
50
                      [this, success_closure, error_closure](QDBusPendingCallWatcher& call)
1342
51
                          {
1343
52
                              if (call.isError())
1344
53
                              {
1345
54
                                  auto e = unmarshal_error(call);
1346
55
                                  switch (e.type())
1347
56
                                  {
1348
57
                                      case StorageError::NoError:
1349
58
                                      {
1350
59
                                          // LCOV_EXCL_START
1351
60
                                          QString msg = "impossible provider exception: " + e.errorString();
1352
61
                                          qCritical() << msg;
1353
62
                                          e = StorageErrorImpl::local_comms_error(msg);
1354
63
                                          break;
1355
64
                                          // LCOV_EXCL_STOP
1356
65
                                      }
1357
66
                                      case StorageError::LocalCommsError:
1358
67
                                      case StorageError::RemoteCommsError:
1359
68
                                      case StorageError::ResourceError:
1360
69
                                      {
1361
70
                                          // Log these errors because they are unexpected.
1362
71
                                          qCritical() << "provider exception:" << e.errorString();
1363
72
                                          break;
1364
73
                                      }
1365
74
                                      default:
1366
75
                                      {
1367
76
                                          // All other errors are not logged.
1368
77
                                          break;
1369
78
                                      }
1370
79
                                  }
1371
80
                                  error_closure(e);
1372
81
                                  return;
1373
82
                              }
1374
83
                              QDBusPendingReply<DBusArgs...> r = call;
1375
84
                              success_closure(call);
1376
85
                          })
1377
86
    {
1378
87
    }
1379
88
};
1380
89
1381
90
}  // namespace internal
1382
91
}  // namespace qt
1383
92
}  // namespace storage
1384
93
}  // namespace unity
1385
0
94
1386
=== added file 'include/unity/storage/qt/internal/HandlerBase.h'
1387
--- include/unity/storage/qt/internal/HandlerBase.h	1970-01-01 00:00:00 +0000
1388
+++ include/unity/storage/qt/internal/HandlerBase.h	2016-09-21 05:03:46 +0000
1389
@@ -0,0 +1,64 @@
1390
1
/*
1391
2
 * Copyright (C) 2016 Canonical Ltd
1392
3
 *
1393
4
 * This program is free software: you can redistribute it and/or modify
1394
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1395
6
 * published by the Free Software Foundation.
1396
7
 *
1397
8
 * This program is distributed in the hope that it will be useful,
1398
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1399
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1400
11
 * GNU Lesser General Public License for more details.
1401
12
 *
1402
13
 * You should have received a copy of the GNU Lesser General Public License
1403
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1404
15
 *
1405
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1406
17
 */
1407
18
1408
19
#pragma once
1409
20
1410
21
#pragma GCC diagnostic push
1411
22
#pragma GCC diagnostic ignored "-Wcast-align"
1412
23
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1413
24
#pragma GCC diagnostic ignored "-Wswitch-default"
1414
25
#include <QDBusPendingCallWatcher>
1415
26
#include <QObject>
1416
27
#pragma GCC diagnostic pop
1417
28
1418
29
#include <functional>
1419
30
1420
31
class QDBusPendingCall;
1421
32
1422
33
namespace unity
1423
34
{
1424
35
namespace storage
1425
36
{
1426
37
namespace qt
1427
38
{
1428
39
namespace internal
1429
40
{
1430
41
1431
42
class HandlerBase : public QObject
1432
43
{
1433
44
    Q_OBJECT
1434
45
1435
46
public:
1436
47
    HandlerBase(QObject* parent,
1437
48
                QDBusPendingCall const& call,
1438
49
                std::function<void(QDBusPendingCallWatcher&)> const& closure);
1439
50
1440
51
public Q_SLOTS:
1441
52
    void finished(QDBusPendingCallWatcher* call);
1442
53
1443
54
protected:
1444
55
    QDBusPendingCallWatcher watcher_;
1445
56
1446
57
private:
1447
58
    std::function<void(QDBusPendingCallWatcher&)> closure_;
1448
59
};
1449
60
1450
61
}  // namespace internal
1451
62
}  // namespace qt
1452
63
}  // namespace storage
1453
64
}  // namespace unity
1454
0
65
1455
=== added file 'include/unity/storage/qt/internal/ItemImpl.h'
1456
--- include/unity/storage/qt/internal/ItemImpl.h	1970-01-01 00:00:00 +0000
1457
+++ include/unity/storage/qt/internal/ItemImpl.h	2016-09-21 05:03:46 +0000
1458
@@ -0,0 +1,99 @@
1459
1
/*
1460
2
 * Copyright (C) 2016 Canonical Ltd
1461
3
 *
1462
4
 * This program is free software: you can redistribute it and/or modify
1463
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1464
6
 * published by the Free Software Foundation.
1465
7
 *
1466
8
 * This program is distributed in the hope that it will be useful,
1467
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1468
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1469
11
 * GNU Lesser General Public License for more details.
1470
12
 *
1471
13
 * You should have received a copy of the GNU Lesser General Public License
1472
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1473
15
 *
1474
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1475
17
 */
1476
18
1477
19
#pragma once
1478
20
1479
21
#include <unity/storage/internal/ItemMetadata.h>
1480
22
#include <unity/storage/qt/Account.h>
1481
23
#include <unity/storage/qt/Item.h>
1482
24
1483
25
namespace unity
1484
26
{
1485
27
namespace storage
1486
28
{
1487
29
namespace qt
1488
30
{
1489
31
namespace internal
1490
32
{
1491
33
1492
34
class AccountImpl;
1493
35
class RuntimeImpl;
1494
36
1495
37
class ItemImpl : public std::enable_shared_from_this<ItemImpl>
1496
38
{
1497
39
public:
1498
40
    ItemImpl();
1499
41
    ItemImpl(storage::internal::ItemMetadata const& md,
1500
42
             std::shared_ptr<AccountImpl> const& account);
1501
43
    ItemImpl(ItemImpl const&) = default;
1502
44
    ItemImpl(ItemImpl&&) = delete;
1503
45
    ~ItemImpl() = default;
1504
46
    ItemImpl& operator=(ItemImpl const&) = default;
1505
47
    ItemImpl& operator=(ItemImpl&&) = delete;
1506
48
1507
49
    QString itemId() const;
1508
50
    QString name() const;
1509
51
    Account account() const;
1510
52
    //Item root() const;
1511
53
    QString etag() const;
1512
54
    Item::Type type() const;
1513
55
    QVariantMap metadata() const;
1514
56
    QDateTime lastModifiedTime() const;
1515
57
    QVector<QString> parentIds() const;
1516
58
1517
59
    ItemListJob* parents() const;
1518
60
    ItemJob* copy(Item const& newParent, QString const& newName) const;
1519
61
    ItemJob* move(Item const& newParent, QString const& newName) const;
1520
62
    VoidJob* deleteItem() const;
1521
63
    Uploader* createUploader(ConflictPolicy policy, qint64 sizeInBytes) const;
1522
64
    Downloader* createDownloader() const;
1523
65
    ItemListJob* list() const;
1524
66
    ItemListJob* lookup(QString const& name) const;
1525
67
    ItemJob* createFolder(QString const& name) const;
1526
68
    Uploader* createFile(QString const& name) const;
1527
69
    IntJob* freeSpaceBytes() const;
1528
70
    IntJob* usedSpaceBytes() const;
1529
71
1530
72
    bool operator==(ItemImpl const&) const;
1531
73
    bool operator!=(ItemImpl const&) const;
1532
74
    bool operator<(ItemImpl const&) const;
1533
75
    bool operator<=(ItemImpl const&) const;
1534
76
    bool operator>(ItemImpl const&) const;
1535
77
    bool operator>=(ItemImpl const&) const;
1536
78
1537
79
    size_t hash() const;
1538
80
1539
81
    static Item make_item(QString const& method,
1540
82
                          storage::internal::ItemMetadata const& md,
1541
83
                          std::shared_ptr<AccountImpl> const& account);
1542
84
1543
85
private:
1544
86
    //std::shared_ptr<RuntimeImpl> get_runtime(QString const& method) const;
1545
87
1546
88
    bool is_valid_;
1547
89
    storage::internal::ItemMetadata md_;
1548
90
    std::shared_ptr<AccountImpl> account_;
1549
91
    //std::shared_ptr<RootImpl> root_;
1550
92
1551
93
    friend class unity::storage::qt::Item;
1552
94
};
1553
95
1554
96
}  // namespace internal
1555
97
}  // namespace qt
1556
98
}  // namespace storage
1557
99
}  // namespace unity
1558
0
100
1559
=== added file 'include/unity/storage/qt/internal/ItemJobImpl.h'
1560
--- include/unity/storage/qt/internal/ItemJobImpl.h	1970-01-01 00:00:00 +0000
1561
+++ include/unity/storage/qt/internal/ItemJobImpl.h	2016-09-21 05:03:46 +0000
1562
@@ -0,0 +1,84 @@
1563
1
/*
1564
2
 * Copyright (C) 2016 Canonical Ltd
1565
3
 *
1566
4
 * This program is free software: you can redistribute it and/or modify
1567
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1568
6
 * published by the Free Software Foundation.
1569
7
 *
1570
8
 * This program is distributed in the hope that it will be useful,
1571
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1572
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1573
11
 * GNU Lesser General Public License for more details.
1574
12
 *
1575
13
 * You should have received a copy of the GNU Lesser General Public License
1576
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1577
15
 *
1578
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1579
17
 */
1580
18
1581
19
#pragma once
1582
20
1583
21
#include <unity/storage/qt/ItemJob.h>
1584
22
1585
23
#include <unity/storage/qt/Account.h>
1586
24
#include <unity/storage/qt/internal/Handler.h>
1587
25
#include <unity/storage/qt/StorageError.h>
1588
26
1589
27
namespace unity
1590
28
{
1591
29
namespace storage
1592
30
{
1593
31
namespace internal
1594
32
{
1595
33
1596
34
class ItemMetadata;
1597
35
1598
36
}
1599
37
1600
38
namespace qt
1601
39
{
1602
40
namespace internal
1603
41
{
1604
42
1605
43
class RuntimeImpl;
1606
44
1607
45
class ItemJobImpl : public QObject
1608
46
{
1609
47
    Q_OBJECT
1610
48
public:
1611
49
    virtual ~ItemJobImpl() = default;
1612
50
1613
51
    bool isValid() const;
1614
52
    ItemJob::Status status() const;
1615
53
    StorageError error() const;
1616
54
    Item item() const;
1617
55
1618
56
    static ItemJob* make_item_job(std::shared_ptr<AccountImpl> const& account,
1619
57
                                  QString const& method,
1620
58
                                  QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
1621
59
                                  std::function<void(storage::internal::ItemMetadata const&)> const& validate);
1622
60
    static ItemJob* make_item_job(StorageError const& e);
1623
61
1624
62
private:
1625
63
    ItemJobImpl(std::shared_ptr<AccountImpl> const& account,
1626
64
                QString const& method,
1627
65
                QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
1628
66
                std::function<void(storage::internal::ItemMetadata const&)> const& validate);
1629
67
    ItemJobImpl(StorageError const& e);
1630
68
1631
69
    ItemJob::Status emit_status_changed(ItemJob::Status new_status) const;
1632
70
1633
71
    ItemJob* public_instance_;
1634
72
1635
73
    ItemJob::Status status_;
1636
74
    StorageError error_;
1637
75
    QString method_;
1638
76
    std::shared_ptr<AccountImpl> account_;
1639
77
    std::function<void(storage::internal::ItemMetadata const&)> validate_;
1640
78
    Item item_;
1641
79
};
1642
80
1643
81
}  // namespace internal
1644
82
}  // namespace qt
1645
83
}  // namespace storage
1646
84
}  // namespace unity
1647
0
85
1648
=== added file 'include/unity/storage/qt/internal/ItemListJobImpl.h'
1649
--- include/unity/storage/qt/internal/ItemListJobImpl.h	1970-01-01 00:00:00 +0000
1650
+++ include/unity/storage/qt/internal/ItemListJobImpl.h	2016-09-21 05:03:46 +0000
1651
@@ -0,0 +1,83 @@
1652
1
/*
1653
2
 * Copyright (C) 2016 Canonical Ltd
1654
3
 *
1655
4
 * This program is free software: you can redistribute it and/or modify
1656
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1657
6
 * published by the Free Software Foundation.
1658
7
 *
1659
8
 * This program is distributed in the hope that it will be useful,
1660
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1661
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1662
11
 * GNU Lesser General Public License for more details.
1663
12
 *
1664
13
 * You should have received a copy of the GNU Lesser General Public License
1665
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1666
15
 *
1667
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1668
17
 */
1669
18
1670
19
#pragma once
1671
20
1672
21
#include <unity/storage/qt/ItemListJob.h>
1673
22
1674
23
#include <unity/storage/qt/Account.h>
1675
24
#include <unity/storage/qt/internal/Handler.h>
1676
25
#include <unity/storage/qt/StorageError.h>
1677
26
1678
27
namespace unity
1679
28
{
1680
29
namespace storage
1681
30
{
1682
31
namespace internal
1683
32
{
1684
33
1685
34
class ItemMetadata;
1686
35
1687
36
}
1688
37
1689
38
namespace qt
1690
39
{
1691
40
namespace internal
1692
41
{
1693
42
1694
43
class RuntimeImpl;
1695
44
1696
45
class ItemListJobImpl : public QObject
1697
46
{
1698
47
    Q_OBJECT
1699
48
public:
1700
49
    virtual ~ItemListJobImpl() = default;
1701
50
1702
51
    bool isValid() const;
1703
52
    ItemListJob::Status status() const;
1704
53
    StorageError error() const;
1705
54
1706
55
    static ItemListJob* make_item_list_job(std::shared_ptr<AccountImpl> const& account,
1707
56
                                           QString const& method,
1708
57
                                           QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
1709
58
                                           std::function<void(storage::internal::ItemMetadata const&)> const& validate);
1710
59
    static ItemListJob* make_item_list_job(StorageError const& error);
1711
60
1712
61
private:
1713
62
    ItemListJobImpl(std::shared_ptr<AccountImpl> const& account,
1714
63
                    QString const& method,
1715
64
                    QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
1716
65
                    std::function<void(storage::internal::ItemMetadata const&)> const& validate);
1717
66
    ItemListJobImpl(StorageError const& error);
1718
67
1719
68
    ItemListJob::Status emit_status_changed(ItemListJob::Status new_status) const;
1720
69
    void emit_items_ready(QList<unity::storage::qt::Item> const& items) const;
1721
70
1722
71
    ItemListJob* public_instance_;
1723
72
1724
73
    ItemListJob::Status status_;
1725
74
    StorageError error_;
1726
75
    QString method_;
1727
76
    std::shared_ptr<AccountImpl> account_;
1728
77
    std::function<void(storage::internal::ItemMetadata const&)> validate_;
1729
78
};
1730
79
1731
80
}  // namespace internal
1732
81
}  // namespace qt
1733
82
}  // namespace storage
1734
83
}  // namespace unity
1735
0
84
1736
=== added file 'include/unity/storage/qt/internal/RuntimeImpl.h'
1737
--- include/unity/storage/qt/internal/RuntimeImpl.h	1970-01-01 00:00:00 +0000
1738
+++ include/unity/storage/qt/internal/RuntimeImpl.h	2016-09-21 05:03:46 +0000
1739
@@ -0,0 +1,85 @@
1740
1
/*
1741
2
 * Copyright (C) 2016 Canonical Ltd
1742
3
 *
1743
4
 * This program is free software: you can redistribute it and/or modify
1744
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1745
6
 * published by the Free Software Foundation.
1746
7
 *
1747
8
 * This program is distributed in the hope that it will be useful,
1748
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1749
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1750
11
 * GNU Lesser General Public License for more details.
1751
12
 *
1752
13
 * You should have received a copy of the GNU Lesser General Public License
1753
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1754
15
 *
1755
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1756
17
 */
1757
18
1758
19
#pragma once
1759
20
1760
21
#include <unity/storage/qt/Account.h>
1761
22
#include <unity/storage/qt/StorageError.h>
1762
23
1763
24
#include <OnlineAccounts/Manager>
1764
25
1765
26
#pragma GCC diagnostic push
1766
27
#pragma GCC diagnostic ignored "-Wcast-align"
1767
28
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1768
29
#include <QDBusConnection>
1769
30
#pragma GCC diagnostic pop
1770
31
1771
32
namespace unity
1772
33
{
1773
34
namespace storage
1774
35
{
1775
36
namespace qt
1776
37
{
1777
38
1778
39
class AccountsJob;
1779
40
class Runtime;
1780
41
1781
42
namespace internal
1782
43
{
1783
44
1784
45
class RuntimeImpl : public std::enable_shared_from_this<RuntimeImpl>
1785
46
{
1786
47
public:
1787
48
    RuntimeImpl();
1788
49
    RuntimeImpl(QDBusConnection const& bus);
1789
50
    RuntimeImpl(RuntimeImpl const&) = delete;
1790
51
    RuntimeImpl(RuntimeImpl&&) = delete;
1791
52
    ~RuntimeImpl();
1792
53
    RuntimeImpl& operator=(RuntimeImpl const&) = delete;
1793
54
    RuntimeImpl& operator=(RuntimeImpl&&) = delete;
1794
55
1795
56
    bool isValid() const;
1796
57
    StorageError error() const;
1797
58
    QDBusConnection connection() const;
1798
59
    AccountsJob* accounts() const;
1799
60
    StorageError shutdown();
1800
61
1801
62
    std::shared_ptr<OnlineAccounts::Manager> accounts_manager() const;
1802
63
1803
64
    Account make_test_account(QString const& bus_name,
1804
65
                              QString const& object_path);
1805
66
1806
67
    Account make_test_account(QString const& bus_name,
1807
68
                              QString const& object_path,
1808
69
                              QString const& owner_id,
1809
70
                              QString const& owner,
1810
71
                              QString const& description);
1811
72
1812
73
private:
1813
74
    bool is_valid_;
1814
75
    StorageError error_;
1815
76
    QDBusConnection conn_;
1816
77
    std::shared_ptr<OnlineAccounts::Manager> accounts_manager_;
1817
78
1818
79
    friend class unity::storage::qt::Runtime;
1819
80
};
1820
81
1821
82
}  // namespace internal
1822
83
}  // namespace qt
1823
84
}  // namespace storage
1824
85
}  // namespace unity
1825
0
86
1826
=== added file 'include/unity/storage/qt/internal/StorageErrorImpl.h'
1827
--- include/unity/storage/qt/internal/StorageErrorImpl.h	1970-01-01 00:00:00 +0000
1828
+++ include/unity/storage/qt/internal/StorageErrorImpl.h	2016-09-21 05:03:46 +0000
1829
@@ -0,0 +1,85 @@
1830
1
/*
1831
2
 * Copyright (C) 2016 Canonical Ltd
1832
3
 *
1833
4
 * This program is free software: you can redistribute it and/or modify
1834
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1835
6
 * published by the Free Software Foundation.
1836
7
 *
1837
8
 * This program is distributed in the hope that it will be useful,
1838
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1839
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1840
11
 * GNU Lesser General Public License for more details.
1841
12
 *
1842
13
 * You should have received a copy of the GNU Lesser General Public License
1843
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1844
15
 *
1845
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1846
17
 */
1847
18
1848
19
#pragma once
1849
20
1850
21
#include <unity/storage/qt/StorageError.h>
1851
22
1852
23
namespace unity
1853
24
{
1854
25
namespace storage
1855
26
{
1856
27
namespace qt
1857
28
{
1858
29
namespace internal
1859
30
{
1860
31
1861
32
class StorageErrorImpl
1862
33
{
1863
34
public:
1864
35
    StorageErrorImpl();
1865
36
    StorageErrorImpl(StorageError::Type type, QString const& msg);
1866
37
    StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& item_id);
1867
38
    StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& item_id, QString const& item_name);
1868
39
    StorageErrorImpl(StorageError::Type type, QString const& msg, int error_code);
1869
40
    StorageErrorImpl(StorageErrorImpl const&) = default;
1870
41
    StorageErrorImpl(StorageErrorImpl&&) = default;
1871
42
    ~StorageErrorImpl() = default;
1872
43
    StorageErrorImpl& operator=(StorageErrorImpl const&) = default;
1873
44
    StorageErrorImpl& operator=(StorageErrorImpl&&) = default;
1874
45
1875
46
    StorageError::Type type() const;
1876
47
    QString name() const;
1877
48
    QString message() const;
1878
49
    QString errorString() const;
1879
50
1880
51
    QString itemId() const;
1881
52
    QString itemName() const;
1882
53
    int errorCode() const;
1883
54
1884
55
    // Generic factory for errors that don't require extra arguments.
1885
56
    static StorageError make_error(StorageError::Type, QString const& msg);
1886
57
1887
58
    // Factories to make things more convenient and ensure consistency.
1888
59
    static StorageError local_comms_error(QString const& msg);
1889
60
    static StorageError remote_comms_error(QString const& msg);
1890
61
    static StorageError deleted_error(QString const& msg, QString const& item_id);
1891
62
    static StorageError runtime_destroyed_error(QString const& msg);
1892
63
    static StorageError not_exists_error(QString const& msg, QString const& key);
1893
64
    static StorageError exists_error(QString const& msg, QString const& item_id, QString const& item_name);
1894
65
    static StorageError conflict_error(QString const& msg);
1895
66
    static StorageError permission_error(QString const& msg);
1896
67
    static StorageError cancelled_error(QString const& msg);
1897
68
    static StorageError logic_error(QString const& msg);
1898
69
    static StorageError invalid_argument_error(QString const& msg);
1899
70
    static StorageError resource_error(QString const& msg, int error_code);
1900
71
1901
72
private:
1902
73
    StorageError::Type type_;
1903
74
    QString name_;
1904
75
    QString message_;
1905
76
    QString item_id_;
1906
77
    QString item_name_;
1907
78
    int error_code_;
1908
79
};
1909
80
1910
81
1911
82
}  // namespace internal
1912
83
}  // namespace qt
1913
84
}  // namespace storage
1914
85
}  // namespace unity
1915
0
86
1916
=== added file 'include/unity/storage/qt/internal/unmarshal_error.h'
1917
--- include/unity/storage/qt/internal/unmarshal_error.h	1970-01-01 00:00:00 +0000
1918
+++ include/unity/storage/qt/internal/unmarshal_error.h	2016-09-21 05:03:46 +0000
1919
@@ -0,0 +1,39 @@
1920
1
/*
1921
2
 * Copyright (C) 2016 Canonical Ltd
1922
3
 *
1923
4
 * This program is free software: you can redistribute it and/or modify
1924
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1925
6
 * published by the Free Software Foundation.
1926
7
 *
1927
8
 * This program is distributed in the hope that it will be useful,
1928
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1929
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1930
11
 * GNU Lesser General Public License for more details.
1931
12
 *
1932
13
 * You should have received a copy of the GNU Lesser General Public License
1933
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1934
15
 *
1935
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1936
17
 */
1937
18
1938
19
#pragma once
1939
20
1940
21
#include <unity/storage/qt/StorageError.h>
1941
22
1942
23
class QDBusPendingCallWatcher;
1943
24
1944
25
namespace unity
1945
26
{
1946
27
namespace storage
1947
28
{
1948
29
namespace qt
1949
30
{
1950
31
namespace internal
1951
32
{
1952
33
1953
34
StorageError unmarshal_error(QDBusPendingCallWatcher const& call);
1954
35
1955
36
}  // namespace internal
1956
37
}  // namespace qt
1957
38
}  // storage
1958
39
}  // unity
1959
0
40
1960
=== added file 'include/unity/storage/qt/internal/validate.h'
1961
--- include/unity/storage/qt/internal/validate.h	1970-01-01 00:00:00 +0000
1962
+++ include/unity/storage/qt/internal/validate.h	2016-09-21 05:03:46 +0000
1963
@@ -0,0 +1,44 @@
1964
1
/*
1965
2
 * Copyright (C) 2016 Canonical Ltd
1966
3
 *
1967
4
 * This program is free software: you can redistribute it and/or modify
1968
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1969
6
 * published by the Free Software Foundation.
1970
7
 *
1971
8
 * This program is distributed in the hope that it will be useful,
1972
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1973
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1974
11
 * GNU Lesser General Public License for more details.
1975
12
 *
1976
13
 * You should have received a copy of the GNU Lesser General Public License
1977
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1978
15
 *
1979
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1980
17
 */
1981
18
1982
19
#pragma once
1983
20
1984
21
#include <QString>
1985
22
1986
23
namespace unity
1987
24
{
1988
25
namespace storage
1989
26
{
1990
27
namespace internal
1991
28
{
1992
29
1993
30
class ItemMetadata;
1994
31
1995
32
}  // namespace internal
1996
33
1997
34
namespace qt
1998
35
{
1999
36
namespace internal
2000
37
{
2001
38
2002
39
void validate(QString const& method, unity::storage::internal::ItemMetadata const& md);
2003
40
2004
41
}  // namespace internal
2005
42
}  // namespace qt
2006
43
}  // namespace storage
2007
44
}  // namespace unity
2008
0
45
2009
=== added file 'src/qt/Account.cpp'
2010
--- src/qt/Account.cpp	1970-01-01 00:00:00 +0000
2011
+++ src/qt/Account.cpp	2016-09-21 05:03:46 +0000
2012
@@ -0,0 +1,148 @@
2013
1
/*
2014
2
 * Copyright (C) 2016 Canonical Ltd
2015
3
 *
2016
4
 * This program is free software: you can redistribute it and/or modify
2017
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2018
6
 * published by the Free Software Foundation.
2019
7
 *
2020
8
 * This program is distributed in the hope that it will be useful,
2021
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2022
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2023
11
 * GNU Lesser General Public License for more details.
2024
12
 *
2025
13
 * You should have received a copy of the GNU Lesser General Public License
2026
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2027
15
 *
2028
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2029
17
 */
2030
18
2031
19
#include <unity/storage/qt/Account.h>
2032
20
2033
21
#include <unity/storage/qt/internal/AccountImpl.h>
2034
22
2035
23
#include <cassert>
2036
24
2037
25
using namespace std;
2038
26
2039
27
namespace unity
2040
28
{
2041
29
namespace storage
2042
30
{
2043
31
namespace qt
2044
32
{
2045
33
2046
34
Account::Account()
2047
35
    : p_(make_shared<internal::AccountImpl>())
2048
36
{
2049
37
}
2050
38
2051
39
Account::Account(shared_ptr<internal::AccountImpl> const& p)
2052
40
    : p_(p)
2053
41
{
2054
42
    assert(p);
2055
43
}
2056
44
2057
45
Account::Account(Account const& other)
2058
46
    : p_(other.p_)
2059
47
{
2060
48
}
2061
49
2062
50
Account::Account(Account&& other)
2063
51
    : p_(make_shared<internal::AccountImpl>())
2064
52
{
2065
53
    p_->is_valid_ = false;
2066
54
    swap(p_, other.p_);
2067
55
}
2068
56
2069
57
Account::~Account() = default;
2070
58
2071
59
Account& Account::operator=(Account const& other)
2072
60
{
2073
61
    if (this == &other)
2074
62
    {
2075
63
        return *this;
2076
64
    }
2077
65
    p_ = other.p_;
2078
66
    return *this;
2079
67
}
2080
68
2081
69
Account& Account::operator=(Account&& other)
2082
70
{
2083
71
    p_->is_valid_ = false;
2084
72
    swap(p_, other.p_);
2085
73
    return *this;
2086
74
}
2087
75
2088
76
bool Account::isValid() const
2089
77
{
2090
78
    return p_->is_valid_;
2091
79
}
2092
80
2093
81
QString Account::owner() const
2094
82
{
2095
83
    return p_->owner();
2096
84
}
2097
85
2098
86
QString Account::ownerId() const
2099
87
{
2100
88
    return p_->ownerId();
2101
89
}
2102
90
2103
91
QString Account::description() const
2104
92
{
2105
93
    return p_->description();
2106
94
}
2107
95
2108
96
ItemListJob* Account::roots() const
2109
97
{
2110
98
    return p_->roots();
2111
99
}
2112
100
2113
101
ItemJob* Account::get(QString const& itemId) const
2114
102
{
2115
103
    return p_->get(itemId);
2116
104
}
2117
105
2118
106
bool Account::operator==(Account const& other) const
2119
107
{
2120
108
    return p_->operator==(*other.p_);
2121
109
}
2122
110
2123
111
bool Account::operator!=(Account const& other) const
2124
112
{
2125
113
    return p_->operator!=(*other.p_);
2126
114
}
2127
115
2128
116
bool Account::operator<(Account const& other) const
2129
117
{
2130
118
    return p_->operator<(*other.p_);
2131
119
}
2132
120
2133
121
bool Account::operator<=(Account const& other) const
2134
122
{
2135
123
    return p_->operator<=(*other.p_);
2136
124
}
2137
125
2138
126
bool Account::operator>(Account const& other) const
2139
127
{
2140
128
    return p_->operator>(*other.p_);
2141
129
}
2142
130
2143
131
bool Account::operator>=(Account const& other) const
2144
132
{
2145
133
    return p_->operator>=(*other.p_);
2146
134
}
2147
135
2148
136
size_t Account::hash() const
2149
137
{
2150
138
    return p_->hash();
2151
139
}
2152
140
2153
141
}  // namespace qt
2154
142
}  // namespace storage
2155
143
}  // namespace unity
2156
144
2157
145
uint qHash(unity::storage::qt::Account const& acc)
2158
146
{
2159
147
    return acc.hash();
2160
148
}
2161
0
149
2162
=== added file 'src/qt/AccountsJob.cpp'
2163
--- src/qt/AccountsJob.cpp	1970-01-01 00:00:00 +0000
2164
+++ src/qt/AccountsJob.cpp	2016-09-21 05:03:46 +0000
2165
@@ -0,0 +1,68 @@
2166
1
/*
2167
2
 * Copyright (C) 2016 Canonical Ltd
2168
3
 *
2169
4
 * This program is free software: you can redistribute it and/or modify
2170
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2171
6
 * published by the Free Software Foundation.
2172
7
 *
2173
8
 * This program is distributed in the hope that it will be useful,
2174
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2175
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2176
11
 * GNU Lesser General Public License for more details.
2177
12
 *
2178
13
 * You should have received a copy of the GNU Lesser General Public License
2179
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2180
15
 *
2181
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2182
17
 */
2183
18
2184
19
#include <unity/storage/qt/AccountsJob.h>
2185
20
2186
21
#include <unity/storage/qt/Account.h>
2187
22
#include <unity/storage/qt/internal/AccountsJobImpl.h>
2188
23
2189
24
using namespace unity::storage::qt;
2190
25
using namespace std;
2191
26
2192
27
namespace unity
2193
28
{
2194
29
namespace storage
2195
30
{
2196
31
namespace qt
2197
32
{
2198
33
2199
34
AccountsJob::AccountsJob(shared_ptr<internal::RuntimeImpl> const& runtime)
2200
35
    : p_(new internal::AccountsJobImpl(this, runtime))
2201
36
{
2202
37
}
2203
38
2204
39
AccountsJob::AccountsJob(StorageError const& error)
2205
40
    : p_(new internal::AccountsJobImpl(this, error))
2206
41
{
2207
42
}
2208
43
2209
44
AccountsJob::~AccountsJob() = default;
2210
45
2211
46
bool AccountsJob::isValid() const
2212
47
{
2213
48
    return p_->isValid();
2214
49
}
2215
50
2216
51
AccountsJob::Status AccountsJob::status() const
2217
52
{
2218
53
    return p_->status();
2219
54
}
2220
55
2221
56
StorageError AccountsJob::error() const
2222
57
{
2223
58
    return p_->error();
2224
59
}
2225
60
2226
61
QList<Account> AccountsJob::accounts() const
2227
62
{
2228
63
    return p_->accounts();
2229
64
}
2230
65
2231
66
}  // namespace qt
2232
67
}  // namespace storage
2233
68
}  // namespace unity
2234
0
69
2235
=== modified file 'src/qt/CMakeLists.txt'
2236
--- src/qt/CMakeLists.txt	2016-06-08 03:57:50 +0000
2237
+++ src/qt/CMakeLists.txt	2016-09-21 05:03:46 +0000
2238
@@ -1,1 +1,83 @@
2239
1
add_subdirectory(client)
1
add_subdirectory(client)
2240
2
2241
3
set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
2242
4
    CLASSNAME ProviderInterface
2243
5
    INCLUDE unity/storage/internal/dbusmarshal.h
2244
6
)
2245
7
2246
8
qt5_add_dbus_interface(generated_files
2247
9
    ${CMAKE_SOURCE_DIR}/data/provider.xml
2248
10
    ProviderInterface
2249
11
)
2250
12
set_source_files_properties(${generated_files} PROPERTIES
2251
13
    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wmissing-field-initializers"
2252
14
    GENERATED TRUE
2253
15
)
2254
16
2255
17
# Sources for remote client V2 library.
2256
18
set(QT_CLIENT_LIB_V2_SRC
2257
19
    Account.cpp
2258
20
    AccountsJob.cpp
2259
21
    Item.cpp
2260
22
    ItemJob.cpp
2261
23
    ItemListJob.cpp
2262
24
    Runtime.cpp
2263
25
    StorageError.cpp
2264
26
    internal/AccountImpl.cpp
2265
27
    internal/AccountsJobImpl.cpp
2266
28
    internal/HandlerBase.cpp
2267
29
    internal/ItemImpl.cpp
2268
30
    internal/ItemJobImpl.cpp
2269
31
    internal/ItemListJobImpl.cpp
2270
32
    internal/RuntimeImpl.cpp
2271
33
    internal/StorageErrorImpl.cpp
2272
34
    internal/unmarshal_error.cpp
2273
35
    internal/validate.cpp
2274
36
    ${generated_files}
2275
37
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/AccountsJob.h
2276
38
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Item.h
2277
39
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/ItemJob.h
2278
40
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/ItemListJob.h
2279
41
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Runtime.h
2280
42
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/AccountsJobImpl.h
2281
43
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/HandlerBase.h
2282
44
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/ItemJobImpl.h
2283
45
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/ItemListJobImpl.h
2284
46
)
2285
47
2286
48
add_library(storage-framework-qt-client-v2 SHARED
2287
49
    ${QT_CLIENT_LIB_V2_SRC}
2288
50
    ${generated_files}
2289
51
)
2290
52
target_include_directories(storage-framework-qt-client-v2 PRIVATE
2291
53
    ${Qt5DBus_INCLUDE_DIRS}
2292
54
    ${Qt5Network_INCLUDE_DIRS}
2293
55
    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
2294
56
)
2295
57
set_target_properties(storage-framework-qt-client-v2 PROPERTIES
2296
58
    AUTOMOC TRUE
2297
59
    LINK_FLAGS "-Wl,--no-undefined"
2298
60
    OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
2299
61
    SOVERSION ${SF_CLIENT_SOVERSION}
2300
62
    VERSION ${SF_CLIENT_LIBVERSION}
2301
63
)
2302
64
target_link_libraries(storage-framework-qt-client-v2
2303
65
    storage-framework-common-internal
2304
66
    Qt5::Core
2305
67
    Qt5::DBus
2306
68
    Qt5::Network
2307
69
    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
2308
70
)
2309
71
install(
2310
72
    TARGETS storage-framework-qt-client-v2
2311
73
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
2312
74
)
2313
75
2314
76
configure_file(
2315
77
    storage-framework-qt-client.pc.in
2316
78
    storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
2317
79
)
2318
80
install(
2319
81
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
2320
82
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
2321
83
)
2322
2
84
2323
=== added file 'src/qt/Item.cpp'
2324
--- src/qt/Item.cpp	1970-01-01 00:00:00 +0000
2325
+++ src/qt/Item.cpp	2016-09-21 05:03:46 +0000
2326
@@ -0,0 +1,230 @@
2327
1
/*
2328
2
 * Copyright (C) 2016 Canonical Ltd
2329
3
 *
2330
4
 * This program is free software: you can redistribute it and/or modify
2331
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2332
6
 * published by the Free Software Foundation.
2333
7
 *
2334
8
 * This program is distributed in the hope that it will be useful,
2335
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2336
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2337
11
 * GNU Lesser General Public License for more details.
2338
12
 *
2339
13
 * You should have received a copy of the GNU Lesser General Public License
2340
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2341
15
 *
2342
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2343
17
 */
2344
18
2345
19
#include <unity/storage/qt/Item.h>
2346
20
#include <unity/storage/qt/internal/ItemImpl.h>
2347
21
2348
22
#include <cassert>
2349
23
#include <QDebug> // TODO: remove this
2350
24
2351
25
using namespace std;
2352
26
2353
27
namespace unity
2354
28
{
2355
29
namespace storage
2356
30
{
2357
31
namespace qt
2358
32
{
2359
33
2360
34
Item::Item()
2361
35
    : p_(make_shared<internal::ItemImpl>())
2362
36
{
2363
37
}
2364
38
2365
39
Item::Item(shared_ptr<internal::ItemImpl> const& p)
2366
40
    : p_(p)
2367
41
{
2368
42
    assert(p);
2369
43
}
2370
44
2371
45
Item::Item(Item const& other)
2372
46
    : p_(other.p_)
2373
47
{
2374
48
}
2375
49
2376
50
Item::Item(Item&& other)
2377
51
{
2378
52
    p_->is_valid_ = false;
2379
53
    swap(p_, other.p_);
2380
54
}
2381
55
2382
56
Item::~Item() = default;
2383
57
2384
58
Item& Item::operator=(Item const& other)
2385
59
{
2386
60
    if (this == &other)
2387
61
    {
2388
62
        return *this;
2389
63
    }
2390
64
    p_ = other.p_;
2391
65
    return *this;
2392
66
}
2393
67
2394
68
Item& Item::operator=(Item&& other)
2395
69
{
2396
70
    p_->is_valid_ = false;
2397
71
    swap(p_, other.p_);
2398
72
    return *this;
2399
73
}
2400
74
2401
75
bool Item::isValid() const
2402
76
{
2403
77
    return p_->is_valid_;
2404
78
}
2405
79
2406
80
QString Item::itemId() const
2407
81
{
2408
82
    return p_->itemId();
2409
83
}
2410
84
2411
85
QString Item::name() const
2412
86
{
2413
87
    return p_->name();
2414
88
}
2415
89
2416
90
Account Item::account() const
2417
91
{
2418
92
    return p_->account();
2419
93
}
2420
94
2421
95
#if 0
2422
96
Item Item::root() const
2423
97
{
2424
98
2425
99
    return p_->root();
2426
100
}
2427
101
#endif
2428
102
2429
103
QString Item::etag() const
2430
104
{
2431
105
    return p_->etag();
2432
106
}
2433
107
2434
108
Item::Type Item::type() const
2435
109
{
2436
110
    return p_->type();
2437
111
}
2438
112
2439
113
QVariantMap Item::metadata() const
2440
114
{
2441
115
    return p_->metadata();
2442
116
}
2443
117
2444
118
QDateTime Item::lastModifiedTime() const
2445
119
{
2446
120
    return p_->lastModifiedTime();
2447
121
}
2448
122
2449
123
QVector<QString> Item::parentIds() const
2450
124
{
2451
125
    return p_->parentIds();
2452
126
}
2453
127
2454
128
ItemListJob* Item::parents() const
2455
129
{
2456
130
    return p_->parents();
2457
131
}
2458
132
2459
133
ItemJob* Item::copy(Item const& newParent, QString const& newName) const
2460
134
{
2461
135
    return p_->copy(newParent, newName);
2462
136
}
2463
137
2464
138
ItemJob* Item::move(Item const& newParent, QString const& newName) const
2465
139
{
2466
140
    return p_->move(newParent, newName);
2467
141
}
2468
142
2469
143
VoidJob* Item::deleteItem() const
2470
144
{
2471
145
    return p_->deleteItem();
2472
146
}
2473
147
2474
148
Uploader* Item::createUploader(ConflictPolicy policy, qint64 sizeInBytes) const
2475
149
{
2476
150
    return p_->createUploader(policy, sizeInBytes);
2477
151
}
2478
152
2479
153
Downloader* Item::createDownloader() const
2480
154
{
2481
155
    return p_->createDownloader();
2482
156
}
2483
157
2484
158
ItemListJob* Item::list() const
2485
159
{
2486
160
    return p_->list();
2487
161
}
2488
162
2489
163
ItemListJob* Item::lookup(QString const& name) const
2490
164
{
2491
165
    return p_->lookup(name);
2492
166
}
2493
167
2494
168
ItemJob* Item::createFolder(QString const& name) const
2495
169
{
2496
170
    return p_->createFolder(name);
2497
171
}
2498
172
2499
173
Uploader* Item::createFile(QString const& name) const
2500
174
{
2501
175
    return p_->createFile(name);
2502
176
}
2503
177
2504
178
IntJob* Item::freeSpaceBytes() const
2505
179
{
2506
180
    return p_->freeSpaceBytes();
2507
181
}
2508
182
2509
183
IntJob* Item::usedSpaceBytes() const
2510
184
{
2511
185
    return p_->usedSpaceBytes();
2512
186
}
2513
187
2514
188
bool Item::operator==(Item const& other) const
2515
189
{
2516
190
    return p_->operator==(*other.p_);
2517
191
}
2518
192
2519
193
bool Item::operator!=(Item const& other) const
2520
194
{
2521
195
    return p_->operator!=(*other.p_);
2522
196
}
2523
197
2524
198
bool Item::operator<(Item const& other) const
2525
199
{
2526
200
    return p_->operator<(*other.p_);
2527
201
}
2528
202
2529
203
bool Item::operator<=(Item const& other) const
2530
204
{
2531
205
    return p_->operator<=(*other.p_);
2532
206
}
2533
207
2534
208
bool Item::operator>(Item const& other) const
2535
209
{
2536
210
    return p_->operator>(*other.p_);
2537
211
}
2538
212
2539
213
bool Item::operator>=(Item const& other) const
2540
214
{
2541
215
    return p_->operator>=(*other.p_);
2542
216
}
2543
217
2544
218
size_t Item::hash() const
2545
219
{
2546
220
    return p_->hash();
2547
221
}
2548
222
2549
223
}  // namespace qt
2550
224
}  // namespace storage
2551
225
}  // namespace unity
2552
226
2553
227
uint qHash(unity::storage::qt::Item const& i)
2554
228
{
2555
229
    return i.hash();
2556
230
}
2557
0
231
2558
=== added file 'src/qt/ItemJob.cpp'
2559
--- src/qt/ItemJob.cpp	1970-01-01 00:00:00 +0000
2560
+++ src/qt/ItemJob.cpp	2016-09-21 05:03:46 +0000
2561
@@ -0,0 +1,62 @@
2562
1
/*
2563
2
 * Copyright (C) 2016 Canonical Ltd
2564
3
 *
2565
4
 * This program is free software: you can redistribute it and/or modify
2566
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2567
6
 * published by the Free Software Foundation.
2568
7
 *
2569
8
 * This program is distributed in the hope that it will be useful,
2570
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2571
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2572
11
 * GNU Lesser General Public License for more details.
2573
12
 *
2574
13
 * You should have received a copy of the GNU Lesser General Public License
2575
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2576
15
 *
2577
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2578
17
 */
2579
18
2580
19
#include <unity/storage/qt/ItemJob.h>
2581
20
2582
21
#include <unity/storage/qt/internal/ItemJobImpl.h>
2583
22
2584
23
using namespace unity::storage::qt;
2585
24
using namespace std;
2586
25
2587
26
namespace unity
2588
27
{
2589
28
namespace storage
2590
29
{
2591
30
namespace qt
2592
31
{
2593
32
2594
33
ItemJob::ItemJob(unique_ptr<internal::ItemJobImpl> p)
2595
34
    : p_(move(p))
2596
35
{
2597
36
}
2598
37
2599
38
ItemJob::~ItemJob() = default;
2600
39
2601
40
bool ItemJob::isValid() const
2602
41
{
2603
42
    return p_->isValid();
2604
43
}
2605
44
2606
45
ItemJob::Status ItemJob::status() const
2607
46
{
2608
47
    return p_->status();
2609
48
}
2610
49
2611
50
StorageError ItemJob::error() const
2612
51
{
2613
52
    return p_->error();
2614
53
}
2615
54
2616
55
Item ItemJob::item() const
2617
56
{
2618
57
    return p_->item();
2619
58
}
2620
59
2621
60
}  // namespace qt
2622
61
}  // namespace storage
2623
62
}  // namespace unity
2624
0
63
2625
=== added file 'src/qt/ItemListJob.cpp'
2626
--- src/qt/ItemListJob.cpp	1970-01-01 00:00:00 +0000
2627
+++ src/qt/ItemListJob.cpp	2016-09-21 05:03:46 +0000
2628
@@ -0,0 +1,57 @@
2629
1
/*
2630
2
 * Copyright (C) 2016 Canonical Ltd
2631
3
 *
2632
4
 * This program is free software: you can redistribute it and/or modify
2633
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2634
6
 * published by the Free Software Foundation.
2635
7
 *
2636
8
 * This program is distributed in the hope that it will be useful,
2637
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2638
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2639
11
 * GNU Lesser General Public License for more details.
2640
12
 *
2641
13
 * You should have received a copy of the GNU Lesser General Public License
2642
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2643
15
 *
2644
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2645
17
 */
2646
18
2647
19
#include <unity/storage/qt/ItemListJob.h>
2648
20
2649
21
#include <unity/storage/qt/internal/ItemListJobImpl.h>
2650
22
2651
23
using namespace unity::storage::qt;
2652
24
using namespace std;
2653
25
2654
26
namespace unity
2655
27
{
2656
28
namespace storage
2657
29
{
2658
30
namespace qt
2659
31
{
2660
32
2661
33
ItemListJob::ItemListJob(unique_ptr<internal::ItemListJobImpl> p)
2662
34
    : p_(move(p))
2663
35
{
2664
36
}
2665
37
2666
38
ItemListJob::~ItemListJob() = default;
2667
39
2668
40
bool ItemListJob::isValid() const
2669
41
{
2670
42
    return p_->isValid();
2671
43
}
2672
44
2673
45
ItemListJob::Status ItemListJob::status() const
2674
46
{
2675
47
    return p_->status();
2676
48
}
2677
49
2678
50
StorageError ItemListJob::error() const
2679
51
{
2680
52
    return p_->error();
2681
53
}
2682
54
2683
55
}  // namespace qt
2684
56
}  // namespace storage
2685
57
}  // namespace unity
2686
0
58
2687
=== added file 'src/qt/Runtime.cpp'
2688
--- src/qt/Runtime.cpp	1970-01-01 00:00:00 +0000
2689
+++ src/qt/Runtime.cpp	2016-09-21 05:03:46 +0000
2690
@@ -0,0 +1,87 @@
2691
1
/*
2692
2
 * Copyright (C) 2016 Canonical Ltd
2693
3
 *
2694
4
 * This program is free software: you can redistribute it and/or modify
2695
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2696
6
 * published by the Free Software Foundation.
2697
7
 *
2698
8
 * This program is distributed in the hope that it will be useful,
2699
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2700
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2701
11
 * GNU Lesser General Public License for more details.
2702
12
 *
2703
13
 * You should have received a copy of the GNU Lesser General Public License
2704
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2705
15
 *
2706
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2707
17
 */
2708
18
2709
19
#include <unity/storage/qt/Runtime.h>
2710
20
2711
21
#include <unity/storage/qt/internal/RuntimeImpl.h>
2712
22
2713
23
using namespace std;
2714
24
2715
25
namespace unity
2716
26
{
2717
27
namespace storage
2718
28
{
2719
29
namespace qt
2720
30
{
2721
31
2722
32
Runtime::Runtime(QObject* parent)
2723
33
    : QObject(parent)
2724
34
    , p_(new internal::RuntimeImpl)
2725
35
{
2726
36
}
2727
37
2728
38
Runtime::Runtime(QDBusConnection const& bus, QObject* parent)
2729
39
    : QObject(parent)
2730
40
    , p_(new internal::RuntimeImpl(bus))
2731
41
{
2732
42
}
2733
43
2734
44
Runtime::~Runtime() = default;
2735
45
2736
46
bool Runtime::isValid() const
2737
47
{
2738
48
    return p_->isValid();
2739
49
}
2740
50
2741
51
StorageError Runtime::error() const
2742
52
{
2743
53
    return p_->error();
2744
54
}
2745
55
2746
56
QDBusConnection Runtime::connection() const
2747
57
{
2748
58
    return p_->connection();
2749
59
}
2750
60
2751
61
StorageError Runtime::shutdown()
2752
62
{
2753
63
    return p_->shutdown();
2754
64
}
2755
65
2756
66
AccountsJob* Runtime::accounts() const
2757
67
{
2758
68
    return p_->accounts();
2759
69
}
2760
70
2761
71
Account Runtime::make_test_account(QString const& bus_name, QString const& object_path)
2762
72
{
2763
73
    return p_->make_test_account(bus_name, object_path);
2764
74
}
2765
75
2766
76
Account Runtime::make_test_account(QString const& bus_name,
2767
77
                                   QString const& object_path,
2768
78
                                   QString const& owner_id,
2769
79
                                   QString const& owner,
2770
80
                                   QString const& description)
2771
81
{
2772
82
    return p_->make_test_account(bus_name, object_path, owner_id, owner, description);
2773
83
}
2774
84
2775
85
}  // namespace qt
2776
86
}  // namespace storage
2777
87
}  // namespace unity
2778
0
88
2779
=== added file 'src/qt/StorageError.cpp'
2780
--- src/qt/StorageError.cpp	1970-01-01 00:00:00 +0000
2781
+++ src/qt/StorageError.cpp	2016-09-21 05:03:46 +0000
2782
@@ -0,0 +1,98 @@
2783
1
/*
2784
2
 * Copyright (C) 2016 Canonical Ltd
2785
3
 *
2786
4
 * This program is free software: you can redistribute it and/or modify
2787
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2788
6
 * published by the Free Software Foundation.
2789
7
 *
2790
8
 * This program is distributed in the hope that it will be useful,
2791
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2792
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2793
11
 * GNU Lesser General Public License for more details.
2794
12
 *
2795
13
 * You should have received a copy of the GNU Lesser General Public License
2796
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2797
15
 *
2798
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2799
17
 */
2800
18
2801
19
#include <unity/storage/qt/StorageError.h>
2802
20
#include <unity/storage/qt/internal/StorageErrorImpl.h>
2803
21
2804
22
#include <cassert>
2805
23
#include <memory>
2806
24
2807
25
using namespace std;
2808
26
2809
27
namespace unity
2810
28
{
2811
29
namespace storage
2812
30
{
2813
31
namespace qt
2814
32
{
2815
33
2816
34
StorageError::StorageError()
2817
35
    : p_(new internal::StorageErrorImpl)
2818
36
{
2819
37
}
2820
38
2821
39
StorageError::StorageError(StorageError const& other)
2822
40
    : p_(new internal::StorageErrorImpl(*other.p_))
2823
41
{
2824
42
}
2825
43
2826
44
StorageError::StorageError(StorageError&&) = default;
2827
45
2828
46
StorageError::StorageError(unique_ptr<internal::StorageErrorImpl> p)
2829
47
    : p_(move(p))
2830
48
{
2831
49
}
2832
50
2833
51
StorageError::~StorageError() = default;
2834
52
2835
53
StorageError& StorageError::operator=(StorageError const& other)
2836
54
{
2837
55
    *p_ = *other.p_;
2838
56
    return *this;
2839
57
}
2840
58
2841
59
StorageError& StorageError::operator=(StorageError&&) = default;
2842
60
2843
61
StorageError::Type StorageError::type() const
2844
62
{
2845
63
    return p_->type();
2846
64
}
2847
65
2848
66
QString StorageError::name() const
2849
67
{
2850
68
    return p_->name();
2851
69
}
2852
70
2853
71
QString StorageError::message() const
2854
72
{
2855
73
    return p_->message();
2856
74
}
2857
75
2858
76
QString StorageError::errorString() const
2859
77
{
2860
78
    return p_->errorString();
2861
79
}
2862
80
2863
81
QString StorageError::itemId() const
2864
82
{
2865
83
    return p_->itemId();
2866
84
}
2867
85
2868
86
QString StorageError::itemName() const
2869
87
{
2870
88
    return p_->itemName();
2871
89
}
2872
90
2873
91
int StorageError::errorCode() const
2874
92
{
2875
93
    return p_->errorCode();
2876
94
}
2877
95
2878
96
}  // namespace qt
2879
97
}  // namespace storage
2880
98
}  // namespace unity
2881
0
99
2882
=== modified file 'src/qt/client/CMakeLists.txt'
2883
--- src/qt/client/CMakeLists.txt	2016-08-11 06:53:25 +0000
2884
+++ src/qt/client/CMakeLists.txt	2016-09-21 05:03:46 +0000
2885
@@ -50,9 +50,9 @@
2886
50
set_target_properties(storage-framework-qt-local-client PROPERTIES
50
set_target_properties(storage-framework-qt-local-client PROPERTIES
2887
51
    AUTOMOC TRUE
51
    AUTOMOC TRUE
2888
52
    LINK_FLAGS "-Wl,--no-undefined"
52
    LINK_FLAGS "-Wl,--no-undefined"
2892
53
    OUTPUT_NAME "storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}"
53
    OUTPUT_NAME "storage-framework-qt-local-client-1"
2893
54
    SOVERSION ${SF_CLIENT_SOVERSION}
54
    SOVERSION 0
2894
55
    VERSION ${SF_CLIENT_LIBVERSION}
55
    VERSION 0.0.1
2895
56
)
56
)
2896
57
target_link_libraries(storage-framework-qt-local-client
57
target_link_libraries(storage-framework-qt-local-client
2897
58
    storage-framework-common-internal
58
    storage-framework-common-internal
2898
@@ -70,10 +70,10 @@
2899
70
70
2900
71
configure_file(
71
configure_file(
2901
72
    storage-framework-qt-local-client.pc.in
72
    storage-framework-qt-local-client.pc.in
2903
73
    storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
73
    storage-framework-qt-local-client-1.pc
2904
74
)
74
)
2905
75
install(
75
install(
2907
76
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
76
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-1.pc
2908
77
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
77
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
2909
78
)
78
)
2910
79
79
2911
@@ -104,9 +104,9 @@
2912
104
set_target_properties(storage-framework-qt-client PROPERTIES
104
set_target_properties(storage-framework-qt-client PROPERTIES
2913
105
    AUTOMOC TRUE
105
    AUTOMOC TRUE
2914
106
    LINK_FLAGS "-Wl,--no-undefined"
106
    LINK_FLAGS "-Wl,--no-undefined"
2918
107
    OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
107
    OUTPUT_NAME "storage-framework-qt-client-1"
2919
108
    SOVERSION ${SF_CLIENT_SOVERSION}
108
    SOVERSION 0
2920
109
    VERSION ${SF_CLIENT_LIBVERSION}
109
    VERSION 0.0.1
2921
110
)
110
)
2922
111
target_link_libraries(storage-framework-qt-client
111
target_link_libraries(storage-framework-qt-client
2923
112
    storage-framework-common-internal
112
    storage-framework-common-internal
2924
@@ -122,10 +122,10 @@
2925
122
)
122
)
2926
123
123
2927
124
configure_file(
124
configure_file(
2930
125
    storage-framework-qt-client.pc.in
125
    storage-framework-qt-client-1.pc.in
2931
126
    storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
126
    storage-framework-qt-client-1.pc
2932
127
)
127
)
2933
128
install(
128
install(
2935
129
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
129
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-1.pc
2936
130
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
130
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
2937
131
)
131
)
2938
132
132
2939
=== added file 'src/qt/client/storage-framework-qt-client-1.pc.in'
2940
--- src/qt/client/storage-framework-qt-client-1.pc.in	1970-01-01 00:00:00 +0000
2941
+++ src/qt/client/storage-framework-qt-client-1.pc.in	2016-09-21 05:03:46 +0000
2942
@@ -0,0 +1,6 @@
2943
1
Name: storage-framework-qt-client-1
2944
2
Description: A Qt client library for the storage framework (soon to be deprecated)
2945
3
Version: 0.1
2946
4
Requires.private: Qt5Core Qt5Network
2947
5
Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/storage-framework-client-1
2948
6
Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstorage-framework-qt-client-1
2949
0
7
2950
=== added file 'src/qt/client/storage-framework-qt-local-client.pc.in'
2951
--- src/qt/client/storage-framework-qt-local-client.pc.in	1970-01-01 00:00:00 +0000
2952
+++ src/qt/client/storage-framework-qt-local-client.pc.in	2016-09-21 05:03:46 +0000
2953
@@ -0,0 +1,6 @@
2954
1
Name: storage-framework-qt-local-client-1
2955
2
Description: A Qt client library for the storage framework (soon to be deprecated)
2956
3
Version: @PROJECT_VERSION@
2957
4
Requires.private: Qt5Core Qt5Network
2958
5
Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/storage-framework-client-1
2959
6
Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstorage-framework-qt-local-client-1
2960
0
7
2961
=== removed file 'src/qt/client/storage-framework-qt-local-client.pc.in'
2962
--- src/qt/client/storage-framework-qt-local-client.pc.in	2016-07-11 03:28:40 +0000
2963
+++ src/qt/client/storage-framework-qt-local-client.pc.in	1970-01-01 00:00:00 +0000
2964
@@ -1,6 +0,0 @@
2965
1
Name: storage-framework-qt-local-client-@SF_CLIENT_API_VERSION@
2966
2
Description: A Qt client library for the storage framework
2967
3
Version: @PROJECT_VERSION@
2968
4
Requires.private: Qt5Core Qt5Network
2969
5
Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/storage-framework-client-@SF_CLIENT_API_VERSION@
2970
6
Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstorage-framework-qt-local-client-@SF_CLIENT_API_VERSION@
2971
7
0
2972
=== added directory 'src/qt/internal'
2973
=== added file 'src/qt/internal/AccountImpl.cpp'
2974
--- src/qt/internal/AccountImpl.cpp	1970-01-01 00:00:00 +0000
2975
+++ src/qt/internal/AccountImpl.cpp	2016-09-21 05:03:46 +0000
2976
@@ -0,0 +1,226 @@
2977
1
/*
2978
2
 * Copyright (C) 2016 Canonical Ltd
2979
3
 *
2980
4
 * This program is free software: you can redistribute it and/or modify
2981
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2982
6
 * published by the Free Software Foundation.
2983
7
 *
2984
8
 * This program is distributed in the hope that it will be useful,
2985
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2986
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2987
11
 * GNU Lesser General Public License for more details.
2988
12
 *
2989
13
 * You should have received a copy of the GNU Lesser General Public License
2990
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2991
15
 *
2992
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2993
17
 */
2994
18
2995
19
#include <unity/storage/qt/internal/AccountImpl.h>
2996
20
2997
21
#include "ProviderInterface.h"
2998
22
#include <unity/storage/qt/Account.h>
2999
23
#include <unity/storage/qt/internal/ItemImpl.h>
3000
24
#include <unity/storage/qt/internal/ItemJobImpl.h>
3001
25
#include <unity/storage/qt/internal/ItemListJobImpl.h>
3002
26
#include <unity/storage/qt/internal/RuntimeImpl.h>
3003
27
#include <unity/storage/qt/Runtime.h>
3004
28
3005
29
#include <boost/functional/hash.hpp>
3006
30
3007
31
#include <cassert>
3008
32
3009
33
using namespace std;
3010
34
3011
35
namespace unity
3012
36
{
3013
37
namespace storage
3014
38
{
3015
39
namespace qt
3016
40
{
3017
41
namespace internal
3018
42
{
3019
43
3020
44
AccountImpl::AccountImpl()
3021
45
    : is_valid_(false)
3022
46
{
3023
47
}
3024
48
3025
49
AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime,
3026
50
                         QString const& bus_name,
3027
51
                         QString const& object_path,
3028
52
                         QString const& owner_id,
3029
53
                         QString const& owner,
3030
54
                         QString const& description)
3031
55
    : is_valid_(true)
3032
56
    , bus_name_(bus_name)
3033
57
    , object_path_(object_path)
3034
58
    , owner_id_(owner_id)
3035
59
    , owner_(owner)
3036
60
    , description_(description)
3037
61
    , runtime_(runtime)
3038
62
    , provider_(new ProviderInterface(bus_name, object_path, runtime->connection()))
3039
63
{
3040
64
    assert(!bus_name.isEmpty());
3041
65
    assert(!object_path.isEmpty());
3042
66
}
3043
67
3044
68
QString AccountImpl::owner() const
3045
69
{
3046
70
    return is_valid_ ? owner_ : "";
3047
71
}
3048
72
3049
73
QString AccountImpl::ownerId() const
3050
74
{
3051
75
    return is_valid_ ? owner_id_ : "";
3052
76
}
3053
77
3054
78
QString AccountImpl::description() const
3055
79
{
3056
80
    return is_valid_ ? description_ : "";
3057
81
}
3058
82
3059
83
ItemListJob* AccountImpl::roots() const
3060
84
{
3061
85
    auto runtime = runtime_.lock();
3062
86
    if (!runtime || !runtime->isValid())
3063
87
    {
3064
88
        auto e = StorageErrorImpl::runtime_destroyed_error("Account::roots(): Runtime was destroyed previously");
3065
89
        return ItemListJobImpl::make_item_list_job(e);
3066
90
    }
3067
91
3068
92
    auto validate = [](storage::internal::ItemMetadata const& md)
3069
93
    {
3070
94
        if (md.type != ItemType::root)
3071
95
        {
3072
96
            QString msg = "provider returned non-root item type: " + QString::number(int(md.type));
3073
97
            qCritical() << msg;
3074
98
            throw StorageErrorImpl::local_comms_error(msg);
3075
99
        }
3076
100
    };
3077
101
3078
102
    QString method = "Account::roots()";
3079
103
    auto reply = provider_->Roots();
3080
104
    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
3081
105
    return ItemListJobImpl::make_item_list_job(This, method, reply, validate);
3082
106
}
3083
107
3084
108
ItemJob* AccountImpl::get(QString const& itemId) const
3085
109
{
3086
110
    auto runtime = runtime_.lock();
3087
111
    if (!runtime || !runtime->isValid())
3088
112
    {
3089
113
        auto e = StorageErrorImpl::runtime_destroyed_error("Account::get(): Runtime was destroyed previously");
3090
114
        return ItemJobImpl::make_item_job(e);
3091
115
    }
3092
116
3093
117
    // TODO: use defaulted param?
3094
118
    auto validate = [](storage::internal::ItemMetadata const&)
3095
119
    {
3096
120
    };
3097
121
3098
122
    QString method = "Item::get()";
3099
123
    auto reply = provider_->Metadata(itemId);
3100
124
    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
3101
125
    return ItemJobImpl::make_item_job(This, method, reply, validate);
3102
126
}
3103
127
3104
128
bool AccountImpl::operator==(AccountImpl const& other) const
3105
129
{
3106
130
    if (is_valid_)
3107
131
    {
3108
132
        return    other.is_valid_
3109
133
               && owner_ == other.owner_
3110
134
               && owner_id_ == other.owner_id_
3111
135
               && description_ == other.description_;
3112
136
    }
3113
137
    return !other.is_valid_;
3114
138
}
3115
139
3116
140
bool AccountImpl::operator!=(AccountImpl const& other) const
3117
141
{
3118
142
    return !operator==(other);
3119
143
}
3120
144
3121
145
bool AccountImpl::operator<(AccountImpl const& other) const
3122
146
{
3123
147
    if (!is_valid_)
3124
148
    {
3125
149
        return other.is_valid_;
3126
150
    }
3127
151
    if (is_valid_ && !other.is_valid_)
3128
152
    {
3129
153
        return false;
3130
154
    }
3131
155
    assert(is_valid_ && other.is_valid_);
3132
156
    if (owner_id_ < other.owner_id_)
3133
157
    {
3134
158
        return true;
3135
159
    }
3136
160
    if (owner_id_ > other.owner_id_)
3137
161
    {
3138
162
        return false;
3139
163
    }
3140
164
    if (owner_ < other.owner_)
3141
165
    {
3142
166
        return true;
3143
167
    }
3144
168
    if (owner_ > other.owner_)
3145
169
    {
3146
170
        return false;
3147
171
    }
3148
172
    if (description_ < other.description_)
3149
173
    {
3150
174
        return true;
3151
175
    }
3152
176
    return false;
3153
177
}
3154
178
3155
179
bool AccountImpl::operator<=(AccountImpl const& other) const
3156
180
{
3157
181
    return operator<(other) || operator==(other);
3158
182
}
3159
183
3160
184
bool AccountImpl::operator>(AccountImpl const& other) const
3161
185
{
3162
186
    return !operator<=(other);
3163
187
}
3164
188
3165
189
bool AccountImpl::operator>=(AccountImpl const& other) const
3166
190
{
3167
191
    return !operator<(other);
3168
192
}
3169
193
3170
194
shared_ptr<ProviderInterface> AccountImpl::provider() const
3171
195
{
3172
196
    return provider_;
3173
197
}
3174
198
3175
199
size_t AccountImpl::hash() const
3176
200
{
3177
201
    if (!is_valid_)
3178
202
    {
3179
203
        return 0;
3180
204
    }
3181
205
    size_t hash = 0;
3182
206
    boost::hash_combine(hash, qHash(owner_));
3183
207
    boost::hash_combine(hash, qHash(owner_id_));
3184
208
    boost::hash_combine(hash, qHash(description_));
3185
209
    return hash;
3186
210
}
3187
211
3188
212
Account AccountImpl::make_account(shared_ptr<RuntimeImpl> const& runtime,
3189
213
                                  QString const& bus_name,
3190
214
                                  QString const& object_path,
3191
215
                                  QString const& owner_id,
3192
216
                                  QString const& owner,
3193
217
                                  QString const& description)
3194
218
{
3195
219
    shared_ptr<AccountImpl> p(new AccountImpl(runtime, bus_name, object_path, owner_id, owner, description));
3196
220
    return Account(p);
3197
221
}
3198
222
3199
223
}  // namespace internal
3200
224
}  // namespace qt
3201
225
}  // namespace storage
3202
226
}  // namespace unity
3203
0
227
3204
=== added file 'src/qt/internal/AccountsJobImpl.cpp'
3205
--- src/qt/internal/AccountsJobImpl.cpp	1970-01-01 00:00:00 +0000
3206
+++ src/qt/internal/AccountsJobImpl.cpp	2016-09-21 05:03:46 +0000
3207
@@ -0,0 +1,183 @@
3208
1
/*
3209
2
 * Copyright (C) 2016 Canonical Ltd
3210
3
 *
3211
4
 * This program is free software: you can redistribute it and/or modify
3212
5
 * it under the terms of the GNU Lesser General Public License version 3 as
3213
6
 * published by the Free Software Foundation.
3214
7
 *
3215
8
 * This program is distributed in the hope that it will be useful,
3216
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3217
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3218
11
 * GNU Lesser General Public License for more details.
3219
12
 *
3220
13
 * You should have received a copy of the GNU Lesser General Public License
3221
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3222
15
 *
3223
16
 * Authors: Michi Henning <michi.henning@canonical.com>
3224
17
 */
3225
18
3226
19
#include <unity/storage/qt/internal/AccountsJobImpl.h>
3227
20
3228
21
#include <unity/storage/qt/internal/AccountImpl.h>
3229
22
#include <unity/storage/qt/internal/RuntimeImpl.h>
3230
23
#include <unity/storage/qt/internal/StorageErrorImpl.h>
3231
24
3232
25
#include <OnlineAccounts/Account>
3233
26
3234
27
#include <cassert>
3235
28
3236
29
using namespace std;
3237
30
3238
31
namespace unity
3239
32
{
3240
33
namespace storage
3241
34
{
3242
35
namespace qt
3243
36
{
3244
37
namespace internal
3245
38
{
3246
39
3247
40
namespace
3248
41
{
3249
42
3250
43
// TODO: We retrieve the accounts directly from online accounts until we have a working registry.
3251
44
3252
45
static map<QString, QString> const BUS_NAMES =
3253
46
{
3254
47
    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
3255
48
    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" }
3256
49
};
3257
50
3258
51
}  // namespace
3259
52
3260
53
AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, shared_ptr<RuntimeImpl> const& runtime)
3261
54
    : public_instance_(public_instance)
3262
55
    , status_(AccountsJob::Loading)
3263
56
    , runtime_(runtime)
3264
57
{
3265
58
    assert(public_instance);
3266
59
    assert(runtime);
3267
60
3268
61
    initialize_accounts();
3269
62
}
3270
63
3271
64
AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, StorageError const& error)
3272
65
    : public_instance_(public_instance)
3273
66
    , status_(AccountsJob::Loading)
3274
67
    , error_(error)
3275
68
{
3276
69
    assert(public_instance);
3277
70
    assert(error.type() != StorageError::NoError);
3278
71
3279
72
    status_ = emit_status_changed(AccountsJob::Error);
3280
73
}
3281
74
3282
75
bool AccountsJobImpl::isValid() const
3283
76
{
3284
77
    return status_ != AccountsJob::Status::Error;
3285
78
}
3286
79
3287
80
AccountsJob::Status AccountsJobImpl::status() const
3288
81
{
3289
82
    return status_;
3290
83
}
3291
84
3292
85
StorageError AccountsJobImpl::error() const
3293
86
{
3294
87
    return error_;
3295
88
}
3296
89
3297
90
QList<Account> AccountsJobImpl::accounts() const
3298
91
{
3299
92
    auto runtime = get_runtime("AccountsJob::accounts()");
3300
93
    if (!runtime)
3301
94
    {
3302
95
        return QList<Account>();
3303
96
    }
3304
97
    if (status_ != AccountsJob::Finished)
3305
98
    {
3306
99
        return QList<Account>();
3307
100
    }
3308
101
    return accounts_;
3309
102
}
3310
103
3311
104
void AccountsJobImpl::manager_ready()
3312
105
{
3313
106
    timer_.stop();
3314
107
    disconnect(this);
3315
108
    initialize_accounts();
3316
109
}
3317
110
3318
111
// LCOV_EXCL_START
3319
112
void AccountsJobImpl::timeout()
3320
113
{
3321
114
    disconnect(this);
3322
115
    error_ = StorageErrorImpl::local_comms_error("AccountsJob(): timeout retrieving Online accounts");
3323
116
    status_ = emit_status_changed(AccountsJob::Error);
3324
117
}
3325
118
// LCOV_EXCL_STOP
3326
119
3327
120
AccountsJob::Status AccountsJobImpl::emit_status_changed(AccountsJob::Status new_status) const
3328
121
{
3329
122
    if (status_ == AccountsJob::Loading)  // Once in a final state, we don't emit the signal again.
3330
123
    {
3331
124
        // We defer emission of the signal so the client gets a chance to connect to the signal
3332
125
        // in case we emit the signal from the constructor.
3333
126
        QMetaObject::invokeMethod(public_instance_,
3334
127
                                  "statusChanged",
3335
128
                                  Qt::QueuedConnection,
3336
129
                                  Q_ARG(unity::storage::qt::AccountsJob::Status, new_status));
3337
130
    }
3338
131
    return new_status;
3339
132
}
3340
133
3341
134
shared_ptr<RuntimeImpl> AccountsJobImpl::get_runtime(QString const& method) const
3342
135
{
3343
136
    auto runtime = runtime_.lock();
3344
137
    if (!runtime || !runtime->isValid())
3345
138
    {
3346
139
        QString msg = method + ": Runtime was destroyed previously";
3347
140
        auto This = const_cast<AccountsJobImpl*>(this);
3348
141
        This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
3349
142
        This->status_ = emit_status_changed(AccountsJob::Error);
3350
143
    }
3351
144
    return runtime;
3352
145
}
3353
146
3354
147
void AccountsJobImpl::initialize_accounts()
3355
148
{
3356
149
    auto runtime = get_runtime("AccountsJob()");
3357
150
    assert(runtime);
3358
151
3359
152
    auto manager = runtime->accounts_manager();
3360
153
    if (!manager->isReady())
3361
154
    {
3362
155
        connect(manager.get(), &OnlineAccounts::Manager::ready, this, &AccountsJobImpl::manager_ready);
3363
156
        connect(&timer_, &QTimer::timeout, this, &AccountsJobImpl::timeout);
3364
157
        timer_.setSingleShot(true);
3365
158
        timer_.start(30000);  // TODO: Need config for this eventually.
3366
159
        return;
3367
160
    }
3368
161
3369
162
    for (auto const map_entry : BUS_NAMES)
3370
163
    {
3371
164
        auto service_id = map_entry.first;
3372
165
        for (auto const& a : manager->availableAccounts(service_id))
3373
166
        {
3374
167
            auto object_path = QStringLiteral("/provider/%1").arg(a->id());
3375
168
            auto bus_name = map_entry.second;
3376
169
            accounts_.append(AccountImpl::make_account(runtime,
3377
170
                                                       bus_name,
3378
171
                                                       object_path,
3379
172
                                                       a->serviceId(),
3380
173
                                                       "",
3381
174
                                                       a->displayName()));
3382
175
        }
3383
176
    }
3384
177
    status_ = emit_status_changed(AccountsJob::Finished);
3385
178
}
3386
179
3387
180
}  // namespace internal
3388
181
}  // namespace qt
3389
182
}  // namespace storage
3390
183
}  // namespace unity
3391
0
184
3392
=== added file 'src/qt/internal/HandlerBase.cpp'
3393
--- src/qt/internal/HandlerBase.cpp	1970-01-01 00:00:00 +0000
3394
+++ src/qt/internal/HandlerBase.cpp	2016-09-21 05:03:46 +0000
3395
@@ -0,0 +1,59 @@
3396
1
/*
3397
2
 * Copyright (C) 2016 Canonical Ltd
3398
3
 *
3399
4
 * This program is free software: you can redistribute it and/or modify
3400
5
 * it under the terms of the GNU Lesser General Public License version 3 as
3401
6
 * published by the Free Software Foundation.
3402
7
 *
3403
8
 * This program is distributed in the hope that it will be useful,
3404
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3405
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3406
11
 * GNU Lesser General Public License for more details.
3407
12
 *
3408
13
 * You should have received a copy of the GNU Lesser General Public License
3409
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3410
15
 *
3411
16
 * Authors: Michi Henning <michi.henning@canonical.com>
3412
17
 */
3413
18
3414
19
#include <unity/storage/qt/internal/HandlerBase.h>
3415
20
3416
21
#pragma GCC diagnostic push
3417
22
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3418
23
#include <QFuture>
3419
24
#pragma GCC diagnostic pop
3420
25
3421
26
#include <cassert>
3422
27
3423
28
using namespace std;
3424
29
3425
30
namespace unity
3426
31
{
3427
32
namespace storage
3428
33
{
3429
34
namespace qt
3430
35
{
3431
36
namespace internal
3432
37
{
3433
38
3434
39
HandlerBase::HandlerBase(QObject* parent,
3435
40
                         QDBusPendingCall const& call,
3436
41
                         function<void(QDBusPendingCallWatcher&)> const& closure)
3437
42
    : QObject(parent)
3438
43
    , watcher_(call)
3439
44
    , closure_(closure)
3440
45
{
3441
46
    assert(closure);
3442
47
    connect(&watcher_, &QDBusPendingCallWatcher::finished, this, &HandlerBase::finished);
3443
48
}
3444
49
3445
50
void HandlerBase::finished(QDBusPendingCallWatcher* call)
3446
51
{
3447
52
    deleteLater();
3448
53
    closure_(*call);
3449
54
}
3450
55
3451
56
}  // namespace internal
3452
57
}  // namespace qt
3453
58
}  // namespace storage
3454
59
}  // namespace unity
3455
0
60
3456
=== added file 'src/qt/internal/ItemImpl.cpp'
3457
--- src/qt/internal/ItemImpl.cpp	1970-01-01 00:00:00 +0000
3458
+++ src/qt/internal/ItemImpl.cpp	2016-09-21 05:03:46 +0000
3459
@@ -0,0 +1,248 @@
3460
1
/*
3461
2
 * Copyright (C) 2016 Canonical Ltd
3462
3
 *
3463
4
 * This program is free software: you can redistribute it and/or modify
3464
5
 * it under the terms of the GNU Lesser General Public License version 3 as
3465
6
 * published by the Free Software Foundation.
3466
7
 *
3467
8
 * This program is distributed in the hope that it will be useful,
3468
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3469
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3470
11
 * GNU Lesser General Public License for more details.
3471
12
 *
3472
13
 * You should have received a copy of the GNU Lesser General Public License
3473
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3474
15
 *
3475
16
 * Authors: Michi Henning <michi.henning@canonical.com>
3476
17
 */
3477
18
3478
19
#include <unity/storage/qt/internal/ItemImpl.h>
3479
20
3480
21
#include "ProviderInterface.h"
3481
22
#include <unity/storage/provider/metadata_keys.h>
3482
23
#include <unity/storage/qt/internal/AccountImpl.h>
3483
24
#include <unity/storage/qt/internal/ItemJobImpl.h>
3484
25
#include <unity/storage/qt/internal/RuntimeImpl.h>
3485
26
#include <unity/storage/qt/internal/validate.h>
3486
27
3487
28
#include <cassert>
3488
29
3489
30
using namespace std;
3490
31
3491
32
namespace unity
3492
33
{
3493
34
namespace storage
3494
35
{
3495
36
namespace qt
3496
37
{
3497
38
namespace internal
3498
39
{
3499
40
3500
41
ItemImpl::ItemImpl()
3501
42
    : is_valid_(false)
3502
43
{
3503
44
    md_.type = storage::ItemType::file;
3504
45
}
3505
46
3506
47
ItemImpl::ItemImpl(storage::internal::ItemMetadata const& md,
3507
48
                   std::shared_ptr<AccountImpl> const& account)
3508
49
    : is_valid_(true)
3509
50
    , md_(md)
3510
51
    , account_(account)
3511
52
{
3512
53
    assert(account);
3513
54
}
3514
55
3515
56
QString ItemImpl::itemId() const
3516
57
{
3517
58
    return is_valid_ ? md_.item_id : "";
3518
59
}
3519
60
3520
61
QString ItemImpl::name() const
3521
62
{
3522
63
    return is_valid_ ? md_.name : "";
3523
64
}
3524
65
3525
66
Account ItemImpl::account() const
3526
67
{
3527
68
    return is_valid_ ? account_ : Account();
3528
69
}
3529
70
3530
71
#if 0
3531
72
Item ItemImpl::root() const
3532
73
{
3533
74
    return is_valid_ ? root_ : Item();
3534
75
}
3535
76
#endif
3536
77
3537
78
QString ItemImpl::etag() const
3538
79
{
3539
80
    return is_valid_ ? md_.etag : "";
3540
81
}
3541
82
3542
83
Item::Type ItemImpl::type() const
3543
84
{
3544
85
    switch (md_.type)
3545
86
    {
3546
87
        case storage::ItemType::file:
3547
88
            return Item::File;
3548
89
        case storage::ItemType::folder:
3549
90
            return Item::Folder;
3550
91
        case storage::ItemType::root:
3551
92
            return Item::Root;
3552
93
        default:
3553
94
            abort();  // LCOV_EXCL_LINE // Impossible
3554
95
    }
3555
96
}
3556
97
3557
98
QVariantMap ItemImpl::metadata() const
3558
99
{
3559
100
    // TODO: Need to agree on metadata representation.
3560
101
    return is_valid_ ? QVariantMap() : QVariantMap();
3561
102
}
3562
103
3563
104
QDateTime ItemImpl::lastModifiedTime() const
3564
105
{
3565
106
    return is_valid_ ? QDateTime::fromString(md_.metadata.value(provider::LAST_MODIFIED_TIME).toString(), Qt::ISODate)
3566
107
                     : QDateTime();
3567
108
}
3568
109
3569
110
QVector<QString> ItemImpl::parentIds() const
3570
111
{
3571
112
    return is_valid_ ? md_.parent_ids : QVector<QString>();
3572
113
}
3573
114
3574
115
ItemListJob* ItemImpl::parents() const
3575
116
{
3576
117
    return nullptr;  // TODO
3577
118
}
3578
119
3579
120
ItemJob* ItemImpl::copy(Item const& newParent, QString const& newName) const
3580
121
{
3581
122
    return nullptr;  // TODO
3582
123
}
3583
124
3584
125
ItemJob* ItemImpl::move(Item const& newParent, QString const& newName) const
3585
126
{
3586
127
    return nullptr;  // TODO
3587
128
}
3588
129
3589
130
VoidJob* ItemImpl::deleteItem() const
3590
131
{
3591
132
    return nullptr;  // TODO
3592
133
}
3593
134
3594
135
Uploader* ItemImpl::createUploader(ConflictPolicy policy, qint64 sizeInBytes) const
3595
136
{
3596
137
    return nullptr;  // TODO
3597
138
}
3598
139
3599
140
Downloader* ItemImpl::createDownloader() const
3600
141
{
3601
142
    return nullptr;  // TODO
3602
143
}
3603
144
3604
145
ItemListJob* ItemImpl::list() const
3605
146
{
3606
147
    return nullptr;  // TODO
3607
148
}
3608
149
3609
150
ItemListJob* ItemImpl::lookup(QString const& name) const
3610
151
{
3611
152
    return nullptr;  // TODO
3612
153
}
3613
154
3614
155
ItemJob* ItemImpl::createFolder(QString const& name) const
3615
156
{
3616
157
    return nullptr;  // TODO
3617
158
}
3618
159
3619
160
Uploader* ItemImpl::createFile(QString const& name) const
3620
161
{
3621
162
    return nullptr;  // TODO
3622
163
}
3623
164
3624
165
IntJob* ItemImpl::freeSpaceBytes() const
3625
166
{
3626
167
    return nullptr;  // TODO
3627
168
}
3628
169
3629
170
IntJob* ItemImpl::usedSpaceBytes() const
3630
171
{
3631
172
    return nullptr;  // TODO
3632
173
}
3633
174
3634
175
bool ItemImpl::operator==(ItemImpl const& other) const
3635
176
{
3636
177
    if (is_valid_)
3637
178
    {
3638
179
        return other.is_valid_ && md_.item_id == other.md_.item_id;
3639
180
    }
3640
181
    return !other.is_valid_;
3641
182
}
3642
183
3643
184
bool ItemImpl::operator!=(ItemImpl const& other) const
3644
185
{
3645
186
    return !operator==(other);
3646
187
}
3647
188
3648
189
bool ItemImpl::operator<(ItemImpl const& other) const
3649
190
{
3650
191
    if (is_valid_)
3651
192
    {
3652
193
        return other.is_valid_ && md_.item_id < other.md_.item_id;
3653
194
    }
3654
195
    return other.is_valid_;
3655
196
}
3656
197
3657
198
bool ItemImpl::operator<=(ItemImpl const& other) const
3658
199
{
3659
200
    return operator<(other) or operator==(other);
3660
201
}
3661
202
3662
203
bool ItemImpl::operator>(ItemImpl const& other) const
3663
204
{
3664
205
    return !operator<=(other);
3665
206
}
3666
207
3667
208
bool ItemImpl::operator>=(ItemImpl const& other) const
3668
209
{
3669
210
    return !operator<(other);
3670
211
}
3671
212
3672
213
size_t ItemImpl::hash() const
3673
214
{
3674
215
    if (!is_valid_)
3675
216
    {
3676
217
        return 0;
3677
218
    }
3678
219
    return qHash(md_.item_id);
3679
220
}
3680
221
3681
222
Item ItemImpl::make_item(QString const& method,
3682
223
                         storage::internal::ItemMetadata const& md,
3683
224
                         std::shared_ptr<AccountImpl> const& account)
3684
225
{
3685
226
    validate(method, md);  // Throws if no good.
3686
227
    auto p = make_shared<ItemImpl>(md, account);
3687
228
    return Item(p);
3688
229
}
3689
230
3690
231
#if 0
3691
232
shared_ptr<RuntimeImpl> ItemImpl::get_runtime(QString const& method) const
3692
233
{
3693
234
    auto runtime = account_->runtime_.lock();
3694
235
    if (!runtime || !runtime->isValid())
3695
236
    {
3696
237
        QString msg = method + ": Runtime was destroyed previously";
3697
238
        auto This = const_cast<ItemImpl*>(this);
3698
239
        This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
3699
240
    }
3700
241
    return runtime;
3701
242
}
3702
243
#endif
3703
244
3704
245
}  // namespace internal
3705
246
}  // namespace qt
3706
247
}  // namespace storage
3707
248
}  // namespace unity
3708
0
249
3709
=== added file 'src/qt/internal/ItemJobImpl.cpp'
3710
--- src/qt/internal/ItemJobImpl.cpp	1970-01-01 00:00:00 +0000
3711
+++ src/qt/internal/ItemJobImpl.cpp	2016-09-21 05:03:46 +0000
3712
@@ -0,0 +1,138 @@
3713
1
/*
3714
2
 * Copyright (C) 2016 Canonical Ltd
3715
3
 *
3716
4
 * This program is free software: you can redistribute it and/or modify
3717
5
 * it under the terms of the GNU Lesser General Public License version 3 as
3718
6
 * published by the Free Software Foundation.
3719
7
 *
3720
8
 * This program is distributed in the hope that it will be useful,
3721
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3722
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3723
11
 * GNU Lesser General Public License for more details.
3724
12
 *
3725
13
 * You should have received a copy of the GNU Lesser General Public License
3726
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3727
15
 *
3728
16
 * Authors: Michi Henning <michi.henning@canonical.com>
3729
17
 */
3730
18
3731
19
#include <unity/storage/qt/internal/ItemJobImpl.h>
3732
20
3733
21
#include <unity/storage/internal/dbusmarshal.h>
3734
22
#include <unity/storage/internal/ItemMetadata.h>
3735
23
#include <unity/storage/qt/internal/Handler.h>
3736
24
#include <unity/storage/qt/internal/ItemImpl.h>
3737
25
3738
26
using namespace std;
3739
27
3740
28
namespace unity
3741
29
{
3742
30
namespace storage
3743
31
{
3744
32
namespace qt
3745
33
{
3746
34
namespace internal
3747
35
{
3748
36
3749
37
ItemJobImpl::ItemJobImpl(shared_ptr<AccountImpl> const& account,
3750
38
                         QString const& method,
3751
39
                         QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
3752
40
                         std::function<void(storage::internal::ItemMetadata const&)> const& validate)
3753
41
    : status_(ItemJob::Loading)
3754
42
    , method_(method)
3755
43
    , account_(account)
3756
44
    , validate_(validate)
3757
45
{
3758
46
    assert(!method.isEmpty());
3759
47
    assert(account);
3760
48
    assert(validate);
3761
49
3762
50
    auto process_reply = [this](decltype(reply)& r)
3763
51
    {
3764
52
        auto metadata = r.value();
3765
53
        try
3766
54
        {
3767
55
            validate_(metadata);
3768
56
            item_ = ItemImpl::make_item(method_, metadata, account_);
3769
57
            status_ = emit_status_changed(ItemJob::Finished);
3770
58
        }
3771
59
        catch (StorageError const& e)
3772
60
        {
3773
61
            // Bad metadata received from provider, validate_() or make_item() have logged it.
3774
62
            error_ = e;
3775
63
            status_ = emit_status_changed(ItemJob::Error);
3776
64
        }
3777
65
    };
3778
66
3779
67
    auto process_error = [this](StorageError const& error)
3780
68
    {
3781
69
        error_ = error;
3782
70
        status_ = emit_status_changed(ItemJob::Error);
3783
71
    };
3784
72
3785
73
    new Handler<storage::internal::ItemMetadata>(this, reply, process_reply, process_error);
3786
74
}
3787
75
3788
76
ItemJobImpl::ItemJobImpl(StorageError const& error)
3789
77
    : status_(ItemJob::Loading)
3790
78
    , error_(error)
3791
79
{
3792
80
}
3793
81
3794
82
bool ItemJobImpl::isValid() const
3795
83
{
3796
84
    return status_ != ItemJob::Status::Error;
3797
85
}
3798
86
3799
87
ItemJob::Status ItemJobImpl::status() const
3800
88
{
3801
89
    return status_;
3802
90
}
3803
91
3804
92
StorageError ItemJobImpl::error() const
3805
93
{
3806
94
    return error_;
3807
95
}
3808
96
3809
97
Item ItemJobImpl::item() const
3810
98
{
3811
99
    return Item();  // TODO
3812
100
}
3813
101
3814
102
ItemJob* ItemJobImpl::make_item_job(shared_ptr<AccountImpl> const& account,
3815
103
                                    QString const& method,
3816
104
                                    QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
3817
105
                                    std::function<void(storage::internal::ItemMetadata const&)> const& validate)
3818
106
{
3819
107
    unique_ptr<ItemJobImpl> impl(new ItemJobImpl(account, method, reply, validate));
3820
108
    auto job = new ItemJob(move(impl));
3821
109
    job->p_->public_instance_ = job;
3822
110
    return job;
3823
111
}
3824
112
3825
113
ItemJob* ItemJobImpl::make_item_job(StorageError const& error)
3826
114
{
3827
115
    unique_ptr<ItemJobImpl> impl(new ItemJobImpl(error));
3828
116
    auto job = new ItemJob(move(impl));
3829
117
    job->p_->public_instance_ = job;
3830
118
    job->p_->status_ = job->p_->emit_status_changed(ItemJob::Error);
3831
119
    return job;
3832
120
}
3833
121
3834
122
ItemJob::Status ItemJobImpl::emit_status_changed(ItemJob::Status new_status) const
3835
123
{
3836
124
    // TODO: should be an assert!
3837
125
    if (status_ == ItemJob::Loading)  // Once in a final state, we don't emit the signal again.
3838
126
    {
3839
127
        QMetaObject::invokeMethod(public_instance_,
3840
128
                                  "statusChanged",
3841
129
                                  Qt::QueuedConnection,
3842
130
                                  Q_ARG(unity::storage::qt::ItemJob::Status, new_status));
3843
131
    }
3844
132
    return new_status;
3845
133
}
3846
134
3847
135
}  // namespace internal
3848
136
}  // namespace qt
3849
137
}  // namespace storage
3850
138
}  // namespace unity
3851
0
139
3852
=== added file 'src/qt/internal/ItemListJobImpl.cpp'
3853
--- src/qt/internal/ItemListJobImpl.cpp	1970-01-01 00:00:00 +0000
3854
+++ src/qt/internal/ItemListJobImpl.cpp	2016-09-21 05:03:46 +0000
3855
@@ -0,0 +1,148 @@
3856
1
/*
3857
2
 * Copyright (C) 2016 Canonical Ltd
3858
3
 *
3859
4
 * This program is free software: you can redistribute it and/or modify
3860
5
 * it under the terms of the GNU Lesser General Public License version 3 as
3861
6
 * published by the Free Software Foundation.
3862
7
 *
3863
8
 * This program is distributed in the hope that it will be useful,
3864
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3865
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3866
11
 * GNU Lesser General Public License for more details.
3867
12
 *
3868
13
 * You should have received a copy of the GNU Lesser General Public License
3869
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3870
15
 *
3871
16
 * Authors: Michi Henning <michi.henning@canonical.com>
3872
17
 */
3873
18
3874
19
#include <unity/storage/qt/internal/ItemListJobImpl.h>
3875
20
3876
21
#include <unity/storage/internal/dbusmarshal.h>
3877
22
#include <unity/storage/internal/ItemMetadata.h>
3878
23
#include <unity/storage/qt/internal/Handler.h>
3879
24
#include <unity/storage/qt/internal/ItemImpl.h>
3880
25
3881
26
using namespace std;
3882
27
3883
28
namespace unity
3884
29
{
3885
30
namespace storage
3886
31
{
3887
32
namespace qt
3888
33
{
3889
34
namespace internal
3890
35
{
3891
36
3892
37
ItemListJobImpl::ItemListJobImpl(shared_ptr<AccountImpl> const& account,
3893
38
                                 QString const& method,
3894
39
                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
3895
40
                                 std::function<void(storage::internal::ItemMetadata const&)> const& validate)
3896
41
    : status_(ItemListJob::Loading)
3897
42
    , method_(method)
3898
43
    , account_(account)
3899
44
    , validate_(validate)
3900
45
{
3901
46
    assert(!method.isEmpty());
3902
47
    assert(account);
3903
48
    assert(validate);
3904
49
3905
50
    auto process_reply = [this](decltype(reply)& r)
3906
51
    {
3907
52
        QList<Item> items;
3908
53
        auto metadata = r.value();
3909
54
        for (auto const& md : metadata)
3910
55
        {
3911
56
            try
3912
57
            {
3913
58
                validate_(md);
3914
59
                auto item = ItemImpl::make_item(method_, md, account_);
3915
60
                items.append(item);
3916
61
            }
3917
62
            catch (StorageError const&)
3918
63
            {
3919
64
                // Bad metadata received from provider, validate_() or make_item() have logged it.
3920
65
            }
3921
66
        }
3922
67
        emit_items_ready(items);
3923
68
        status_ = emit_status_changed(ItemListJob::Finished);
3924
69
    };
3925
70
3926
71
    auto process_error = [this](StorageError const& error)
3927
72
    {
3928
73
        error_ = error;
3929
74
        status_ = emit_status_changed(ItemListJob::Error);
3930
75
    };
3931
76
3932
77
    new Handler<QList<storage::internal::ItemMetadata>>(this, reply, process_reply, process_error);
3933
78
}
3934
79
3935
80
ItemListJobImpl::ItemListJobImpl(StorageError const& error)
3936
81
    : status_(ItemListJob::Loading)
3937
82
    , error_(error)
3938
83
{
3939
84
}
3940
85
3941
86
bool ItemListJobImpl::isValid() const
3942
87
{
3943
88
    return status_ != ItemListJob::Status::Error;
3944
89
}
3945
90
3946
91
ItemListJob::Status ItemListJobImpl::status() const
3947
92
{
3948
93
    return status_;
3949
94
}
3950
95
3951
96
StorageError ItemListJobImpl::error() const
3952
97
{
3953
98
    return error_;
3954
99
}
3955
100
3956
101
ItemListJob* ItemListJobImpl::make_item_list_job(
3957
102
                                shared_ptr<AccountImpl> const& account,
3958
103
                                QString const& method,
3959
104
                                QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
3960
105
                                std::function<void(storage::internal::ItemMetadata const&)> const& validate)
3961
106
{
3962
107
    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(account, method, reply, validate));
3963
108
    auto job = new ItemListJob(move(impl));
3964
109
    job->p_->public_instance_ = job;
3965
110
    return job;
3966
111
}
3967
112
3968
113
ItemListJob* ItemListJobImpl::make_item_list_job(StorageError const& error)
3969
114
{
3970
115
    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(error));
3971
116
    auto job = new ItemListJob(move(impl));
3972
117
    job->p_->public_instance_ = job;
3973
118
    job->p_->status_ = job->p_->emit_status_changed(ItemListJob::Error);
3974
119
    return job;
3975
120
}
3976
121
3977
122
ItemListJob::Status ItemListJobImpl::emit_status_changed(ItemListJob::Status new_status) const
3978
123
{
3979
124
    // TODO: use assert
3980
125
    if (status_ == ItemListJob::Loading)  // Once in a final state, we don't emit the signal again.
3981
126
    {
3982
127
        // We defer emission of the signal so the client gets a chance to connect to the signal
3983
128
        // in case we emit the signal from the constructor.
3984
129
        QMetaObject::invokeMethod(public_instance_,
3985
130
                                  "statusChanged",
3986
131
                                  Qt::QueuedConnection,
3987
132
                                  Q_ARG(unity::storage::qt::ItemListJob::Status, new_status));
3988
133
    }
3989
134
    return new_status;
3990
135
}
3991
136
3992
137
void ItemListJobImpl::emit_items_ready(QList<Item> const& items) const
3993
138
{
3994
139
    QMetaObject::invokeMethod(public_instance_,
3995
140
                              "itemsReady",
3996
141
                              Qt::QueuedConnection,
3997
142
                              Q_ARG(QList<unity::storage::qt::Item>, items));
3998
143
}
3999
144
4000
145
}  // namespace internal
4001
146
}  // namespace qt
4002
147
}  // namespace storage
4003
148
}  // namespace unity
4004
0
149
4005
=== added file 'src/qt/internal/RuntimeImpl.cpp'
4006
--- src/qt/internal/RuntimeImpl.cpp	1970-01-01 00:00:00 +0000
4007
+++ src/qt/internal/RuntimeImpl.cpp	2016-09-21 05:03:46 +0000
4008
@@ -0,0 +1,168 @@
4009
1
/*
4010
2
 * Copyright (C) 2016 Canonical Ltd
4011
3
 *
4012
4
 * This program is free software: you can redistribute it and/or modify
4013
5
 * it under the terms of the GNU Lesser General Public License version 3 as
4014
6
 * published by the Free Software Foundation.
4015
7
 *
4016
8
 * This program is distributed in the hope that it will be useful,
4017
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4018
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4019
11
 * GNU Lesser General Public License for more details.
4020
12
 *
4021
13
 * You should have received a copy of the GNU Lesser General Public License
4022
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4023
15
 *
4024
16
 * Authors: Michi Henning <michi.henning@canonical.com>
4025
17
 */
4026
18
4027
19
#include <unity/storage/qt/internal/RuntimeImpl.h>
4028
20
4029
21
#include <unity/storage/internal/dbusmarshal.h>
4030
22
#include <unity/storage/qt/AccountsJob.h>
4031
23
#include <unity/storage/qt/internal/AccountImpl.h>
4032
24
#include <unity/storage/qt/internal/StorageErrorImpl.h>
4033
25
#include <unity/storage/qt/Item.h>
4034
26
#include <unity/storage/qt/ItemJob.h>
4035
27
#include <unity/storage/qt/ItemListJob.h>
4036
28
#include <unity/storage/qt/Runtime.h>
4037
29
4038
30
#include <QDBusError>
4039
31
#include <QDBusMetaType>
4040
32
4041
33
using namespace std;
4042
34
4043
35
namespace unity
4044
36
{
4045
37
namespace storage
4046
38
{
4047
39
namespace qt
4048
40
{
4049
41
namespace internal
4050
42
{
4051
43
namespace
4052
44
{
4053
45
4054
46
void register_meta_types()
4055
47
{
4056
48
    qRegisterMetaType<unity::storage::qt::AccountsJob::Status>();
4057
49
    qRegisterMetaType<unity::storage::qt::Item>();
4058
50
    qRegisterMetaType<QList<unity::storage::qt::Item>>();
4059
51
    qRegisterMetaType<unity::storage::qt::ItemJob::Status>();
4060
52
    qRegisterMetaType<unity::storage::qt::ItemListJob::Status>();
4061
53
4062
54
    qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
4063
55
    qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
4064
56
}
4065
57
4066
58
}
4067
59
4068
60
// TODO: chain the two constructors.
4069
61
RuntimeImpl::RuntimeImpl()
4070
62
    : is_valid_(true)
4071
63
    , conn_(QDBusConnection::sessionBus())
4072
64
    , accounts_manager_(new OnlineAccounts::Manager("", conn_))
4073
65
{
4074
66
    register_meta_types();
4075
67
4076
68
#if 0
4077
69
    if (!conn_.isConnected())
4078
70
    {
4079
71
        // LCOV_EXCL_START
4080
72
        is_valid_ = false;
4081
73
        QString msg = "Runtime(): cannot connect to session bus: " + conn_.lastError().message();
4082
74
        error_ = StorageErrorImpl::local_comms_error(msg);
4083
75
        // LCOV_EXCL_STOP
4084
76
    }
4085
77
#endif
4086
78
}
4087
79
4088
80
RuntimeImpl::RuntimeImpl(QDBusConnection const& bus)
4089
81
    : is_valid_(true)
4090
82
    , conn_(bus)
4091
83
    , accounts_manager_(new OnlineAccounts::Manager("", conn_))
4092
84
{
4093
85
    register_meta_types();
4094
86
4095
87
#if 0
4096
88
    if (!conn_.isConnected())
4097
89
    {
4098
90
        is_valid_ = false;
4099
91
        QString msg = "Runtime(): DBus connection is not connected";
4100
92
        error_ = StorageErrorImpl::local_comms_error(msg);
4101
93
    }
4102
94
#endif
4103
95
}
4104
96
4105
97
RuntimeImpl::~RuntimeImpl()
4106
98
{
4107
99
    shutdown();
4108
100
}
4109
101
4110
102
bool RuntimeImpl::isValid() const
4111
103
{
4112
104
    return is_valid_;
4113
105
}
4114
106
4115
107
StorageError RuntimeImpl::error() const
4116
108
{
4117
109
    return error_;
4118
110
}
4119
111
4120
112
QDBusConnection RuntimeImpl::connection() const
4121
113
{
4122
114
    return conn_;
4123
115
}
4124
116
4125
117
AccountsJob* RuntimeImpl::accounts() const
4126
118
{
4127
119
    if (!is_valid_)
4128
120
    {
4129
121
        QString msg = "Runtime::accounts(): Runtime was destroyed previously";
4130
122
        return new AccountsJob(StorageErrorImpl::runtime_destroyed_error(msg));
4131
123
    }
4132
124
    auto This = const_cast<RuntimeImpl*>(this);
4133
125
    return new AccountsJob(This->shared_from_this());
4134
126
}
4135
127
4136
128
StorageError RuntimeImpl::shutdown()
4137
129
{
4138
130
    if (is_valid_)
4139
131
    {
4140
132
        conn_.disconnectFromBus(conn_.name());
4141
133
        is_valid_ = false;
4142
134
        return StorageError();
4143
135
    }
4144
136
    error_ = StorageErrorImpl::runtime_destroyed_error("Runtime::shutdown(): Runtime was destroyed previously");
4145
137
    return error_;
4146
138
}
4147
139
4148
140
shared_ptr<OnlineAccounts::Manager> RuntimeImpl::accounts_manager() const
4149
141
{
4150
142
    return accounts_manager_;
4151
143
}
4152
144
4153
145
Account RuntimeImpl::make_test_account(QString const& bus_name,
4154
146
                                       QString const& object_path)
4155
147
{
4156
148
    return make_test_account(bus_name, object_path, "", "", "");
4157
149
}
4158
150
4159
151
Account RuntimeImpl::make_test_account(QString const& bus_name,
4160
152
                                       QString const& object_path,
4161
153
                                       QString const& owner_id,
4162
154
                                       QString const& owner,
4163
155
                                       QString const& description)
4164
156
{
4165
157
    return AccountImpl::make_account(shared_from_this(),
4166
158
                                     bus_name,
4167
159
                                     object_path,
4168
160
                                     owner_id,
4169
161
                                     owner,
4170
162
                                     description);
4171
163
}
4172
164
4173
165
}  // namespace internal
4174
166
}  // namespace qt
4175
167
}  // namespace storage
4176
168
}  // namespace unity
4177
0
169
4178
=== added file 'src/qt/internal/StorageErrorImpl.cpp'
4179
--- src/qt/internal/StorageErrorImpl.cpp	1970-01-01 00:00:00 +0000
4180
+++ src/qt/internal/StorageErrorImpl.cpp	2016-09-21 05:03:46 +0000
4181
@@ -0,0 +1,230 @@
4182
1
/*
4183
2
 * Copyright (C) 2016 Canonical Ltd
4184
3
 *
4185
4
 * This program is free software: you can redistribute it and/or modify
4186
5
 * it under the terms of the GNU Lesser General Public License version 3 as
4187
6
 * published by the Free Software Foundation.
4188
7
 *
4189
8
 * This program is distributed in the hope that it will be useful,
4190
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4191
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4192
11
 * GNU Lesser General Public License for more details.
4193
12
 *
4194
13
 * You should have received a copy of the GNU Lesser General Public License
4195
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4196
15
 *
4197
16
 * Authors: Michi Henning <michi.henning@canonical.com>
4198
17
 */
4199
18
4200
19
#include <unity/storage/qt/internal/StorageErrorImpl.h>
4201
20
4202
21
#include <cassert>
4203
22
#include <memory>
4204
23
4205
24
using namespace std;
4206
25
4207
26
namespace unity
4208
27
{
4209
28
namespace storage
4210
29
{
4211
30
namespace qt
4212
31
{
4213
32
namespace internal
4214
33
{
4215
34
4216
35
namespace
4217
36
{
4218
37
4219
38
static char const * const ERROR_NAMES[StorageError::__LAST_STORAGE_ERROR] =
4220
39
{
4221
40
    "NoError", "LocalCommsError", "RemoteCommsError", "Deleted", "RuntimeDestroyed", "NotExists",
4222
41
    "Exists", "Conflict", "PermissionDenied", "Cancelled", "LogicError", "InvalidArgument", "ResourceError"
4223
42
};
4224
43
4225
44
}  // namespace
4226
45
4227
46
StorageErrorImpl::StorageErrorImpl()
4228
47
    : type_(StorageError::Type::NoError)
4229
48
    , name_(ERROR_NAMES[type_])
4230
49
    , message_("No error")
4231
50
    , error_code_(0)
4232
51
{
4233
52
}
4234
53
4235
54
StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg)
4236
55
    : type_(type)
4237
56
    , name_(ERROR_NAMES[type_])
4238
57
    , message_(msg)
4239
58
    , error_code_(0)
4240
59
{
4241
60
    assert(   type == StorageError::Type::LocalCommsError
4242
61
           || type == StorageError::Type::RemoteCommsError
4243
62
           || type == StorageError::Type::RuntimeDestroyed
4244
63
           || type == StorageError::Type::Conflict
4245
64
           || type == StorageError::Type::PermissionDenied
4246
65
           || type == StorageError::Type::Cancelled
4247
66
           || type == StorageError::Type::LogicError
4248
67
           || type == StorageError::Type::InvalidArgument);
4249
68
    assert(!msg.isEmpty());
4250
69
}
4251
70
4252
71
StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& key)
4253
72
    : type_(type)
4254
73
    , name_(ERROR_NAMES[type_])
4255
74
    , message_(msg)
4256
75
    , error_code_(0)
4257
76
{
4258
77
    assert(   type == StorageError::Type::Deleted
4259
78
           || type == StorageError::Type::NotExists);
4260
79
    assert(!msg.isEmpty());
4261
80
4262
81
    item_id_ = key;
4263
82
    if (type == StorageError::Type::NotExists)
4264
83
    {
4265
84
        item_name_ = key;
4266
85
    }
4267
86
}
4268
87
4269
88
StorageErrorImpl::StorageErrorImpl(StorageError::Type type,
4270
89
                                   QString const& msg,
4271
90
                                   QString const& item_id,
4272
91
                                   QString const& item_name)
4273
92
    : type_(type)
4274
93
    , name_(ERROR_NAMES[type_])
4275
94
    , message_(msg)
4276
95
    , item_id_(item_id)
4277
96
    , item_name_(item_name)
4278
97
    , error_code_(0)
4279
98
{
4280
99
    assert(type == StorageError::Type::Exists);
4281
100
    assert(!msg.isEmpty());
4282
101
    assert(!item_id.isEmpty());
4283
102
    assert(!item_name.isEmpty());
4284
103
}
4285
104
4286
105
StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg, int error_code)
4287
106
    : type_(type)
4288
107
    , message_(msg)
4289
108
    , error_code_(error_code)
4290
109
{
4291
110
    assert(type == StorageError::Type::ResourceError);
4292
111
    assert(!msg.isEmpty());
4293
112
}
4294
113
4295
114
StorageError::Type StorageErrorImpl::type() const
4296
115
{
4297
116
    return type_;
4298
117
}
4299
118
4300
119
QString StorageErrorImpl::name() const
4301
120
{
4302
121
    return name_;
4303
122
}
4304
123
4305
124
QString StorageErrorImpl::message() const
4306
125
{
4307
126
    return message_;
4308
127
}
4309
128
4310
129
QString StorageErrorImpl::errorString() const
4311
130
{
4312
131
    return name_ + ": " + message_;
4313
132
}
4314
133
4315
134
QString StorageErrorImpl::itemId() const
4316
135
{
4317
136
    return item_id_;
4318
137
}
4319
138
4320
139
QString StorageErrorImpl::itemName() const
4321
140
{
4322
141
    return item_name_;
4323
142
}
4324
143
4325
144
int StorageErrorImpl::errorCode() const
4326
145
{
4327
146
    return error_code_;
4328
147
}
4329
148
4330
149
StorageError StorageErrorImpl::make_error(StorageError::Type type, QString const& msg)
4331
150
{
4332
151
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(type, msg));
4333
152
    return StorageError(move(p));
4334
153
}
4335
154
4336
155
StorageError StorageErrorImpl::local_comms_error(QString const& msg)
4337
156
{
4338
157
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::LocalCommsError, msg));
4339
158
    return StorageError(move(p));
4340
159
}
4341
160
4342
161
StorageError StorageErrorImpl::remote_comms_error(QString const& msg)
4343
162
{
4344
163
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::RemoteCommsError, msg));
4345
164
    return StorageError(move(p));
4346
165
}
4347
166
4348
167
StorageError StorageErrorImpl::deleted_error(QString const& msg, QString const& item_id)
4349
168
{
4350
169
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Deleted, msg, item_id));
4351
170
    return StorageError(move(p));
4352
171
}
4353
172
4354
173
StorageError StorageErrorImpl::runtime_destroyed_error(QString const& msg)
4355
174
{
4356
175
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::RuntimeDestroyed, msg));
4357
176
    return StorageError(move(p));
4358
177
}
4359
178
4360
179
StorageError StorageErrorImpl::not_exists_error(QString const& msg, QString const& key)
4361
180
{
4362
181
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::NotExists, msg, key));
4363
182
    return StorageError(move(p));
4364
183
}
4365
184
4366
185
StorageError StorageErrorImpl::exists_error(QString const& msg, QString const& item_id, QString const& item_name)
4367
186
{
4368
187
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Exists, msg, item_id, item_name));
4369
188
    return StorageError(move(p));
4370
189
}
4371
190
4372
191
StorageError StorageErrorImpl::conflict_error(QString const& msg)
4373
192
{
4374
193
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Conflict, msg));
4375
194
    return StorageError(move(p));
4376
195
}
4377
196
4378
197
StorageError StorageErrorImpl::permission_error(QString const& msg)
4379
198
{
4380
199
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::PermissionDenied, msg));
4381
200
    return StorageError(move(p));
4382
201
}
4383
202
4384
203
StorageError StorageErrorImpl::cancelled_error(QString const& msg)
4385
204
{
4386
205
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Cancelled, msg));
4387
206
    return StorageError(move(p));
4388
207
}
4389
208
4390
209
StorageError StorageErrorImpl::logic_error(QString const& msg)
4391
210
{
4392
211
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::LogicError, msg));
4393
212
    return StorageError(move(p));
4394
213
}
4395
214
4396
215
StorageError StorageErrorImpl::invalid_argument_error(QString const& msg)
4397
216
{
4398
217
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::InvalidArgument, msg));
4399
218
    return StorageError(move(p));
4400
219
}
4401
220
4402
221
StorageError StorageErrorImpl::resource_error(QString const& msg, int error_code)
4403
222
{
4404
223
    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::ResourceError, msg, error_code));
4405
224
    return StorageError(move(p));
4406
225
}
4407
226
4408
227
}  // namespace internal
4409
228
}  // namespace qt
4410
229
}  // namespace storage
4411
230
}  // namespace unity
4412
0
231
4413
=== added file 'src/qt/internal/unmarshal_error.cpp'
4414
--- src/qt/internal/unmarshal_error.cpp	1970-01-01 00:00:00 +0000
4415
+++ src/qt/internal/unmarshal_error.cpp	2016-09-21 05:03:46 +0000
4416
@@ -0,0 +1,131 @@
4417
1
/*
4418
2
 * Copyright (C) 2016 Canonical Ltd
4419
3
 *
4420
4
 * This program is free software: you can redistribute it and/or modify
4421
5
 * it under the terms of the GNU Lesser General Public License version 3 as
4422
6
 * published by the Free Software Foundation.
4423
7
 *
4424
8
 * This program is distributed in the hope that it will be useful,
4425
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4426
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4427
11
 * GNU Lesser General Public License for more details.
4428
12
 *
4429
13
 * You should have received a copy of the GNU Lesser General Public License
4430
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4431
15
 *
4432
16
 * Authors: Michi Henning <michi.henning@canonical.com>
4433
17
 */
4434
18
4435
19
#include <unity/storage/qt/internal/unmarshal_error.h>
4436
20
4437
21
#include <unity/storage/internal/dbus_error.h>
4438
22
#include <unity/storage/qt/internal/StorageErrorImpl.h>
4439
23
4440
24
#include <QDBusPendingReply>
4441
25
4442
26
#include <cassert>
4443
27
#include <map>
4444
28
4445
29
using namespace unity::storage::internal;
4446
30
using namespace std;
4447
31
4448
32
namespace unity
4449
33
{
4450
34
namespace storage
4451
35
{
4452
36
namespace qt
4453
37
{
4454
38
namespace internal
4455
39
{
4456
40
namespace
4457
41
{
4458
42
4459
43
template<StorageError::Type T>
4460
44
StorageError make_error(QDBusPendingCallWatcher const& call)
4461
45
{
4462
46
    QDBusPendingReply<QString> reply = call;
4463
47
    auto msg = reply.argumentAt<0>();
4464
48
    return StorageErrorImpl::make_error(T, msg);
4465
49
}
4466
50
4467
51
template<>
4468
52
StorageError make_error<StorageError::NotExists>(QDBusPendingCallWatcher const& call)
4469
53
{
4470
54
    QDBusPendingReply<QString, QString> reply = call;
4471
55
    auto msg = reply.argumentAt<0>();
4472
56
    auto key = reply.argumentAt<1>();
4473
57
    return StorageErrorImpl::not_exists_error(msg, key);
4474
58
}
4475
59
4476
60
template<>
4477
61
StorageError make_error<StorageError::Exists>(QDBusPendingCallWatcher const& call)
4478
62
{
4479
63
    QDBusPendingReply<QString, QString, QString> reply = call;
4480
64
    auto msg = reply.argumentAt<0>();
4481
65
    auto id = reply.argumentAt<1>();
4482
66
    auto name = reply.argumentAt<2>();
4483
67
    return StorageErrorImpl::exists_error(msg, id, name);
4484
68
}
4485
69
4486
70
template<>
4487
71
StorageError make_error<StorageError::ResourceError>(QDBusPendingCallWatcher const& call)
4488
72
{
4489
73
    QDBusPendingReply<QString, int> reply = call;
4490
74
    auto msg = reply.argumentAt<0>();
4491
75
    auto error_code = reply.argumentAt<1>();
4492
76
    return StorageErrorImpl::resource_error(msg, error_code);
4493
77
}
4494
78
4495
79
static const map<QString, function<StorageError(QDBusPendingCallWatcher const& call)>> exception_factories =
4496
80
{
4497
81
    { "RemoteCommsException",     make_error<StorageError::RemoteCommsError> },
4498
82
    { "NotExistsException",       make_error<StorageError::NotExists> },
4499
83
    { "ExistsException",          make_error<StorageError::Exists> },
4500
84
    { "ConflictException",        make_error<StorageError::Conflict> },
4501
85
    { "PermissionException",      make_error<StorageError::PermissionDenied> },
4502
86
    { "CancelledException",       make_error<StorageError::Cancelled> },
4503
87
    { "LogicException",           make_error<StorageError::LogicError> },
4504
88
    { "InvalidArgumentException", make_error<StorageError::InvalidArgument> },
4505
89
    { "ResourceException",        make_error<StorageError::ResourceError> },
4506
90
    { "QuotaException",           make_error<StorageError::QuotaExceeded> },
4507
91
    { "UnknownException",         make_error<StorageError::LocalCommsError> }  // Yes, LocalCommsError is intentional
4508
92
};
4509
93
4510
94
}  // namespace
4511
95
4512
96
StorageError unmarshal_error(QDBusPendingCallWatcher const& call)
4513
97
{
4514
98
    assert(call.isError());
4515
99
4516
100
    int err = call.error().type();
4517
101
    if (err != QDBusError::Other)
4518
102
    {
4519
103
        // Some DBus error that doesn't represent a StorageError.
4520
104
        return StorageErrorImpl::local_comms_error(call.error().message());
4521
105
    }
4522
106
4523
107
    auto exception_type = call.error().name();
4524
108
    if (!exception_type.startsWith(DBUS_ERROR_PREFIX))
4525
109
    {
4526
110
        // Some error with the wrong prefix (should never happen unless the server is broken).
4527
111
        QString msg = "unmarshal_exception(): unknown exception type received from server: " + exception_type
4528
112
                      + ": " + call.error().message();
4529
113
        return StorageErrorImpl::local_comms_error(msg);
4530
114
    }
4531
115
    exception_type = exception_type.remove(0, strlen(DBUS_ERROR_PREFIX));
4532
116
4533
117
    auto factory_it = exception_factories.find(exception_type);
4534
118
    if (factory_it == exception_factories.end())
4535
119
    {
4536
120
        // Some StorageError that we don't recognize.
4537
121
        QString msg = "unmarshal_exception(): unknown exception type received from server: " + exception_type
4538
122
                      + ": " + call.error().message();
4539
123
        return StorageErrorImpl::local_comms_error(msg);
4540
124
    }
4541
125
    return factory_it->second(call);
4542
126
}
4543
127
4544
128
}  // namespace internal
4545
129
}  // namespace qt
4546
130
}  // namespace storage
4547
131
}  // namespace unity
4548
0
132
4549
=== added file 'src/qt/internal/validate.cpp'
4550
--- src/qt/internal/validate.cpp	1970-01-01 00:00:00 +0000
4551
+++ src/qt/internal/validate.cpp	2016-09-21 05:03:46 +0000
4552
@@ -0,0 +1,170 @@
4553
1
/*
4554
2
 * Copyright (C) 2016 Canonical Ltd
4555
3
 *
4556
4
 * This program is free software: you can redistribute it and/or modify
4557
5
 * it under the terms of the GNU Lesser General Public License version 3 as
4558
6
 * published by the Free Software Foundation.
4559
7
 *
4560
8
 * This program is distributed in the hope that it will be useful,
4561
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4562
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4563
11
 * GNU Lesser General Public License for more details.
4564
12
 *
4565
13
 * You should have received a copy of the GNU Lesser General Public License
4566
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4567
15
 *
4568
16
 * Authors: Michi Henning <michi.henning@canonical.com>
4569
17
 */
4570
18
4571
19
#include <unity/storage/qt/internal/validate.h>
4572
20
4573
21
#include <unity/storage/internal/ItemMetadata.h>
4574
22
#include <unity/storage/provider/metadata_keys.h>
4575
23
#include <unity/storage/qt/internal/StorageErrorImpl.h>
4576
24
4577
25
#include <QDateTime>
4578
26
#include <QDebug>
4579
27
#include <QString>
4580
28
4581
29
using namespace unity::storage::internal;
4582
30
using namespace std;
4583
31
4584
32
namespace unity
4585
33
{
4586
34
namespace storage
4587
35
{
4588
36
namespace qt
4589
37
{
4590
38
namespace internal
4591
39
{
4592
40
4593
41
namespace
4594
42
{
4595
43
4596
44
// Check that actual type and value match the expect type and value for a particular metadata entry.
4597
45
4598
46
void validate_type_and_value(QString const& prefix,
4599
47
                             QMapIterator<QString, QVariant> actual,
4600
48
                             unordered_map<string, provider::MetadataType>::const_iterator known)
4601
49
{
4602
50
    using namespace unity::storage::provider;
4603
51
4604
52
    switch (known->second)
4605
53
    {
4606
54
        case MetadataType::iso_8601_date_time:
4607
55
        {
4608
56
            if (actual.value().type() != QVariant::String)
4609
57
            {
4610
58
                QString msg = prefix + actual.key() + ": expected value of type String, but received value of type "
4611
59
                              + actual.value().typeName();
4612
60
                throw StorageErrorImpl::local_comms_error(msg);
4613
61
            }
4614
62
            QDateTime dt = QDateTime::fromString(actual.value().toString(), Qt::ISODate);
4615
63
            if (!dt.isValid())
4616
64
            {
4617
65
                QString msg = prefix + actual.key() + ": value \"" + actual.value().toString()
4618
66
                              + "\" does not parse as ISO-8601 date";
4619
67
                throw StorageErrorImpl::local_comms_error(msg);
4620
68
            }
4621
69
            auto timespec = dt.timeSpec();
4622
70
            if (timespec == Qt::LocalTime)
4623
71
            {
4624
72
                QString msg = prefix + actual.key() + ": value \"" + actual.value().toString()
4625
73
                              + "\" lacks a time zone specification";
4626
74
                throw StorageErrorImpl::local_comms_error(msg);
4627
75
            }
4628
76
            break;
4629
77
        }
4630
78
        case MetadataType::int64:
4631
79
        {
4632
80
            if (actual.value().type() != QVariant::LongLong)
4633
81
            {
4634
82
                QString msg = prefix + actual.key() + ": expected value of type LongLong, but received value of type "
4635
83
                              + actual.value().typeName();
4636
84
                throw StorageErrorImpl::local_comms_error(msg);
4637
85
            }
4638
86
            break;
4639
87
        }
4640
88
        default:
4641
89
        {
4642
90
            abort();  // Impossible.  // LCOV_EXCL_LINE
4643
91
        }
4644
92
    }
4645
93
}
4646
94
4647
95
}  // namespace
4648
96
4649
97
void validate(QString const& method, ItemMetadata const& md)
4650
98
{
4651
99
    using namespace unity::storage::provider;
4652
100
4653
101
    QString prefix = method + ": received invalid metadata from provider: ";
4654
102
4655
103
    // Basic sanity checks for mandatory fields.
4656
104
    if (md.item_id.isEmpty())
4657
105
    {
4658
106
        throw StorageErrorImpl::local_comms_error(prefix + "item_id cannot be empty");
4659
107
    }
4660
108
    if (md.type != ItemType::root)
4661
109
    {
4662
110
        if (md.parent_ids.isEmpty())
4663
111
        {
4664
112
            throw StorageErrorImpl::local_comms_error(prefix + "file or folder must have at least one parent ID");
4665
113
        }
4666
114
        for (int i = 0; i < md.parent_ids.size(); ++i)
4667
115
        {
4668
116
            if (md.parent_ids.at(i).isEmpty())
4669
117
            {
4670
118
                throw StorageErrorImpl::local_comms_error(prefix + "parent_id of file or folder cannot be empty");
4671
119
            }
4672
120
        }
4673
121
    }
4674
122
    if (md.type == ItemType::root && !md.parent_ids.isEmpty())
4675
123
    {
4676
124
        throw StorageErrorImpl::local_comms_error(prefix + "metadata: parent_ids of root must be empty");
4677
125
    }
4678
126
    if (md.name.isEmpty())
4679
127
    {
4680
128
        throw StorageErrorImpl::local_comms_error(prefix + "name cannot be empty");
4681
129
    }
4682
130
    if (md.etag.isEmpty())
4683
131
    {
4684
132
        throw StorageErrorImpl::local_comms_error(prefix + "etag cannot be empty");
4685
133
    }
4686
134
4687
135
    // Sanity check metadata to make sure only known metadata keys appear.
4688
136
    QMapIterator<QString, QVariant> actual(md.metadata);
4689
137
    while (actual.hasNext())
4690
138
    {
4691
139
        actual.next();
4692
140
        auto known = known_metadata.find(actual.key().toStdString());
4693
141
        if (known == known_metadata.end())
4694
142
        {
4695
143
            qWarning() << prefix << "unknown metadata key:" << actual.key();
4696
144
        }
4697
145
        else
4698
146
        {
4699
147
            validate_type_and_value(prefix, actual, known);
4700
148
        }
4701
149
    }
4702
150
4703
151
    // Sanity check metadata to make sure that mandatory fields are present.
4704
152
    if (md.type == ItemType::file)
4705
153
    {
4706
154
        if (!md.metadata.contains(SIZE_IN_BYTES))
4707
155
        {
4708
156
            QString msg = prefix + "missing key " + SIZE_IN_BYTES + " in metadata for " + md.item_id;
4709
157
            throw StorageErrorImpl::local_comms_error(msg);
4710
158
        }
4711
159
        if (!md.metadata.contains(LAST_MODIFIED_TIME))
4712
160
        {
4713
161
            QString msg = prefix + "missing key " + LAST_MODIFIED_TIME + " in metadata for " + md.item_id;
4714
162
            throw StorageErrorImpl::local_comms_error(msg);
4715
163
        }
4716
164
    }
4717
165
}
4718
166
4719
167
}  // namespace internal
4720
168
}  // namespace qt
4721
169
}  // namespace storage
4722
170
}  // namespace unity
4723
0
171
4724
=== renamed file 'src/qt/client/storage-framework-qt-client.pc.in' => 'src/qt/storage-framework-qt-client.pc.in'
4725
=== modified file 'tests/CMakeLists.txt'
4726
--- tests/CMakeLists.txt	2016-08-11 04:20:06 +0000
4727
+++ tests/CMakeLists.txt	2016-09-21 05:03:46 +0000
4728
@@ -14,6 +14,7 @@
4729
14
set(unit_test_dirs
14
set(unit_test_dirs
4730
15
    local-client
15
    local-client
4731
16
    remote-client
16
    remote-client
4732
17
    remote-client-v1
4733
17
    provider-AccountData
18
    provider-AccountData
4734
18
    provider-DBusPeerCache
19
    provider-DBusPeerCache
4735
19
    provider-ProviderInterface
20
    provider-ProviderInterface
4736
20
21
4737
=== modified file 'tests/headers/CMakeLists.txt'
4738
--- tests/headers/CMakeLists.txt	2016-08-22 04:35:33 +0000
4739
+++ tests/headers/CMakeLists.txt	2016-09-21 05:03:46 +0000
4740
@@ -7,6 +7,7 @@
4741
7
set(subdirs
7
set(subdirs
4742
8
    unity/storage
8
    unity/storage
4743
9
    unity/storage/provider
9
    unity/storage/provider
4744
10
    unity/storage/qt
4745
10
    unity/storage/qt/client
11
    unity/storage/qt/client
4746
11
    unity/storage/qt/client/internal/local_client
12
    unity/storage/qt/client/internal/local_client
4747
12
    unity/storage/qt/client/internal/remote_client
13
    unity/storage/qt/client/internal/remote_client
4748
13
14
4749
=== added directory 'tests/remote-client'
4750
=== renamed directory 'tests/remote-client' => 'tests/remote-client-v1'
4751
=== modified file 'tests/remote-client-v1/CMakeLists.txt'
4752
--- tests/remote-client/CMakeLists.txt	2016-08-18 04:54:24 +0000
4753
+++ tests/remote-client-v1/CMakeLists.txt	2016-09-21 05:03:46 +0000
4754
@@ -1,10 +1,10 @@
4757
1
add_executable(remote-client_test remote-client_test.cpp MockProvider.cpp)
1
add_executable(remote-client-v1_test remote-client-v1_test.cpp MockProvider.cpp)
4758
2
set_target_properties(remote-client_test PROPERTIES AUTOMOC TRUE)
2
set_target_properties(remote-client-v1_test PROPERTIES AUTOMOC TRUE)
4759
3
3
4760
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
4761
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
4762
6
6
4764
7
target_link_libraries(remote-client_test
7
target_link_libraries(remote-client-v1_test
4765
8
    storage-framework-provider
8
    storage-framework-provider
4766
9
    storage-framework-qt-client
9
    storage-framework-qt-client
4767
10
    Qt5::Network
10
    Qt5::Network
4768
@@ -14,7 +14,7 @@
4769
14
    testutils
14
    testutils
4770
15
    gtest
15
    gtest
4771
16
)
16
)
4774
17
add_test(remote-client remote-client_test)
17
add_test(remote-client-v1 remote-client-v1_test)
4775
18
add_dependencies(remote-client_test qt-client-all-headers provider-test)
18
add_dependencies(remote-client-v1_test qt-client-all-headers provider-test)
4776
19
19
4777
20
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
20
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
4778
21
21
4779
=== renamed file 'tests/remote-client/remote-client_test.cpp' => 'tests/remote-client-v1/remote-client-v1_test.cpp'
4780
--- tests/remote-client/remote-client_test.cpp	2016-09-02 02:56:52 +0000
4781
+++ tests/remote-client-v1/remote-client-v1_test.cpp	2016-09-21 05:03:46 +0000
4782
@@ -81,6 +81,7 @@
4783
81
    void SetUp() override
81
    void SetUp() override
4784
82
    {
82
    {
4785
83
        runtime_ = Runtime::create(connection());
83
        runtime_ = Runtime::create(connection());
4786
84
        //acc_ = runtime_->make_test_account(service_connection_->baseService(), impossible_name());
4787
84
        acc_ = runtime_->make_test_account(bus_name(), object_path());
85
        acc_ = runtime_->make_test_account(bus_name(), object_path());
4788
85
    }
86
    }
4789
86
87
4790
87
88
4791
=== added file 'tests/remote-client/CMakeLists.txt'
4792
--- tests/remote-client/CMakeLists.txt	1970-01-01 00:00:00 +0000
4793
+++ tests/remote-client/CMakeLists.txt	2016-09-21 05:03:46 +0000
4794
@@ -0,0 +1,20 @@
4795
1
add_executable(remote-client_test remote-client_test.cpp MockProvider.cpp)
4796
2
set_target_properties(remote-client_test PROPERTIES AUTOMOC TRUE)
4797
3
4798
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
4799
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
4800
6
4801
7
target_link_libraries(remote-client_test
4802
8
    storage-framework-provider
4803
9
    storage-framework-qt-client-v2
4804
10
    Qt5::Network
4805
11
    Qt5::Test
4806
12
    ${Boost_LIBRARIES}
4807
13
    ${GLIB_DEPS_LIBRARIES}
4808
14
    testutils
4809
15
    gtest
4810
16
)
4811
17
add_test(remote-client remote-client_test)
4812
18
add_dependencies(remote-client_test qt-client-all-headers provider-test)
4813
19
4814
20
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
4815
0
21
4816
=== added file 'tests/remote-client/MockProvider.cpp'
4817
--- tests/remote-client/MockProvider.cpp	1970-01-01 00:00:00 +0000
4818
+++ tests/remote-client/MockProvider.cpp	2016-09-21 05:03:46 +0000
4819
@@ -0,0 +1,237 @@
4820
1
/*
4821
2
 * Copyright (C) 2016 Canonical Ltd
4822
3
 *
4823
4
 * This program is free software: you can redistribute it and/or modify
4824
5
 * it under the terms of the GNU Lesser General Public License version 3 as
4825
6
 * published by the Free Software Foundation.
4826
7
 *
4827
8
 * This program is distributed in the hope that it will be useful,
4828
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4829
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4830
11
 * GNU Lesser General Public License for more details.
4831
12
 *
4832
13
 * You should have received a copy of the GNU Lesser General Public License
4833
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4834
15
 *
4835
16
 * Authors: Michi Henning <michi.henning@canonical.com>
4836
17
 */
4837
18
4838
19
#include "MockProvider.h"
4839
20
4840
21
#include <unity/storage/provider/Exceptions.h>
4841
22
#include <unity/storage/provider/metadata_keys.h>
4842
23
4843
24
#include <boost/thread.hpp>
4844
25
#include <boost/thread/future.hpp>
4845
26
4846
27
#include <chrono>
4847
28
#include <thread>
4848
29
#include <inttypes.h>
4849
30
4850
31
using namespace unity::storage;
4851
32
using namespace unity::storage::provider;
4852
33
using namespace std;
4853
34
4854
35
using boost::make_exceptional_future;
4855
36
using boost::make_ready_future;
4856
37
4857
38
MockProvider::MockProvider()
4858
39
{
4859
40
}
4860
41
4861
42
MockProvider::MockProvider(string const& cmd)
4862
43
    : cmd_(cmd)
4863
44
{
4864
45
}
4865
46
4866
47
boost::future<ItemList> MockProvider::roots(Context const&)
4867
48
{
4868
49
    cerr << "roots CALLED" << endl;
4869
50
    ItemList roots =
4870
51
    {
4871
52
        {"root_id", {}, "Root", "etag", ItemType::root, {}}
4872
53
    };
4873
54
    return make_ready_future<ItemList>(roots);
4874
55
}
4875
56
4876
57
boost::future<tuple<ItemList,string>> MockProvider::list(
4877
58
    string const& item_id, string const& page_token,
4878
59
    Context const&)
4879
60
{
4880
61
    if (item_id != "root_id")
4881
62
    {
4882
63
        string msg = string("Item::list(): no such item: \"") + item_id + "\"";
4883
64
        return make_exceptional_future<tuple<ItemList,string>>(NotExistsException(msg, item_id));
4884
65
    }
4885
66
    if (page_token != "")
4886
67
    {
4887
68
        string msg = string("Item::list(): invalid page token: \"") + page_token + "\"";
4888
69
        return make_exceptional_future<tuple<ItemList,string>>(LogicException("invalid page token"));
4889
70
    }
4890
71
    ItemList children =
4891
72
    {
4892
73
        {
4893
74
            "child_id", { "root_id" }, "Child", "etag", ItemType::file,
4894
75
            { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } }
4895
76
        }
4896
77
    };
4897
78
    boost::promise<tuple<ItemList,string>> p;
4898
79
    p.set_value(make_tuple(children, string()));
4899
80
    return p.get_future();
4900
81
}
4901
82
4902
83
boost::future<ItemList> MockProvider::lookup(
4903
84
    string const& parent_id, string const& name, Context const&)
4904
85
{
4905
86
    if (parent_id != "root_id")
4906
87
    {
4907
88
        string msg = string("Folder::lookup(): no such item: \"") + parent_id + "\"";
4908
89
        return make_exceptional_future<ItemList>(NotExistsException(msg, parent_id));
4909
90
    }
4910
91
    if (name != "Child")
4911
92
    {
4912
93
        string msg = string("Folder::lookup(): no such item: \"") + name + "\"";
4913
94
        return make_exceptional_future<ItemList>(NotExistsException(msg, name));
4914
95
    }
4915
96
    ItemList children =
4916
97
    {
4917
98
        { "child_id", { "root_id" }, "Child", "etag", ItemType::file,
4918
99
          { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } }
4919
100
    };
4920
101
    return make_ready_future<ItemList>(children);
4921
102
}
4922
103
4923
104
boost::future<Item> MockProvider::metadata(string const& item_id, Context const&)
4924
105
{
4925
106
    if (item_id == "root_id")
4926
107
    {
4927
108
        Item metadata{"root_id", {}, "Root", "etag", ItemType::root, {}};
4928
109
        return make_ready_future<Item>(metadata);
4929
110
    }
4930
111
    else if (item_id == "child_id")
4931
112
    {
4932
113
        Item metadata
4933
114
        {
4934
115
            "child_id", { "root_id" }, "Child", "etag", ItemType::file,
4935
116
            { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } }
4936
117
        };
4937
118
        return make_ready_future<Item>(metadata);
4938
119
    }
4939
120
    else if (item_id == "child_folder_id")
4940
121
    {
4941
122
        Item metadata{"child_folder_id", { "root_id" }, "Child_Folder", "etag", ItemType::folder, {}};
4942
123
        return make_ready_future<Item>(metadata);
4943
124
    }
4944
125
    return make_exceptional_future<Item>(NotExistsException("metadata(): no such item: " + item_id, item_id));
4945
126
}
4946
127
4947
128
boost::future<Item> MockProvider::create_folder(
4948
129
    string const& parent_id, string const& name,
4949
130
    Context const&)
4950
131
{
4951
132
    Item metadata{"new_folder_id", { parent_id }, name, "etag", ItemType::folder, {}};
4952
133
    return make_ready_future<Item>(metadata);
4953
134
}
4954
135
4955
136
string make_job_id()
4956
137
{
4957
138
    static int last_job_id = 0;
4958
139
    return to_string(++last_job_id);
4959
140
}
4960
141
4961
142
boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
4962
143
    string const&, string const&,
4963
144
    int64_t, string const&, bool, Context const&)
4964
145
{
4965
146
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
4966
147
}
4967
148
4968
149
boost::future<unique_ptr<UploadJob>> MockProvider::update(
4969
150
    string const&, int64_t, string const&, Context const&)
4970
151
{
4971
152
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
4972
153
}
4973
154
4974
155
boost::future<unique_ptr<DownloadJob>> MockProvider::download(
4975
156
    string const&, Context const&)
4976
157
{
4977
158
    unique_ptr<DownloadJob> job(new MockDownloadJob(make_job_id()));
4978
159
    const char contents[] = "Hello world";
4979
160
    if (write(job->write_socket(), contents, sizeof(contents)) != sizeof(contents))
4980
161
    {
4981
162
        ResourceException e("download(): write failed", errno);
4982
163
        job->report_error(make_exception_ptr(e));
4983
164
        return make_exceptional_future<unique_ptr<DownloadJob>>(e);
4984
165
    }
4985
166
    job->report_complete();
4986
167
    return make_ready_future(std::move(job));
4987
168
}
4988
169
4989
170
boost::future<void> MockProvider::delete_item(
4990
171
    string const&, Context const&)
4991
172
{
4992
173
    return make_ready_future();
4993
174
}
4994
175
4995
176
boost::future<Item> MockProvider::move(
4996
177
    string const& item_id, string const& new_parent_id,
4997
178
    string const& new_name, Context const&)
4998
179
{
4999
180
    Item metadata{item_id, { new_parent_id }, new_name, "etag", ItemType::file, {}};
5000
181
    return make_ready_future(metadata);
Status:	Merged
Approved by:	James Henstridge on 2016-09-21
Approved revision:	82
Merged at revision:	69
Proposed branch:	lp:~michihenning/storage-framework/api2
Merge into:	lp:storage-framework/devel
Diff against target:	6643 lines (+6158/-34) 63 files modified CMakeLists.txt (+4/-3) debian/changelog (+7/-0) debian/control (+10/-0) debian/control.in (+9/-0) debian/libstorage-framework-qt-client-1-0.install (+1/-1) debian/libstorage-framework-qt-client-2-0.install (+1/-0) include/unity/storage/CMakeLists.txt (+4/-0) include/unity/storage/internal/ItemMetadata.h (+3/-0) include/unity/storage/internal/dbusmarshal.h (+0/-3) include/unity/storage/qt/Account.h (+103/-0) include/unity/storage/qt/AccountsJob.h (+80/-0) include/unity/storage/qt/CMakeLists.txt (+17/-1) include/unity/storage/qt/ConflictPolicy.h (+32/-0) include/unity/storage/qt/Downloader.h (+68/-0) include/unity/storage/qt/Item.h (+142/-0) include/unity/storage/qt/ItemJob.h (+75/-0) include/unity/storage/qt/ItemListJob.h (+77/-0) include/unity/storage/qt/Runtime.h (+80/-0) include/unity/storage/qt/StorageError.h (+87/-0) include/unity/storage/qt/Uploader.h (+72/-0) include/unity/storage/qt/VoidJob.h (+56/-0) include/unity/storage/qt/client/CMakeLists.txt (+3/-4) include/unity/storage/qt/internal/AccountImpl.h (+99/-0) include/unity/storage/qt/internal/AccountsJobImpl.h (+70/-0) include/unity/storage/qt/internal/Handler.h (+93/-0) include/unity/storage/qt/internal/HandlerBase.h (+64/-0) include/unity/storage/qt/internal/ItemImpl.h (+99/-0) include/unity/storage/qt/internal/ItemJobImpl.h (+84/-0) include/unity/storage/qt/internal/ItemListJobImpl.h (+83/-0) include/unity/storage/qt/internal/RuntimeImpl.h (+85/-0) include/unity/storage/qt/internal/StorageErrorImpl.h (+85/-0) include/unity/storage/qt/internal/unmarshal_error.h (+39/-0) include/unity/storage/qt/internal/validate.h (+44/-0) src/qt/Account.cpp (+148/-0) src/qt/AccountsJob.cpp (+68/-0) src/qt/CMakeLists.txt (+82/-0) src/qt/Item.cpp (+230/-0) src/qt/ItemJob.cpp (+62/-0) src/qt/ItemListJob.cpp (+57/-0) src/qt/Runtime.cpp (+87/-0) src/qt/StorageError.cpp (+98/-0) src/qt/client/CMakeLists.txt (+11/-11) src/qt/client/storage-framework-qt-client-1.pc.in (+6/-0) src/qt/client/storage-framework-qt-local-client.pc.in (+0/-6) src/qt/internal/AccountImpl.cpp (+226/-0) src/qt/internal/AccountsJobImpl.cpp (+183/-0) src/qt/internal/HandlerBase.cpp (+59/-0) src/qt/internal/ItemImpl.cpp (+248/-0) src/qt/internal/ItemJobImpl.cpp (+138/-0) src/qt/internal/ItemListJobImpl.cpp (+148/-0) src/qt/internal/RuntimeImpl.cpp (+168/-0) src/qt/internal/StorageErrorImpl.cpp (+230/-0) src/qt/internal/unmarshal_error.cpp (+131/-0) src/qt/internal/validate.cpp (+170/-0) tests/CMakeLists.txt (+1/-0) tests/headers/CMakeLists.txt (+1/-0) tests/remote-client-v1/CMakeLists.txt (+5/-5) tests/remote-client-v1/remote-client-v1_test.cpp (+1/-0) tests/remote-client/CMakeLists.txt (+20/-0) tests/remote-client/MockProvider.cpp (+237/-0) tests/remote-client/MockProvider.h (+96/-0) tests/remote-client/remote-client_test.cpp (+1470/-0) tests/utils/ProviderFixture.cpp (+1/-0)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/api2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-09-22
James Henstridge		2016-09-01	Approve on 2016-09-21
Review via email: mp+304599@code.launchpad.net