1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-10-31 09:03:32 +0000
3
+++ CMakeLists.txt	2016-11-28 11:06:57 +0000
4
@@ -138,6 +138,7 @@
5
138
        storage-framework-qt-local-client
138
        storage-framework-qt-local-client
6
139
        sf-provider-objects
139
        sf-provider-objects
7
140
        storage-framework-provider
140
        storage-framework-provider
8
141
        storage-framework-registry
9
141
    FILTER
142
    FILTER
10
142
        ${CMAKE_SOURCE_DIR}/tests/*
143
        ${CMAKE_SOURCE_DIR}/tests/*
11
143
        ${CMAKE_BINARY_DIR}/*
144
        ${CMAKE_BINARY_DIR}/*
12
144
145
13
=== modified file 'data/registry.xml'
14
--- data/registry.xml	2016-05-04 14:32:07 +0000
15
+++ data/registry.xml	2016-11-28 11:06:57 +0000
16
@@ -3,33 +3,30 @@
17
3
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
3
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
18
4
  <!--
4
  <!--
19
5
      com.canonical.StorageFramework.Registry:
5
      com.canonical.StorageFramework.Registry:
24
6
      @short_description: Interface to query the backend registry
6
      @short_description: Interface to retrieve providers that are configured in online accounts
21
7
22
8
      Inteface to query the repository of backends that are
23
9
      available.
25
10
  -->
7
  -->
26
11
  <interface name="com.canonical.StorageFramework.Registry">
8
  <interface name="com.canonical.StorageFramework.Registry">
27
12
28
13
    <!--
9
    <!--
48
14
        GetBackend:
10
        List:
49
15
        @short_description: request access to a storage account
11
        @short_description: Get the list of accounts
50
16
        @service_id: if not empty, restrict results to accounts
12
        @accounts: Returned list of accounts.
51
17
            matching this service ID.
13
52
18
        @bus_name: the bus name of the storage provider
14
        Returns the list of provider accounts that are available
53
19
        @path: the object path of the storage account at the provider
15
        in online accounts. In essence, this method is a proxy
54
20
16
        for the OnlineAccounts::Manager::availableAccounts() method.
55
21
        Interactively prompt the user to pick a storage account for
17
56
22
        use by the application, and return the D-Bus endpoint that can
18
        The returned values are structs with the following members:
57
23
        be used to communicate with the associated provider.
19
          - bus name (e.g. "com.canonical.StorageFramework.Provider.OwnCloud")
58
24
20
          - object path (e.g. "/provider/7")
59
25
        As this involves user interaction, the caller should use a
21
          - ID (e.g. 7, used for object path)
60
26
        relatively long time out for this method call.
22
          - service ID (e.g. "storage-provider-owncloud")
61
27
        -->
23
          - display name (e.g. "michi.henning@canonical.com")
62
28
    <method name="GetProvider">
24
          - translated provider name (e.g. "OwnCloud")
63
29
      <arg type="s" name="service_id" direction="in" />
25
          - icon name
64
30
26
    -->
65
31
      <arg type="s" name="bus_name" direction="out" />
27
    <method name="ListAccounts">
66
32
      <arg type="o" name="path" direction="out" />
28
      <arg type="a(soussss)" name="accounts" direction="out"/>
67
29
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::AccountDetails&gt;"/>
68
33
    </method>
30
    </method>
69
34
  </interface>
31
  </interface>
70
35
</node>
32
</node>
71
36
33
72
=== modified file 'debian/control'
73
--- debian/control	2016-11-18 06:03:02 +0000
74
+++ debian/control	2016-11-28 11:06:57 +0000
75
@@ -53,12 +53,24 @@
76
53
Description: Client library for the Storage Framework (API v1, soon to be removed)
53
Description: Client library for the Storage Framework (API v1, soon to be removed)
77
54
 Runtime support for storage framework clients.
54
 Runtime support for storage framework clients.
78
55
55
79
56
Package: storage-framework-registry
80
57
Architecture: any
81
58
Multi-Arch: foreign
82
59
Pre-Depends: ${misc:Pre-Depends},
83
60
Depends: ${misc:Depends},
84
61
         ${shlibs:Depends},
85
62
#        TODO: should be removed once online accounts is fixed: lp:1643421
86
63
         online-accounts-daemon,
87
64
Description: Registry for the Storage Framework
88
65
 DBus service that provides access to provider account information.
89
66
90
56
Package: libstorage-framework-qt-client-2-0
67
Package: libstorage-framework-qt-client-2-0
91
57
Architecture: any
68
Architecture: any
92
58
Multi-Arch: same
69
Multi-Arch: same
93
59
Pre-Depends: ${misc:Pre-Depends},
70
Pre-Depends: ${misc:Pre-Depends},
94
60
Depends: ${misc:Depends},
71
Depends: ${misc:Depends},
95
61
         ${shlibs:Depends},
72
         ${shlibs:Depends},
96
73
         storage-framework-registry
97
62
Description: Client library for the Storage Framework
74
Description: Client library for the Storage Framework
98
63
 Runtime support for storage framework clients.
75
 Runtime support for storage framework clients.
99
64
76
100
65
77
101
=== modified file 'debian/control.in'
102
--- debian/control.in	2016-11-18 06:03:02 +0000
103
+++ debian/control.in	2016-11-28 11:06:57 +0000
104
@@ -48,12 +48,24 @@
105
48
Description: Client library for the Storage Framework (API v1, soon to be removed)
48
Description: Client library for the Storage Framework (API v1, soon to be removed)
106
49
 Runtime support for storage framework clients.
49
 Runtime support for storage framework clients.
107
50
50
108
51
Package: storage-framework-registry
109
52
Architecture: any
110
53
Multi-Arch: foreign
111
54
Pre-Depends: ${misc:Pre-Depends},
112
55
Depends: ${misc:Depends},
113
56
         ${shlibs:Depends},
114
57
#        TODO: should be removed once online accounts is fixed: lp:1643421
115
58
         online-accounts-daemon,
116
59
Description: Registry for the Storage Framework
117
60
 DBus service that provides access to provider account information.
118
61
119
51
Package: libstorage-framework-qt-client-2-0
62
Package: libstorage-framework-qt-client-2-0
120
52
Architecture: any
63
Architecture: any
121
53
Multi-Arch: same
64
Multi-Arch: same
122
54
Pre-Depends: ${misc:Pre-Depends},
65
Pre-Depends: ${misc:Pre-Depends},
123
55
Depends: ${misc:Depends},
66
Depends: ${misc:Depends},
124
56
         ${shlibs:Depends},
67
         ${shlibs:Depends},
125
68
         storage-framework-registry
126
57
Description: Client library for the Storage Framework
69
Description: Client library for the Storage Framework
127
58
 Runtime support for storage framework clients.
70
 Runtime support for storage framework clients.
128
59
71
129
60
72
130
=== added file 'debian/storage-framework-registry.install'
131
--- debian/storage-framework-registry.install	1970-01-01 00:00:00 +0000
132
+++ debian/storage-framework-registry.install	2016-11-28 11:06:57 +0000
133
@@ -0,0 +1,2 @@
134
1
usr/lib/*/*/storage-framework-registry
135
2
usr/share/dbus-1/services/com.canonical.StorageFramework.Registry.service
136
0
3
137
=== modified file 'demo/demo.qml'
138
--- demo/demo.qml	2016-11-04 10:52:10 +0000
139
+++ demo/demo.qml	2016-11-28 11:06:57 +0000
140
@@ -48,7 +48,7 @@
141
48
        for (var i = 0; i < accounts.length; i++) {
48
        for (var i = 0; i < accounts.length; i++) {
142
49
          console.log("Account " + i + ": busName =     " + accounts[i].busName());
49
          console.log("Account " + i + ": busName =     " + accounts[i].busName());
143
50
          console.log("Account " + i + ": objectPath =  " + accounts[i].objectPath());
50
          console.log("Account " + i + ": objectPath =  " + accounts[i].objectPath());
145
51
          console.log("Account " + i + ": displayName = " + accounts[i].displayName);
51
          console.log("Account " + i + ": name =        " + accounts[i].name);
146
52
        }
52
        }
147
53
      }
53
      }
148
54
    }
54
    }
149
55
55
150
=== modified file 'demo/provider_test/provider-test.cpp'
151
--- demo/provider_test/provider-test.cpp	2016-11-03 02:43:43 +0000
152
+++ demo/provider_test/provider-test.cpp	2016-11-28 11:06:57 +0000
153
@@ -314,7 +314,7 @@
154
314
int main(int argc, char **argv)
314
int main(int argc, char **argv)
155
315
{
315
{
156
316
    const std::string bus_name = "com.canonical.StorageFramework.Provider.ProviderTest";
316
    const std::string bus_name = "com.canonical.StorageFramework.Provider.ProviderTest";
158
317
    std::string account_service_id = "google-drive-scope";
317
    std::string account_service_id = "storage-provider-test";
159
318
    if (argc > 1)
318
    if (argc > 1)
160
319
    {
319
    {
161
320
        account_service_id = argv[1];
320
        account_service_id = argv[1];
162
321
321
163
=== added file 'include/unity/storage/internal/AccountDetails.h'
164
--- include/unity/storage/internal/AccountDetails.h	1970-01-01 00:00:00 +0000
165
+++ include/unity/storage/internal/AccountDetails.h	2016-11-28 11:06:57 +0000
166
@@ -0,0 +1,60 @@
167
1
/*
168
2
 * Copyright (C) 2016 Canonical Ltd
169
3
 *
170
4
 * This program is free software: you can redistribute it and/or modify
171
5
 * it under the terms of the GNU Lesser General Public License version 3 as
172
6
 * published by the Free Software Foundation.
173
7
 *
174
8
 * This program is distributed in the hope that it will be useful,
175
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
176
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
177
11
 * GNU Lesser General Public License for more details.
178
12
 *
179
13
 * You should have received a copy of the GNU Lesser General Public License
180
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
181
15
 *
182
16
 * Authors: Michi Henning <michi.henning@canonical.com>
183
17
 */
184
18
185
19
#pragma once
186
20
187
21
#pragma GCC diagnostic push
188
22
#pragma GCC diagnostic ignored "-Wcast-align"
189
23
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
190
24
#pragma GCC diagnostic ignored "-Wswitch-default"
191
25
#include <QDBusArgument>
192
26
#pragma GCC diagnostic pop
193
27
194
28
namespace unity
195
29
{
196
30
namespace storage
197
31
{
198
32
namespace internal
199
33
{
200
34
201
35
struct AccountDetails
202
36
{
203
37
    QString busName;
204
38
    QDBusObjectPath objectPath;
205
39
    quint32 id;
206
40
    QString serviceId;
207
41
    QString displayName;
208
42
    QString providerName;
209
43
    QString iconName;
210
44
};
211
45
212
46
bool operator==(AccountDetails const& lhs, AccountDetails const& rhs);
213
47
bool operator!=(AccountDetails const& lhs, AccountDetails const& rhs);
214
48
bool operator<(AccountDetails const& lhs, AccountDetails const& rhs);
215
49
bool operator<=(AccountDetails const& lhs, AccountDetails const& rhs);
216
50
bool operator>(AccountDetails const& lhs, AccountDetails const& rhs);
217
51
bool operator>=(AccountDetails const& lhs, AccountDetails const& rhs);
218
52
219
53
QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::AccountDetails const& account);
220
54
QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::AccountDetails& account);
221
55
222
56
}  // namespace internal
223
57
}  // namespace storage
224
58
}  // namespace unity
225
59
226
60
Q_DECLARE_METATYPE(unity::storage::internal::AccountDetails)
227
0
61
228
=== added file 'include/unity/storage/internal/ActivityNotifier.h'
229
--- include/unity/storage/internal/ActivityNotifier.h	1970-01-01 00:00:00 +0000
230
+++ include/unity/storage/internal/ActivityNotifier.h	2016-11-28 11:06:57 +0000
231
@@ -0,0 +1,57 @@
232
1
/*
233
2
 * Copyright (C) 2016 Canonical Ltd
234
3
 *
235
4
 * This program is free software: you can redistribute it and/or modify
236
5
 * it under the terms of the GNU Lesser General Public License version 3 as
237
6
 * published by the Free Software Foundation.
238
7
 *
239
8
 * This program is distributed in the hope that it will be useful,
240
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
241
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
242
11
 * GNU Lesser General Public License for more details.
243
12
 *
244
13
 * You should have received a copy of the GNU Lesser General Public License
245
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
246
15
 *
247
16
 * Authors: Michi Henning <michi.henning@canonical.com>
248
17
 */
249
18
250
19
#pragma once
251
20
252
21
#include <unity/storage/internal/InactivityTimer.h>
253
22
254
23
#include <cassert>
255
24
#include <memory>
256
25
257
26
namespace unity
258
27
{
259
28
namespace storage
260
29
{
261
30
namespace internal
262
31
{
263
32
264
33
class InactivityTimer;
265
34
266
35
class ActivityNotifier
267
36
{
268
37
public:
269
38
    ActivityNotifier(std::shared_ptr<InactivityTimer> const& timer)
270
39
        : timer_(timer)
271
40
    {
272
41
        assert(timer);
273
42
274
43
        timer_->request_started();
275
44
    }
276
45
277
46
    ~ActivityNotifier()
278
47
    {
279
48
        timer_->request_finished();
280
49
    }
281
50
282
51
private:
283
52
    std::shared_ptr<InactivityTimer> timer_;
284
53
};
285
54
286
55
}  // namespace internal
287
56
}  // namespace storage
288
57
}  // namespace unity
289
0
58
290
=== added file 'include/unity/storage/internal/EnvVars.h'
291
--- include/unity/storage/internal/EnvVars.h	1970-01-01 00:00:00 +0000
292
+++ include/unity/storage/internal/EnvVars.h	2016-11-28 11:06:57 +0000
293
@@ -0,0 +1,51 @@
294
1
/*
295
2
 * Copyright (C) 2016 Canonical Ltd
296
3
 *
297
4
 * This program is free software: you can redistribute it and/or modify
298
5
 * it under the terms of the GNU Lesser General Public License version 3 as
299
6
 * published by the Free Software Foundation.
300
7
 *
301
8
 * This program is distributed in the hope that it will be useful,
302
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
303
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
304
11
 * GNU Lesser General Public License for more details.
305
12
 *
306
13
 * You should have received a copy of the GNU Lesser General Public License
307
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
308
15
 *
309
16
 * Authors: Michi Henning <michi.henning@canonical.com>
310
17
 */
311
18
312
19
#pragma once
313
20
314
21
#include <unity/storage/registry/Registry.h>
315
22
316
23
#include <string>
317
24
318
25
namespace unity
319
26
{
320
27
namespace storage
321
28
{
322
29
namespace internal
323
30
{
324
31
325
32
constexpr char const* REGISTRY_IDLE_TIMEOUT = "SF_REGISTRY_IDLE_TIMEOUT";  // Seconds, 0 means "never"
326
33
constexpr int REGISTRY_IDLE_TIMEOUT_DFLT = 30;
327
34
328
35
// Helper class to make retrieval of environment variables type-safe and
329
36
// to sanity check the setting, if applicable. Also returns a default
330
37
// setting, if applicable.
331
38
332
39
class EnvVars
333
40
{
334
41
public:
335
42
    static int registry_timeout_ms();
336
43
337
44
    // Returns value of var_name in the environment, if set, and an empty string otherwise.
338
45
    // Can be used for any environment variable, not just the ones defined above.
339
46
    static std::string get(char const* var_name);
340
47
};
341
48
342
49
}  // namespace internal
343
50
}  // namespace storage
344
51
}  // namespace unity
345
0
52
346
=== added file 'include/unity/storage/internal/InactivityTimer.h'
347
--- include/unity/storage/internal/InactivityTimer.h	1970-01-01 00:00:00 +0000
348
+++ include/unity/storage/internal/InactivityTimer.h	2016-11-28 11:06:57 +0000
349
@@ -0,0 +1,60 @@
350
1
/*
351
2
 * Copyright (C) 2016 Canonical Ltd
352
3
 *
353
4
 * This program is free software: you can redistribute it and/or modify
354
5
 * it under the terms of the GNU Lesser General Public License version 3 as
355
6
 * published by the Free Software Foundation.
356
7
 *
357
8
 * This program is distributed in the hope that it will be useful,
358
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
359
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
360
11
 * GNU Lesser General Public License for more details.
361
12
 *
362
13
 * You should have received a copy of the GNU Lesser General Public License
363
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
364
15
 *
365
16
 * Authors: Michi Henning <michi.henning@canonical.com>
366
17
 */
367
18
368
19
#pragma once
369
20
370
21
#pragma GCC diagnostic push
371
22
#pragma GCC diagnostic ignored "-Wcast-align"
372
23
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
373
24
#pragma GCC diagnostic ignored "-Wswitch-default"
374
25
#include <QTimer>
375
26
#pragma GCC diagnostic pop
376
27
377
28
#include <functional>
378
29
379
30
namespace unity
380
31
{
381
32
namespace storage
382
33
{
383
34
namespace internal
384
35
{
385
36
386
37
class InactivityTimer : public QObject
387
38
{
388
39
    Q_OBJECT
389
40
390
41
public:
391
42
    InactivityTimer(int timeout_ms, std::function<void()> timeout_func);
392
43
    ~InactivityTimer();
393
44
394
45
    void request_started();
395
46
    void request_finished();
396
47
397
48
private Q_SLOTS:
398
49
    void timeout();
399
50
400
51
private:
401
52
    int timeout_ms_;
402
53
    std::function<void()> timeout_func_;
403
54
    QTimer timer_;
404
55
    int32_t num_requests_;
405
56
};
406
57
407
58
}  // namespace internal
408
59
}  // namespace storage
409
60
}  // namespace unity
410
0
61
411
=== modified file 'include/unity/storage/internal/TraceMessageHandler.h'
412
--- include/unity/storage/internal/TraceMessageHandler.h	2016-08-25 05:18:37 +0000
413
+++ include/unity/storage/internal/TraceMessageHandler.h	2016-11-28 11:06:57 +0000
414
@@ -35,7 +35,10 @@
415
35
class TraceMessageHandler final
35
class TraceMessageHandler final
416
36
{
36
{
417
37
public:
37
public:
418
38
    TraceMessageHandler();
419
38
    TraceMessageHandler(std::string const& prog_name);
39
    TraceMessageHandler(std::string const& prog_name);
420
40
    TraceMessageHandler(QString const& prog_name);
421
41
    TraceMessageHandler(char const* prog_name);
422
39
    ~TraceMessageHandler();
42
    ~TraceMessageHandler();
423
40
43
424
41
private:
44
private:
425
42
45
426
=== modified file 'include/unity/storage/qt/Account.h'
427
--- include/unity/storage/qt/Account.h	2016-11-03 06:41:00 +0000
428
+++ include/unity/storage/qt/Account.h	2016-11-28 11:06:57 +0000
429
@@ -47,6 +47,8 @@
430
47
    Q_PROPERTY(QString busName READ busName FINAL)
47
    Q_PROPERTY(QString busName READ busName FINAL)
431
48
    Q_PROPERTY(QString objectPath READ objectPath FINAL)
48
    Q_PROPERTY(QString objectPath READ objectPath FINAL)
432
49
    Q_PROPERTY(QString displayName READ displayName FINAL)
49
    Q_PROPERTY(QString displayName READ displayName FINAL)
433
50
    Q_PROPERTY(QString providerName READ providerName FINAL)
434
51
    Q_PROPERTY(QString iconName READ iconName FINAL)
435
50
52
436
51
public:
53
public:
437
52
    Account();
54
    Account();
438
@@ -60,7 +62,8 @@
439
60
    QString busName() const;
62
    QString busName() const;
440
61
    QString objectPath() const;
63
    QString objectPath() const;
441
62
    QString displayName() const;
64
    QString displayName() const;
443
63
    // TODO: add more methods to retrieve additional info, such as description, icon ID, and service name.
65
    QString providerName() const;
444
66
    QString iconName() const;
445
64
67
446
65
    Q_INVOKABLE unity::storage::qt::ItemListJob* roots(QStringList const& keys = QStringList()) const;
68
    Q_INVOKABLE unity::storage::qt::ItemListJob* roots(QStringList const& keys = QStringList()) const;
447
66
    Q_INVOKABLE unity::storage::qt::ItemJob* get(QString const& itemId, QStringList const& keys = QStringList()) const;
69
    Q_INVOKABLE unity::storage::qt::ItemJob* get(QString const& itemId, QStringList const& keys = QStringList()) const;
448
67
70
449
=== modified file 'include/unity/storage/qt/AccountsJob.h'
450
--- include/unity/storage/qt/AccountsJob.h	2016-11-02 02:54:48 +0000
451
+++ include/unity/storage/qt/AccountsJob.h	2016-11-28 11:06:57 +0000
452
@@ -34,12 +34,10 @@
453
34
{
34
{
454
35
35
455
36
class AccountsJobImpl;
36
class AccountsJobImpl;
456
37
class RuntimeImpl;
457
38
37
458
39
}  // namespace internal
38
}  // namespace internal
459
40
39
460
41
class Account;
40
class Account;
461
42
class Runtime;
462
43
class StorageError;
41
class StorageError;
463
44
42
464
45
class Q_DECL_EXPORT AccountsJob final : public QObject
43
class Q_DECL_EXPORT AccountsJob final : public QObject
465
@@ -65,14 +63,13 @@
466
65
    void statusChanged(unity::storage::qt::AccountsJob::Status status) const;
63
    void statusChanged(unity::storage::qt::AccountsJob::Status status) const;
467
66
64
468
67
private:
65
private:
471
68
    AccountsJob(std::shared_ptr<internal::RuntimeImpl> const& runtime);
66
    AccountsJob(std::unique_ptr<internal::AccountsJobImpl> accounts_job_impl);
470
69
    AccountsJob(StorageError const& error);
472
70
67
473
71
    QVariantList accountsAsVariantList() const;
68
    QVariantList accountsAsVariantList() const;
474
72
69
475
73
    std::unique_ptr<internal::AccountsJobImpl> const p_;
70
    std::unique_ptr<internal::AccountsJobImpl> const p_;
476
74
71
478
75
    friend class internal::RuntimeImpl;
72
    friend class internal::AccountsJobImpl;
479
76
};
73
};
480
77
74
481
78
}  // namespace qt
75
}  // namespace qt
482
79
76
483
=== modified file 'include/unity/storage/qt/Runtime.h'
484
--- include/unity/storage/qt/Runtime.h	2016-11-02 02:54:48 +0000
485
+++ include/unity/storage/qt/Runtime.h	2016-11-28 11:06:57 +0000
486
@@ -66,9 +66,9 @@
487
66
66
488
67
    Account make_test_account(QString const& bus_name,
67
    Account make_test_account(QString const& bus_name,
489
68
                              QString const& object_path,
68
                              QString const& object_path,
493
69
                              QString const& id = "",
69
                              quint32 id = 999,
494
70
                              QString const& serviceId = "",
70
                              QString const& service_id = "",
495
71
                              QString const& displayName = "") const;
71
                              QString const& name = "") const;
