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