496
72
72
497
73
private:
73
private:
498
74
    std::shared_ptr<internal::RuntimeImpl> p_;
74
    std::shared_ptr<internal::RuntimeImpl> p_;
499
75
75
500
=== modified file 'include/unity/storage/qt/internal/AccountImpl.h'
501
--- include/unity/storage/qt/internal/AccountImpl.h	2016-11-03 06:41:00 +0000
502
+++ include/unity/storage/qt/internal/AccountImpl.h	2016-11-28 11:06:57 +0000
503
@@ -19,10 +19,7 @@
504
19
#pragma once
19
#pragma once
505
20
20
506
21
#include <unity/storage/qt/Item.h>
21
#include <unity/storage/qt/Item.h>
511
22
22
#include <unity/storage/internal/AccountDetails.h>
508
23
#include <QString>
509
24
510
25
#include <memory>
512
26
23
513
27
class ProviderInterface;
24
class ProviderInterface;
514
28
25
515
@@ -50,6 +47,8 @@
516
50
    QString busName() const;
47
    QString busName() const;
517
51
    QString objectPath() const;
48
    QString objectPath() const;
518
52
    QString displayName() const;
49
    QString displayName() const;
519
50
    QString providerName() const;
520
51
    QString iconName() const;
521
53
52
522
54
    ItemListJob* roots(QStringList const& keys) const;
53
    ItemListJob* roots(QStringList const& keys) const;
523
55
    ItemJob* get(QString const& itemId, QStringList const& keys) const;
54
    ItemJob* get(QString const& itemId, QStringList const& keys) const;
524
@@ -67,26 +66,14 @@
525
67
    std::shared_ptr<ProviderInterface> provider() const;
66
    std::shared_ptr<ProviderInterface> provider() const;
526
68
67
527
69
    static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime_impl,
68
    static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime_impl,
533
70
                                QString const& bus_name,
69
                                storage::internal::AccountDetails const& details);
529
71
                                QString const& object_path,
530
72
                                QString const& id,
531
73
                                QString const& service_id,
532
74
                                QString const& display_name);
534
75
70
535
76
private:
71
private:
536
77
    AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime_impl,
72
    AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime_impl,
542
78
                QString const& bus_name,
73
                storage::internal::AccountDetails const& details);
538
79
                QString const& object_path,
539
80
                QString const& id,
540
81
                QString const& service_id,
541
82
                QString const& display_name);
543
83
74
544
84
    bool is_valid_;
75
    bool is_valid_;
550
85
    QString bus_name_;
76
    storage::internal::AccountDetails details_;
546
86
    QString object_path_;
547
87
    QString id_;
548
88
    QString service_id_;
549
89
    QString display_name_;
551
90
    std::weak_ptr<RuntimeImpl> runtime_impl_;
77
    std::weak_ptr<RuntimeImpl> runtime_impl_;
552
91
    std::shared_ptr<ProviderInterface> provider_;
78
    std::shared_ptr<ProviderInterface> provider_;
553
92
79
554
93
80
555
=== modified file 'include/unity/storage/qt/internal/AccountsJobImpl.h'
556
--- include/unity/storage/qt/internal/AccountsJobImpl.h	2016-11-02 02:54:48 +0000
557
+++ include/unity/storage/qt/internal/AccountsJobImpl.h	2016-11-28 11:06:57 +0000
558
@@ -18,9 +18,14 @@
559
18
18
560
19
#pragma once
19
#pragma once
561
20
20
562
21
#include <unity/storage/internal/AccountDetails.h>
563
21
#include <unity/storage/qt/AccountsJob.h>
22
#include <unity/storage/qt/AccountsJob.h>
564
22
23
566
23
#include <QTimer>
24
#pragma GCC diagnostic push
567
25
#pragma GCC diagnostic ignored "-Wcast-align"
568
26
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
569
27
#include <QDBusPendingReply>
570
28
#pragma GCC diagnostic pop
571
24
29
572
25
namespace unity
30
namespace unity
573
26
{
31
{
574
@@ -31,12 +36,16 @@
575
31
namespace internal
36
namespace internal
576
32
{
37
{
577
33
38
578
39
class RuntimeImpl;
579
40
580
34
class AccountsJobImpl : public QObject
41
class AccountsJobImpl : public QObject
581
35
{
42
{
582
36
    Q_OBJECT
43
    Q_OBJECT
583
37
public:
44
public:
586
38
    AccountsJobImpl(AccountsJob* public_instance, std::shared_ptr<RuntimeImpl> const& runtime_impl);
45
    AccountsJobImpl(std::shared_ptr<RuntimeImpl> const& runtime_impl,
587
39
    AccountsJobImpl(AccountsJob* public_instance, StorageError const& error);
46
                    QString const& method,
588
47
                    QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply);
589
48
    AccountsJobImpl(StorageError const& error);
590
40
    virtual ~AccountsJobImpl() = default;
49
    virtual ~AccountsJobImpl() = default;
591
41
50
592
42
    bool isValid() const;
51
    bool isValid() const;
593
@@ -45,21 +54,20 @@
594
45
    QList<Account> accounts() const;
54
    QList<Account> accounts() const;
595
46
    QVariantList accountsAsVariantList() const;
55
    QVariantList accountsAsVariantList() const;
596
47
56
600
48
private Q_SLOTS:
57
    static AccountsJob* make_job(std::shared_ptr<RuntimeImpl> const& runtime_impl,
601
49
    void manager_ready();
58
                                 QString const& method,
602
50
    void timeout();
59
                                 QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply);
603
60
    static AccountsJob* make_job(StorageError const& e);
604
51
61
605
52
private:
62
private:
606
53
    std::shared_ptr<RuntimeImpl> get_runtime_impl(QString const& method) const;
63
    std::shared_ptr<RuntimeImpl> get_runtime_impl(QString const& method) const;
607
54
    void initialize_accounts();
608
55
    AccountsJob::Status emit_status_changed(AccountsJob::Status new_status) const;
64
    AccountsJob::Status emit_status_changed(AccountsJob::Status new_status) const;
609
56
65
611
57
    AccountsJob* const public_instance_;
66
    AccountsJob* public_instance_;
612
58
    AccountsJob::Status status_;
67
    AccountsJob::Status status_;
613
59
    StorageError error_;
68
    StorageError error_;
614
60
    QList<unity::storage::qt::Account> accounts_;
615
61
    std::weak_ptr<RuntimeImpl> const runtime_impl_;
69
    std::weak_ptr<RuntimeImpl> const runtime_impl_;
617
62
    QTimer timer_;
70
    QList<Account> accounts_;
618
63
71
619
64
    friend class unity::storage::qt::AccountsJob;
72
    friend class unity::storage::qt::AccountsJob;
620
65
};
73
};
621
66
74
622
=== modified file 'include/unity/storage/qt/internal/Handler.h'
623
--- include/unity/storage/qt/internal/Handler.h	2016-11-04 04:13:45 +0000
624
+++ include/unity/storage/qt/internal/Handler.h	2016-11-28 11:06:57 +0000
625
@@ -71,7 +71,7 @@
626
71
                                      case StorageError::Type::NoError:
71
                                      case StorageError::Type::NoError:
627
72
                                      {
72
                                      {
628
73
                                          // LCOV_EXCL_START
73
                                          // LCOV_EXCL_START
630
74
                                          QString msg = "impossible provider exception: " + e.errorString();
74
                                          QString msg = "impossible service exception: " + e.errorString();
631
75
                                          qCritical().noquote() << msg;
75
                                          qCritical().noquote() << msg;
632
76
                                          e = StorageErrorImpl::local_comms_error(msg);
76
                                          e = StorageErrorImpl::local_comms_error(msg);
633
77
                                          break;
77
                                          break;
634
@@ -82,7 +82,7 @@
635
82
                                      case StorageError::Type::ResourceError:
82
                                      case StorageError::Type::ResourceError:
636
83
                                      {
83
                                      {
637
84
                                          // Log these errors because they are unexpected.
84
                                          // Log these errors because they are unexpected.
639
85
                                          QString msg = "provider exception: " + e.errorString();
85
                                          QString msg = "service exception: " + e.errorString();
640
86
                                          qCritical().noquote() << msg;
86
                                          qCritical().noquote() << msg;
641
87
                                          break;
87
                                          break;
642
88
                                      }
88
                                      }
643
89
89
644
=== modified file 'include/unity/storage/qt/internal/RuntimeImpl.h'
645
--- include/unity/storage/qt/internal/RuntimeImpl.h	2016-09-22 01:52:20 +0000
646
+++ include/unity/storage/qt/internal/RuntimeImpl.h	2016-11-28 11:06:57 +0000
647
@@ -24,10 +24,11 @@
648
24
#pragma GCC diagnostic push
24
#pragma GCC diagnostic push
649
25
#pragma GCC diagnostic ignored "-Wcast-align"
25
#pragma GCC diagnostic ignored "-Wcast-align"
650
26
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
26
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
651
27
#include <OnlineAccounts/Manager>
652
28
#include <QDBusConnection>
27
#include <QDBusConnection>
653
29
#pragma GCC diagnostic pop
28
#pragma GCC diagnostic pop
654
30
29
655
30
class RegistryInterface;
656
31
657
31
namespace unity
32
namespace unity
658
32
{
33
{
659
33
namespace storage
34
namespace storage
660
@@ -45,7 +46,7 @@
661
45
{
46
{
662
46
public:
47
public:
663
47
    RuntimeImpl();
48
    RuntimeImpl();
665
48
    RuntimeImpl(QDBusConnection const& bus);
49
    RuntimeImpl(QDBusConnection const& conn);
666
49
    RuntimeImpl(RuntimeImpl const&) = delete;
50
    RuntimeImpl(RuntimeImpl const&) = delete;
667
50
    RuntimeImpl(RuntimeImpl&&) = delete;
51
    RuntimeImpl(RuntimeImpl&&) = delete;
668
51
    ~RuntimeImpl();
52
    ~RuntimeImpl();
669
@@ -58,19 +59,17 @@
670
58
    AccountsJob* accounts() const;
59
    AccountsJob* accounts() const;
671
59
    StorageError shutdown();
60
    StorageError shutdown();
672
60
61
673
61
    std::shared_ptr<OnlineAccounts::Manager> accounts_manager() const;
674
62
675
63
    Account make_test_account(QString const& bus_name,
62
    Account make_test_account(QString const& bus_name,
676
64
                              QString const& object_path,
63
                              QString const& object_path,
680
65
                              QString const& owner_id,
64
                              quint32 id,
681
66
                              QString const& owner,
65
                              QString const& service_id,
682
67
                              QString const& description);
66
                              QString const& display_name);
683
68
67
684
69
private:
68
private:
685
70
    bool is_valid_;
69
    bool is_valid_;
686
71
    StorageError error_;
70
    StorageError error_;
687
72
    QDBusConnection conn_;
71
    QDBusConnection conn_;
689
73
    std::shared_ptr<OnlineAccounts::Manager> accounts_manager_;
72
    std::unique_ptr<RegistryInterface> registry_;
690
74
73
691
75
    friend class unity::storage::qt::Runtime;
74
    friend class unity::storage::qt::Runtime;
692
76
};
75
};
693
77
76
694
=== added directory 'include/unity/storage/registry'
695
=== added file 'include/unity/storage/registry/Registry.h'
696
--- include/unity/storage/registry/Registry.h	1970-01-01 00:00:00 +0000
697
+++ include/unity/storage/registry/Registry.h	2016-11-28 11:06:57 +0000
698
@@ -0,0 +1,35 @@
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
#include <QString>
720
22
721
23
namespace unity
722
24
{
723
25
namespace storage
724
26
{
725
27
namespace registry
726
28
{
727
29
728
30
static QString const BUS_NAME(QStringLiteral("com.canonical.StorageFramework.Registry"));
729
31
static QString const OBJECT_PATH(QStringLiteral("/com/canonical/StorageFramework/Registry"));
730
32
731
33
}  // namespace registry
732
34
}  // namespace storage
733
35
}  // namespace unity
734
0
36
735
=== added directory 'include/unity/storage/registry/internal'
736
=== added file 'include/unity/storage/registry/internal/ListAccountsHandler.h'
737
--- include/unity/storage/registry/internal/ListAccountsHandler.h	1970-01-01 00:00:00 +0000
738
+++ include/unity/storage/registry/internal/ListAccountsHandler.h	2016-11-28 11:06:57 +0000
739
@@ -0,0 +1,70 @@
740
1
/*
741
2
 * Copyright (C) 2016 Canonical Ltd
742
3
 *
743
4
 * This program is free software: you can redistribute it and/or modify
744
5
 * it under the terms of the GNU Lesser General Public License version 3 as
745
6
 * published by the Free Software Foundation.
746
7
 *
747
8
 * This program is distributed in the hope that it will be useful,
748
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
749
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
750
11
 * GNU Lesser General Public License for more details.
751
12
 *
752
13
 * You should have received a copy of the GNU Lesser General Public License
753
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
754
15
 *
755
16
 * Authors: Michi Henning <michi.henning@canonical.com>
756
17
 */
757
18
758
19
#pragma once
759
20
760
21
#include <unity/storage/internal/ActivityNotifier.h>
761
22
762
23
#pragma GCC diagnostic push
763
24
#pragma GCC diagnostic ignored "-Wcast-align"
764
25
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
765
26
#include <OnlineAccounts/Manager>
766
27
#include <QDBusConnection>
767
28
#include <QDBusMessage>
768
29
#include <QTimer>
769
30
#pragma GCC diagnostic pop
770
31
771
32
namespace unity
772
33
{
773
34
namespace storage
774
35
{
775
36
namespace registry
776
37
{
777
38
namespace internal
778
39
{
779
40
780
41
class ListAccountsHandler : public QObject
781
42
{
782
43
    Q_OBJECT
783
44
784
45
public:
785
46
    ListAccountsHandler(QDBusConnection const& conn,
786
47
                        QDBusMessage const& msg,
787
48
                        std::shared_ptr<storage::internal::InactivityTimer> const& timer);
788
49
    ~ListAccountsHandler();
789
50
790
51
private Q_SLOTS:
791
52
    void manager_ready();
792
53
    void timeout();
793
54
794
55
private:
795
56
    void initialize_manager();
796
57
797
58
    QDBusConnection const conn_;
798
59
    QDBusMessage const msg_;
799
60
    OnlineAccounts::Manager manager_;
800
61
    QTimer timer_;
801
62
    storage::internal::ActivityNotifier activity_notifier_;  // RAII guard variable
802
63
803
64
    Q_DISABLE_COPY(ListAccountsHandler)
804
65
};
805
66
806
67
}  // namespace internal
807
68
}  // namespace registry
808
69
}  // namespace storage
809
70
}  // namespace unity
810
0
71
811
=== added file 'include/unity/storage/registry/internal/RegistryAdaptor.h'
812
--- include/unity/storage/registry/internal/RegistryAdaptor.h	1970-01-01 00:00:00 +0000
813
+++ include/unity/storage/registry/internal/RegistryAdaptor.h	2016-11-28 11:06:57 +0000
814
@@ -0,0 +1,71 @@
815
1
/*
816
2
 * Copyright (C) 2016 Canonical Ltd
817
3
 *
818
4
 * This program is free software: you can redistribute it and/or modify
819
5
 * it under the terms of the GNU Lesser General Public License version 3 as
820
6
 * published by the Free Software Foundation.
821
7
 *
822
8
 * This program is distributed in the hope that it will be useful,
823
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
824
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
825
11
 * GNU Lesser General Public License for more details.
826
12
 *
827
13
 * You should have received a copy of the GNU Lesser General Public License
828
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
829
15
 *
830
16
 * Authors: Michi Henning <michi.henning@canonical.com>
831
17
 */
832
18
833
19
#pragma once
834
20
835
21
#include <unity/storage/internal/AccountDetails.h>
836
22
837
23
#pragma GCC diagnostic push
838
24
#pragma GCC diagnostic ignored "-Wcast-align"
839
25
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
840
26
#include <QDBusConnection>
841
27
#include <QDBusContext>
842
28
#pragma GCC diagnostic pop
843
29
844
30
#include <memory>
845
31
846
32
namespace unity
847
33
{
848
34
namespace storage
849
35
{
850
36
namespace internal
851
37
{
852
38
853
39
class InactivityTimer;
854
40
855
41
}  // namespace internal
856
42
857
43
namespace registry
858
44
{
859
45
namespace internal
860
46
{
861
47
862
48
class RegistryAdaptor : public QObject, protected QDBusContext
863
49
{
864
50
    Q_OBJECT
865
51
866
52
public:
867
53
    RegistryAdaptor(QDBusConnection const& conn,
868
54
                    std::shared_ptr<storage::internal::InactivityTimer> const& timer,
869
55
                    QObject* parent = nullptr);
870
56
    ~RegistryAdaptor();
871
57
872
58
public Q_SLOTS:
873
59
    QList<unity::storage::internal::AccountDetails> ListAccounts();
874
60
875
61
private:
876
62
    QDBusConnection conn_;
877
63
    std::shared_ptr<storage::internal::InactivityTimer> timer_;
878
64
879
65
    Q_DISABLE_COPY(RegistryAdaptor)
880
66
};
881
67
882
68
}  // namespace internal
883
69
}  // namespace registry
884
70
}  // namespace storage
885
71
}  // namespace unity
886
0
72
887
=== added file 'include/unity/storage/registry/internal/qdbus-last-error-msg.h'
888
--- include/unity/storage/registry/internal/qdbus-last-error-msg.h	1970-01-01 00:00:00 +0000
889
+++ include/unity/storage/registry/internal/qdbus-last-error-msg.h	2016-11-28 11:06:57 +0000
890
@@ -0,0 +1,41 @@
891
1
/*
892
2
 * Copyright (C) 2016 Canonical Ltd
893
3
 *
894
4
 * This program is free software: you can redistribute it and/or modify
895
5
 * it under the terms of the GNU Lesser General Public License version 3 as
896
6
 * published by the Free Software Foundation.
897
7
 *
898
8
 * This program is distributed in the hope that it will be useful,
899
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
900
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
901
11
 * GNU Lesser General Public License for more details.
902
12
 *
903
13
 * You should have received a copy of the GNU Lesser General Public License
904
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
905
15
 *
906
16
 * Authors: Michi Henning <michi.henning@canonical.com>
907
17
 */
908
18
909
19
#pragma once
910
20
911
21
#pragma GCC diagnostic push
912
22
#pragma GCC diagnostic ignored "-Wcast-align"
913
23
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
914
24
#include <QDBusConnection>
915
25
#pragma GCC diagnostic pop
916
26
917
27
namespace unity
918
28
{
919
29
namespace storage
920
30
{
921
31
namespace registry
922
32
{
923
33
namespace internal
924
34
{
925
35
926
36
QString last_error_msg(QDBusConnection const& conn);
927
37
928
38
}  // namespace internal
929
39
}  // namespace registry
930
40
}  // namespace storage
931
41
}  // namespace unity
932
0
42
933
=== modified file 'src/CMakeLists.txt'
934
--- src/CMakeLists.txt	2016-07-06 00:59:42 +0000
935
+++ src/CMakeLists.txt	2016-11-28 11:06:57 +0000
936
@@ -1,3 +1,4 @@
937
1
add_subdirectory(internal)
1
add_subdirectory(internal)
938
2
add_subdirectory(provider)
2
add_subdirectory(provider)
939
3
add_subdirectory(qt)
3
add_subdirectory(qt)
940
4
add_subdirectory(registry)
941
4
5
942
=== added file 'src/internal/AccountDetails.cpp'
943
--- src/internal/AccountDetails.cpp	1970-01-01 00:00:00 +0000
944
+++ src/internal/AccountDetails.cpp	2016-11-28 11:06:57 +0000
945
@@ -0,0 +1,108 @@
946
1
/*
947
2
 * Copyright (C) 2016 Canonical Ltd
948
3
 *
949
4
 * This program is free software: you can redistribute it and/or modify
950
5
 * it under the terms of the GNU Lesser General Public License version 3 as
951
6
 * published by the Free Software Foundation.
952
7
 *
953
8
 * This program is distributed in the hope that it will be useful,
954
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
955
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
956
11
 * GNU Lesser General Public License for more details.
957
12
 *
958
13
 * You should have received a copy of the GNU Lesser General Public License
959
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
960
15
 *
961
16
 * Authors: Michi Henning <michi.henning@canonical.com>
962
17
 */
963
18
964
19
#include <unity/storage/internal/AccountDetails.h>
965
20
966
21
using namespace unity::storage::internal;
967
22
968
23
namespace unity
969
24
{
970
25
namespace storage
971
26
{
972
27
namespace internal
973
28
{
974
29
975
30
bool operator==(AccountDetails const& lhs, AccountDetails const& rhs)
976
31
{
977
32
   return    lhs.id == rhs.id
978
33
          && lhs.serviceId == rhs.serviceId
979
34
          && lhs.displayName == rhs.displayName;
980
35
}
981
36
982
37
bool operator!=(AccountDetails const& lhs, AccountDetails const& rhs)
983
38
{
984
39
    return !(lhs == rhs);
985
40
}
986
41
987
42
bool operator<(AccountDetails const& lhs, AccountDetails const& rhs)
988
43
{
989
44
    if (lhs.id < rhs.id)
990
45
    {
991
46
        return true;
992
47
    }
993
48
    if (lhs.id > rhs.id)
994
49
    {
995
50
        return false;
996
51
    }
997
52
    if (lhs.serviceId < rhs.serviceId)
998
53
    {
999
54
        return true;
1000
55
    }
1001
56
    if (lhs.serviceId > rhs.serviceId)
1002
57
    {
1003
58
        return false;
1004
59
    }
1005
60
    return lhs.displayName < rhs.displayName;
1006
61
}
1007
62
1008
63
bool operator<=(AccountDetails const& lhs, AccountDetails const& rhs)
1009
64
{
1010
65
    return lhs < rhs || lhs == rhs;
1011
66
}
1012
67
1013
68
bool operator>(AccountDetails const& lhs, AccountDetails const& rhs)
1014
69
{
1015
70
    return !(lhs <= rhs);
1016
71
}
1017
72
1018
73
bool operator>=(AccountDetails const& lhs, AccountDetails const& rhs)
1019
74
{
1020
75
    return !(lhs < rhs);
1021
76
}
1022
77
1023
78
QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::AccountDetails const& account)
1024
79
{
1025
80
    argument.beginStructure();
1026
81
    argument << account.busName;
1027
82
    argument << account.objectPath;
1028
83
    argument << account.id;
1029
84
    argument << account.serviceId;
1030
85
    argument << account.displayName;
1031
86
    argument << account.providerName;
1032
87
    argument << account.iconName;
1033
88
    argument.endStructure();
1034
89
    return argument;
1035
90
}
1036
91
1037
92
QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::AccountDetails& account)
1038
93
{
1039
94
    argument.beginStructure();
1040
95
    argument >> account.busName;
1041
96
    argument >> account.objectPath;
1042
97
    argument >> account.id;
1043
98
    argument >> account.serviceId;
1044
99
    argument >> account.displayName;
1045
100
    argument >> account.providerName;
1046
101
    argument >> account.iconName;
1047
102
    argument.endStructure();
1048
103
    return argument;
1049
104
}
1050
105
1051
106
}  // namespace internal
1052
107
}  // namespace storage
1053
108
}  // namespace unity
1054
0
109
1055
=== modified file 'src/internal/CMakeLists.txt'
1056
--- src/internal/CMakeLists.txt	2016-08-12 06:19:22 +0000
1057
+++ src/internal/CMakeLists.txt	2016-11-28 11:06:57 +0000
1058
@@ -1,10 +1,18 @@
1059
1
set(src
1
set(src
1060
2
    AccountDetails.cpp
1061
2
    dbusmarshal.cpp
3
    dbusmarshal.cpp
1062
4
    EnvVars.cpp
1063
5
    InactivityTimer.cpp
1064
3
    safe_strerror.cpp
6
    safe_strerror.cpp
1065
4
    TraceMessageHandler.cpp
7
    TraceMessageHandler.cpp
1066
8
    ${CMAKE_SOURCE_DIR}/include/unity/storage/internal/InactivityTimer.h
1067
5
)
9
)
1068
6
10
1069
11
1070
7
add_library(storage-framework-common-internal STATIC ${src})
12
add_library(storage-framework-common-internal STATIC ${src})
1071
13
1072
14
set_target_properties(storage-framework-common-internal PROPERTIES AUTOMOC TRUE)
1073
15
1074
8
target_link_libraries(storage-framework-common-internal
16
target_link_libraries(storage-framework-common-internal
1075
9
    Qt5::DBus
17
    Qt5::DBus
1076
10
)
18
)
1077
11
19
1078
=== added file 'src/internal/EnvVars.cpp'
1079
--- src/internal/EnvVars.cpp	1970-01-01 00:00:00 +0000
1080
+++ src/internal/EnvVars.cpp	2016-11-28 11:06:57 +0000
1081
@@ -0,0 +1,81 @@
1082
1
/*
1083
2
 * Copyright (C) 2016 Canonical Ltd
1084
3
 *
1085
4
 * This program is free software: you can redistribute it and/or modify
1086
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1087
6
 * published by the Free Software Foundation.
1088
7
 *
1089
8
 * This program is distributed in the hope that it will be useful,
1090
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1091
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1092
11
 * GNU Lesser General Public License for more details.
1093
12
 *
1094
13
 * You should have received a copy of the GNU Lesser General Public License
1095
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1096
15
 *
1097
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1098
17
 */
1099
18
1100
19
#include <unity/storage/internal/EnvVars.h>
1101
20
1102
21
#include <cassert>
1103
22
#include <QDebug>
1104
23
1105
24
#include <stdlib.h>
1106
25
1107
26
using namespace std;
1108
27
1109
28
namespace unity
1110
29
{
1111
30
namespace storage
1112
31
{
1113
32
namespace internal
1114
33
{
1115
34
1116
35
int EnvVars::registry_timeout_ms()
1117
36
{
1118
37
    int const dflt_val = REGISTRY_IDLE_TIMEOUT_DFLT * 1000;
1119
38
1120
39
    auto const val = get(REGISTRY_IDLE_TIMEOUT);
1121
40
    if (val.empty())
1122
41
    {
1123
42
        return dflt_val;
1124
43
    }
1125
44
    try
1126
45
    {
1127
46
        size_t pos;
1128
47
        auto int_val = stoi(val, &pos);
1129
48
        if (pos != val.size())
1130
49
        {
1131
50
            throw invalid_argument("unexpected trailing character(s)");
1132
51
        }
1133
52
        if (int_val < 0)
1134
53
        {
1135
54
            throw invalid_argument("value must be >= 0");
1136
55
        }
1137
56
        return int_val;
1138
57
    }
1139
58
    catch (std::exception const& e)
1140
59
    {
1141
60
        qWarning().noquote().nospace() << "Invalid setting of env var " << QString::fromStdString(REGISTRY_IDLE_TIMEOUT)
1142
61
                                       << " (\"" << QString::fromStdString(val) << "\"): " << e.what();
1143
62
        qWarning().nospace() << "Using default value of " << REGISTRY_IDLE_TIMEOUT_DFLT;
1144
63
    }
1145
64
    return dflt_val;
1146
65
}
1147
66
1148
67
string EnvVars::get(char const* var_name)
1149
68
{
1150
69
    assert(var_name != nullptr);
1151
70
1152
71
    auto p = getenv(var_name);
1153
72
    if (!p)
1154
73
    {
1155
74
        return string();
1156
75
    }
1157
76
    return string(p);
1158
77
}
1159
78
1160
79
}  // namespace internal
1161
80
}  // namespace storage
1162
81
}  // namespace unity
1163
0
82
1164
=== added file 'src/internal/InactivityTimer.cpp'
1165
--- src/internal/InactivityTimer.cpp	1970-01-01 00:00:00 +0000
1166
+++ src/internal/InactivityTimer.cpp	2016-11-28 11:06:57 +0000
1167
@@ -0,0 +1,82 @@
1168
1
/*
1169
2
 * Copyright (C) 2016 Canonical Ltd
1170
3
 *
1171
4
 * This program is free software: you can redistribute it and/or modify
1172
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1173
6
 * published by the Free Software Foundation.
1174
7
 *
1175
8
 * This program is distributed in the hope that it will be useful,
1176
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1177
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1178
11
 * GNU Lesser General Public License for more details.
1179
12
 *
1180
13
 * You should have received a copy of the GNU Lesser General Public License
1181
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1182
15
 *
1183
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1184
17
 */
1185
18
1186
19
#include <unity/storage/internal/InactivityTimer.h>
1187
20
1188
21
#include <QDebug>
1189
22
1190
23
#include <cassert>
1191
24
1192
25
namespace unity
1193
26
{
1194
27
namespace storage
1195
28
{
1196
29
namespace internal
1197
30
{
1198
31
1199
32
InactivityTimer::InactivityTimer(int timeout_ms, std::function<void()> timeout_func)
1200
33
    : timeout_ms_(timeout_ms)
1201
34
    , timeout_func_(timeout_func)
1202
35
    , num_requests_(0)
1203
36
{
1204
37
    assert(timeout_ms_ >= 0);
1205
38
    assert(timeout_func);
1206
39
1207
40
    connect(&timer_, &QTimer::timeout, this, &InactivityTimer::timeout);
1208
41
}
1209
42
1210
43
InactivityTimer::~InactivityTimer() = default;
1211
44
1212
45
void InactivityTimer::request_started()
1213
46
{
1214
47
    assert(num_requests_ >= 0);
1215
48
1216
49
    if (num_requests_++ == 0)
1217
50
    {
1218
51
        timer_.stop();
1219
52
    }
1220
53
}
1221
54
1222
55
void InactivityTimer::request_finished()
1223
56
{
1224
57
    assert(num_requests_ > 0);
1225
58
1226
59
    if (--num_requests_ == 0)
1227
60
    {
1228
61
        timer_.start(timeout_ms_);
1229
62
    }
1230
63
}
1231
64
1232
65
void InactivityTimer::timeout()
1233
66
{
1234
67
    timer_.stop();
1235
68
    disconnect(this);
1236
69
    try
1237
70
    {
1238
71
        timeout_func_();
1239
72
    }
1240
73
    catch (std::exception const& e)
1241
74
    {
1242
75
        auto msg = QString("InactivityTimer::timeout(): exception from timeout callback: ") + e.what();
1243
76
        qWarning().nospace() << msg;
1244
77
    }
1245
78
}
1246
79
1247
80
} // namespace internal
1248
81
} // namespace storage
1249
82
} // namespace unity
1250
0
83
1251
=== modified file 'src/internal/TraceMessageHandler.cpp'
1252
--- src/internal/TraceMessageHandler.cpp	2016-08-12 06:19:22 +0000
1253
+++ src/internal/TraceMessageHandler.cpp	2016-11-28 11:06:57 +0000
1254
@@ -80,10 +80,27 @@
1255
80
80
1256
81
}  // namespace
81
}  // namespace
1257
82
82
1258
83
TraceMessageHandler::TraceMessageHandler()
1259
84
    : old_message_handler_(qInstallMessageHandler(trace_message_handler))
1260
85
{
1261
86
}
1262
87
1263
83
TraceMessageHandler::TraceMessageHandler(string const& prog_name)
88
TraceMessageHandler::TraceMessageHandler(string const& prog_name)
1267
84
{
89
    : TraceMessageHandler()
1268
85
    prefix = prog_name;
90
{
1269
86
    old_message_handler_ = qInstallMessageHandler(trace_message_handler);
91
    prefix = prog_name;
1270
92
}
1271
93
1272
94
TraceMessageHandler::TraceMessageHandler(QString const& prog_name)
1273
95
    : TraceMessageHandler()
1274
96
{
1275
97
    prefix = prog_name.toStdString();
1276
98
}
1277
99
1278
100
TraceMessageHandler::TraceMessageHandler(char const* prog_name)
1279
101
    : TraceMessageHandler()
1280
102
{
1281
103
    prefix = prog_name;
1282
87
}
104
}
1283
88
105
1284
89
TraceMessageHandler::~TraceMessageHandler()
106
TraceMessageHandler::~TraceMessageHandler()
1285
90
107
1286
=== modified file 'src/qt/Account.cpp'
1287
--- src/qt/Account.cpp	2016-11-03 06:41:00 +0000
1288
+++ src/qt/Account.cpp	2016-11-28 11:06:57 +0000
1289
@@ -93,6 +93,16 @@
1290
93
    return p_->displayName();
93
    return p_->displayName();
1291
94
}
94
}
1292
95
95
1293
96
QString Account::providerName() const
1294
97
{
1295
98
    return p_->providerName();
1296
99
}
1297
100
1298
101
QString Account::iconName() const
1299
102
{
1300
103
    return p_->iconName();
1301
104
}
1302
105
1303
96
ItemListJob* Account::roots(QStringList const& keys) const
106
ItemListJob* Account::roots(QStringList const& keys) const
1304
97
{
107
{
1305
98
    return p_->roots(keys);
108
    return p_->roots(keys);
1306
99
109
1307
=== modified file 'src/qt/AccountsJob.cpp'
1308
--- src/qt/AccountsJob.cpp	2016-11-02 02:54:48 +0000
1309
+++ src/qt/AccountsJob.cpp	2016-11-28 11:06:57 +0000
1310
@@ -18,7 +18,6 @@
1311
18
18
1312
19
#include <unity/storage/qt/AccountsJob.h>
19
#include <unity/storage/qt/AccountsJob.h>
1313
20
20
1314
21
#include <unity/storage/qt/Account.h>
1315
22
#include <unity/storage/qt/internal/AccountsJobImpl.h>
21
#include <unity/storage/qt/internal/AccountsJobImpl.h>
1316
23
22
1317
24
#include <QVariant>
23
#include <QVariant>
1318
@@ -33,13 +32,8 @@
1319
33
namespace qt
32
namespace qt
1320
34
{
33
{
1321
35
34
1329
36
AccountsJob::AccountsJob(shared_ptr<internal::RuntimeImpl> const& runtime)
35
AccountsJob::AccountsJob(unique_ptr<internal::AccountsJobImpl> accounts_job_impl)
1330
37
    : p_(new internal::AccountsJobImpl(this, runtime))
36
    : p_(move(accounts_job_impl))
1324
38
{
1325
39
}
1326
40
1327
41
AccountsJob::AccountsJob(StorageError const& error)
1328
42
    : p_(new internal::AccountsJobImpl(this, error))
1331
43
{
37
{
1332
44
}
38
}
1333
45
39
1334
46
40
1335
=== modified file 'src/qt/CMakeLists.txt'
1336
--- src/qt/CMakeLists.txt	2016-10-12 08:08:48 +0000
1337
+++ src/qt/CMakeLists.txt	2016-11-28 11:06:57 +0000
1338
@@ -4,11 +4,20 @@
1339
4
    CLASSNAME ProviderInterface
4
    CLASSNAME ProviderInterface
1340
5
    INCLUDE unity/storage/internal/dbusmarshal.h
5
    INCLUDE unity/storage/internal/dbusmarshal.h
1341
6
)
6
)
1342
7
1343
8
qt5_add_dbus_interface(generated_files
7
qt5_add_dbus_interface(generated_files
1344
9
    ${CMAKE_SOURCE_DIR}/data/provider.xml
8
    ${CMAKE_SOURCE_DIR}/data/provider.xml
1345
10
    ProviderInterface
9
    ProviderInterface
1346
11
)
10
)
1347
11
1348
12
set_source_files_properties(${CMAKE_SOURCE_DIR}/data/registry.xml PROPERTIES
1349
13
    CLASSNAME RegistryInterface
1350
14
    INCLUDE unity/storage/internal/AccountDetails.h
1351
15
)
1352
16
qt5_add_dbus_interface(generated_files
1353
17
    ${CMAKE_SOURCE_DIR}/data/registry.xml
1354
18
    RegistryInterface
1355
19
)
1356
20
1357
12
set_source_files_properties(${generated_files} dbusmarshal.cpp PROPERTIES
21
set_source_files_properties(${generated_files} dbusmarshal.cpp PROPERTIES
1358
13
    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
22
    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
1359
14
    GENERATED TRUE
23
    GENERATED TRUE
1360
@@ -71,7 +80,6 @@
1361
71
target_include_directories(storage-framework-qt-client-v2 PRIVATE
80
target_include_directories(storage-framework-qt-client-v2 PRIVATE
1362
72
    ${Qt5DBus_INCLUDE_DIRS}
81
    ${Qt5DBus_INCLUDE_DIRS}
1363
73
    ${Qt5Network_INCLUDE_DIRS}
82
    ${Qt5Network_INCLUDE_DIRS}
1364
74
    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
1365
75
)
83
)
1366
76
set_target_properties(storage-framework-qt-client-v2 PROPERTIES
84
set_target_properties(storage-framework-qt-client-v2 PROPERTIES
1367
77
    AUTOMOC TRUE
85
    AUTOMOC TRUE
1368
@@ -85,7 +93,6 @@
1369
85
    Qt5::Core
93
    Qt5::Core
1370
86
    Qt5::DBus
94
    Qt5::DBus
1371
87
    Qt5::Network
95
    Qt5::Network
1372
88
    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
1373
89
)
96
)
1374
90
install(
97
install(
1375
91
    TARGETS storage-framework-qt-client-v2
98
    TARGETS storage-framework-qt-client-v2
1376
92
99
1377
=== modified file 'src/qt/Runtime.cpp'
1378
--- src/qt/Runtime.cpp	2016-09-22 01:52:20 +0000
1379
+++ src/qt/Runtime.cpp	2016-11-28 11:06:57 +0000
1380
@@ -70,11 +70,11 @@
1381
70
70
1382
71
Account Runtime::make_test_account(QString const& bus_name,
71
Account Runtime::make_test_account(QString const& bus_name,
1383
72
                                   QString const& object_path,
72
                                   QString const& object_path,
1387
73
                                   QString const& owner_id,
73
                                   quint32 id,
1388
74
                                   QString const& owner,
74
                                   QString const& service_id,
1389
75
                                   QString const& description) const
75
                                   QString const& display_name) const
1390
76
{
76
{
1392
77
    return p_->make_test_account(bus_name, object_path, owner_id, owner, description);
77
    return p_->make_test_account(bus_name, object_path, id, service_id, display_name);
1393
78
}
78
}
1394
79
79
1395
80
}  // namespace qt
80
}  // namespace qt
1396
81
81
1397
=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
1398
--- src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-11-02 09:32:53 +0000
1399
+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-11-28 11:06:57 +0000
1400
@@ -47,7 +47,7 @@
1401
47
47
1402
48
static const map<QString, QString> BUS_NAMES =
48
static const map<QString, QString> BUS_NAMES =
1403
49
{
49
{
1405
50
    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
50
    { "storage-provider-test", "com.canonical.StorageFramework.Provider.ProviderTest" },
1406
51
    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" },
51
    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" },
1407
52
    { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
52
    { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
1408
53
    { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },
53
    { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },
1409
54
54
1410
=== modified file 'src/qt/internal/AccountImpl.cpp'
1411
--- src/qt/internal/AccountImpl.cpp	2016-11-25 03:23:55 +0000
1412
+++ src/qt/internal/AccountImpl.cpp	2016-11-28 11:06:57 +0000
1413
@@ -48,37 +48,39 @@
1414
48
}
48
}
1415
49
49
1416
50
AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime_impl,
50
AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime_impl,
1422
51
                         QString const& bus_name,
51
                         storage::internal::AccountDetails const& details)
1418
52
                         QString const& object_path,
1419
53
                         QString const& id,
1420
54
                         QString const& service_id,
1421
55
                         QString const& display_name)
1423
56
    : is_valid_(true)
52
    : is_valid_(true)
1429
57
    , bus_name_(bus_name)
53
    , details_(details)
1425
58
    , object_path_(object_path)
1426
59
    , id_(id)
1427
60
    , service_id_(service_id)
1428
61
    , display_name_(display_name)
1430
62
    , runtime_impl_(runtime_impl)
54
    , runtime_impl_(runtime_impl)
1432
63
    , provider_(new ProviderInterface(bus_name, object_path, runtime_impl->connection()))
55
    , provider_(new ProviderInterface(details.busName, details.objectPath.path(), runtime_impl->connection()))
1433
64
{
56
{
1436
65
    assert(!bus_name.isEmpty());
57
    assert(!details.busName.isEmpty());
1437
66
    assert(!object_path.isEmpty());
58
    assert(!details.objectPath.path().isEmpty());
1438
67
}
59
}
1439
68
60
1440
69
QString AccountImpl::busName() const
61
QString AccountImpl::busName() const
1441
70
{
62
{
1443
71
    return is_valid_ ? bus_name_ : "";
63
    return is_valid_ ? details_.busName : "";
1444
72
}
64
}
1445
73
65
1446
74
QString AccountImpl::objectPath() const
66
QString AccountImpl::objectPath() const
1447
75
{
67
{
1449
76
    return is_valid_ ? object_path_ : "";
68
    return is_valid_ ? details_.objectPath.path() : QDBusObjectPath().path();
1450
77
}
69
}
1451
78
70
1452
79
QString AccountImpl::displayName() const
71
QString AccountImpl::displayName() const
1453
80
{
72
{
1455
81
    return is_valid_ ? display_name_ : "";
73
    return is_valid_ ? details_.displayName : "";
1456
74
}
1457
75
1458
76
QString AccountImpl::providerName() const
1459
77
{
1460
78
    return is_valid_ ? details_.providerName : "";
1461
79
}
1462
80
1463
81
QString AccountImpl::iconName() const
1464
82
{
1465
83
    return is_valid_ ? details_.iconName : "";
1466
82
}
84
}
1467
83
85
1468
84
ItemListJob* AccountImpl::roots(QStringList const& keys) const
86
ItemListJob* AccountImpl::roots(QStringList const& keys) const
1469
@@ -142,10 +144,7 @@
1470
142
{
144
{
1471
143
    if (is_valid_)
145
    if (is_valid_)
1472
144
    {
146
    {
1477
145
        return    other.is_valid_
147
        return other.is_valid_ && details_ == other.details_;
1474
146
               && id_ == other.id_
1475
147
               && service_id_ == other.service_id_
1476
148
               && display_name_ == other.display_name_;
1478
149
    }
148
    }
1479
150
    return !other.is_valid_;
149
    return !other.is_valid_;
1480
151
}
150
}
1481
@@ -165,24 +164,7 @@
1482
165
    {
164
    {
1483
166
        return false;
165
        return false;
1484
167
    }
166
    }
1503
168
    assert(is_valid_ && other.is_valid_);
167
    return details_ < other.details_;
1486
169
    if (id_ < other.id_)
1487
170
    {
1488
171
        return true;
1489
172
    }
1490
173
    if (id_ > other.id_)
1491
174
    {
1492
175
        return false;
1493
176
    }
1494
177
    if (service_id_ < other.service_id_)
1495
178
    {
1496
179
        return true;
1497
180
    }
1498
181
    if (service_id_ > other.service_id_)
1499
182
    {
1500
183
        return false;
1501
184
    }
1502
185
    return display_name_ < other.display_name_;
1504
186
}
168
}
1505
187
169
1506
188
bool AccountImpl::operator<=(AccountImpl const& other) const
170
bool AccountImpl::operator<=(AccountImpl const& other) const
1507
@@ -216,21 +198,16 @@
1508
216
    {
198
    {
1509
217
        return 0;
199
        return 0;
1510
218
    }
200
    }
1515
219
    size_t hash = 0;
201
    size_t hash = details_.id;
1516
220
    boost::hash_combine(hash, qHash(service_id_));
202
    boost::hash_combine(hash, qHash(details_.serviceId));
1517
221
    boost::hash_combine(hash, qHash(id_));
203
    boost::hash_combine(hash, qHash(details_.displayName));
1514
222
    boost::hash_combine(hash, qHash(display_name_));
1518
223
    return hash;
204
    return hash;
1519
224
}
205
}
1520
225
206
1521
226
Account AccountImpl::make_account(shared_ptr<RuntimeImpl> const& runtime,
207
Account AccountImpl::make_account(shared_ptr<RuntimeImpl> const& runtime,
1527
227
                                  QString const& bus_name,
208
                                  storage::internal::AccountDetails const& details)
1523
228
                                  QString const& object_path,
1524
229
                                  QString const& id,
1525
230
                                  QString const& service_id,
1526
231
                                  QString const& display_name)
1528
232
{
209
{
1530
233
    shared_ptr<AccountImpl> p(new AccountImpl(runtime, bus_name, object_path, id, service_id, display_name));
210
    shared_ptr<AccountImpl> p(new AccountImpl(runtime, details));
1531
234
    return Account(p);
211
    return Account(p);
1532
235
}
212
}
1533
236
213
1534
237
214
1535
=== modified file 'src/qt/internal/AccountsJobImpl.cpp'
1536
--- src/qt/internal/AccountsJobImpl.cpp	2016-11-03 07:33:40 +0000
1537
+++ src/qt/internal/AccountsJobImpl.cpp	2016-11-28 11:06:57 +0000
1538
@@ -18,12 +18,12 @@
1539
18
18
1540
19
#include <unity/storage/qt/internal/AccountsJobImpl.h>
19
#include <unity/storage/qt/internal/AccountsJobImpl.h>
1541
20
20
1542
21
#include "RegistryInterface.h"
1543
21
#include <unity/storage/qt/internal/AccountImpl.h>
22
#include <unity/storage/qt/internal/AccountImpl.h>
1544
23
#include <unity/storage/qt/internal/Handler.h>
1545
22
#include <unity/storage/qt/internal/RuntimeImpl.h>
24
#include <unity/storage/qt/internal/RuntimeImpl.h>
1546
23
#include <unity/storage/qt/internal/StorageErrorImpl.h>
25
#include <unity/storage/qt/internal/StorageErrorImpl.h>
1547
24
26
1548
25
#include <OnlineAccounts/Account>
1549
26
1550
27
#include <cassert>
27
#include <cassert>
1551
28
28
1552
29
using namespace std;
29
using namespace std;
1553
@@ -37,38 +37,45 @@
1554
37
namespace internal
37
namespace internal
1555
38
{
38
{
1556
39
39
1575
40
namespace
40
AccountsJobImpl::AccountsJobImpl(shared_ptr<RuntimeImpl> const& runtime_impl,
1576
41
{
41
                                 QString const& method,
1577
42
42
                                 QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply)
1578
43
// TODO: We retrieve the accounts directly from online accounts until we have a working registry.
43
    : status_(AccountsJob::Status::Loading)
1561
44
1562
45
static map<QString, QString> const BUS_NAMES =
1563
46
{
1564
47
    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
1565
48
    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" },
1566
49
    { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
1567
50
    { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },
1568
51
};
1569
52
1570
53
}  // namespace
1571
54
1572
55
AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, shared_ptr<RuntimeImpl> const& runtime_impl)
1573
56
    : public_instance_(public_instance)
1574
57
    , status_(AccountsJob::Status::Loading)
1579
58
    , runtime_impl_(runtime_impl)
44
    , runtime_impl_(runtime_impl)
1580
59
{
45
{
1581
60
    assert(public_instance);
1582
61
    assert(runtime_impl);
46
    assert(runtime_impl);
1583
62
47
1585
63
    initialize_accounts();
48
    auto process_reply = [this, method](decltype(reply)& r)
1586
49
    {
1587
50
        auto runtime = get_runtime_impl(method);
1588
51
        if (!runtime || !runtime->isValid())
1589
52
        {
1590
53
            return;
1591
54
        }
1592
55
1593
56
        for (auto const& ad : r.value())
1594
57
        {
1595
58
            auto a = AccountImpl::make_account(runtime, ad);
1596
59
            accounts_.append(a);
1597
60
        }
1598
61
        status_ = AccountsJob::Status::Finished;
1599
62
        Q_EMIT public_instance_->statusChanged(status_);
1600
63
    };
1601
64
1602
65
    auto process_error = [this](StorageError const& error)
1603
66
    {
1604
67
        error_ = error;
1605
68
        status_ = AccountsJob::Status::Error;
1606
69
        Q_EMIT public_instance_->statusChanged(status_);
1607
70
    };
1608
71
1609
72
    new Handler<QList<storage::internal::AccountDetails>>(this, reply, process_reply, process_error);
1610
64
}
73
}
1611
65
74
1615
66
AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, StorageError const& error)
75
AccountsJobImpl::AccountsJobImpl(StorageError const& error)
1616
67
    : public_instance_(public_instance)
76
    : status_(AccountsJob::Status::Error)
1614
68
    , status_(AccountsJob::Status::Loading)
1617
69
    , error_(error)
77
    , error_(error)
1618
70
{
78
{
1619
71
    assert(public_instance);
1620
72
    assert(error.type() != StorageError::Type::NoError);
79
    assert(error.type() != StorageError::Type::NoError);
1621
73
80
1622
74
    status_ = emit_status_changed(AccountsJob::Status::Error);
81
    status_ = emit_status_changed(AccountsJob::Status::Error);
1623
@@ -113,21 +120,27 @@
1624
113
    return account_list;
120
    return account_list;
1625
114
}
121
}
1626
115
122
1628
116
void AccountsJobImpl::manager_ready()
123
AccountsJob* AccountsJobImpl::make_job(shared_ptr<RuntimeImpl> const& runtime,
1629
124
                                       QString const& method,
1630
125
                                       QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply)
1631
117
{
126
{
1635
118
    timer_.stop();
127
    unique_ptr<AccountsJobImpl> impl(new AccountsJobImpl(runtime, method, reply));
1636
119
    disconnect(this);
128
    auto job = new AccountsJob(move(impl));
1637
120
    initialize_accounts();
129
    job->p_->public_instance_ = job;
1638
130
    return job;
1639
121
}
131
}
1640
122
132
1643
123
// LCOV_EXCL_START
133
AccountsJob* AccountsJobImpl::make_job(StorageError const& error)
1642
124
void AccountsJobImpl::timeout()
1644
125
{
134
{
1648
126
    disconnect(this);
135
    unique_ptr<AccountsJobImpl> impl(new AccountsJobImpl(error));
1649
127
    error_ = StorageErrorImpl::local_comms_error("AccountsJob(): timeout retrieving Online accounts");
136
    auto job = new AccountsJob(move(impl));
1650
128
    status_ = emit_status_changed(AccountsJob::Status::Error);
137
    job->p_->public_instance_ = job;
1651
138
    QMetaObject::invokeMethod(job,
1652
139
                              "statusChanged",
1653
140
                              Qt::QueuedConnection,
1654
141
                              Q_ARG(unity::storage::qt::AccountsJob::Status, job->p_->status_));
1655
142
    return job;
1656
129
}
143
}
1657
130
// LCOV_EXCL_STOP
1658
131
144
1659
132
AccountsJob::Status AccountsJobImpl::emit_status_changed(AccountsJob::Status new_status) const
145
AccountsJob::Status AccountsJobImpl::emit_status_changed(AccountsJob::Status new_status) const
1660
133
{
146
{
1661
@@ -152,43 +165,11 @@
1662
152
        auto This = const_cast<AccountsJobImpl*>(this);
165
        auto This = const_cast<AccountsJobImpl*>(this);
1663
153
        This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
166
        This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
1664
154
        This->status_ = emit_status_changed(AccountsJob::Status::Error);
167
        This->status_ = emit_status_changed(AccountsJob::Status::Error);
1665
168
        return nullptr;
1666
155
    }
169
    }
1667
156
    return runtime;
170
    return runtime;
1668
157
}
171
}
1669
158
172
1670
159
void AccountsJobImpl::initialize_accounts()
1671
160
{
1672
161
    auto runtime = get_runtime_impl("AccountsJob()");
1673
162
    assert(runtime);
1674
163
1675
164
    auto manager = runtime->accounts_manager();
1676
165
    if (!manager->isReady())
1677
166
    {
1678
167
        connect(manager.get(), &OnlineAccounts::Manager::ready, this, &AccountsJobImpl::manager_ready);
1679
168
        connect(&timer_, &QTimer::timeout, this, &AccountsJobImpl::timeout);
1680
169
        timer_.setSingleShot(true);
1681
170
        timer_.start(30000);  // TODO: Need config for this eventually.
1682
171
        return;
1683
172
    }
1684
173
1685
174
    for (auto const map_entry : BUS_NAMES)
1686
175
    {
1687
176
        auto service_id = map_entry.first;
1688
177
        for (auto const& a : manager->availableAccounts(service_id))
1689
178
        {
1690
179
            auto object_path = QStringLiteral("/provider/%1").arg(a->id());
1691
180
            auto bus_name = map_entry.second;
1692
181
            accounts_.append(AccountImpl::make_account(runtime,
1693
182
                                                       bus_name,
1694
183
                                                       object_path,
1695
184
                                                       QString::number(a->id()),
1696
185
                                                       a->serviceId(),
1697
186
                                                       a->displayName()));
1698
187
        }
1699
188
    }
1700
189
    status_ = emit_status_changed(AccountsJob::Status::Finished);
1701
190
}
1702
191
1703
192
}  // namespace internal
173
}  // namespace internal
1704
193
}  // namespace qt
174
}  // namespace qt
1705
194
}  // namespace storage
175
}  // namespace storage
1706
195
176
1707
=== modified file 'src/qt/internal/RuntimeImpl.cpp'
1708
--- src/qt/internal/RuntimeImpl.cpp	2016-10-10 05:24:16 +0000
1709
+++ src/qt/internal/RuntimeImpl.cpp	2016-11-28 11:06:57 +0000
1710
@@ -18,15 +18,17 @@
1711
18
18
1712
19
#include <unity/storage/qt/internal/RuntimeImpl.h>
19
#include <unity/storage/qt/internal/RuntimeImpl.h>
1713
20
20
1714
21
#include "RegistryInterface.h"
1715
21
#include <unity/storage/internal/dbusmarshal.h>
22
#include <unity/storage/internal/dbusmarshal.h>
1717
22
#include <unity/storage/qt/AccountsJob.h>
23
#include <unity/storage/internal/EnvVars.h>
1718
23
#include <unity/storage/qt/internal/AccountImpl.h>
24
#include <unity/storage/qt/internal/AccountImpl.h>
1719
25
#include <unity/storage/qt/internal/AccountsJobImpl.h>
1720
24
#include <unity/storage/qt/internal/StorageErrorImpl.h>
26
#include <unity/storage/qt/internal/StorageErrorImpl.h>
1721
25
#include <unity/storage/qt/Item.h>
1722
26
#include <unity/storage/qt/ItemJob.h>
27
#include <unity/storage/qt/ItemJob.h>
1723
27
#include <unity/storage/qt/ItemListJob.h>
28
#include <unity/storage/qt/ItemListJob.h>
1724
28
#include <unity/storage/qt/Runtime.h>
29
#include <unity/storage/qt/Runtime.h>
1725
29
#include <unity/storage/qt/VoidJob.h>
30
#include <unity/storage/qt/VoidJob.h>
1726
31
#include <unity/storage/registry/Registry.h>
1727
30
32
1728
31
#include <QDBusError>
33
#include <QDBusError>
1729
32
#include <QDBusMetaType>
34
#include <QDBusMetaType>
1730
@@ -57,6 +59,9 @@
1731
57
59
1732
58
    qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
60
    qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
1733
59
    qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
61
    qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
1734
62
1735
63
    qDBusRegisterMetaType<unity::storage::internal::AccountDetails>();
1736
64
    qDBusRegisterMetaType<QList<unity::storage::internal::AccountDetails>>();
1737
60
}
65
}
1738
61
66
1739
62
}
67
}
1740
@@ -66,10 +71,12 @@
1741
66
{
71
{
1742
67
}
72
}
1743
68
73
1745
69
RuntimeImpl::RuntimeImpl(QDBusConnection const& bus)
74
RuntimeImpl::RuntimeImpl(QDBusConnection const& conn)
1746
70
    : is_valid_(true)
75
    : is_valid_(true)
1749
71
    , conn_(bus)
76
    , conn_(conn)
1750
72
    , accounts_manager_(new OnlineAccounts::Manager("", conn_))
77
    , registry_(new RegistryInterface(storage::registry::BUS_NAME,
1751
78
                                      storage::registry::OBJECT_PATH,
1752
79
                                      conn_))
1753
73
{
80
{
1754
74
    register_meta_types();
81
    register_meta_types();
1755
75
}
82
}
1756
@@ -96,13 +103,17 @@
1757
96
103
1758
97
AccountsJob* RuntimeImpl::accounts() const
104
AccountsJob* RuntimeImpl::accounts() const
1759
98
{
105
{
1760
106
    QString const method = "Runtime::accounts()";
1761
107
1762
99
    if (!is_valid_)
108
    if (!is_valid_)
1763
100
    {
109
    {
1764
101
        QString msg = "Runtime::accounts(): Runtime was destroyed previously";
110
        QString msg = "Runtime::accounts(): Runtime was destroyed previously";
1766
102
        return new AccountsJob(StorageErrorImpl::runtime_destroyed_error(msg));
111
        return AccountsJobImpl::make_job(StorageErrorImpl::runtime_destroyed_error(msg));
1767
103
    }
112
    }
1770
104
    auto This = const_cast<RuntimeImpl*>(this);
113
1771
105
    return new AccountsJob(This->shared_from_this());
114
    auto reply = registry_->ListAccounts();
1772
115
    auto This = const_pointer_cast<RuntimeImpl>(shared_from_this());
1773
116
    return AccountsJobImpl::make_job(This, method, reply);
1774
106
}
117
}
1775
107
118
1776
108
StorageError RuntimeImpl::shutdown()
119
StorageError RuntimeImpl::shutdown()
1777
@@ -116,23 +127,14 @@
1778
116
    return error_;
127
    return error_;
1779
117
}
128
}
1780
118
129
1781
119
shared_ptr<OnlineAccounts::Manager> RuntimeImpl::accounts_manager() const
1782
120
{
1783
121
    return accounts_manager_;
1784
122
}
1785
123
1786
124
Account RuntimeImpl::make_test_account(QString const& bus_name,
130
Account RuntimeImpl::make_test_account(QString const& bus_name,
1787
125
                                       QString const& object_path,
131
                                       QString const& object_path,
1791
126
                                       QString const& owner_id,
132
                                       quint32 id,
1792
127
                                       QString const& owner,
133
                                       QString const& service_id,
1793
128
                                       QString const& description)
134
                                       QString const& name)
1794
129
{
135
{
1801
130
    return AccountImpl::make_account(shared_from_this(),
136
    storage::internal::AccountDetails ad{bus_name, QDBusObjectPath(object_path), id, service_id, name, "", ""};
1802
131
                                     bus_name,
137
    return AccountImpl::make_account(shared_from_this(), ad);
1797
132
                                     object_path,
1798
133
                                     owner_id,
1799
134
                                     owner,
1800
135
                                     description);
1803
136
}
138
}
1804
137
139
1805
138
}  // namespace internal
140
}  // namespace internal
1806
139
141
1807
=== added directory 'src/registry'
1808
=== added file 'src/registry/CMakeLists.txt'
1809
--- src/registry/CMakeLists.txt	1970-01-01 00:00:00 +0000
1810
+++ src/registry/CMakeLists.txt	2016-11-28 11:06:57 +0000
1811
@@ -0,0 +1,47 @@
1812
1
include_directories(
1813
2
    ${CMAKE_CURRENT_BINARY_DIR}
1814
3
    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
1815
4
)
1816
5
1817
6
set(TARGET "storage-framework-registry")
1818
7
1819
8
qt5_add_dbus_adaptor(adaptor_files
1820
9
    ${CMAKE_SOURCE_DIR}/data/registry.xml
1821
10
    unity/storage/registry/internal/RegistryAdaptor.h
1822
11
    unity::storage::registry::internal::RegistryAdaptor
1823
12
)
1824
13
1825
14
set_source_files_properties(${adaptor_files} PROPERTIES
1826
15
    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
1827
16
    GENERATED TRUE
1828
17
)
1829
18
1830
19
add_executable(${TARGET}
1831
20
    internal/ListAccountsHandler.cpp
1832
21
    internal/qdbus-last-error-msg.cpp
1833
22
    internal/RegistryAdaptor.cpp
1834
23
    main.cpp
1835
24
    ${CMAKE_SOURCE_DIR}/include/unity/storage/registry/internal/ListAccountsHandler.h
1836
25
    ${CMAKE_SOURCE_DIR}/include/unity/storage/registry/internal/RegistryAdaptor.h
1837
26
    ${adaptor_files})
1838
27
1839
28
set_target_properties(${TARGET} PROPERTIES AUTOMOC TRUE)
1840
29
1841
30
target_link_libraries(${TARGET}
1842
31
    storage-framework-common-internal
1843
32
    Qt5::Core
1844
33
    Qt5::DBus
1845
34
    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
1846
35
)
1847
36
1848
37
install(
1849
38
    TARGETS ${TARGET}
1850
39
    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
1851
40
)
1852
41
1853
42
configure_file(com.canonical.StorageFramework.Registry.service.in com.canonical.StorageFramework.Registry.service)
1854
43
1855
44
install(
1856
45
    FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.StorageFramework.Registry.service
1857
46
    DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
1858
47
)
1859
0
48
1860
=== added file 'src/registry/com.canonical.StorageFramework.Registry.service.in'
1861
--- src/registry/com.canonical.StorageFramework.Registry.service.in	1970-01-01 00:00:00 +0000
1862
+++ src/registry/com.canonical.StorageFramework.Registry.service.in	2016-11-28 11:06:57 +0000
1863
@@ -0,0 +1,3 @@
1864
1
[D-BUS Service]
1865
2
Name=com.canonical.StorageFramework.Registry
1866
3
Exec=@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/storage-framework-registry
1867
0
4
1868
=== added directory 'src/registry/internal'
1869
=== added file 'src/registry/internal/ListAccountsHandler.cpp'
1870
--- src/registry/internal/ListAccountsHandler.cpp	1970-01-01 00:00:00 +0000
1871
+++ src/registry/internal/ListAccountsHandler.cpp	2016-11-28 11:06:57 +0000
1872
@@ -0,0 +1,127 @@
1873
1
/*
1874
2
 * Copyright (C) 2016 Canonical Ltd
1875
3
 *
1876
4
 * This program is free software: you can redistribute it and/or modify
1877
5
 * it under the terms of the GNU Lesser General Public License version 3 as
1878
6
 * published by the Free Software Foundation.
1879
7
 *
1880
8
 * This program is distributed in the hope that it will be useful,
1881
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1882
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1883
11
 * GNU Lesser General Public License for more details.
1884
12
 *
1885
13
 * You should have received a copy of the GNU Lesser General Public License
1886
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1887
15
 *
1888
16
 * Authors: Michi Henning <michi.henning@canonical.com>
1889
17
 */
1890
18
1891
19
#include <unity/storage/registry/internal/ListAccountsHandler.h>
1892
20
1893
21
#include <unity/storage/internal/AccountDetails.h>
1894
22
#include <unity/storage/registry/internal/qdbus-last-error-msg.h>
1895
23
1896
24
#include <OnlineAccounts/Account>
1897
25
#include <QDebug>
1898
26
1899
27
using namespace std;
1900
28
1901
29
namespace unity
1902
30
{
1903
31
namespace storage
1904
32
{
1905
33
namespace registry
1906
34
{
1907
35
namespace internal
1908
36
{
1909
37
1910
38
ListAccountsHandler::ListAccountsHandler(QDBusConnection const& conn,
1911
39
                                         QDBusMessage const& msg,
1912
40
                                         shared_ptr<storage::internal::InactivityTimer> const& timer)
1913
41
    : conn_(conn)
1914
42
    , msg_(msg)
1915
43
    , manager_("", conn)
1916
44
    , activity_notifier_(timer)
1917
45
{
1918
46
    connect(&manager_, &OnlineAccounts::Manager::ready, this, &ListAccountsHandler::manager_ready);
1919
47
    connect(&timer_, &QTimer::timeout, this, &ListAccountsHandler::timeout);
1920
48
    timer_.setSingleShot(true);
1921
49
    timer_.start(25000);  // TODO: Need config for this eventually.
1922
50
}
1923
51
1924
52
ListAccountsHandler::~ListAccountsHandler() = default;
1925
53
1926
54
namespace
1927
55
{
1928
56
1929
57
// TODO: This is a hack until Online Accounts is updated to give us the provider ID, provider name, and icon name.
1930
58
1931
59
struct ProviderDetails
1932
60
{
1933
61
    char const* bus_name;
1934
62
    char const* provider_name;
1935
63
};
1936
64
1937
65
static map<QString, ProviderDetails> const BUS_NAMES =
1938
66
{
1939
67
    { "storage-provider-test", { "com.canonical.StorageFramework.Provider.ProviderTest", "Test Provider" } },
1940
68
    { "com.canonical.scopes.mcloud_mcloud_mcloud", { "com.canonical.StorageFramework.Provider.McloudProvider", "mcloud" } },
1941
69
    { "storage-provider-owncloud", { "com.canonical.StorageFramework.Provider.OwnCloud", "ownCloud" } },
1942
70
    { "storage-provider-onedrive", { "com.canonical.StorageFramework.Provider.OnedriveProvider", "OneDrive" } },
1943
71
};
1944
72
1945
73
}  // namespace
1946
74
1947
75
void ListAccountsHandler::manager_ready()
1948
76
{
1949
77
    timer_.stop();
1950
78
    disconnect(this);
1951
79
    deleteLater();
1952
80
1953
81
    QList<storage::internal::AccountDetails> accounts;
1954
82
    for (auto const& acct : manager_.availableAccounts())
1955
83
    {
1956
84
        auto const it = BUS_NAMES.find(acct->serviceId());
1957
85
        if (it == BUS_NAMES.end())
1958
86
        {
1959
87
            continue;
1960
88
        }
1961
89
1962
90
        storage::internal::AccountDetails ad;
1963
91
        ad.busName = it->second.bus_name;
1964
92
        ad.objectPath = QDBusObjectPath(QStringLiteral("/provider/%1").arg(acct->id()));
1965
93
        ad.id = acct->id();
1966
94
        ad.serviceId = acct->serviceId();
1967
95
        ad.displayName = acct->displayName();
1968
96
        ad.providerName = it->second.provider_name;
1969
97
        ad.iconName = "";
1970
98
1971
99
        accounts.append(ad);
1972
100
    }
1973
101
1974
102
    if (!conn_.send(msg_.createReply(QVariant::fromValue(accounts))))
1975
103
    {
1976
104
        auto msg = last_error_msg(conn_);
1977
105
        qCritical().noquote() << "ListAccounts(): could not send DBus reply" + msg;
1978
106
    }
1979
107
}
1980
108
1981
109
void ListAccountsHandler::timeout()
1982
110
{
1983
111
    disconnect(this);
1984
112
    deleteLater();
1985
113
1986
114
    QString err = QString("cannot contact Online Accounts: request timed out after ") +
1987
115
                  QString::number(timer_.interval()) + " ms";
1988
116
    qCritical().noquote() << err;
1989
117
    if (!conn_.send(msg_.createErrorReply(QDBusError::Other, err)))
1990
118
    {
1991
119
        auto msg = last_error_msg(conn_);
1992
120
        qCritical().noquote() << "ListAccounts(): could not send DBus error reply" + msg;
1993
121
    }
1994
122
}
1995
123
1996
124
} // namespace internal
1997
125
} // namespace registry
1998
126
} // namespace storage
1999
127
} // namespace unity
2000
0
128
2001
=== added file 'src/registry/internal/RegistryAdaptor.cpp'
2002
--- src/registry/internal/RegistryAdaptor.cpp	1970-01-01 00:00:00 +0000
2003
+++ src/registry/internal/RegistryAdaptor.cpp	2016-11-28 11:06:57 +0000
2004
@@ -0,0 +1,55 @@
2005
1
/*
2006
2
 * Copyright (C) 2016 Canonical Ltd
2007
3
 *
2008
4
 * This program is free software: you can redistribute it and/or modify
2009
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2010
6
 * published by the Free Software Foundation.
2011
7
 *
2012
8
 * This program is distributed in the hope that it will be useful,
2013
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2014
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2015
11
 * GNU Lesser General Public License for more details.
2016
12
 *
2017
13
 * You should have received a copy of the GNU Lesser General Public License
2018
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2019
15
 *
2020
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2021
17
 */
2022
18
2023
19
#include <unity/storage/registry/internal/RegistryAdaptor.h>
2024
20
2025
21
#include <unity/storage/registry/internal/ListAccountsHandler.h>
2026
22
2027
23
using namespace std;
2028
24
2029
25
namespace unity
2030
26
{
2031
27
namespace storage
2032
28
{
2033
29
namespace registry
2034
30
{
2035
31
namespace internal
2036
32
{
2037
33
2038
34
RegistryAdaptor::RegistryAdaptor(QDBusConnection const& conn,
2039
35
                                 shared_ptr<storage::internal::InactivityTimer> const& timer,
2040
36
                                 QObject* parent)
2041
37
    : QObject(parent)
2042
38
    , conn_(conn)
2043
39
    , timer_(timer)
2044
40
{
2045
41
}
2046
42
2047
43
RegistryAdaptor::~RegistryAdaptor() = default;
2048
44
2049
45
QList<unity::storage::internal::AccountDetails> RegistryAdaptor::ListAccounts()
2050
46
{
2051
47
    new ListAccountsHandler(conn_, message(), timer_);  // Handler deletes itself once done.
2052
48
    setDelayedReply(true);
2053
49
    return QList<unity::storage::internal::AccountDetails>();
2054
50
}
2055
51
2056
52
} // namespace internal
2057
53
} // namespace registry
2058
54
} // namespace storage
2059
55
} // namespace unity
2060
0
56
2061
=== added file 'src/registry/internal/qdbus-last-error-msg.cpp'
2062
--- src/registry/internal/qdbus-last-error-msg.cpp	1970-01-01 00:00:00 +0000
2063
+++ src/registry/internal/qdbus-last-error-msg.cpp	2016-11-28 11:06:57 +0000
2064
@@ -0,0 +1,49 @@
2065
1
/*
2066
2
 * Copyright (C) 2016 Canonical Ltd
2067
3
 *
2068
4
 * This program is free software: you can redistribute it and/or modify
2069
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2070
6
 * published by the Free Software Foundation.
2071
7
 *
2072
8
 * This program is distributed in the hope that it will be useful,
2073
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2074
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2075
11
 * GNU Lesser General Public License for more details.
2076
12
 *
2077
13
 * You should have received a copy of the GNU Lesser General Public License
2078
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2079
15
 *
2080
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2081
17
 */
2082
18
2083
19
#include <unity/storage/registry/internal/qdbus-last-error-msg.h>
2084
20
2085
21
#pragma GCC diagnostic push
2086
22
#pragma GCC diagnostic ignored "-Wcast-align"
2087
23
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2088
24
#include <QDBusError>
2089
25
#pragma GCC diagnostic pop
2090
26
2091
27
namespace unity
2092
28
{
2093
29
namespace storage
2094
30
{
2095
31
namespace registry
2096
32
{
2097
33
namespace internal
2098
34
{
2099
35
2100
36
QString last_error_msg(QDBusConnection const& conn)
2101
37
{
2102
38
    auto msg = conn.lastError().message();
2103
39
    if (!msg.isEmpty())
2104
40
    {
2105
41
        msg = ": " + msg;
2106
42
    }
2107
43
    return msg;
2108
44
}
2109
45
2110
46
}  // namespace internal
2111
47
}  // namespace registry
2112
48
}  // namespace storage
2113
49
}  // namespace unity
2114
0
50
2115
=== added file 'src/registry/main.cpp'
2116
--- src/registry/main.cpp	1970-01-01 00:00:00 +0000
2117
+++ src/registry/main.cpp	2016-11-28 11:06:57 +0000
2118
@@ -0,0 +1,95 @@
2119
1
/*
2120
2
 * Copyright (C) 2016 Canonical Ltd
2121
3
 *
2122
4
 * This program is free software: you can redistribute it and/or modify
2123
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2124
6
 * published by the Free Software Foundation.
2125
7
 *
2126
8
 * This program is distributed in the hope that it will be useful,
2127
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2128
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2129
11
 * GNU Lesser General Public License for more details.
2130
12
 *
2131
13
 * You should have received a copy of the GNU Lesser General Public License
2132
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2133
15
 *
2134
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2135
17
 */
2136
18
2137
19
#include "registryadaptor.h"
2138
20
#include <unity/storage/internal/EnvVars.h>
2139
21
#include <unity/storage/internal/InactivityTimer.h>
2140
22
#include <unity/storage/internal/TraceMessageHandler.h>
2141
23
#include <unity/storage/registry/internal/qdbus-last-error-msg.h>
2142
24
#include <unity/storage/registry/internal/RegistryAdaptor.h>
2143
25
#include <unity/storage/registry/Registry.h>
2144
26
2145
27
#pragma GCC diagnostic push
2146
28
#pragma GCC diagnostic ignored "-Wcast-align"
2147
29
#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2148
30
#include <QCoreApplication>
2149
31
#include <QDBusArgument>
2150
32
#include <QDBusError>
2151
33
#include <QFileInfo>
2152
34
#pragma GCC diagnostic pop
2153
35
2154
36
using namespace unity::storage;
2155
37
using namespace unity::storage::registry::internal;
2156
38
using namespace std;
2157
39
2158
40
int main(int argc, char* argv[])
2159
41
{
2160
42
    auto const prog_name = QFileInfo(argv[0]).fileName();
2161
43
    internal::TraceMessageHandler message_handler(prog_name);
2162
44
2163
45
    int rc = 1;
2164
46
    try
2165
47
    {
2166
48
        QCoreApplication app(argc, argv);
2167
49
2168
50
        auto conn = QDBusConnection::sessionBus();
2169
51
2170
52
        int const timeout_ms = internal::EnvVars::registry_timeout_ms();
2171
53
        auto timeout_func = [&app, timeout_ms]
2172
54
        {
2173
55
            qInfo().noquote().nospace() << "Exiting after " << QString::number(timeout_ms) << " ms of idle time";
2174
56
            app.quit();
2175
57
        };
2176
58
        auto inactivity_timer = make_shared<unity::storage::internal::InactivityTimer>(timeout_ms, timeout_func);
2177
59
2178
60
        registry::internal::RegistryAdaptor registry_adaptor(conn, inactivity_timer);
2179
61
        new ::RegistryAdaptor(&registry_adaptor);
2180
62
2181
63
        auto const& object_path = registry::OBJECT_PATH;
2182
64
        if (!conn.registerObject(object_path, &registry_adaptor))
2183
65
        {
2184
66
            auto msg = last_error_msg(conn);
2185
67
            throw runtime_error(string("Could not register object path ") +
2186
68
                                       object_path.toStdString() + msg.toStdString());
2187
69
        }
2188
70
2189
71
        qDBusRegisterMetaType<unity::storage::internal::AccountDetails>();
2190
72
        qDBusRegisterMetaType<QList<unity::storage::internal::AccountDetails>>();
2191
73
2192
74
        auto const& bus_name = registry::BUS_NAME;
2193
75
        if (!conn.registerService(bus_name))
2194
76
        {
2195
77
            auto msg = last_error_msg(conn);
2196
78
            throw runtime_error(string("Could not acquire DBus name ") + bus_name.toStdString() + msg.toStdString());
2197
79
        }
2198
80
2199
81
        rc = app.exec();
2200
82
2201
83
        if (!conn.unregisterService(bus_name))
2202
84
        {
2203
85
            auto msg = last_error_msg(conn);
2204
86
            throw runtime_error(string("Could not release DBus name ") + bus_name.toStdString() + msg.toStdString());
2205
87
        }
2206
88
    }
2207
89
    catch (std::exception const& e)
2208
90
    {
2209
91
        qCritical().noquote() << e.what();
2210
92
    }
2211
93
2212
94
    return rc;
2213
95
}
2214
0
96
2215
=== modified file 'tests/CMakeLists.txt'
2216
--- tests/CMakeLists.txt	2016-11-23 03:03:58 +0000
2217
+++ tests/CMakeLists.txt	2016-11-28 11:06:57 +0000
2218
@@ -6,6 +6,7 @@
2219
6
add_subdirectory(utils)
6
add_subdirectory(utils)
2220
7
7
2221
8
set(unit_test_dirs
8
set(unit_test_dirs
2222
9
    registry
2223
9
    local-client
10
    local-client
2224
10
    remote-client
11
    remote-client
2225
11
    remote-client-v1
12
    remote-client-v1
2226
12
13
2227
=== added directory 'tests/registry'
2228
=== added file 'tests/registry/CMakeLists.txt'
2229
--- tests/registry/CMakeLists.txt	1970-01-01 00:00:00 +0000
2230
+++ tests/registry/CMakeLists.txt	2016-11-28 11:06:57 +0000
2231
@@ -0,0 +1,20 @@
2232
1
add_executable(registry_test registry_test.cpp)
2233
2
#set_target_properties(remote-client_test PROPERTIES AUTOMOC TRUE)
2234
3
2235
4
#add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
2236
5
#include_directories(${GLIB_DEPS_INCLUDE_DIRS})
2237
6
2238
7
#target_link_libraries(remote-client_test
2239
8
#    storage-framework-provider
2240
9
#    storage-framework-qt-client-v2
2241
10
#    Qt5::Network
2242
11
#    Qt5::Test
2243
12
#    ${Boost_LIBRARIES}
2244
13
#    ${GLIB_DEPS_LIBRARIES}
2245
14
#    testutils
2246
15
#    gtest
2247
16
#)
2248
17
add_test(registry registry_test)
2249
18
#add_dependencies(remote-client_test qt-client-all-headers provider-test)
2250
19
2251
20
#set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
2252
0
21
2253
=== added file 'tests/registry/registry_test.cpp'
2254
--- tests/registry/registry_test.cpp	1970-01-01 00:00:00 +0000
2255
+++ tests/registry/registry_test.cpp	2016-11-28 11:06:57 +0000
2256
@@ -0,0 +1,27 @@
2257
1
/*
2258
2
 * Copyright (C) 2016 Canonical Ltd
2259
3
 *
2260
4
 * This program is free software: you can redistribute it and/or modify
2261
5
 * it under the terms of the GNU Lesser General Public License version 3 as
2262
6
 * published by the Free Software Foundation.
2263
7
 *
2264
8
 * This program is distributed in the hope that it will be useful,
2265
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2266
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2267
11
 * GNU Lesser General Public License for more details.
2268
12
 *
2269
13
 * You should have received a copy of the GNU Lesser General Public License
2270
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2271
15
 *
2272
16
 * Authors: Michi Henning <michi.henning@canonical.com>
2273
17
 */
2274
18
2275
19
int main(int argc, char** argv)
2276
20
{
2277
21
#if 0
2278
22
    QCoreApplication app(argc, argv);
2279
23
2280
24
    ::testing::InitGoogleTest(&argc, argv);
2281
25
    return RUN_ALL_TESTS();
2282
26
#endif
2283
27
}
2284
0
28
2285
=== modified file 'tests/remote-client-v1/remote-client-v1_test.cpp'
2286
--- tests/remote-client-v1/remote-client-v1_test.cpp	2016-09-26 02:37:03 +0000
2287
+++ tests/remote-client-v1/remote-client-v1_test.cpp	2016-11-28 11:06:57 +0000
2288
@@ -56,7 +56,7 @@
2289
56
    void SetUp() override
56
    void SetUp() override
2290
57
    {
57
    {
2291
58
        dbus_.reset(new DBusEnvironment);
58
        dbus_.reset(new DBusEnvironment);
2293
59
        dbus_->add_demo_provider("google-drive-scope");
59
        dbus_->add_demo_provider("storage-provider-test");
2294
60
        dbus_->start_services();
60
        dbus_->start_services();
2295
61
    }
61
    }
2296
62
62
2297
@@ -150,7 +150,7 @@
2298
150
    }
150
    }
2299
151
    for (auto acc : accounts)
151
    for (auto acc : accounts)
2300
152
    {
152
    {
2302
153
        if (acc->owner_id() == "google-drive-scope")
153
        if (acc->owner_id() == "storage-provider-test")
2303
154
        {
154
        {
2304
155
            return acc;
155
            return acc;
2305
156
        }
156
        }
2306
@@ -198,8 +198,8 @@
2307
198
    auto acc = get_account(runtime);
198
    auto acc = get_account(runtime);
2308
199
    EXPECT_EQ(runtime, acc->runtime());
199
    EXPECT_EQ(runtime, acc->runtime());
2309
200
    EXPECT_EQ("", acc->owner());
200
    EXPECT_EQ("", acc->owner());
2312
201
    EXPECT_EQ("google-drive-scope", acc->owner_id());
201
    EXPECT_EQ("storage-provider-test", acc->owner_id());
2313
202
    EXPECT_EQ("Fake google account", acc->description());
202
    EXPECT_EQ("Fake test account", acc->description());
2314
203
}
203
}
2315
204
204
2316
205
TEST_F(RuntimeTest, roots)
205
TEST_F(RuntimeTest, roots)
2317
206
206
2318
=== modified file 'tests/remote-client/CMakeLists.txt'
2319
--- tests/remote-client/CMakeLists.txt	2016-09-08 08:33:59 +0000
2320
+++ tests/remote-client/CMakeLists.txt	2016-11-28 11:06:57 +0000
2321
@@ -15,6 +15,6 @@
2322
15
    gtest
15
    gtest
2323
16
)
16
)
2324
17
add_test(remote-client remote-client_test)
17
add_test(remote-client remote-client_test)
2326
18
add_dependencies(remote-client_test qt-client-all-headers provider-test)
18
add_dependencies(remote-client_test qt-client-all-headers storage-framework-registry)
2327
19
19
2328
20
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
20
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
2329
21
21
2330
=== modified file 'tests/remote-client/remote-client_test.cpp'
2331
--- tests/remote-client/remote-client_test.cpp	2016-11-25 23:42:08 +0000
2332
+++ tests/remote-client/remote-client_test.cpp	2016-11-28 11:06:57 +0000
2333
@@ -125,77 +125,77 @@
2334
125
125
2335
126
    {
126
    {
2336
127
        auto acc = runtime_->make_test_account(service_connection_->baseService(), object_path(),
127
        auto acc = runtime_->make_test_account(service_connection_->baseService(), object_path(),
2338
128
                                               "id", "sid", "displayName");
128
                                               99, "sid", "name");
2339
129
        EXPECT_TRUE(acc.isValid());
129
        EXPECT_TRUE(acc.isValid());
2340
130
        EXPECT_EQ(service_connection_->baseService(), acc.busName());
130
        EXPECT_EQ(service_connection_->baseService(), acc.busName());
2341
131
        EXPECT_EQ(object_path(), acc.objectPath());
131
        EXPECT_EQ(object_path(), acc.objectPath());
2343
132
        EXPECT_EQ("displayName", acc.displayName());
132
        EXPECT_EQ("name", acc.displayName());
2344
133
133
2345
134
        // Copy constructor
134
        // Copy constructor
2346
135
        Account a2(acc);
135
        Account a2(acc);
2347
136
        EXPECT_TRUE(a2.isValid());
136
        EXPECT_TRUE(a2.isValid());
2348
137
        EXPECT_EQ(service_connection_->baseService(), a2.busName());
137
        EXPECT_EQ(service_connection_->baseService(), a2.busName());
2349
138
        EXPECT_EQ(object_path(), a2.objectPath());
138
        EXPECT_EQ(object_path(), a2.objectPath());
2351
139
        EXPECT_EQ("displayName", a2.displayName());
139
        EXPECT_EQ("name", a2.displayName());
2352
140
140
2353
141
        // Move constructor
141
        // Move constructor
2354
142
        Account a3(move(a2));
142
        Account a3(move(a2));
2355
143
        EXPECT_TRUE(a3.isValid());
143
        EXPECT_TRUE(a3.isValid());
2356
144
        EXPECT_EQ(service_connection_->baseService(), a3.busName());
144
        EXPECT_EQ(service_connection_->baseService(), a3.busName());
2357
145
        EXPECT_EQ(object_path(), a3.objectPath());
145
        EXPECT_EQ(object_path(), a3.objectPath());
2359
146
        EXPECT_EQ("displayName", a3.displayName());
146
        EXPECT_EQ("name", a3.displayName());
2360
147
147
2361
148
        // Moved-from object must be invalid
148
        // Moved-from object must be invalid
2362
149
        EXPECT_FALSE(a2.isValid());
149
        EXPECT_FALSE(a2.isValid());
2363
150
150
2364
151
        // Moved-from object must be assignable
151
        // Moved-from object must be assignable
2365
152
        auto a4 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
152
        auto a4 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
2367
153
                                              "id4", "sid4", "displayName4");
153
                                              99, "sid4", "name4");
2368
154
        a2 = a4;
154
        a2 = a4;
2369
155
        EXPECT_TRUE(a2.isValid());
155
        EXPECT_TRUE(a2.isValid());
2370
156
        EXPECT_EQ(service_connection_->baseService(), a2.busName());
156
        EXPECT_EQ(service_connection_->baseService(), a2.busName());
2371
157
        EXPECT_EQ(object_path(), a2.objectPath());
157
        EXPECT_EQ(object_path(), a2.objectPath());
2373
158
        EXPECT_EQ("displayName4", a2.displayName());
158
        EXPECT_EQ("name4", a2.displayName());
2374
159
    }
159
    }
2375
160
160
2376
161
    {
161
    {
2379
162
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "id", "sid", "dn");
162
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 99, "sid", "dn");
2380
163
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "id2", "sid2", "dn2");
163
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 100, "sid2", "n2");
2381
164
164
2382
165
        // Copy assignment
165
        // Copy assignment
2383
166
        a1 = a2;
166
        a1 = a2;
2384
167
        EXPECT_TRUE(a2.isValid());
167
        EXPECT_TRUE(a2.isValid());
2385
168
        EXPECT_EQ(service_connection_->baseService(), a1.busName());
168
        EXPECT_EQ(service_connection_->baseService(), a1.busName());
2386
169
        EXPECT_EQ(object_path(), a1.objectPath());
169
        EXPECT_EQ(object_path(), a1.objectPath());
2388
170
        EXPECT_EQ("dn2", a1.displayName());
170
        EXPECT_EQ("n2", a1.displayName());
2389
171
171
2390
172
        // Self-assignment
172
        // Self-assignment
2391
173
        a2 = a2;
173
        a2 = a2;
2392
174
        EXPECT_TRUE(a2.isValid());
174
        EXPECT_TRUE(a2.isValid());
2393
175
        EXPECT_EQ(service_connection_->baseService(), a1.busName());
175
        EXPECT_EQ(service_connection_->baseService(), a1.busName());
2394
176
        EXPECT_EQ(object_path(), a1.objectPath());
176
        EXPECT_EQ(object_path(), a1.objectPath());
2396
177
        EXPECT_EQ("dn2", a1.displayName());
177
        EXPECT_EQ("n2", a1.displayName());
2397
178
178
2398
179
        // Move assignment
179
        // Move assignment
2399
180
        auto a3 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
180
        auto a3 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
2401
181
                                              "id3", "sid3", "dn3");
181
                                              101, "sid3", "n3");
2402
182
        a1 = move(a3);
182
        a1 = move(a3);
2403
183
        EXPECT_TRUE(a1.isValid());
183
        EXPECT_TRUE(a1.isValid());
2404
184
        EXPECT_EQ(service_connection_->baseService(), a1.busName());
184
        EXPECT_EQ(service_connection_->baseService(), a1.busName());
2405
185
        EXPECT_EQ(object_path(), a1.objectPath());
185
        EXPECT_EQ(object_path(), a1.objectPath());
2407
186
        EXPECT_EQ("dn3", a1.displayName());
186
        EXPECT_EQ("n3", a1.displayName());
2408
187
187
2409
188
        // Moved-from object must be invalid
188
        // Moved-from object must be invalid
2410
189
        EXPECT_FALSE(a3.isValid());
189
        EXPECT_FALSE(a3.isValid());
2411
190
190
2412
191
        // Moved-from object must be assignable
191
        // Moved-from object must be assignable
2413
192
        auto a4 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
192
        auto a4 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
2415
193
                                              "id4", "sid4", "dn4");
193
                                              102, "sid4", "n4");
2416
194
        a2 = a4;
194
        a2 = a4;
2417
195
        EXPECT_TRUE(a2.isValid());
195
        EXPECT_TRUE(a2.isValid());
2418
196
        EXPECT_EQ(service_connection_->baseService(), a2.busName());
196
        EXPECT_EQ(service_connection_->baseService(), a2.busName());
2419
197
        EXPECT_EQ(object_path(), a2.objectPath());
197
        EXPECT_EQ(object_path(), a2.objectPath());
2421
198
        EXPECT_EQ("dn4", a2.displayName());
198
        EXPECT_EQ("n4", a2.displayName());
2422
199
    }
199
    }
2423
200
}
200
}
2424
201
201
2425
@@ -235,8 +235,8 @@
2426
235
235
2427
236
    {
236
    {
2428
237
        // a1 < a2 for ID
237
        // a1 < a2 for ID
2431
238
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "x", "x");
238
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "x", "x");
2432
239
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "b", "x", "x");
239
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 2, "x", "x");
2433
240
240
2434
241
        EXPECT_FALSE(a1 == a2);
241
        EXPECT_FALSE(a1 == a2);
2435
242
        EXPECT_TRUE(a1 != a2);
242
        EXPECT_TRUE(a1 != a2);
2436
@@ -256,8 +256,8 @@
2437
256
256
2438
257
    {
257
    {
2439
258
        // a1 < a2 for service ID
258
        // a1 < a2 for service ID
2442
259
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "x");
259
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "x");
2443
260
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "b", "x");
260
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "b", "x");
2444
261
261
2445
262
        EXPECT_FALSE(a1 == a2);
262
        EXPECT_FALSE(a1 == a2);
2446
263
        EXPECT_TRUE(a1 != a2);
263
        EXPECT_TRUE(a1 != a2);
2447
@@ -277,8 +277,8 @@
2448
277
277
2449
278
    {
278
    {
2450
279
        // a1 < a2 for display name
279
        // a1 < a2 for display name
2453
280
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
280
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
2454
281
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "b");
281
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "b");
2455
282
282
2456
283
        EXPECT_FALSE(a1 == a2);
283
        EXPECT_FALSE(a1 == a2);
2457
284
        EXPECT_TRUE(a1 != a2);
284
        EXPECT_TRUE(a1 != a2);
2458
@@ -298,8 +298,8 @@
2459
298
298
2460
299
    {
299
    {
2461
300
        // a1 == a2
300
        // a1 == a2
2464
301
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
301
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
2465
302
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
302
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
2466
303
303
2467
304
        EXPECT_TRUE(a1 == a2);
304
        EXPECT_TRUE(a1 == a2);
2468
305
        EXPECT_FALSE(a1 != a2);
305
        EXPECT_FALSE(a1 != a2);
2469
@@ -327,7 +327,7 @@
2470
327
    EXPECT_EQ(0u, a1.hash());
327
    EXPECT_EQ(0u, a1.hash());
2471
328
    EXPECT_EQ(0u, qHash(a1));
328
    EXPECT_EQ(0u, qHash(a1));
2472
329
329
2474
330
    auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
330
    auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
2475
331
    // Due to different return types (size_t vs uint), hash() and qHash() do not return the same value.
331
    // Due to different return types (size_t vs uint), hash() and qHash() do not return the same value.
2476
332
    EXPECT_NE(0u, a2.hash());
332
    EXPECT_NE(0u, a2.hash());
2477
333
    EXPECT_NE(0u, qHash(a2));
333
    EXPECT_NE(0u, qHash(a2));
2478
@@ -351,17 +351,29 @@
2479
351
    EXPECT_EQ(AccountsJob::Status::Finished, j->status());
351
    EXPECT_EQ(AccountsJob::Status::Finished, j->status());
2480
352
    EXPECT_EQ(StorageError::Type::NoError, j->error().type());
352
    EXPECT_EQ(StorageError::Type::NoError, j->error().type());
2481
353
353
2482
354
    EXPECT_TRUE(runtime_->connection().isConnected());  // Just for coverage.
2483
355
2484
356
    auto accounts = j->accounts();
354
    auto accounts = j->accounts();
2485
355
    EXPECT_GT(accounts.size(), 0);
2486
357
356
2490
358
    // We don't check the contents of accounts here because we are using the real online accounts manager
357
    // The fake online accounts service includes a "com.canonical.StorageFramework.Provider.ProviderTest" account.
2491
359
    // in this test. This means that the number and kind of accounts that are returned depends
358
    bool found = false;
2492
360
    // on what provider accounts the test user has configured.
359
    for (auto const& a : accounts)
2493
360
    {
2494
361
        qDebug() << a.busName();
2495
362
        if (a.busName() == "com.canonical.StorageFramework.Provider.ProviderTest")
2496
363
        {
2497
364
            found = true;
2498
365
            EXPECT_EQ("Test Provider", a.providerName());
2499
366
            // TODO: add tests for the other account properties.
2500
367
            break;
2501
368
        }
2502
369
    }
2503
370
    EXPECT_TRUE(found);
2504
361
}
371
}
2505
362
372
2506
363
TEST_F(AccountTest, runtime_destroyed)
373
TEST_F(AccountTest, runtime_destroyed)
2507
364
{
374
{
2508
375
    EXPECT_TRUE(runtime_->connection().isConnected());  // Just for coverage.
2509
376
2510
365
    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime.
377
    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime.
2511
366
378
2512
367
    AccountsJob* j = runtime_->accounts();
379
    AccountsJob* j = runtime_->accounts();
2513
@@ -1189,8 +1201,8 @@
2514
1189
    {
1201
    {
2515
1190
        // Both items valid with identical metadata, but different accounts (a1 < a2).
1202
        // Both items valid with identical metadata, but different accounts (a1 < a2).
2516
1191
1203
2519
1192
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "x", "x");
1204
        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "x", "x");
2520
1193
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "b", "x", "x");
1205
        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 2, "x", "x");
2521
1194
1206
2522
1195
        Item i1;
1207
        Item i1;
2523
1196
        Item i2;
1208
        Item i2;
2524
@@ -1666,11 +1678,12 @@
2525
1666
{
1678
{
2526
1667
    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
1679
    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
2527
1668
1680
2529
1669
    auto test_account = runtime_->make_test_account(service_connection_->baseService(), object_path(), "test_account");
1681
    auto acc1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1);
2530
1682
    auto acc2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 2);
2531
1670
1683
2532
1671
    Item root1;
1684
    Item root1;
2533
1672
    {
1685
    {
2535
1673
        unique_ptr<ItemJob> j(test_account.get("root_id"));
1686
        unique_ptr<ItemJob> j(acc1.get("root_id"));
2536
1674
        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
1687
        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
2537
1675
        spy.wait(SIGNAL_WAIT_TIME);
1688
        spy.wait(SIGNAL_WAIT_TIME);
2538
1676
        root1 = j->item();
1689
        root1 = j->item();
2539
@@ -1679,7 +1692,7 @@
2540
1679
1692
2541
1680
    Item root2;
1693
    Item root2;
2542
1681
    {
1694
    {
2544
1682
        unique_ptr<ItemJob> j(acc_.get("root_id"));
1695
        unique_ptr<ItemJob> j(acc2.get("root_id"));
2545
1683
        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
1696
        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
2546
1684
        spy.wait(SIGNAL_WAIT_TIME);
1697
        spy.wait(SIGNAL_WAIT_TIME);
2547
1685
        root2 = j->item();
1698
        root2 = j->item();
2548
@@ -1688,7 +1701,7 @@
2549
1688
1701
2550
1689
    Item child;
1702
    Item child;
2551
1690
    {
1703
    {
2553
1691
        unique_ptr<ItemJob> j(acc_.get("child_id"));
1704
        unique_ptr<ItemJob> j(acc2.get("child_id"));
2554
1692
        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
1705
        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
2555
1693
        spy.wait(SIGNAL_WAIT_TIME);
1706
        spy.wait(SIGNAL_WAIT_TIME);
2556
1694
        child = j->item();
1707
        child = j->item();
2557
1695
1708
2558
=== modified file 'tests/utils/DBusEnvironment.cpp'
2559
--- tests/utils/DBusEnvironment.cpp	2016-08-04 10:12:01 +0000
2560
+++ tests/utils/DBusEnvironment.cpp	2016-11-28 11:06:57 +0000
2561
@@ -17,6 +17,7 @@
2562
17
 */
17
 */
2563
18
18
2564
19
#include "DBusEnvironment.h"
19
#include "DBusEnvironment.h"
2565
20
#include <unity/storage/registry/Registry.h>
2566
20
21
2567
21
#include <testsetup.h>
22
#include <testsetup.h>
2568
22
23
2569
@@ -27,6 +28,9 @@
2570
27
char const ACCOUNTS_BUS_NAME[] = "com.ubuntu.OnlineAccounts.Manager";
28
char const ACCOUNTS_BUS_NAME[] = "com.ubuntu.OnlineAccounts.Manager";
2571
28
char const FAKE_ACCOUNTS_SERVICE[] = TEST_SRC_DIR "/utils/fake-online-accounts-daemon.py";
29
char const FAKE_ACCOUNTS_SERVICE[] = TEST_SRC_DIR "/utils/fake-online-accounts-daemon.py";
2572
29
30
2573
31
char const REGISTRY_TEST_BUS_NAME[] = "com.ubuntu.StorageFramework.TestRegistry";
2574
32
char const REGISTRY_SERVICE[] = TEST_BIN_DIR "/../src/registry/storage-framework-registry";
2575
33
2576
30
char const DEMO_PROVIDER_BUS_NAME[] = "com.canonical.StorageFramework.Provider.ProviderTest";
34
char const DEMO_PROVIDER_BUS_NAME[] = "com.canonical.StorageFramework.Provider.ProviderTest";
2577
31
char const DEMO_PROVIDER_SERVICE[] = TEST_BIN_DIR "/../demo/provider_test/provider-test";
35
char const DEMO_PROVIDER_SERVICE[] = TEST_BIN_DIR "/../demo/provider_test/provider-test";
2578
32
}
36
}
2579
@@ -38,6 +42,11 @@
2580
38
                                ACCOUNTS_BUS_NAME, QDBusConnection::SessionBus,
42
                                ACCOUNTS_BUS_NAME, QDBusConnection::SessionBus,
2581
39
                                FAKE_ACCOUNTS_SERVICE, {}));
43
                                FAKE_ACCOUNTS_SERVICE, {}));
2582
40
    runner_->registerService(accounts_service_);
44
    runner_->registerService(accounts_service_);
2583
45
2584
46
    registry_service_.reset(new QtDBusTest::QProcessDBusService(
2585
47
                                unity::storage::registry::BUS_NAME, QDBusConnection::SessionBus,
2586
48
                                REGISTRY_SERVICE, {}));
2587
49
    runner_->registerService(registry_service_);
2588
41
}
50
}
2589
42
51
2590
43
DBusEnvironment::~DBusEnvironment()
52
DBusEnvironment::~DBusEnvironment()
2591
44
53
2592
=== modified file 'tests/utils/DBusEnvironment.h'
2593
--- tests/utils/DBusEnvironment.h	2016-08-04 10:12:01 +0000
2594
+++ tests/utils/DBusEnvironment.h	2016-11-28 11:06:57 +0000
2595
@@ -45,5 +45,6 @@
2596
45
private:
45
private:
2597
46
    std::unique_ptr<QtDBusTest::DBusTestRunner> runner_;
46
    std::unique_ptr<QtDBusTest::DBusTestRunner> runner_;
2598
47
    QSharedPointer<QtDBusTest::QProcessDBusService> accounts_service_;
47
    QSharedPointer<QtDBusTest::QProcessDBusService> accounts_service_;
2599
48
    QSharedPointer<QtDBusTest::QProcessDBusService> registry_service_;
2600
48
    QSharedPointer<QtDBusTest::QProcessDBusService> demo_provider_;
49
    QSharedPointer<QtDBusTest::QProcessDBusService> demo_provider_;
2601
49
};
50
};
2602
50
51
2603
=== modified file 'tests/utils/fake-online-accounts-daemon.py'
2604
--- tests/utils/fake-online-accounts-daemon.py	2016-11-16 06:08:56 +0000
2605
+++ tests/utils/fake-online-accounts-daemon.py	2016-11-28 11:06:57 +0000
2606
@@ -86,16 +86,16 @@
2607
86
        }, signature="sv")
86
        }, signature="sv")
2608
87
87
2609
88
class Account:
88
class Account:
2611
89
    def __init__(self, account_id, display_name, service_id, credentials, settings=None):
89
    def __init__(self, account_id, name, service_id, credentials, settings=None):
2612
90
        self.account_id = account_id
90
        self.account_id = account_id
2614
91
        self.display_name = display_name
91
        self.name = name
2615
92
        self.service_id = service_id
92
        self.service_id = service_id
2616
93
        self.credentials = credentials
93
        self.credentials = credentials
2617
94
        self.settings = settings
94
        self.settings = settings
2618
95
95
2619
96
    def serialise(self):
96
    def serialise(self):
2620
97
        account_info = dbus.Dictionary({
97
        account_info = dbus.Dictionary({
2622
98
            "displayName": dbus.String(self.display_name),
98
            "displayName": dbus.String(self.name),
2623
99
            "serviceId": dbus.String(self.service_id),
99
            "serviceId": dbus.String(self.service_id),
2624
100
            "authMethod": dbus.Int32(self.credentials.method),
100
            "authMethod": dbus.Int32(self.credentials.method),
2625
101
        }, signature="sv")
101
        }, signature="sv")
2626
@@ -174,8 +174,8 @@
2627
174
        Account(4, "Password host account", "password-host-service",
174
        Account(4, "Password host account", "password-host-service",
2628
175
                Password_Bug1628473("joe", "secret"),
175
                Password_Bug1628473("joe", "secret"),
2629
176
                {"host": "http://www.example.com/"}),
176
                {"host": "http://www.example.com/"}),
2632
177
        Account(42, "Fake google account", "google-drive-scope",
177
        Account(42, "Fake test account", "storage-provider-test",
2633
178
                OAuth2("fake-google-access-token", 0, [])),
178
                OAuth2("fake-test-access-token", 0, [])),
2634
179
        Account(99, "Fake mcloud account", "com.canonical.scopes.mcloud_mcloud_mcloud",
179
        Account(99, "Fake mcloud account", "com.canonical.scopes.mcloud_mcloud_mcloud",
2635
180
                OAuth2("fake-mcloud-access-token", 0, [])),
180
                OAuth2("fake-mcloud-access-token", 0, [])),
2636
181
    ]
181
    ]
Status:	Merged
Approved by:	James Henstridge on 2016-11-29
Approved revision:	122
Merged at revision:	99
Proposed branch:	lp:~michihenning/storage-framework/registry
Merge into:	lp:storage-framework/devel
Diff against target:	2636 lines (+1457/-276) 52 files modified CMakeLists.txt (+1/-0) data/registry.xml (+21/-24) debian/control (+12/-0) debian/control.in (+12/-0) debian/storage-framework-registry.install (+2/-0) demo/demo.qml (+1/-1) demo/provider_test/provider-test.cpp (+1/-1) include/unity/storage/internal/AccountDetails.h (+60/-0) include/unity/storage/internal/ActivityNotifier.h (+57/-0) include/unity/storage/internal/EnvVars.h (+51/-0) include/unity/storage/internal/InactivityTimer.h (+60/-0) include/unity/storage/internal/TraceMessageHandler.h (+3/-0) include/unity/storage/qt/Account.h (+4/-1) include/unity/storage/qt/AccountsJob.h (+2/-5) include/unity/storage/qt/Runtime.h (+3/-3) include/unity/storage/qt/internal/AccountImpl.h (+6/-19) include/unity/storage/qt/internal/AccountsJobImpl.h (+18/-10) include/unity/storage/qt/internal/Handler.h (+2/-2) include/unity/storage/qt/internal/RuntimeImpl.h (+7/-8) include/unity/storage/registry/Registry.h (+35/-0) include/unity/storage/registry/internal/ListAccountsHandler.h (+70/-0) include/unity/storage/registry/internal/RegistryAdaptor.h (+71/-0) include/unity/storage/registry/internal/qdbus-last-error-msg.h (+41/-0) src/CMakeLists.txt (+1/-0) src/internal/AccountDetails.cpp (+108/-0) src/internal/CMakeLists.txt (+8/-0) src/internal/EnvVars.cpp (+81/-0) src/internal/InactivityTimer.cpp (+82/-0) src/internal/TraceMessageHandler.cpp (+20/-3) src/qt/Account.cpp (+10/-0) src/qt/AccountsJob.cpp (+2/-8) src/qt/CMakeLists.txt (+10/-3) src/qt/Runtime.cpp (+4/-4) src/qt/client/internal/remote_client/RuntimeImpl.cpp (+1/-1) src/qt/internal/AccountImpl.cpp (+25/-48) src/qt/internal/AccountsJobImpl.cpp (+50/-69) src/qt/internal/RuntimeImpl.cpp (+24/-22) src/registry/CMakeLists.txt (+47/-0) src/registry/com.canonical.StorageFramework.Registry.service.in (+3/-0) src/registry/internal/ListAccountsHandler.cpp (+127/-0) src/registry/internal/RegistryAdaptor.cpp (+55/-0) src/registry/internal/qdbus-last-error-msg.cpp (+49/-0) src/registry/main.cpp (+95/-0) tests/CMakeLists.txt (+1/-0) tests/registry/CMakeLists.txt (+20/-0) tests/registry/registry_test.cpp (+27/-0) tests/remote-client-v1/remote-client-v1_test.cpp (+4/-4) tests/remote-client/CMakeLists.txt (+1/-1) tests/remote-client/remote-client_test.cpp (+47/-34) tests/utils/DBusEnvironment.cpp (+9/-0) tests/utils/DBusEnvironment.h (+1/-0) tests/utils/fake-online-accounts-daemon.py (+5/-5)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/registry
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
James Henstridge		2016-11-08	Approve on 2016-11-29
unity-api-1-bot	continuous-integration		Approve on 2016-11-28
Review via email: mp+310254@code.launchpad.net