1
=== modified file 'data/provider.xml'
2
--- data/provider.xml	2016-08-11 01:56:11 +0000
3
+++ data/provider.xml	2016-11-02 04:28:58 +0000
4
@@ -16,11 +16,21 @@
5
16
16
6
17
      Note that parent_ids is a sequence of IDs instead of a single ID to allow the client to
17
      Note that parent_ids is a sequence of IDs instead of a single ID to allow the client to
7
18
      navigate items in Google Drive, which permits more than one parent for a file or folder.
18
      navigate items in Google Drive, which permits more than one parent for a file or folder.
8
19
9
20
      The metadata_keys parameter allows the caller to select which metadata values should be returned
10
21
      for an item. If the list is empty, the provider will return a "reasonable" default set of metadata
11
22
      values. (Note that this may not be the same set for each provider.) If the caller specifies one or
12
23
      more keys, the provider will return the requested values. Note that not all providers may support
13
24
      all values, so some of the requested values may be missing. Also, providers are free to return
14
25
      additional values that were not requested.
15
26
      Passing a single-element list with the value "__ALL__" indicates that the provider should return
16
27
      all available metadata.
17
19
  -->
28
  -->
18
20
  <interface name="com.canonical.StorageFramework.Provider">
29
  <interface name="com.canonical.StorageFramework.Provider">
19
21
    <!--
30
    <!--
20
22
        Roots:
31
        Roots:
21
23
        @short_description: Get the list of roots for the storage account
32
        @short_description: Get the list of roots for the storage account
22
33
        @metadata_keys: what metadata to return for the roots
23
24
        @roots: Returned list of roots.
34
        @roots: Returned list of roots.
24
25
35
25
26
        Returns the list of top level root items provided by the
36
        Returns the list of top level root items provided by the
26
@@ -28,6 +38,7 @@
27
28
        of files, this list will contain a single item.
38
        of files, this list will contain a single item.
28
29
    -->
39
    -->
29
30
    <method name="Roots">
40
    <method name="Roots">
30
41
      <arg type="as" name="metadata_keys" direction="in"/>
31
31
      <arg type="a(sasssia{sv})" name="roots" direction="out"/>
42
      <arg type="a(sasssia{sv})" name="roots" direction="out"/>
32
32
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
43
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
33
33
    </method>
44
    </method>
34
@@ -37,6 +48,7 @@
35
37
        @short_description: list the children of the given folder
48
        @short_description: list the children of the given folder
36
38
        @item_id: the ID identifying the folder
49
        @item_id: the ID identifying the folder
37
39
        @page_token: if not empty, return the page of results identified by this token.
50
        @page_token: if not empty, return the page of results identified by this token.
38
51
        @metadata_keys: what metadata to return for the children
39
40
        @children: returned list of children
52
        @children: returned list of children
40
41
        @next_token: if not empty, a token that can be used to request more results.
53
        @next_token: if not empty, a token that can be used to request more results.
41
42
54
42
@@ -48,6 +60,7 @@
43
48
    <method name="List">
60
    <method name="List">
44
49
      <arg type="s" name="item_id" direction="in"/>
61
      <arg type="s" name="item_id" direction="in"/>
45
50
      <arg type="s" name="page_token" direction="in"/>
62
      <arg type="s" name="page_token" direction="in"/>
46
63
      <arg type="as" name="metadata_keys" direction="in"/>
47
51
      <arg type="a(sasssia{sv})" name="children" direction="out"/>
64
      <arg type="a(sasssia{sv})" name="children" direction="out"/>
48
52
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
65
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
49
53
      <arg type="s" name="next_token" direction="out"/>
66
      <arg type="s" name="next_token" direction="out"/>
50
@@ -58,11 +71,13 @@
51
58
        @short_description: lookup a child in a folder by name
71
        @short_description: lookup a child in a folder by name
52
59
        @parent_id: the ID of the parent folder
72
        @parent_id: the ID of the parent folder
53
60
        @name: the name of the child
73
        @name: the name of the child
54
74
        @metadata_keys: what metadata to return for the item(s)
55
61
        @items: the matching items in the folder
75
        @items: the matching items in the folder
56
62
    -->
76
    -->
57
63
    <method name="Lookup">
77
    <method name="Lookup">
58
64
      <arg type="s" name="parent_id" direction="in"/>
78
      <arg type="s" name="parent_id" direction="in"/>
59
65
      <arg type="s" name="name" direction="in"/>
79
      <arg type="s" name="name" direction="in"/>
60
80
      <arg type="as" name="metadata_keys" direction="in"/>
61
66
      <arg type="a(sasssia{sv})" name="items" direction="out"/>
81
      <arg type="a(sasssia{sv})" name="items" direction="out"/>
62
67
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
82
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
63
68
    </method>
83
    </method>
64
@@ -71,10 +86,12 @@
65
71
        Metadata:
86
        Metadata:
66
72
        @short_description: get metadata for an item
87
        @short_description: get metadata for an item
67
73
        @item_id: the ID of the item
88
        @item_id: the ID of the item
68
89
        @metadata_keys: what metadata to return for the item
69
74
        @metadata: the item metadata
90
        @metadata: the item metadata
70
75
    -->
91
    -->
71
76
    <method name="Metadata">
92
    <method name="Metadata">
72
77
      <arg type="s" name="item_id" direction="in"/>
93
      <arg type="s" name="item_id" direction="in"/>
73
94
      <arg type="as" name="metadata_keys" direction="in"/>
74
78
      <arg type="(sasssia{sv})" name="metadata" direction="out"/>
95
      <arg type="(sasssia{sv})" name="metadata" direction="out"/>
75
79
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
96
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
76
80
    </method>
97
    </method>
77
@@ -84,11 +101,13 @@
78
84
        @short_description: create a new folder
101
        @short_description: create a new folder
79
85
        @parent_id: the ID of the parent folder
102
        @parent_id: the ID of the parent folder
80
86
        @name: the name of the new folder
103
        @name: the name of the new folder
81
104
        @metadata_keys: what metadata to return for the new folder
82
87
        @metadata: the metadata for the new folder
105
        @metadata: the metadata for the new folder
83
88
    -->
106
    -->
84
89
    <method name="CreateFolder">
107
    <method name="CreateFolder">
85
90
      <arg type="s" name="parent_id" direction="in"/>
108
      <arg type="s" name="parent_id" direction="in"/>
86
91
      <arg type="s" name="name" direction="in"/>
109
      <arg type="s" name="name" direction="in"/>
87
110
      <arg type="as" name="metadata_keys" direction="in"/>
88
92
      <arg type="(sasssia{sv})" name="metadata" direction="out"/>
111
      <arg type="(sasssia{sv})" name="metadata" direction="out"/>
89
93
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
112
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
90
94
    </method>
113
    </method>
91
@@ -102,6 +121,7 @@
92
102
        @content_type: the content type of the new file
121
        @content_type: the content type of the new file
93
103
        @allow_overwrite: if false, the file creation will fail if it
122
        @allow_overwrite: if false, the file creation will fail if it
94
104
        would overwrite an existing file.
123
        would overwrite an existing file.
95
124
        @metadata_keys: what metadata to return for the new file
96
105
        @upload_id: the identifier for this upload job
125
        @upload_id: the identifier for this upload job
97
106
        @file_descriptor: a file descriptor to write the file contents to
126
        @file_descriptor: a file descriptor to write the file contents to
98
107
127
99
@@ -116,6 +136,7 @@
100
116
      <arg type="x" name="size" direction="in"/>
136
      <arg type="x" name="size" direction="in"/>
101
117
      <arg type="s" name="content_type" direction="in"/>
137
      <arg type="s" name="content_type" direction="in"/>
102
118
      <arg type="b" name="allow_overwrite" direction="in"/>
138
      <arg type="b" name="allow_overwrite" direction="in"/>
103
139
      <arg type="as" name="metadata_keys" direction="in"/>
104
119
      <arg type="s" name="upload_id" direction="out"/>
140
      <arg type="s" name="upload_id" direction="out"/>
105
120
      <arg type="h" name="file_descriptor" direction="out"/>
141
      <arg type="h" name="file_descriptor" direction="out"/>
106
121
    </method>
142
    </method>
107
@@ -127,6 +148,7 @@
108
127
        @size: the size of the upload
148
        @size: the size of the upload
109
128
        @old_etag: if not empty, the expected etag of the old version
149
        @old_etag: if not empty, the expected etag of the old version
110
129
        of the file.
150
        of the file.
111
151
        @metadata_keys: what metadata to return for the updated file
112
130
        @upload_id: the identifier for this upload job
152
        @upload_id: the identifier for this upload job
113
131
        @file_descriptor: a file descriptor to write the file contents to
153
        @file_descriptor: a file descriptor to write the file contents to
114
132
154
115
@@ -144,6 +166,7 @@
116
144
      <arg type="s" name="item_id" direction="in"/>
166
      <arg type="s" name="item_id" direction="in"/>
117
145
      <arg type="x" name="size" direction="in"/>
167
      <arg type="x" name="size" direction="in"/>
118
146
      <arg type="s" name="old_etag" direction="in"/>
168
      <arg type="s" name="old_etag" direction="in"/>
119
169
      <arg type="as" name="metadata_keys" direction="in"/>
120
147
      <arg type="s" name="upload_id" direction="out"/>
170
      <arg type="s" name="upload_id" direction="out"/>
121
148
      <arg type="h" name="file_descriptor" direction="out"/>
171
      <arg type="h" name="file_descriptor" direction="out"/>
122
149
    </method>
172
    </method>
123
@@ -233,12 +256,14 @@
124
233
        @item_id: the ID for the item
256
        @item_id: the ID for the item
125
234
        @new_parent_id: the ID for the new parent folder
257
        @new_parent_id: the ID for the new parent folder
126
235
        @new_name: the new name for the item
258
        @new_name: the new name for the item
127
259
        @metadata_keys: what metadata to return for the moved item
128
236
        @metadata: the metadata for the file in the new location
260
        @metadata: the metadata for the file in the new location
129
237
    -->
261
    -->
130
238
    <method name="Move">
262
    <method name="Move">
131
239
      <arg type="s" name="item_id" direction="in"/>
263
      <arg type="s" name="item_id" direction="in"/>
132
240
      <arg type="s" name="new_parent_id" direction="in"/>
264
      <arg type="s" name="new_parent_id" direction="in"/>
133
241
      <arg type="s" name="new_name" direction="in"/>
265
      <arg type="s" name="new_name" direction="in"/>
134
266
      <arg type="as" name="metadata_keys" direction="in"/>
135
242
      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
267
      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
136
243
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
268
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
137
244
    </method>
269
    </method>
138
@@ -249,12 +274,14 @@
139
249
        @item_id: the ID for the item
274
        @item_id: the ID for the item
140
250
        @new_parent_id: the ID for the new parent folder
275
        @new_parent_id: the ID for the new parent folder
141
251
        @new_name: the new name for the item
276
        @new_name: the new name for the item
142
277
        @metadata_keys: what metadata to return for the copied item
143
252
        @metadata: the metadata for the file in the new location
278
        @metadata: the metadata for the file in the new location
144
253
    -->
279
    -->
145
254
    <method name="Copy">
280
    <method name="Copy">
146
255
      <arg type="s" name="item_id" direction="in"/>
281
      <arg type="s" name="item_id" direction="in"/>
147
256
      <arg type="s" name="new_parent_id" direction="in"/>
282
      <arg type="s" name="new_parent_id" direction="in"/>
148
257
      <arg type="s" name="new_name" direction="in"/>
283
      <arg type="s" name="new_name" direction="in"/>
149
284
      <arg type="as" name="metadata_keys" direction="in"/>
150
258
      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
285
      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
151
259
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
286
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
152
260
    </method>
287
    </method>
153
261
288
154
=== modified file 'demo/provider_test/provider-test.cpp'
155
--- demo/provider_test/provider-test.cpp	2016-09-03 00:53:43 +0000
156
+++ demo/provider_test/provider-test.cpp	2016-11-02 04:28:58 +0000
157
@@ -42,25 +42,25 @@
158
42
public:
42
public:
159
43
    MyProvider();
43
    MyProvider();
160
44
44
162
45
    boost::future<ItemList> roots(Context const& ctx) override;
45
    boost::future<ItemList> roots(vector<string> const& keys, Context const& ctx) override;
163
46
    boost::future<tuple<ItemList,string>> list(
46
    boost::future<tuple<ItemList,string>> list(
165
47
        string const& item_id, string const& page_token,
47
        string const& item_id, string const& page_token, vector<string> const& keys,
166
48
        Context const& ctx) override;
48
        Context const& ctx) override;
167
49
    boost::future<ItemList> lookup(
49
    boost::future<ItemList> lookup(
169
50
        string const& parent_id, string const& name,
50
        string const& parent_id, string const& name, vector<string> const& keys,
170
51
        Context const& ctx) override;
51
        Context const& ctx) override;
171
52
    boost::future<Item> metadata(
52
    boost::future<Item> metadata(
173
53
        string const& item_id, Context const& ctx) override;
53
        string const& item_id, vector<string> const& keys, Context const& ctx) override;
174
54
    boost::future<Item> create_folder(
54
    boost::future<Item> create_folder(
176
55
        string const& parent_id, string const& name,
55
        string const& parent_id, string const& name, vector<string> const& keys,
177
56
        Context const& ctx) override;
56
        Context const& ctx) override;
178
57
57
179
58
    boost::future<unique_ptr<UploadJob>> create_file(
58
    boost::future<unique_ptr<UploadJob>> create_file(
180
59
        string const& parent_id, string const& name,
59
        string const& parent_id, string const& name,
182
60
        int64_t size, string const& content_type, bool allow_overwrite,
60
        int64_t size, string const& content_type, bool allow_overwrite, vector<string> const& keys,
183
61
        Context const& ctx) override;
61
        Context const& ctx) override;
184
62
    boost::future<unique_ptr<UploadJob>> update(
62
    boost::future<unique_ptr<UploadJob>> update(
186
63
        string const& item_id, int64_t size, string const& old_etag,
63
        string const& item_id, int64_t size, string const& old_etag, vector<string> const& keys,
187
64
        Context const& ctx) override;
64
        Context const& ctx) override;
188
65
65
189
66
    boost::future<unique_ptr<DownloadJob>> download(
66
    boost::future<unique_ptr<DownloadJob>> download(
190
@@ -70,10 +70,10 @@
191
70
        string const& item_id, Context const& ctx) override;
70
        string const& item_id, Context const& ctx) override;
192
71
    boost::future<Item> move(
71
    boost::future<Item> move(
193
72
        string const& item_id, string const& new_parent_id,
72
        string const& item_id, string const& new_parent_id,
195
73
        string const& new_name, Context const& ctx) override;
73
        string const& new_name, vector<string> const& keys, Context const& ctx) override;
196
74
    boost::future<Item> copy(
74
    boost::future<Item> copy(
197
75
        string const& item_id, string const& new_parent_id,
75
        string const& item_id, string const& new_parent_id,
199
76
        string const& new_name, Context const& ctx) override;
76
        string const& new_name, vector<string> const& keys, Context const& ctx) override;
200
77
};
77
};
201
78
78
202
79
class MyUploadJob : public TempfileUploadJob
79
class MyUploadJob : public TempfileUploadJob
203
@@ -98,7 +98,7 @@
204
98
{
98
{
205
99
}
99
}
206
100
100
208
101
boost::future<ItemList> MyProvider::roots(Context const& ctx)
101
boost::future<ItemList> MyProvider::roots(vector<string> const& keys, Context const& ctx)
209
102
{
102
{
210
103
    printf("roots() called by %s (%d)\n", ctx.security_label.c_str(), ctx.pid);
103
    printf("roots() called by %s (%d)\n", ctx.security_label.c_str(), ctx.pid);
211
104
    fflush(stdout);
104
    fflush(stdout);
212
@@ -109,7 +109,7 @@
213
109
}
109
}
214
110
110
215
111
boost::future<tuple<ItemList,string>> MyProvider::list(
111
boost::future<tuple<ItemList,string>> MyProvider::list(
217
112
    string const& item_id, string const& page_token,
112
    string const& item_id, string const& page_token, vector<string> const& keys,
218
113
    Context const& ctx)
113
    Context const& ctx)
219
114
{
114
{
220
115
    printf("list('%s', '%s') called by %s (%d)\n", item_id.c_str(), page_token.c_str(), ctx.security_label.c_str(), ctx.pid);
115
    printf("list('%s', '%s') called by %s (%d)\n", item_id.c_str(), page_token.c_str(), ctx.security_label.c_str(), ctx.pid);
221
@@ -137,7 +137,7 @@
222
137
}
137
}
223
138
138
224
139
boost::future<ItemList> MyProvider::lookup(
139
boost::future<ItemList> MyProvider::lookup(
226
140
    string const& parent_id, string const& name, Context const& ctx)
140
    string const& parent_id, string const& name, vector<string> const& keys, Context const& ctx)
227
141
{
141
{
228
142
    printf("lookup('%s', '%s') called by %s (%d)\n", parent_id.c_str(), name.c_str(), ctx.security_label.c_str(), ctx.pid);
142
    printf("lookup('%s', '%s') called by %s (%d)\n", parent_id.c_str(), name.c_str(), ctx.security_label.c_str(), ctx.pid);
229
143
    fflush(stdout);
143
    fflush(stdout);
230
@@ -160,6 +160,7 @@
231
160
}
160
}
232
161
161
233
162
boost::future<Item> MyProvider::metadata(string const& item_id,
162
boost::future<Item> MyProvider::metadata(string const& item_id,
234
163
                                         vector<string> const& keys,
235
163
                                         Context const& ctx)
164
                                         Context const& ctx)
236
164
{
165
{
237
165
    printf("metadata('%s') called by %s (%d)\n", item_id.c_str(), ctx.security_label.c_str(), ctx.pid);
166
    printf("metadata('%s') called by %s (%d)\n", item_id.c_str(), ctx.security_label.c_str(), ctx.pid);
238
@@ -187,7 +188,7 @@
239
187
}
188
}
240
188
189
241
189
boost::future<Item> MyProvider::create_folder(
190
boost::future<Item> MyProvider::create_folder(
243
190
    string const& parent_id, string const& name,
191
    string const& parent_id, string const& name, vector<string> const& keys,
244
191
    Context const& ctx)
192
    Context const& ctx)
245
192
{
193
{
246
193
    printf("create_folder('%s', '%s') called by %s (%d)\n", parent_id.c_str(), name.c_str(), ctx.security_label.c_str(), ctx.pid);
194
    printf("create_folder('%s', '%s') called by %s (%d)\n", parent_id.c_str(), name.c_str(), ctx.security_label.c_str(), ctx.pid);
247
@@ -204,7 +205,7 @@
248
204
205
249
205
boost::future<unique_ptr<UploadJob>> MyProvider::create_file(
206
boost::future<unique_ptr<UploadJob>> MyProvider::create_file(
250
206
    string const& parent_id, string const& name,
207
    string const& parent_id, string const& name,
252
207
    int64_t size, string const& content_type, bool allow_overwrite,
208
    int64_t size, string const& content_type, bool allow_overwrite, vector<string> const& keys,
253
208
    Context const& ctx)
209
    Context const& ctx)
254
209
{
210
{
255
210
    printf("create_file('%s', '%s', %" PRId64 ", '%s', %d) called by %s (%d)\n", parent_id.c_str(), name.c_str(), size, content_type.c_str(), allow_overwrite, ctx.security_label.c_str(), ctx.pid);
211
    printf("create_file('%s', '%s', %" PRId64 ", '%s', %d) called by %s (%d)\n", parent_id.c_str(), name.c_str(), size, content_type.c_str(), allow_overwrite, ctx.security_label.c_str(), ctx.pid);
256
@@ -213,7 +214,7 @@
257
213
}
214
}
258
214
215
259
215
boost::future<unique_ptr<UploadJob>> MyProvider::update(
216
boost::future<unique_ptr<UploadJob>> MyProvider::update(
261
216
    string const& item_id, int64_t size, string const& old_etag, Context const& ctx)
217
    string const& item_id, int64_t size, string const& old_etag, vector<string> const& keys, Context const& ctx)
262
217
{
218
{
263
218
    printf("update('%s', %" PRId64 ", '%s') called by %s (%d)\n", item_id.c_str(), size, old_etag.c_str(), ctx.security_label.c_str(), ctx.pid);
219
    printf("update('%s', %" PRId64 ", '%s') called by %s (%d)\n", item_id.c_str(), size, old_etag.c_str(), ctx.security_label.c_str(), ctx.pid);
264
219
    fflush(stdout);
220
    fflush(stdout);
265
@@ -248,7 +249,7 @@
266
248
249
267
249
boost::future<Item> MyProvider::move(
250
boost::future<Item> MyProvider::move(
268
250
    string const& item_id, string const& new_parent_id,
251
    string const& item_id, string const& new_parent_id,
270
251
    string const& new_name, Context const& ctx)
252
    string const& new_name, vector<string> const& keys, Context const& ctx)
271
252
{
253
{
272
253
    printf("move('%s', '%s', '%s') called by %s (%d)\n", item_id.c_str(), new_parent_id.c_str(), new_name.c_str(), ctx.security_label.c_str(), ctx.pid);
254
    printf("move('%s', '%s', '%s') called by %s (%d)\n", item_id.c_str(), new_parent_id.c_str(), new_name.c_str(), ctx.security_label.c_str(), ctx.pid);
273
254
    fflush(stdout);
255
    fflush(stdout);
274
@@ -258,7 +259,7 @@
275
258
259
276
259
boost::future<Item> MyProvider::copy(
260
boost::future<Item> MyProvider::copy(
277
260
    string const& item_id, string const& new_parent_id,
261
    string const& item_id, string const& new_parent_id,
279
261
    string const& new_name, Context const& ctx)
262
    string const& new_name, vector<string> const& keys, Context const& ctx)
280
262
{
263
{
281
263
    printf("copy('%s', '%s', '%s') called by %s (%d)\n", item_id.c_str(), new_parent_id.c_str(), new_name.c_str(), ctx.security_label.c_str(), ctx.pid);
264
    printf("copy('%s', '%s', '%s') called by %s (%d)\n", item_id.c_str(), new_parent_id.c_str(), new_name.c_str(), ctx.security_label.c_str(), ctx.pid);
282
264
    fflush(stdout);
265
    fflush(stdout);
283
265
266
284
=== modified file 'include/unity/storage/provider/ProviderBase.h'
285
--- include/unity/storage/provider/ProviderBase.h	2016-09-28 07:04:41 +0000
286
+++ include/unity/storage/provider/ProviderBase.h	2016-11-02 04:28:58 +0000
287
@@ -75,26 +75,27 @@
288
75
    ProviderBase(ProviderBase const& other) = delete;
75
    ProviderBase(ProviderBase const& other) = delete;
289
76
    ProviderBase& operator=(ProviderBase const& other) = delete;
76
    ProviderBase& operator=(ProviderBase const& other) = delete;
290
77
77
292
78
    virtual boost::future<ItemList> roots(Context const& context) = 0;
78
    virtual boost::future<ItemList> roots(std::vector<std::string> const& keys, Context const& context) = 0;
293
79
    virtual boost::future<std::tuple<ItemList,std::string>> list(
79
    virtual boost::future<std::tuple<ItemList,std::string>> list(
294
80
        std::string const& item_id, std::string const& page_token,
80
        std::string const& item_id, std::string const& page_token,
295
81
        std::vector<std::string> const& keys,
296
81
        Context const& context) = 0;
82
        Context const& context) = 0;
297
82
    virtual boost::future<ItemList> lookup(
83
    virtual boost::future<ItemList> lookup(
299
83
        std::string const& parent_id, std::string const& name,
84
        std::string const& parent_id, std::string const& name, std::vector<std::string> const& keys,
300
84
        Context const& context) = 0;
85
        Context const& context) = 0;
302
85
    virtual boost::future<Item> metadata(std::string const& item_id,
86
    virtual boost::future<Item> metadata(std::string const& item_id, std::vector<std::string> const& keys,
303
86
        Context const& context) = 0;
87
        Context const& context) = 0;
304
87
88
305
88
    virtual boost::future<Item> create_folder(
89
    virtual boost::future<Item> create_folder(
307
89
        std::string const& parent_id, std::string const& name,
90
        std::string const& parent_id, std::string const& name, std::vector<std::string> const& keys,
308
90
        Context const& context) = 0;
91
        Context const& context) = 0;
309
91
92
310
92
    virtual boost::future<std::unique_ptr<UploadJob>> create_file(
93
    virtual boost::future<std::unique_ptr<UploadJob>> create_file(
311
93
        std::string const& parent_id, std::string const& name,
94
        std::string const& parent_id, std::string const& name,
313
94
        int64_t size, std::string const& content_type, bool allow_overwrite,
95
        int64_t size, std::string const& content_type, bool allow_overwrite, std::vector<std::string> const& keys,
314
95
        Context const& context) = 0;
96
        Context const& context) = 0;
315
96
    virtual boost::future<std::unique_ptr<UploadJob>> update(
97
    virtual boost::future<std::unique_ptr<UploadJob>> update(
317
97
        std::string const& item_id, int64_t size, std::string const& old_etag,
98
        std::string const& item_id, int64_t size, std::string const& old_etag, std::vector<std::string> const& keys,
318
98
        Context const& context) = 0;
99
        Context const& context) = 0;
319
99
100
320
100
    virtual boost::future<std::unique_ptr<DownloadJob>> download(
101
    virtual boost::future<std::unique_ptr<DownloadJob>> download(
321
@@ -104,10 +105,10 @@
322
104
        std::string const& item_id, Context const& context) = 0;
105
        std::string const& item_id, Context const& context) = 0;
323
105
    virtual boost::future<Item> move(
106
    virtual boost::future<Item> move(
324
106
        std::string const& item_id, std::string const& new_parent_id,
107
        std::string const& item_id, std::string const& new_parent_id,
326
107
        std::string const& new_name, Context const& context) = 0;
108
        std::string const& new_name, std::vector<std::string> const& keys, Context const& context) = 0;
327
108
    virtual boost::future<Item> copy(
109
    virtual boost::future<Item> copy(
328
109
        std::string const& item_id, std::string const& new_parent_id,
110
        std::string const& item_id, std::string const& new_parent_id,
330
110
        std::string const& new_name, Context const& context) = 0;
111
        std::string const& new_name, std::vector<std::string> const& keys, Context const& context) = 0;
331
111
};
112
};
332
112
113
333
113
}
114
}
334
114
115
335
=== modified file 'include/unity/storage/provider/internal/ProviderInterface.h'
336
--- include/unity/storage/provider/internal/ProviderInterface.h	2016-08-25 23:56:02 +0000
337
+++ include/unity/storage/provider/internal/ProviderInterface.h	2016-11-02 04:28:58 +0000
338
@@ -59,20 +59,36 @@
339
59
    typedef unity::storage::internal::ItemMetadata IMD;  // To keep things readable
59
    typedef unity::storage::internal::ItemMetadata IMD;  // To keep things readable
340
60
60
341
61
public Q_SLOTS:
61
public Q_SLOTS:
349
62
    QList<IMD> Roots();
62
    QList<IMD> Roots(QList<QString> const& keys);
350
63
    QList<IMD> List(QString const& item_id, QString const& page_token, QString& next_token);
63
    QList<IMD> List(QString const& item_id, QString const& page_token, QList<QString> const& keys, QString& next_token);
351
64
    QList<IMD> Lookup(QString const& parent_id, QString const& name);
64
    QList<IMD> Lookup(QString const& parent_id, QString const& name, QList<QString> const& keys);
352
65
    IMD Metadata(QString const& item_id);
65
    IMD Metadata(QString const& item_id, QList<QString> const& keys);
353
66
    IMD CreateFolder(QString const& parent_id, QString const& name);
66
    IMD CreateFolder(QString const& parent_id, QString const& name, QList<QString> const& keys);
354
67
    QString CreateFile(QString const& parent_id, QString const& name, int64_t size, QString const& content_type, bool allow_overwrite, QDBusUnixFileDescriptor& file_descriptor);
67
    QString CreateFile(QString const& parent_id,
355
68
    QString Update(QString const& item_id, int64_t size, QString const& old_etag, QDBusUnixFileDescriptor& file_descriptor);
68
                       QString const& name,
356
69
                       int64_t size,
357
70
                       QString const& content_type,
358
71
                       bool allow_overwrite,
359
72
                       QList<QString> const& keys,
360
73
                       QDBusUnixFileDescriptor& file_descriptor);
361
74
    QString Update(QString const& item_id,
362
75
                   int64_t size,
363
76
                   QString const& old_etag,
364
77
                   QList<QString> const& keys,
365
78
                   QDBusUnixFileDescriptor& file_descriptor);
366
69
    IMD FinishUpload(QString const& upload_id);
79
    IMD FinishUpload(QString const& upload_id);
367
70
    void CancelUpload(QString const& upload_id);
80
    void CancelUpload(QString const& upload_id);
368
71
    QString Download(QString const& item_id, QDBusUnixFileDescriptor& file_descriptor);
81
    QString Download(QString const& item_id, QDBusUnixFileDescriptor& file_descriptor);
369
72
    void FinishDownload(QString const& download_id);
82
    void FinishDownload(QString const& download_id);
370
73
    void Delete(QString const& item_id);
83
    void Delete(QString const& item_id);
373
74
    IMD Move(QString const& item_id, QString const& new_parent_id, QString const& new_name);
84
    IMD Move(QString const& item_id,
374
75
    IMD Copy(QString const& item_id, QString const& new_parent_id, QString const& new_name);
85
             QString const& new_parent_id,
375
86
             QString const& new_name,
376
87
             QList<QString> const& metadata_keys);
377
88
    IMD Copy(QString const& item_id,
378
89
             QString const& new_parent_id,
379
90
             QString const& new_name,
380
91
             QList<QString> const& metadata_keys);
381
76
92
382
77
private Q_SLOTS:
93
private Q_SLOTS:
383
78
    void request_finished();
94
    void request_finished();
384
79
95
385
=== modified file 'include/unity/storage/qt/Account.h'
386
--- include/unity/storage/qt/Account.h	2016-10-10 05:24:16 +0000
387
+++ include/unity/storage/qt/Account.h	2016-11-02 04:28:58 +0000
388
@@ -18,9 +18,8 @@
389
18
18
390
19
#pragma once
19
#pragma once
391
20
20
392
21
#include <QList>
393
22
#include <QMetaType>
21
#include <QMetaType>
395
23
#include <QString>
22
#include <QStringList>
396
24
23
397
25
#include <memory>
24
#include <memory>
398
26
25
399
@@ -62,8 +61,8 @@
400
62
    QString ownerId() const;
61
    QString ownerId() const;
401
63
    QString description() const;
62
    QString description() const;
402
64
63
405
65
    Q_INVOKABLE ItemListJob* roots() const;
64
    Q_INVOKABLE ItemListJob* roots(QStringList const& keys = QStringList()) const;
406
66
    Q_INVOKABLE ItemJob* get(QString const& itemId) const;
65
    Q_INVOKABLE ItemJob* get(QString const& itemId, QStringList const& keys = QStringList()) const;
407
67
66
408
68
    bool operator==(Account const&) const;
67
    bool operator==(Account const&) const;
409
69
    bool operator!=(Account const&) const;
68
    bool operator!=(Account const&) const;
410
70
69
411
=== modified file 'include/unity/storage/qt/Item.h'
412
--- include/unity/storage/qt/Item.h	2016-10-13 07:59:12 +0000
413
+++ include/unity/storage/qt/Item.h	2016-11-02 04:28:58 +0000
414
@@ -62,7 +62,7 @@
415
62
    Q_PROPERTY(unity::storage::qt::Item::Type type READ type FINAL)
62
    Q_PROPERTY(unity::storage::qt::Item::Type type READ type FINAL)
416
63
    Q_PROPERTY(QVariantMap metadata READ metadata FINAL)
63
    Q_PROPERTY(QVariantMap metadata READ metadata FINAL)
417
64
    Q_PROPERTY(QDateTime lastModifiedTime READ lastModifiedTime FINAL)
64
    Q_PROPERTY(QDateTime lastModifiedTime READ lastModifiedTime FINAL)
419
65
    Q_PROPERTY(QList<QString> parentIds READ parentIds FINAL)
65
    Q_PROPERTY(QStringList parentIds READ parentIds FINAL)
420
66
66
421
67
public:
67
public:
422
68
    Item();
68
    Item();
423
@@ -95,23 +95,30 @@
424
95
    Type type() const;
95
    Type type() const;
425
96
    QVariantMap metadata() const;
96
    QVariantMap metadata() const;
426
97
    QDateTime lastModifiedTime() const;
97
    QDateTime lastModifiedTime() const;
428
98
    QList<QString> parentIds() const;
98
    QStringList parentIds() const;
429
99
99
433
100
    Q_INVOKABLE ItemListJob* parents() const;
100
    Q_INVOKABLE ItemListJob* parents(QStringList const& keys = QStringList()) const;
434
101
    Q_INVOKABLE ItemJob* copy(Item const& newParent, QString const& newName) const;
101
    Q_INVOKABLE ItemJob* copy(Item const& newParent,
435
102
    Q_INVOKABLE ItemJob* move(Item const& newParent, QString const& newName) const;
102
                              QString const& newName,
436
103
                              QStringList const& keys = QStringList()) const;
437
104
    Q_INVOKABLE ItemJob* move(Item const& newParent,
438
105
                              QString const& newName,
439
106
                              QStringList const& keys = QStringList()) const;
440
103
    Q_INVOKABLE VoidJob* deleteItem() const;
107
    Q_INVOKABLE VoidJob* deleteItem() const;
441
104
108
443
105
    Q_INVOKABLE Uploader* createUploader(ConflictPolicy policy, qint64 sizeInBytes) const;
109
    Q_INVOKABLE Uploader* createUploader(ConflictPolicy policy,
444
110
                                         qint64 sizeInBytes,
445
111
                                         QStringList const& keys = QStringList()) const;
446
106
    Q_INVOKABLE Downloader* createDownloader() const;
112
    Q_INVOKABLE Downloader* createDownloader() const;
447
107
113
451
108
    Q_INVOKABLE ItemListJob* list() const;
114
    Q_INVOKABLE ItemListJob* list(QStringList const& keys = QStringList()) const;
452
109
    Q_INVOKABLE ItemListJob* lookup(QString const& name) const;
115
    Q_INVOKABLE ItemListJob* lookup(QString const& name, QStringList const& = QStringList()) const;
453
110
    Q_INVOKABLE ItemJob* createFolder(QString const& name) const;
116
    Q_INVOKABLE ItemJob* createFolder(QString const& name, QStringList const& = QStringList()) const;
454
111
    Q_INVOKABLE Uploader* createFile(QString const& name,
117
    Q_INVOKABLE Uploader* createFile(QString const& name,
455
112
                                     ConflictPolicy policy,
118
                                     ConflictPolicy policy,
456
113
                                     qint64 sizeInBytes,
119
                                     qint64 sizeInBytes,
458
114
                                     QString const& contentType) const;
120
                                     QString const& contentType,
459
121
                                     QStringList const& keys = QStringList()) const;
460
115
122
461
116
    Q_INVOKABLE IntJob* freeSpaceBytes() const;
123
    Q_INVOKABLE IntJob* freeSpaceBytes() const;
462
117
    Q_INVOKABLE IntJob* usedSpaceBytes() const;
124
    Q_INVOKABLE IntJob* usedSpaceBytes() const;
463
118
125
464
=== modified file 'include/unity/storage/qt/internal/AccountImpl.h'
465
--- include/unity/storage/qt/internal/AccountImpl.h	2016-10-12 05:25:20 +0000
466
+++ include/unity/storage/qt/internal/AccountImpl.h	2016-11-02 04:28:58 +0000
467
@@ -51,8 +51,8 @@
468
51
    QString owner() const;
51
    QString owner() const;
469
52
    QString description() const;
52
    QString description() const;
470
53
53
473
54
    ItemListJob* roots() const;
54
    ItemListJob* roots(QStringList const& keys) const;
474
55
    ItemJob* get(QString const& itemId) const;
55
    ItemJob* get(QString const& itemId, QStringList const& keys) const;
475
56
56
476
57
    bool operator==(AccountImpl const&) const;
57
    bool operator==(AccountImpl const&) const;
477
58
    bool operator!=(AccountImpl const&) const;
58
    bool operator!=(AccountImpl const&) const;
478
59
59
479
=== modified file 'include/unity/storage/qt/internal/ItemImpl.h'
480
--- include/unity/storage/qt/internal/ItemImpl.h	2016-10-13 07:59:12 +0000
481
+++ include/unity/storage/qt/internal/ItemImpl.h	2016-11-02 04:28:58 +0000
482
@@ -58,20 +58,21 @@
483
58
    QDateTime lastModifiedTime() const;
58
    QDateTime lastModifiedTime() const;
484
59
    QList<QString> parentIds() const;
59
    QList<QString> parentIds() const;
485
60
60
489
61
    ItemListJob* parents() const;
61
    ItemListJob* parents(QStringList const& keys) const;
490
62
    ItemJob* copy(Item const& newParent, QString const& newName) const;
62
    ItemJob* copy(Item const& newParent, QString const& newName, QStringList const& keys) const;
491
63
    ItemJob* move(Item const& newParent, QString const& newName) const;
63
    ItemJob* move(Item const& newParent, QString const& newName, QStringList const& keys) const;
492
64
    VoidJob* deleteItem() const;
64
    VoidJob* deleteItem() const;
494
65
    Uploader* createUploader(Item::ConflictPolicy policy, qint64 sizeInBytes) const;
65
    Uploader* createUploader(Item::ConflictPolicy policy, qint64 sizeInBytes, QStringList const& keys) const;
495
66
    Downloader* createDownloader() const;
66
    Downloader* createDownloader() const;
499
67
    ItemListJob* list() const;
67
    ItemListJob* list(QStringList const& keys) const;
500
68
    ItemListJob* lookup(QString const& name) const;
68
    ItemListJob* lookup(QString const& name, QStringList const& keys) const;
501
69
    ItemJob* createFolder(QString const& name) const;
69
    ItemJob* createFolder(QString const& name, QStringList const& keys) const;
502
70
    Uploader* createFile(QString const& name) const;
70
    Uploader* createFile(QString const& name) const;
503
71
    Uploader* createFile(QString const& name,
71
    Uploader* createFile(QString const& name,
504
72
                         Item::ConflictPolicy policy,
72
                         Item::ConflictPolicy policy,
505
73
                         qint64 sizeInBytes,
73
                         qint64 sizeInBytes,
507
74
                         QString const& contentType) const;
74
                         QString const& contentType,
508
75
                         QStringList const& keys) const;
509
75
    IntJob* freeSpaceBytes() const;
76
    IntJob* freeSpaceBytes() const;
510
76
    IntJob* usedSpaceBytes() const;
77
    IntJob* usedSpaceBytes() const;
511
77
78
512
78
79
513
=== modified file 'src/provider/internal/ProviderInterface.cpp'
514
--- src/provider/internal/ProviderInterface.cpp	2016-09-02 13:51:37 +0000
515
+++ src/provider/internal/ProviderInterface.cpp	2016-11-02 04:28:58 +0000
516
@@ -33,6 +33,21 @@
517
33
33
518
34
using namespace std;
34
using namespace std;
519
35
35
520
36
namespace
521
37
{
522
38
523
39
vector<string> to_vector(QList<QString> const& l)
524
40
{
525
41
    vector<string> v;
526
42
    for (auto const& s : l)
527
43
    {
528
44
        v.push_back(s.toStdString());
529
45
    }
530
46
    return v;
531
47
}
532
48
533
49
}
534
50
535
36
namespace unity {
51
namespace unity {
536
37
namespace storage {
52
namespace storage {
537
38
namespace provider {
53
namespace provider {
538
@@ -86,10 +101,10 @@
539
86
    handler->deleteLater();
101
    handler->deleteLater();
540
87
}
102
}
541
88
103
543
89
QList<ProviderInterface::IMD> ProviderInterface::Roots()
104
QList<ProviderInterface::IMD> ProviderInterface::Roots(QList<QString> const& keys)
544
90
{
105
{
547
91
    queue_request([](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
106
    queue_request([keys](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
548
92
            auto f = account->provider().roots(ctx);
107
            auto f = account->provider().roots(to_vector(keys), ctx);
549
93
            return f.then(
108
            return f.then(
550
94
                EXEC_IN_MAIN
109
                EXEC_IN_MAIN
551
95
                [account, message](decltype(f) f) -> QDBusMessage {
110
                [account, message](decltype(f) f) -> QDBusMessage {
552
@@ -100,10 +115,15 @@
553
100
    return {};
115
    return {};
554
101
}
116
}
555
102
117
557
103
QList<ProviderInterface::IMD> ProviderInterface::List(QString const& item_id, QString const& page_token, QString& /*next_token*/)
118
QList<ProviderInterface::IMD> ProviderInterface::List(QString const& item_id,
558
119
                                                      QString const& page_token,
559
120
                                                      QList<QString> const& keys,
560
121
                                                      QString& /*next_token*/)
561
104
{
122
{
564
105
    queue_request([item_id, page_token](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
123
    queue_request([item_id, page_token, keys](shared_ptr<AccountData> const& account,
565
106
            auto f = account->provider().list(item_id.toStdString(), page_token.toStdString(), ctx);
124
                                              Context const& ctx,
566
125
                                              QDBusMessage const& message) {
567
126
            auto f = account->provider().list(item_id.toStdString(), page_token.toStdString(), to_vector(keys), ctx);
568
107
            return f.then(
127
            return f.then(
569
108
                EXEC_IN_MAIN
128
                EXEC_IN_MAIN
570
109
                [account, message](decltype(f) f) -> QDBusMessage {
129
                [account, message](decltype(f) f) -> QDBusMessage {
571
@@ -119,10 +139,14 @@
572
119
    return {};
139
    return {};
573
120
}
140
}
574
121
141
576
122
QList<ProviderInterface::IMD> ProviderInterface::Lookup(QString const& parent_id, QString const& name)
142
QList<ProviderInterface::IMD> ProviderInterface::Lookup(QString const& parent_id,
577
143
                                                        QString const& name,
578
144
                                                        QList<QString> const& keys)
579
123
{
145
{
582
124
    queue_request([parent_id, name](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
146
    queue_request([parent_id, name, keys](shared_ptr<AccountData> const& account,
583
125
            auto f = account->provider().lookup(parent_id.toStdString(), name.toStdString(), ctx);
147
                                          Context const& ctx,
584
148
                                          QDBusMessage const& message) {
585
149
            auto f = account->provider().lookup(parent_id.toStdString(), name.toStdString(), to_vector(keys), ctx);
586
126
            return f.then(
150
            return f.then(
587
127
                EXEC_IN_MAIN
151
                EXEC_IN_MAIN
588
128
                [account, message](decltype(f) f) -> QDBusMessage {
152
                [account, message](decltype(f) f) -> QDBusMessage {
589
@@ -133,10 +157,12 @@
590
133
    return {};
157
    return {};
591
134
}
158
}
592
135
159
594
136
ProviderInterface::IMD ProviderInterface::Metadata(QString const& item_id)
160
ProviderInterface::IMD ProviderInterface::Metadata(QString const& item_id, QList<QString> const& keys)
595
137
{
161
{
598
138
    queue_request([item_id](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
162
    queue_request([item_id, keys](shared_ptr<AccountData> const& account,
599
139
            auto f = account->provider().metadata(item_id.toStdString(), ctx);
163
                                  Context const& ctx,
600
164
                                  QDBusMessage const& message) {
601
165
            auto f = account->provider().metadata(item_id.toStdString(), to_vector(keys), ctx);
602
140
            return f.then(
166
            return f.then(
603
141
                EXEC_IN_MAIN
167
                EXEC_IN_MAIN
604
142
                [account, message](decltype(f) f) -> QDBusMessage {
168
                [account, message](decltype(f) f) -> QDBusMessage {
605
@@ -147,11 +173,15 @@
606
147
    return {};
173
    return {};
607
148
}
174
}
608
149
175
610
150
ProviderInterface::IMD ProviderInterface::CreateFolder(QString const& parent_id, QString const& name)
176
ProviderInterface::IMD ProviderInterface::CreateFolder(QString const& parent_id,
611
177
                                                       QString const& name,
612
178
                                                       QList<QString> const& keys)
613
151
{
179
{
615
152
    queue_request([parent_id, name](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
180
    queue_request([parent_id, name, keys](shared_ptr<AccountData> const& account,
616
181
                                          Context const& ctx,
617
182
                                          QDBusMessage const& message) {
618
153
            auto f = account->provider().create_folder(
183
            auto f = account->provider().create_folder(
620
154
                parent_id.toStdString(), name.toStdString(), ctx);
184
                parent_id.toStdString(), name.toStdString(), to_vector(keys), ctx);
621
155
            return f.then(
185
            return f.then(
622
156
                EXEC_IN_MAIN
186
                EXEC_IN_MAIN
623
157
                [account, message](decltype(f) f) -> QDBusMessage {
187
                [account, message](decltype(f) f) -> QDBusMessage {
624
@@ -162,12 +192,20 @@
625
162
    return {};
192
    return {};
626
163
}
193
}
627
164
194
629
165
QString ProviderInterface::CreateFile(QString const& parent_id, QString const& name, int64_t size, QString const& content_type, bool allow_overwrite, QDBusUnixFileDescriptor& /*file_descriptor*/)
195
QString ProviderInterface::CreateFile(QString const& parent_id,
630
196
                                      QString const& name,
631
197
                                      int64_t size,
632
198
                                      QString const& content_type,
633
199
                                      bool allow_overwrite,
634
200
                                      QList<QString> const& keys,
635
201
                                      QDBusUnixFileDescriptor& /*file_descriptor*/)
636
166
{
202
{
638
167
    queue_request([parent_id, name, size, content_type, allow_overwrite](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
203
    queue_request([parent_id, name, size, content_type, allow_overwrite, keys](shared_ptr<AccountData> const& account,
639
204
                                                                               Context const& ctx,
640
205
                                                                               QDBusMessage const& message) {
641
168
            auto f = account->provider().create_file(
206
            auto f = account->provider().create_file(
642
169
                parent_id.toStdString(), name.toStdString(),
207
                parent_id.toStdString(), name.toStdString(),
644
170
                size, content_type.toStdString(), allow_overwrite, ctx);
208
                size, content_type.toStdString(), allow_overwrite, to_vector(keys), ctx);
645
171
            return f.then(
209
            return f.then(
646
172
                EXEC_IN_MAIN
210
                EXEC_IN_MAIN
647
173
                [account, message](decltype(f) f) -> QDBusMessage {
211
                [account, message](decltype(f) f) -> QDBusMessage {
648
@@ -188,11 +226,17 @@
649
188
    return "";
226
    return "";
650
189
}
227
}
651
190
228
653
191
QString ProviderInterface::Update(QString const& item_id, int64_t size, QString const& old_etag, QDBusUnixFileDescriptor& /*file_descriptor*/)
229
QString ProviderInterface::Update(QString const& item_id,
654
230
                                  int64_t size,
655
231
                                  QString const& old_etag,
656
232
                                  QList<QString> const& keys,
657
233
                                  QDBusUnixFileDescriptor& /*file_descriptor*/)
658
192
{
234
{
660
193
    queue_request([item_id, size, old_etag](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
235
    queue_request([item_id, size, old_etag, keys](shared_ptr<AccountData> const& account,
661
236
                                                  Context const& ctx,
662
237
                                                  QDBusMessage const& message) {
663
194
            auto f = account->provider().update(
238
            auto f = account->provider().update(
665
195
                item_id.toStdString(), size, old_etag.toStdString(), ctx);
239
                item_id.toStdString(), size, old_etag.toStdString(), to_vector(keys), ctx);
666
196
            return f.then(
240
            return f.then(
667
197
                EXEC_IN_MAIN
241
                EXEC_IN_MAIN
668
198
                [account, message](decltype(f) f) -> QDBusMessage {
242
                [account, message](decltype(f) f) -> QDBusMessage {
669
@@ -215,7 +259,9 @@
670
215
259
671
216
ProviderInterface::IMD ProviderInterface::FinishUpload(QString const& upload_id)
260
ProviderInterface::IMD ProviderInterface::FinishUpload(QString const& upload_id)
672
217
{
261
{
674
218
    queue_request([upload_id](shared_ptr<AccountData> const& account, Context const& /*ctx*/, QDBusMessage const& message) {
262
    queue_request([upload_id](shared_ptr<AccountData> const& account,
675
263
                              Context const& /*ctx*/,
676
264
                              QDBusMessage const& message) {
677
219
            // FIXME: removing the job at this point means we can't
265
            // FIXME: removing the job at this point means we can't
678
220
            // cancel during finish().
266
            // cancel during finish().
679
221
            // Throws if job is not available
267
            // Throws if job is not available
680
@@ -233,7 +279,9 @@
681
233
279
682
234
void ProviderInterface::CancelUpload(QString const& upload_id)
280
void ProviderInterface::CancelUpload(QString const& upload_id)
683
235
{
281
{
685
236
    queue_request([upload_id](shared_ptr<AccountData> const& account, Context const& /*ctx*/, QDBusMessage const& message) {
282
    queue_request([upload_id](shared_ptr<AccountData> const& account,
686
283
                              Context const& /*ctx*/,
687
284
                              QDBusMessage const& message) {
688
237
            // Throws if job is not available
285
            // Throws if job is not available
689
238
            auto job = account->jobs().remove_upload(message.service(), upload_id.toStdString());
286
            auto job = account->jobs().remove_upload(message.service(), upload_id.toStdString());
690
239
            auto f = job->p_->cancel(*job);
287
            auto f = job->p_->cancel(*job);
691
@@ -273,7 +321,9 @@
692
273
321
693
274
void ProviderInterface::FinishDownload(QString const& download_id)
322
void ProviderInterface::FinishDownload(QString const& download_id)
694
275
{
323
{
696
276
    queue_request([download_id](shared_ptr<AccountData> const& account, Context const& /*ctx*/, QDBusMessage const& message) {
324
    queue_request([download_id](shared_ptr<AccountData> const& account,
697
325
                                Context const& /*ctx*/,
698
326
                                QDBusMessage const& message) {
699
277
            // FIXME: removing the job at this point means we can't
327
            // FIXME: removing the job at this point means we can't
700
278
            // cancel during finish().
328
            // cancel during finish().
701
279
            // Throws if job is not available
329
            // Throws if job is not available
702
@@ -302,12 +352,17 @@
703
302
        });
352
        });
704
303
}
353
}
705
304
354
707
305
ProviderInterface::IMD ProviderInterface::Move(QString const& item_id, QString const& new_parent_id, QString const& new_name)
355
ProviderInterface::IMD ProviderInterface::Move(QString const& item_id,
708
356
                                               QString const& new_parent_id,
709
357
                                               QString const& new_name,
710
358
                                               QList<QString> const& keys)
711
306
{
359
{
713
307
    queue_request([item_id, new_parent_id, new_name](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
360
    queue_request([item_id, new_parent_id, new_name, keys](shared_ptr<AccountData> const& account,
714
361
                                                           Context const& ctx,
715
362
                                                           QDBusMessage const& message) {
716
308
            auto f = account->provider().move(
363
            auto f = account->provider().move(
717
309
                item_id.toStdString(), new_parent_id.toStdString(),
364
                item_id.toStdString(), new_parent_id.toStdString(),
719
310
                new_name.toStdString(), ctx);
365
                new_name.toStdString(), to_vector(keys), ctx);
720
311
            return f.then(
366
            return f.then(
721
312
                EXEC_IN_MAIN
367
                EXEC_IN_MAIN
722
313
                [account, message](decltype(f) f) -> QDBusMessage {
368
                [account, message](decltype(f) f) -> QDBusMessage {
723
@@ -318,12 +373,17 @@
724
318
    return {};
373
    return {};
725
319
}
374
}
726
320
375
728
321
ProviderInterface::IMD ProviderInterface::Copy(QString const& item_id, QString const& new_parent_id, QString const& new_name)
376
ProviderInterface::IMD ProviderInterface::Copy(QString const& item_id,
729
377
                                               QString const& new_parent_id,
730
378
                                               QString const& new_name,
731
379
                                               QList<QString> const& keys)
732
322
{
380
{
734
323
    queue_request([item_id, new_parent_id, new_name](shared_ptr<AccountData> const& account, Context const& ctx, QDBusMessage const& message) {
381
    queue_request([item_id, new_parent_id, new_name, keys](shared_ptr<AccountData> const& account,
735
382
                                                           Context const& ctx,
736
383
                                                           QDBusMessage const& message) {
737
324
            auto f = account->provider().copy(
384
            auto f = account->provider().copy(
738
325
                item_id.toStdString(), new_parent_id.toStdString(),
385
                item_id.toStdString(), new_parent_id.toStdString(),
740
326
                new_name.toStdString(), ctx);
386
                new_name.toStdString(), to_vector(keys), ctx);
741
327
            return f.then(
387
            return f.then(
742
328
                EXEC_IN_MAIN
388
                EXEC_IN_MAIN
743
329
                [account, message](decltype(f) f) -> QDBusMessage {
389
                [account, message](decltype(f) f) -> QDBusMessage {
744
330
390
745
=== modified file 'src/qt/Account.cpp'
746
--- src/qt/Account.cpp	2016-09-22 01:52:20 +0000
747
+++ src/qt/Account.cpp	2016-11-02 04:28:58 +0000
748
@@ -93,14 +93,14 @@
749
93
    return p_->description();
93
    return p_->description();
750
94
}
94
}
751
95
95
753
96
ItemListJob* Account::roots() const
96
ItemListJob* Account::roots(QStringList const& keys) const
754
97
{
97
{
756
98
    return p_->roots();
98
    return p_->roots(keys);
757
99
}
99
}
758
100
100
760
101
ItemJob* Account::get(QString const& itemId) const
101
ItemJob* Account::get(QString const& itemId, QStringList const& keys) const
761
102
{
102
{
763
103
    return p_->get(itemId);
103
    return p_->get(itemId, keys);
764
104
}
104
}
765
105
105
766
106
bool Account::operator==(Account const& other) const
106
bool Account::operator==(Account const& other) const
767
107
107
768
=== modified file 'src/qt/Item.cpp'
769
--- src/qt/Item.cpp	2016-10-13 07:59:12 +0000
770
+++ src/qt/Item.cpp	2016-11-02 04:28:58 +0000
771
@@ -112,24 +112,24 @@
772
112
    return p_->lastModifiedTime();
112
    return p_->lastModifiedTime();
773
113
}
113
}
774
114
114
776
115
QList<QString> Item::parentIds() const
115
QStringList Item::parentIds() const
777
116
{
116
{
778
117
    return p_->parentIds();
117
    return p_->parentIds();
779
118
}
118
}
780
119
119
794
120
ItemListJob* Item::parents() const
120
ItemListJob* Item::parents(QStringList const& keys) const
795
121
{
121
{
796
122
    return p_->parents();
122
    return p_->parents(keys);
797
123
}
123
}
798
124
124
799
125
ItemJob* Item::copy(Item const& newParent, QString const& newName) const
125
ItemJob* Item::copy(Item const& newParent, QString const& newName, QStringList const& keys) const
800
126
{
126
{
801
127
    return p_->copy(newParent, newName);
127
    return p_->copy(newParent, newName, keys);
802
128
}
128
}
803
129
129
804
130
ItemJob* Item::move(Item const& newParent, QString const& newName) const
130
ItemJob* Item::move(Item const& newParent, QString const& newName, QStringList const& keys) const
805
131
{
131
{
806
132
    return p_->move(newParent, newName);
132
    return p_->move(newParent, newName, keys);
807
133
}
133
}
808
134
134
809
135
VoidJob* Item::deleteItem() const
135
VoidJob* Item::deleteItem() const
810
@@ -137,9 +137,9 @@
811
137
    return p_->deleteItem();
137
    return p_->deleteItem();
812
138
}
138
}
813
139
139
815
140
Uploader* Item::createUploader(ConflictPolicy policy, qint64 sizeInBytes) const
140
Uploader* Item::createUploader(ConflictPolicy policy, qint64 sizeInBytes, QStringList const& keys) const
816
141
{
141
{
818
142
    return p_->createUploader(policy, sizeInBytes);
142
    return p_->createUploader(policy, sizeInBytes, keys);
819
143
}
143
}
820
144
144
821
145
Downloader* Item::createDownloader() const
145
Downloader* Item::createDownloader() const
822
@@ -147,27 +147,28 @@
823
147
    return p_->createDownloader();
147
    return p_->createDownloader();
824
148
}
148
}
825
149
149
839
150
ItemListJob* Item::list() const
150
ItemListJob* Item::list(QStringList const& keys) const
840
151
{
151
{
841
152
    return p_->list();
152
    return p_->list(keys);
842
153
}
153
}
843
154
154
844
155
ItemListJob* Item::lookup(QString const& name) const
155
ItemListJob* Item::lookup(QString const& name, QStringList const& keys) const
845
156
{
156
{
846
157
    return p_->lookup(name);
157
    return p_->lookup(name, keys);
847
158
}
158
}
848
159
159
849
160
ItemJob* Item::createFolder(QString const& name) const
160
ItemJob* Item::createFolder(QString const& name, QStringList const& keys) const
850
161
{
161
{
851
162
    return p_->createFolder(name);
162
    return p_->createFolder(name, keys);
852
163
}
163
}
853
164
164
854
165
Uploader* Item::createFile(QString const& name,
165
Uploader* Item::createFile(QString const& name,
855
166
                           ConflictPolicy policy,
166
                           ConflictPolicy policy,
856
167
                           qint64 sizeInBytes,
167
                           qint64 sizeInBytes,
858
168
                           QString const& contentType) const
168
                           QString const& contentType,
859
169
                           QStringList const& keys) const
860
169
{
170
{
862
170
    return p_->createFile(name, policy, sizeInBytes, contentType);
171
    return p_->createFile(name, policy, sizeInBytes, contentType, keys);
863
171
}
172
}
864
172
173
865
173
IntJob* Item::freeSpaceBytes() const
174
IntJob* Item::freeSpaceBytes() const
866
174
175
867
=== modified file 'src/qt/client/internal/remote_client/AccountImpl.cpp'
868
--- src/qt/client/internal/remote_client/AccountImpl.cpp	2016-08-26 04:45:56 +0000
869
+++ src/qt/client/internal/remote_client/AccountImpl.cpp	2016-11-02 04:28:58 +0000
870
@@ -86,7 +86,7 @@
871
86
        return make_exceptional_future<QVector<Root::SPtr>>(RuntimeDestroyedException("Account::roots()"));
86
        return make_exceptional_future<QVector<Root::SPtr>>(RuntimeDestroyedException("Account::roots()"));
872
87
    }
87
    }
873
88
88
875
89
    auto reply = provider_->Roots();
89
    auto reply = provider_->Roots(QList<QString>());
876
90
90
877
91
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<QVector<Root::SPtr>>& qf)
91
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<QVector<Root::SPtr>>& qf)
878
92
    {
92
    {
879
93
93
880
=== modified file 'src/qt/client/internal/remote_client/FileImpl.cpp'
881
--- src/qt/client/internal/remote_client/FileImpl.cpp	2016-08-26 04:45:56 +0000
882
+++ src/qt/client/internal/remote_client/FileImpl.cpp	2016-11-02 04:28:58 +0000
883
@@ -72,7 +72,7 @@
884
72
72
885
73
    QString old_etag = policy == ConflictPolicy::overwrite ? "" : md_.etag;
73
    QString old_etag = policy == ConflictPolicy::overwrite ? "" : md_.etag;
886
74
    auto prov = provider();
74
    auto prov = provider();
888
75
    auto reply = prov->Update(md_.item_id, size, old_etag);
75
    auto reply = prov->Update(md_.item_id, size, old_etag, QList<QString>());
889
76
76
890
77
    auto process_reply = [this, size, old_etag, prov](decltype(reply) const& reply,
77
    auto process_reply = [this, size, old_etag, prov](decltype(reply) const& reply,
891
78
                                                      QFutureInterface<std::shared_ptr<Uploader>>& qf)
78
                                                      QFutureInterface<std::shared_ptr<Uploader>>& qf)
892
79
79
893
=== modified file 'src/qt/client/internal/remote_client/FolderImpl.cpp'
894
--- src/qt/client/internal/remote_client/FolderImpl.cpp	2016-08-26 04:45:56 +0000
895
+++ src/qt/client/internal/remote_client/FolderImpl.cpp	2016-11-02 04:28:58 +0000
896
@@ -68,7 +68,7 @@
897
68
    }
68
    }
898
69
69
899
70
    auto prov = provider();
70
    auto prov = provider();
901
71
    auto reply = prov->List(md_.item_id, "");
71
    auto reply = prov->List(md_.item_id, "", QList<QString>());
902
72
72
903
73
    // Sorry for the mess, but we can't use auto for the lambda because it calls itself,
73
    // Sorry for the mess, but we can't use auto for the lambda because it calls itself,
904
74
    // and the compiler can't deduce the type of the lambda while it's still parsing the lambda body.
74
    // and the compiler can't deduce the type of the lambda while it's still parsing the lambda body.
905
@@ -114,7 +114,7 @@
906
114
        else
114
        else
907
115
        {
115
        {
908
116
            // Request next lot.
116
            // Request next lot.
910
117
            auto next_reply = prov->List(md_.item_id, token);
117
            auto next_reply = prov->List(md_.item_id, token, QList<QString>());
911
118
            new Handler<QVector<shared_ptr<Item>>>(const_cast<FolderImpl*>(this), next_reply, process_reply);
118
            new Handler<QVector<shared_ptr<Item>>>(const_cast<FolderImpl*>(this), next_reply, process_reply);
912
119
        }
119
        }
913
120
    };
120
    };
914
@@ -135,7 +135,7 @@
915
135
    }
135
    }
916
136
136
917
137
    auto prov = provider();
137
    auto prov = provider();
919
138
    auto reply = prov->Lookup(md_.item_id, name);
138
    auto reply = prov->Lookup(md_.item_id, name, QList<QString>());
920
139
139
921
140
    auto process_reply = [this, name](decltype(reply) const& reply, QFutureInterface<QVector<shared_ptr<Item>>>& qf)
140
    auto process_reply = [this, name](decltype(reply) const& reply, QFutureInterface<QVector<shared_ptr<Item>>>& qf)
922
141
    {
141
    {
923
@@ -194,7 +194,7 @@
924
194
    }
194
    }
925
195
195
926
196
    auto prov = provider();
196
    auto prov = provider();
928
197
    auto reply = prov->CreateFolder(md_.item_id, name);
197
    auto reply = prov->CreateFolder(md_.item_id, name, QList<QString>());
929
198
198
930
199
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<shared_ptr<Folder>>& qf)
199
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<shared_ptr<Folder>>& qf)
931
200
    {
200
    {
932
@@ -252,7 +252,7 @@
933
252
    }
252
    }
934
253
253
935
254
    auto prov = provider();
254
    auto prov = provider();
937
255
    auto reply = prov->CreateFile(md_.item_id, name, size, "application/octet-stream", false);
255
    auto reply = prov->CreateFile(md_.item_id, name, size, "application/octet-stream", false, QList<QString>());
938
256
256
939
257
    auto process_reply = [this, size](decltype(reply) const& reply, QFutureInterface<shared_ptr<Uploader>>& qf)
257
    auto process_reply = [this, size](decltype(reply) const& reply, QFutureInterface<shared_ptr<Uploader>>& qf)
940
258
    {
258
    {
941
259
259
942
=== modified file 'src/qt/client/internal/remote_client/ItemImpl.cpp'
943
--- src/qt/client/internal/remote_client/ItemImpl.cpp	2016-09-28 04:37:14 +0000
944
+++ src/qt/client/internal/remote_client/ItemImpl.cpp	2016-11-02 04:28:58 +0000
945
@@ -95,7 +95,7 @@
946
95
    }
95
    }
947
96
96
948
97
    auto prov = provider();
97
    auto prov = provider();
950
98
    auto reply = prov->Copy(md_.item_id, new_parent->native_identity(), new_name);
98
    auto reply = prov->Copy(md_.item_id, new_parent->native_identity(), new_name, QList<QString>());
951
99
99
952
100
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Item>>& qf)
100
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Item>>& qf)
953
101
    {
101
    {
954
@@ -160,7 +160,7 @@
955
160
    {
160
    {
956
161
        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::move()"));
161
        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::move()"));
957
162
    }
162
    }
959
163
    auto reply = prov->Move(md_.item_id, new_parent->native_identity(), new_name);
163
    auto reply = prov->Move(md_.item_id, new_parent->native_identity(), new_name, QList<QString>());
960
164
164
961
165
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Item>>& qf)
165
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Item>>& qf)
962
166
    {
166
    {
963
167
167
964
=== modified file 'src/qt/client/internal/remote_client/RootImpl.cpp'
965
--- src/qt/client/internal/remote_client/RootImpl.cpp	2016-08-26 04:45:56 +0000
966
+++ src/qt/client/internal/remote_client/RootImpl.cpp	2016-11-02 04:28:58 +0000
967
@@ -122,7 +122,7 @@
968
122
    }
122
    }
969
123
123
970
124
    auto prov = provider();
124
    auto prov = provider();
972
125
    auto reply = prov->Metadata(native_identity);
125
    auto reply = prov->Metadata(native_identity, QList<QString>());
973
126
126
974
127
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<Item::SPtr>& qf)
127
    auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<Item::SPtr>& qf)
975
128
    {
128
    {
976
129
129
977
=== modified file 'src/qt/internal/AccountImpl.cpp'
978
--- src/qt/internal/AccountImpl.cpp	2016-10-12 05:25:20 +0000
979
+++ src/qt/internal/AccountImpl.cpp	2016-11-02 04:28:58 +0000
980
@@ -81,7 +81,7 @@
981
81
    return is_valid_ ? description_ : "";
81
    return is_valid_ ? description_ : "";
982
82
}
82
}
983
83
83
985
84
ItemListJob* AccountImpl::roots() const
84
ItemListJob* AccountImpl::roots(QStringList const& keys) const
986
85
{
85
{
987
86
    QString const method = "Account::roots()";
86
    QString const method = "Account::roots()";
988
87
87
989
@@ -107,12 +107,12 @@
990
107
        }
107
        }
991
108
    };
108
    };
992
109
109
994
110
    auto reply = provider_->Roots();
110
    auto reply = provider_->Roots(keys);
995
111
    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
111
    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
996
112
    return ItemListJobImpl::make_job(This, method, reply, validate);
112
    return ItemListJobImpl::make_job(This, method, reply, validate);
997
113
}
113
}
998
114
114
1000
115
ItemJob* AccountImpl::get(QString const& itemId) const
115
ItemJob* AccountImpl::get(QString const& itemId, QStringList const& keys) const
1001
116
{
116
{
1002
117
    QString const method = "Account::get()";
117
    QString const method = "Account::get()";
1003
118
118
1004
@@ -132,7 +132,7 @@
1005
132
    {
132
    {
1006
133
    };
133
    };
1007
134
134
1009
135
    auto reply = provider_->Metadata(itemId);
135
    auto reply = provider_->Metadata(itemId, keys);
1010
136
    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
136
    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
1011
137
    return ItemJobImpl::make_job(This, method, reply, validate);
137
    return ItemJobImpl::make_job(This, method, reply, validate);
1012
138
}
138
}
1013
139
139
1014
=== modified file 'src/qt/internal/ItemImpl.cpp'
1015
--- src/qt/internal/ItemImpl.cpp	2016-10-17 12:23:12 +0000
1016
+++ src/qt/internal/ItemImpl.cpp	2016-11-02 04:28:58 +0000
1017
@@ -115,7 +115,7 @@
1018
115
    return md_.parent_ids;
115
    return md_.parent_ids;
1019
116
}
116
}
1020
117
117
1022
118
ItemListJob* ItemImpl::parents() const
118
ItemListJob* ItemImpl::parents(QStringList const& keys) const
1023
119
{
119
{
1024
120
    QString const method = "Item::parents()";
120
    QString const method = "Item::parents()";
1025
121
121
1026
@@ -135,7 +135,7 @@
1027
135
    QList<QDBusPendingReply<storage::internal::ItemMetadata>> replies;
135
    QList<QDBusPendingReply<storage::internal::ItemMetadata>> replies;
1028
136
    for (auto const& id : md_.parent_ids)
136
    for (auto const& id : md_.parent_ids)
1029
137
    {
137
    {
1031
138
        auto reply = account_impl_->provider()->Metadata(id);
138
        auto reply = account_impl_->provider()->Metadata(id, keys);
1032
139
        replies.append(reply);
139
        replies.append(reply);
1033
140
    }
140
    }
1034
141
141
1035
@@ -152,7 +152,7 @@
1036
152
    return MultiItemJobImpl::make_job(account_impl_, method, replies, validate);
152
    return MultiItemJobImpl::make_job(account_impl_, method, replies, validate);
1037
153
}
153
}
1038
154
154
1040
155
ItemJob* ItemImpl::copy(Item const& newParent, QString const& newName) const
155
ItemJob* ItemImpl::copy(Item const& newParent, QString const& newName, QStringList const& keys) const
1041
156
{
156
{
1042
157
    QString const method = "Item::copy()";
157
    QString const method = "Item::copy()";
1043
158
158
1044
@@ -174,12 +174,12 @@
1045
174
        }
174
        }
1046
175
    };
175
    };
1047
176
176
1049
177
    auto reply = account_impl_->provider()->Copy(md_.item_id, newParent.itemId(), newName);
177
    auto reply = account_impl_->provider()->Copy(md_.item_id, newParent.itemId(), newName, keys);
1050
178
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
178
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1051
179
    return ItemJobImpl::make_job(This, method, reply, validate);
179
    return ItemJobImpl::make_job(This, method, reply, validate);
1052
180
}
180
}
1053
181
181
1055
182
ItemJob* ItemImpl::move(Item const& newParent, QString const& newName) const
182
ItemJob* ItemImpl::move(Item const& newParent, QString const& newName, QStringList const& keys) const
1056
183
{
183
{
1057
184
    QString const method = "Item::move()";
184
    QString const method = "Item::move()";
1058
185
185
1059
@@ -207,7 +207,7 @@
1060
207
        }
207
        }
1061
208
    };
208
    };
1062
209
209
1064
210
    auto reply = account_impl_->provider()->Move(md_.item_id, newParent.itemId(), newName);
210
    auto reply = account_impl_->provider()->Move(md_.item_id, newParent.itemId(), newName, keys);
1065
211
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
211
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1066
212
    return ItemJobImpl::make_job(This, method, reply, validate);
212
    return ItemJobImpl::make_job(This, method, reply, validate);
1067
213
}
213
}
1068
@@ -232,7 +232,7 @@
1069
232
    return VoidJobImpl::make_job(This, method, reply);
232
    return VoidJobImpl::make_job(This, method, reply);
1070
233
}
233
}
1071
234
234
1073
235
Uploader* ItemImpl::createUploader(Item::ConflictPolicy policy, qint64 sizeInBytes) const
235
Uploader* ItemImpl::createUploader(Item::ConflictPolicy policy, qint64 sizeInBytes, QStringList const& keys) const
1074
236
{
236
{
1075
237
    QString const method = "Item::createUploader()";
237
    QString const method = "Item::createUploader()";
1076
238
238
1077
@@ -263,7 +263,7 @@
1078
263
    };
263
    };
1079
264
264
1080
265
    auto etag = policy == Item::ConflictPolicy::Overwrite ? "" : md_.etag;
265
    auto etag = policy == Item::ConflictPolicy::Overwrite ? "" : md_.etag;
1082
266
    auto reply = account_impl_->provider()->Update(md_.item_id, sizeInBytes, etag);
266
    auto reply = account_impl_->provider()->Update(md_.item_id, sizeInBytes, etag, keys);
1083
267
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
267
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1084
268
    return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes);
268
    return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes);
1085
269
}
269
}
1086
@@ -288,7 +288,7 @@
1087
288
    return DownloaderImpl::make_job(This, method, reply);
288
    return DownloaderImpl::make_job(This, method, reply);
1088
289
}
289
}
1089
290
290
1091
291
ItemListJob* ItemImpl::list() const
291
ItemListJob* ItemImpl::list(QStringList const& keys) const
1092
292
{
292
{
1093
293
    QString const method = "Item::list()";
293
    QString const method = "Item::list()";
1094
294
294
1095
@@ -313,17 +313,17 @@
1096
313
        }
313
        }
1097
314
    };
314
    };
1098
315
315
1100
316
    auto fetch_next = [this](QString const& page_token)
316
    auto fetch_next = [this, keys](QString const& page_token)
1101
317
    {
317
    {
1103
318
        return account_impl_->provider()->List(md_.item_id, page_token);
318
        return account_impl_->provider()->List(md_.item_id, page_token, keys);
1104
319
    };
319
    };
1105
320
320
1107
321
    auto reply = account_impl_->provider()->List(md_.item_id, "");
321
    auto reply = account_impl_->provider()->List(md_.item_id, "", keys);
1108
322
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
322
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1109
323
    return MultiItemListJobImpl::make_job(This, method, reply, validate, fetch_next);
323
    return MultiItemListJobImpl::make_job(This, method, reply, validate, fetch_next);
1110
324
}
324
}
1111
325
325
1113
326
ItemListJob* ItemImpl::lookup(QString const& name) const
326
ItemListJob* ItemImpl::lookup(QString const& name, QStringList const& keys) const
1114
327
{
327
{
1115
328
    QString const method = "Item::lookup()";
328
    QString const method = "Item::lookup()";
1116
329
329
1117
@@ -342,12 +342,12 @@
1118
342
    {
342
    {
1119
343
    };
343
    };
1120
344
344
1122
345
    auto reply = account_impl_->provider()->Lookup(md_.item_id, name);
345
    auto reply = account_impl_->provider()->Lookup(md_.item_id, name, keys);
1123
346
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
346
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1124
347
    return ItemListJobImpl::make_job(This, method, reply, validate);
347
    return ItemListJobImpl::make_job(This, method, reply, validate);
1125
348
}
348
}
1126
349
349
1128
350
ItemJob* ItemImpl::createFolder(QString const& name) const
350
ItemJob* ItemImpl::createFolder(QString const& name, QStringList const& keys) const
1129
351
{
351
{
1130
352
    QString const method = "Item::createFolder()";
352
    QString const method = "Item::createFolder()";
1131
353
353
1132
@@ -373,7 +373,7 @@
1133
373
        throw StorageErrorImpl::local_comms_error(msg);
373
        throw StorageErrorImpl::local_comms_error(msg);
1134
374
    };
374
    };
1135
375
375
1137
376
    auto reply = account_impl_->provider()->CreateFolder(md_.item_id, name);
376
    auto reply = account_impl_->provider()->CreateFolder(md_.item_id, name, keys);
1138
377
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
377
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1139
378
    return ItemJobImpl::make_job(This, method, reply, validate);
378
    return ItemJobImpl::make_job(This, method, reply, validate);
1140
379
}
379
}
1141
@@ -381,7 +381,8 @@
1142
381
Uploader* ItemImpl::createFile(QString const& name,
381
Uploader* ItemImpl::createFile(QString const& name,
1143
382
                               Item::ConflictPolicy policy,
382
                               Item::ConflictPolicy policy,
1144
383
                               qint64 sizeInBytes,
383
                               qint64 sizeInBytes,
1146
384
                               QString const& contentType) const
384
                               QString const& contentType,
1147
385
                               QStringList const& keys) const
1148
385
{
386
{
1149
386
    QString const method = "Item::createFile()";
387
    QString const method = "Item::createFile()";
1150
387
388
1151
@@ -418,7 +419,8 @@
1152
418
    };
419
    };
1153
419
420
1154
420
    bool allow_overwrite = policy == Item::ConflictPolicy::Overwrite;
421
    bool allow_overwrite = policy == Item::ConflictPolicy::Overwrite;
1156
421
    auto reply = account_impl_->provider()->CreateFile(md_.item_id, name, sizeInBytes, contentType, allow_overwrite);
422
    auto reply = account_impl_->provider()->CreateFile(md_.item_id, name, sizeInBytes,
1157
423
                                                       contentType, allow_overwrite, keys);
1158
422
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
424
    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
1159
423
    return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes);
425
    return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes);
1160
424
}
426
}
1161
425
427
1162
=== modified file 'tests/provider-ProviderInterface/ProviderInterface_test.cpp'
1163
--- tests/provider-ProviderInterface/ProviderInterface_test.cpp	2016-09-28 04:37:14 +0000
1164
+++ tests/provider-ProviderInterface/ProviderInterface_test.cpp	2016-11-02 04:28:58 +0000
1165
@@ -85,7 +85,7 @@
1166
85
{
85
{
1167
86
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
86
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1168
87
87
1170
88
    auto reply = client_->Roots();
88
    auto reply = client_->Roots(QList<QString>());
1171
89
    wait_for(reply);
89
    wait_for(reply);
1172
90
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
90
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1173
91
    EXPECT_EQ(1, reply.value().size());
91
    EXPECT_EQ(1, reply.value().size());
1174
@@ -101,7 +101,7 @@
1175
101
{
101
{
1176
102
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
102
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1177
103
103
1179
104
    auto reply = client_->List("root_id", "");
104
    auto reply = client_->List("root_id", "", QList<QString>());
1180
105
    wait_for(reply);
105
    wait_for(reply);
1181
106
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
106
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1182
107
    auto items = reply.argumentAt<0>();
107
    auto items = reply.argumentAt<0>();
1183
@@ -111,7 +111,7 @@
1184
111
    EXPECT_EQ("child2_id", items[1].item_id);
111
    EXPECT_EQ("child2_id", items[1].item_id);
1185
112
    EXPECT_EQ("page_token", page_token);
112
    EXPECT_EQ("page_token", page_token);
1186
113
113
1188
114
    reply = client_->List("root_id", page_token);
114
    reply = client_->List("root_id", page_token, QList<QString>());
1189
115
    wait_for(reply);
115
    wait_for(reply);
1190
116
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
116
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1191
117
    items = reply.argumentAt<0>();
117
    items = reply.argumentAt<0>();
1192
@@ -122,13 +122,13 @@
1193
122
    EXPECT_EQ("", page_token);
122
    EXPECT_EQ("", page_token);
1194
123
123
1195
124
    // Try a bad page token
124
    // Try a bad page token
1197
125
    reply = client_->List("root_id", "bad_page_token");
125
    reply = client_->List("root_id", "bad_page_token", QList<QString>());
1198
126
    wait_for(reply);
126
    wait_for(reply);
1199
127
    EXPECT_TRUE(reply.isError());
127
    EXPECT_TRUE(reply.isError());
1200
128
    EXPECT_EQ(PROVIDER_ERROR + "LogicException", reply.error().name()) << reply.error().name().toStdString();
128
    EXPECT_EQ(PROVIDER_ERROR + "LogicException", reply.error().name()) << reply.error().name().toStdString();
1201
129
    EXPECT_EQ("Unknown page token", reply.error().message()) << reply.error().message().toStdString();
129
    EXPECT_EQ("Unknown page token", reply.error().message()) << reply.error().message().toStdString();
1202
130
130
1204
131
    reply = client_->List("no_such_folder_id", "");
131
    reply = client_->List("no_such_folder_id", "", QList<QString>());
1205
132
    wait_for(reply);
132
    wait_for(reply);
1206
133
    EXPECT_TRUE(reply.isError());
133
    EXPECT_TRUE(reply.isError());
1207
134
    EXPECT_EQ(PROVIDER_ERROR + "NotExistsException", reply.error().name());
134
    EXPECT_EQ(PROVIDER_ERROR + "NotExistsException", reply.error().name());
1208
@@ -139,7 +139,7 @@
1209
139
{
139
{
1210
140
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
140
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1211
141
141
1213
142
    auto reply = client_->Lookup("root_id", "Filename");
142
    auto reply = client_->Lookup("root_id", "Filename", QList<QString>());
1214
143
    wait_for(reply);
143
    wait_for(reply);
1215
144
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
144
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1216
145
    auto items = reply.value();
145
    auto items = reply.value();
1217
@@ -155,7 +155,7 @@
1218
155
{
155
{
1219
156
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
156
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1220
157
157
1222
158
    auto reply = client_->Metadata("root_id");
158
    auto reply = client_->Metadata("root_id", QList<QString>());
1223
159
    wait_for(reply);
159
    wait_for(reply);
1224
160
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
160
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1225
161
    auto item = reply.value();
161
    auto item = reply.value();
1226
@@ -169,7 +169,7 @@
1227
169
{
169
{
1228
170
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
170
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1229
171
171
1231
172
    auto reply = client_->CreateFolder("root_id", "New Folder");
172
    auto reply = client_->CreateFolder("root_id", "New Folder", QList<QString>());
1232
173
    wait_for(reply);
173
    wait_for(reply);
1233
174
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
174
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1234
175
    auto item = reply.value();
175
    auto item = reply.value();
1235
@@ -186,7 +186,8 @@
1236
186
    QString upload_id;
186
    QString upload_id;
1237
187
    QDBusUnixFileDescriptor socket;
187
    QDBusUnixFileDescriptor socket;
1238
188
    {
188
    {
1240
189
        auto reply = client_->CreateFile("parent_id", "file name", file_contents.size(), "text/plain", false);
189
        auto reply = client_->CreateFile("parent_id", "file name", file_contents.size(),
1241
190
                                         "text/plain", false, QList<QString>());
1242
190
        wait_for(reply);
191
        wait_for(reply);
1243
191
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
192
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1244
192
        upload_id = reply.argumentAt<0>();
193
        upload_id = reply.argumentAt<0>();
1245
@@ -235,7 +236,7 @@
1246
235
    QString upload_id;
236
    QString upload_id;
1247
236
    QDBusUnixFileDescriptor socket;
237
    QDBusUnixFileDescriptor socket;
1248
237
    {
238
    {
1250
238
        auto reply = client_->Update("item_id", file_contents.size(), "old_etag");
239
        auto reply = client_->Update("item_id", file_contents.size(), "old_etag", QList<QString>());
1251
239
        wait_for(reply);
240
        wait_for(reply);
1252
240
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
241
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1253
241
        upload_id = reply.argumentAt<0>();
242
        upload_id = reply.argumentAt<0>();
1254
@@ -282,7 +283,7 @@
1255
282
    QString upload_id;
283
    QString upload_id;
1256
283
    QDBusUnixFileDescriptor socket;
284
    QDBusUnixFileDescriptor socket;
1257
284
    {
285
    {
1259
285
        auto reply = client_->Update("item_id", 100, "old_etag");
286
        auto reply = client_->Update("item_id", 100, "old_etag", QList<QString>());
1260
286
        wait_for(reply);
287
        wait_for(reply);
1261
287
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
288
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1262
288
        upload_id = reply.argumentAt<0>();
289
        upload_id = reply.argumentAt<0>();
1263
@@ -305,7 +306,7 @@
1264
305
    QString upload_id;
306
    QString upload_id;
1265
306
    QDBusUnixFileDescriptor socket;
307
    QDBusUnixFileDescriptor socket;
1266
307
    {
308
    {
1268
308
        auto reply = client_->Update("item_id", file_contents.size() - 5, "old_etag");
309
        auto reply = client_->Update("item_id", file_contents.size() - 5, "old_etag", QList<QString>());
1269
309
        wait_for(reply);
310
        wait_for(reply);
1270
310
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
311
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1271
311
        upload_id = reply.argumentAt<0>();
312
        upload_id = reply.argumentAt<0>();
1272
@@ -352,7 +353,7 @@
1273
352
    QString upload_id;
353
    QString upload_id;
1274
353
    QDBusUnixFileDescriptor socket;
354
    QDBusUnixFileDescriptor socket;
1275
354
    {
355
    {
1277
355
        auto reply = client_->Update("item_id", 100, "old_etag");
356
        auto reply = client_->Update("item_id", 100, "old_etag", QList<QString>());
1278
356
        wait_for(reply);
357
        wait_for(reply);
1279
357
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
358
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1280
358
        upload_id = reply.argumentAt<0>();
359
        upload_id = reply.argumentAt<0>();
1281
@@ -372,7 +373,7 @@
1282
372
    QString upload_id;
373
    QString upload_id;
1283
373
    QDBusUnixFileDescriptor socket;
374
    QDBusUnixFileDescriptor socket;
1284
374
    {
375
    {
1286
375
        auto reply = client_->Update("item_id", 100, "old_etag");
376
        auto reply = client_->Update("item_id", 100, "old_etag", QList<QString>());
1287
376
        wait_for(reply);
377
        wait_for(reply);
1288
377
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
378
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1289
378
        upload_id = reply.argumentAt<0>();
379
        upload_id = reply.argumentAt<0>();
1290
@@ -387,7 +388,7 @@
1291
387
{
388
{
1292
388
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
389
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1293
389
390
1295
390
    auto upload_reply = client_->Update("item_id", 100, "old_etag");
391
    auto upload_reply = client_->Update("item_id", 100, "old_etag", QList<QString>());
1296
391
    wait_for(upload_reply);
392
    wait_for(upload_reply);
1297
392
    ASSERT_TRUE(upload_reply.isValid()) << upload_reply.error().message().toStdString();
393
    ASSERT_TRUE(upload_reply.isValid()) << upload_reply.error().message().toStdString();
1298
393
    auto upload_id = upload_reply.argumentAt<0>();
394
    auto upload_id = upload_reply.argumentAt<0>();
1299
@@ -419,7 +420,7 @@
1300
419
        QDBusConnection::disconnectFromBus(SECOND_CONNECTION_NAME);
420
        QDBusConnection::disconnectFromBus(SECOND_CONNECTION_NAME);
1301
420
        service_watcher.addWatchedService(connection2.baseService());
421
        service_watcher.addWatchedService(connection2.baseService());
1302
421
        ProviderClient client2(bus_name(), object_path(), connection2);
422
        ProviderClient client2(bus_name(), object_path(), connection2);
1304
422
        auto reply = client2.Update("item_id", 100, "old_etag");
423
        auto reply = client2.Update("item_id", 100, "old_etag", QList<QString>());
1305
423
        wait_for(reply);
424
        wait_for(reply);
1306
424
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
425
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1307
425
        // Store socket so it will remain open past the closing of the
426
        // Store socket so it will remain open past the closing of the
1308
@@ -457,7 +458,7 @@
1309
457
{
458
{
1310
458
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
459
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1311
459
460
1313
460
    auto upload_reply = client_->Update("item_id", 100, "old_etag");
461
    auto upload_reply = client_->Update("item_id", 100, "old_etag", QList<QString>());
1314
461
    wait_for(upload_reply);
462
    wait_for(upload_reply);
1315
462
    ASSERT_TRUE(upload_reply.isValid()) << upload_reply.error().message().toStdString();
463
    ASSERT_TRUE(upload_reply.isValid()) << upload_reply.error().message().toStdString();
1316
463
    auto upload_id = upload_reply.argumentAt<0>();
464
    auto upload_id = upload_reply.argumentAt<0>();
1317
@@ -480,7 +481,7 @@
1318
480
    QString upload_id;
481
    QString upload_id;
1319
481
    QDBusUnixFileDescriptor socket;
482
    QDBusUnixFileDescriptor socket;
1320
482
    {
483
    {
1322
483
        auto reply = client_->Update("tempfile_item_id", file_contents.size(), "old_etag");
484
        auto reply = client_->Update("tempfile_item_id", file_contents.size(), "old_etag", QList<QString>());
1323
484
        wait_for(reply);
485
        wait_for(reply);
1324
485
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
486
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1325
486
        upload_id = reply.argumentAt<0>();
487
        upload_id = reply.argumentAt<0>();
1326
@@ -527,7 +528,7 @@
1327
527
    QString upload_id;
528
    QString upload_id;
1328
528
    QDBusUnixFileDescriptor socket;
529
    QDBusUnixFileDescriptor socket;
1329
529
    {
530
    {
1331
530
        auto reply = client_->Update("tempfile_item_id", 100, "old_etag");
531
        auto reply = client_->Update("tempfile_item_id", 100, "old_etag", QList<QString>());
1332
531
        wait_for(reply);
532
        wait_for(reply);
1333
532
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
533
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1334
533
        upload_id = reply.argumentAt<0>();
534
        upload_id = reply.argumentAt<0>();
1335
@@ -550,7 +551,7 @@
1336
550
    QString upload_id;
551
    QString upload_id;
1337
551
    QDBusUnixFileDescriptor socket;
552
    QDBusUnixFileDescriptor socket;
1338
552
    {
553
    {
1340
553
        auto reply = client_->Update("tempfile_item_id", file_contents.size() - 5, "old_etag");
554
        auto reply = client_->Update("tempfile_item_id", file_contents.size() - 5, "old_etag", QList<QString>());
1341
554
        wait_for(reply);
555
        wait_for(reply);
1342
555
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
556
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1343
556
        upload_id = reply.argumentAt<0>();
557
        upload_id = reply.argumentAt<0>();
1344
@@ -597,7 +598,7 @@
1345
597
    QString upload_id;
598
    QString upload_id;
1346
598
    QDBusUnixFileDescriptor socket;
599
    QDBusUnixFileDescriptor socket;
1347
599
    {
600
    {
1349
600
        auto reply = client_->Update("tempfile_item_id", 100, "old_etag");
601
        auto reply = client_->Update("tempfile_item_id", 100, "old_etag", QList<QString>());
1350
601
        wait_for(reply);
602
        wait_for(reply);
1351
602
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
603
        ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1352
603
        upload_id = reply.argumentAt<0>();
604
        upload_id = reply.argumentAt<0>();
1353
@@ -756,7 +757,7 @@
1354
756
{
757
{
1355
757
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
758
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1356
758
759
1358
759
    auto reply = client_->Move("child_id", "new_parent_id", "New name");
760
    auto reply = client_->Move("child_id", "new_parent_id", "New name", QList<QString>());
1359
760
    wait_for(reply);
761
    wait_for(reply);
1360
761
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
762
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1361
762
    auto item = reply.value();
763
    auto item = reply.value();
1362
@@ -770,7 +771,7 @@
1363
770
{
771
{
1364
771
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
772
    set_provider(unique_ptr<ProviderBase>(new TestProvider));
1365
772
773
1367
773
    auto reply = client_->Copy("child_id", "new_parent_id", "New name");
774
    auto reply = client_->Copy("child_id", "new_parent_id", "New name", QList<QString>());
1368
774
    wait_for(reply);
775
    wait_for(reply);
1369
775
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
776
    ASSERT_TRUE(reply.isValid()) << reply.error().message().toStdString();
1370
776
    auto item = reply.value();
777
    auto item = reply.value();
1371
777
778
1372
=== modified file 'tests/provider-ProviderInterface/TestProvider.cpp'
1373
--- tests/provider-ProviderInterface/TestProvider.cpp	2016-08-24 10:52:17 +0000
1374
+++ tests/provider-ProviderInterface/TestProvider.cpp	2016-11-02 04:28:58 +0000
1375
@@ -283,8 +283,9 @@
1376
283
}
283
}
1377
284
284
1378
285
285
1380
286
boost::future<ItemList> TestProvider::roots(Context const& ctx)
286
boost::future<ItemList> TestProvider::roots(vector<string> const& keys, Context const& ctx)
1381
287
{
287
{
1382
288
    Q_UNUSED(keys);
1383
288
    Q_UNUSED(ctx);
289
    Q_UNUSED(ctx);
1384
289
290
1385
290
    ItemList roots = {
291
    ItemList roots = {
1386
@@ -296,8 +297,9 @@
1387
296
}
297
}
1388
297
298
1389
298
boost::future<tuple<ItemList,string>> TestProvider::list(
299
boost::future<tuple<ItemList,string>> TestProvider::list(
1391
299
    string const& item_id, string const& page_token, Context const& ctx)
300
    string const& item_id, string const& page_token, vector<string> const& keys, Context const& ctx)
1392
300
{
301
{
1393
302
    Q_UNUSED(keys);
1394
301
    Q_UNUSED(ctx);
303
    Q_UNUSED(ctx);
1395
302
304
1396
303
    boost::promise<tuple<ItemList,string>> p;
305
    boost::promise<tuple<ItemList,string>> p;
1397
@@ -330,8 +332,9 @@
1398
330
}
332
}
1399
331
333
1400
332
boost::future<ItemList> TestProvider::lookup(
334
boost::future<ItemList> TestProvider::lookup(
1402
333
    string const& parent_id, string const& name, Context const& ctx)
335
    string const& parent_id, string const& name, vector<string> const& keys, Context const& ctx)
1403
334
{
336
{
1404
337
    Q_UNUSED(keys);
1405
335
    Q_UNUSED(ctx);
338
    Q_UNUSED(ctx);
1406
336
339
1407
337
    boost::promise<ItemList> p;
340
    boost::promise<ItemList> p;
1408
@@ -343,8 +346,9 @@
1409
343
}
346
}
1410
344
347
1411
345
boost::future<Item> TestProvider::metadata(
348
boost::future<Item> TestProvider::metadata(
1413
346
    string const& item_id, Context const& ctx)
349
    string const& item_id, vector<string> const& keys, Context const& ctx)
1414
347
{
350
{
1415
351
    Q_UNUSED(keys);
1416
348
    Q_UNUSED(ctx);
352
    Q_UNUSED(ctx);
1417
349
353
1418
350
    boost::promise<Item> p;
354
    boost::promise<Item> p;
1419
@@ -361,8 +365,9 @@
1420
361
}
365
}
1421
362
366
1422
363
boost::future<Item> TestProvider::create_folder(
367
boost::future<Item> TestProvider::create_folder(
1424
364
    string const& parent_id, string const& name, Context const& ctx)
368
    string const& parent_id, string const& name, vector<string> const& keys, Context const& ctx)
1425
365
{
369
{
1426
370
    Q_UNUSED(keys);
1427
366
    Q_UNUSED(ctx);
371
    Q_UNUSED(ctx);
1428
367
372
1429
368
    boost::promise<Item> p;
373
    boost::promise<Item> p;
1430
@@ -373,11 +378,12 @@
1431
373
378
1432
374
boost::future<unique_ptr<UploadJob>> TestProvider::create_file(
379
boost::future<unique_ptr<UploadJob>> TestProvider::create_file(
1433
375
    string const& parent_id, string const& name,
380
    string const& parent_id, string const& name,
1435
376
    int64_t size, string const& content_type, bool allow_overwrite,
381
    int64_t size, string const& content_type, bool allow_overwrite, vector<string> const& keys,
1436
377
    Context const& ctx)
382
    Context const& ctx)
1437
378
{
383
{
1438
379
    Q_UNUSED(content_type);
384
    Q_UNUSED(content_type);
1439
380
    Q_UNUSED(allow_overwrite);
385
    Q_UNUSED(allow_overwrite);
1440
386
    Q_UNUSED(keys);
1441
381
    Q_UNUSED(ctx);
387
    Q_UNUSED(ctx);
1442
382
388
1443
383
    boost::promise<unique_ptr<UploadJob>> p;
389
    boost::promise<unique_ptr<UploadJob>> p;
1444
@@ -387,11 +393,12 @@
1445
387
}
393
}
1446
388
394
1447
389
boost::future<unique_ptr<UploadJob>> TestProvider::update(
395
boost::future<unique_ptr<UploadJob>> TestProvider::update(
1449
390
    string const& item_id, int64_t size, string const& old_etag,
396
    string const& item_id, int64_t size, string const& old_etag, vector<string> const& keys,
1450
391
    Context const& ctx)
397
    Context const& ctx)
1451
392
{
398
{
1452
393
    Q_UNUSED(item_id);
399
    Q_UNUSED(item_id);
1453
394
    Q_UNUSED(old_etag);
400
    Q_UNUSED(old_etag);
1454
401
    Q_UNUSED(keys);
1455
395
    Q_UNUSED(ctx);
402
    Q_UNUSED(ctx);
1456
396
403
1457
397
    boost::promise<unique_ptr<UploadJob>> p;
404
    boost::promise<unique_ptr<UploadJob>> p;
1458
@@ -438,8 +445,9 @@
1459
438
445
1460
439
boost::future<Item> TestProvider::move(
446
boost::future<Item> TestProvider::move(
1461
440
    string const& item_id, string const& new_parent_id,
447
    string const& item_id, string const& new_parent_id,
1463
441
    string const& new_name, Context const& ctx)
448
    string const& new_name, vector<string> const& keys, Context const& ctx)
1464
442
{
449
{
1465
450
    Q_UNUSED(keys);
1466
443
    Q_UNUSED(ctx);
451
    Q_UNUSED(ctx);
1467
444
452
1468
445
    boost::promise<Item> p;
453
    boost::promise<Item> p;
1469
@@ -450,9 +458,10 @@
1470
450
458
1471
451
boost::future<Item> TestProvider::copy(
459
boost::future<Item> TestProvider::copy(
1472
452
    string const& item_id, string const& new_parent_id,
460
    string const& item_id, string const& new_parent_id,
1474
453
    string const& new_name, Context const& ctx)
461
    string const& new_name, vector<string> const& keys, Context const& ctx)
1475
454
{
462
{
1476
455
    Q_UNUSED(item_id);
463
    Q_UNUSED(item_id);
1477
464
    Q_UNUSED(keys);
1478
456
    Q_UNUSED(ctx);
465
    Q_UNUSED(ctx);
1479
457
466
1480
458
    boost::promise<Item> p;
467
    boost::promise<Item> p;
1481
459
468
1482
=== modified file 'tests/provider-ProviderInterface/TestProvider.h'
1483
--- tests/provider-ProviderInterface/TestProvider.h	2016-08-11 05:13:00 +0000
1484
+++ tests/provider-ProviderInterface/TestProvider.h	2016-11-02 04:28:58 +0000
1485
@@ -30,25 +30,25 @@
1486
30
30
1487
31
class TestProvider : public ProviderBase {
31
class TestProvider : public ProviderBase {
1488
32
public:
32
public:
1490
33
    boost::future<ItemList> roots(Context const& ctx) override;
33
    boost::future<ItemList> roots(vector<string> const& keys, Context const& ctx) override;
1491
34
    boost::future<tuple<ItemList,string>> list(
34
    boost::future<tuple<ItemList,string>> list(
1493
35
        string const& item_id, string const& page_token,
35
        string const& item_id, string const& page_token, vector<string> const& keys,
1494
36
        Context const& ctx) override;
36
        Context const& ctx) override;
1495
37
    boost::future<ItemList> lookup(
37
    boost::future<ItemList> lookup(
1497
38
        string const& parent_id, string const& name,
38
        string const& parent_id, string const& name, vector<string> const& keys,
1498
39
        Context const& ctx) override;
39
        Context const& ctx) override;
1499
40
    boost::future<Item> metadata(
40
    boost::future<Item> metadata(
1501
41
        string const& item_id, Context const& ctx) override;
41
        string const& item_id, vector<string> const& keys, Context const& ctx) override;
1502
42
    boost::future<Item> create_folder(
42
    boost::future<Item> create_folder(
1504
43
        string const& parent_id, string const& name,
43
        string const& parent_id, string const& name, vector<string> const& keys,
1505
44
        Context const& ctx) override;
44
        Context const& ctx) override;
1506
45
45
1507
46
    boost::future<unique_ptr<UploadJob>> create_file(
46
    boost::future<unique_ptr<UploadJob>> create_file(
1508
47
        string const& parent_id, string const& name,
47
        string const& parent_id, string const& name,
1510
48
        int64_t size, string const& content_type, bool allow_overwrite,
48
        int64_t size, string const& content_type, bool allow_overwrite, vector<string> const& keys,
1511
49
        Context const& ctx) override;
49
        Context const& ctx) override;
1512
50
    boost::future<unique_ptr<UploadJob>> update(
50
    boost::future<unique_ptr<UploadJob>> update(
1514
51
        string const& item_id, int64_t size, string const& old_etag,
51
        string const& item_id, int64_t size, string const& old_etag, vector<string> const& keys,
1515
52
        Context const& ctx) override;
52
        Context const& ctx) override;
1516
53
53
1517
54
    boost::future<unique_ptr<DownloadJob>> download(
54
    boost::future<unique_ptr<DownloadJob>> download(
1518
@@ -58,8 +58,8 @@
1519
58
        string const& item_id, Context const& ctx) override;
58
        string const& item_id, Context const& ctx) override;
1520
59
    boost::future<Item> move(
59
    boost::future<Item> move(
1521
60
        string const& item_id, string const& new_parent_id,
60
        string const& item_id, string const& new_parent_id,
1523
61
        string const& new_name, Context const& ctx) override;
61
        string const& new_name, vector<string> const& keys, Context const& ctx) override;
1524
62
    boost::future<Item> copy(
62
    boost::future<Item> copy(
1525
63
        string const& item_id, string const& new_parent_id,
63
        string const& item_id, string const& new_parent_id,
1527
64
        string const& new_name, Context const& ctx) override;
64
        string const& new_name, vector<string> const& keys, Context const& ctx) override;
1528
65
};
65
};
1529
66
66
1530
=== modified file 'tests/remote-client-v1/MockProvider.cpp'
1531
--- tests/remote-client-v1/MockProvider.cpp	2016-08-22 06:04:06 +0000
1532
+++ tests/remote-client-v1/MockProvider.cpp	2016-11-02 04:28:58 +0000
1533
@@ -44,7 +44,7 @@
1534
44
{
44
{
1535
45
}
45
}
1536
46
46
1538
47
boost::future<ItemList> MockProvider::roots(Context const&)
47
boost::future<ItemList> MockProvider::roots(vector<string> const&, Context const&)
1539
48
{
48
{
1540
49
    ItemList roots =
49
    ItemList roots =
1541
50
    {
50
    {
1542
@@ -54,7 +54,7 @@
1543
54
}
54
}
1544
55
55
1545
56
boost::future<tuple<ItemList,string>> MockProvider::list(
56
boost::future<tuple<ItemList,string>> MockProvider::list(
1547
57
    string const& item_id, string const& page_token,
57
    string const& item_id, string const& page_token, vector<string> const&,
1548
58
    Context const&)
58
    Context const&)
1549
59
{
59
{
1550
60
    if (item_id != "root_id")
60
    if (item_id != "root_id")
1551
@@ -80,7 +80,7 @@
1552
80
}
80
}
1553
81
81
1554
82
boost::future<ItemList> MockProvider::lookup(
82
boost::future<ItemList> MockProvider::lookup(
1556
83
    string const& parent_id, string const& name, Context const&)
83
    string const& parent_id, string const& name, vector<string> const&, Context const&)
1557
84
{
84
{
1558
85
    if (parent_id != "root_id")
85
    if (parent_id != "root_id")
1559
86
    {
86
    {
1560
@@ -100,7 +100,7 @@
1561
100
    return make_ready_future<ItemList>(children);
100
    return make_ready_future<ItemList>(children);
1562
101
}
101
}
1563
102
102
1565
103
boost::future<Item> MockProvider::metadata(string const& item_id, Context const&)
103
boost::future<Item> MockProvider::metadata(string const& item_id, vector<string> const&, Context const&)
1566
104
{
104
{
1567
105
    if (item_id == "root_id")
105
    if (item_id == "root_id")
1568
106
    {
106
    {
1569
@@ -125,7 +125,7 @@
1570
125
}
125
}
1571
126
126
1572
127
boost::future<Item> MockProvider::create_folder(
127
boost::future<Item> MockProvider::create_folder(
1574
128
    string const& parent_id, string const& name,
128
    string const& parent_id, string const& name, vector<string> const&,
1575
129
    Context const&)
129
    Context const&)
1576
130
{
130
{
1577
131
    Item metadata{"new_folder_id", { parent_id }, name, "etag", ItemType::folder, {}};
131
    Item metadata{"new_folder_id", { parent_id }, name, "etag", ItemType::folder, {}};
1578
@@ -140,13 +140,13 @@
1579
140
140
1580
141
boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
141
boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
1581
142
    string const&, string const&,
142
    string const&, string const&,
1583
143
    int64_t, string const&, bool, Context const&)
143
    int64_t, string const&, bool, vector<string> const&, Context const&)
1584
144
{
144
{
1585
145
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
145
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
1586
146
}
146
}
1587
147
147
1588
148
boost::future<unique_ptr<UploadJob>> MockProvider::update(
148
boost::future<unique_ptr<UploadJob>> MockProvider::update(
1590
149
    string const&, int64_t, string const&, Context const&)
149
    string const&, int64_t, string const&, vector<string> const&, Context const&)
1591
150
{
150
{
1592
151
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
151
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
1593
152
}
152
}
1594
@@ -174,7 +174,7 @@
1595
174
174
1596
175
boost::future<Item> MockProvider::move(
175
boost::future<Item> MockProvider::move(
1597
176
    string const& item_id, string const& new_parent_id,
176
    string const& item_id, string const& new_parent_id,
1599
177
    string const& new_name, Context const&)
177
    string const& new_name, vector<string> const&, Context const&)
1600
178
{
178
{
1601
179
    Item metadata{item_id, { new_parent_id }, new_name, "etag", ItemType::file, {}};
179
    Item metadata{item_id, { new_parent_id }, new_name, "etag", ItemType::file, {}};
1602
180
    return make_ready_future(metadata);
180
    return make_ready_future(metadata);
1603
@@ -182,7 +182,7 @@
1604
182
182
1605
183
boost::future<Item> MockProvider::copy(
183
boost::future<Item> MockProvider::copy(
1606
184
    string const&, string const& new_parent_id,
184
    string const&, string const& new_parent_id,
1608
185
    string const& new_name, Context const&)
185
    string const& new_name, vector<string> const&, Context const&)
1609
186
{
186
{
1610
187
    Item metadata{"new_item_id", { new_parent_id }, new_name, "etag", ItemType::file, {}};
187
    Item metadata{"new_item_id", { new_parent_id }, new_name, "etag", ItemType::file, {}};
1611
188
    return make_ready_future(metadata);
188
    return make_ready_future(metadata);
1612
189
189
1613
=== modified file 'tests/remote-client-v1/MockProvider.h'
1614
--- tests/remote-client-v1/MockProvider.h	2016-08-22 04:56:44 +0000
1615
+++ tests/remote-client-v1/MockProvider.h	2016-11-02 04:28:58 +0000
1616
@@ -28,25 +28,27 @@
1617
28
    MockProvider();
28
    MockProvider();
1618
29
    MockProvider(std::string const& cmd);
29
    MockProvider(std::string const& cmd);
1619
30
30
1621
31
    boost::future<unity::storage::provider::ItemList> roots(unity::storage::provider::Context const& ctx) override;
31
    boost::future<unity::storage::provider::ItemList> roots(std::vector<std::string> const& keys,
1622
32
                                                            unity::storage::provider::Context const& ctx) override;
1623
32
    boost::future<std::tuple<unity::storage::provider::ItemList, std::string>> list(
33
    boost::future<std::tuple<unity::storage::provider::ItemList, std::string>> list(
1625
33
        std::string const& item_id,  std::string const& page_token,
34
        std::string const& item_id, std::string const& page_token, std::vector<std::string> const& keys,
1626
34
        unity::storage::provider::Context const& ctx) override;
35
        unity::storage::provider::Context const& ctx) override;
1627
35
    boost::future<unity::storage::provider::ItemList> lookup(
36
    boost::future<unity::storage::provider::ItemList> lookup(
1629
36
        std::string const& parent_id,  std::string const& name,
37
        std::string const& parent_id,  std::string const& name, std::vector<std::string> const& keys,
1630
37
        unity::storage::provider::Context const& ctx) override;
38
        unity::storage::provider::Context const& ctx) override;
1631
38
    boost::future<unity::storage::provider::Item> metadata(
39
    boost::future<unity::storage::provider::Item> metadata(
1633
39
        std::string const& item_id, unity::storage::provider::Context const& ctx) override;
40
        std::string const& item_id, std::vector<std::string> const& keys,
1634
41
        unity::storage::provider::Context const& ctx) override;
1635
40
    boost::future<unity::storage::provider::Item> create_folder(
42
    boost::future<unity::storage::provider::Item> create_folder(
1637
41
        std::string const& parent_id,  std::string const& name,
43
        std::string const& parent_id,  std::string const& name, std::vector<std::string> const& keys,
1638
42
        unity::storage::provider::Context const& ctx) override;
44
        unity::storage::provider::Context const& ctx) override;
1639
43
45
1640
44
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> create_file(
46
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> create_file(
1641
45
        std::string const& parent_id, std::string const& name,
47
        std::string const& parent_id, std::string const& name,
1643
46
        int64_t size, std::string const& content_type, bool allow_overwrite,
48
        int64_t size, std::string const& content_type, bool allow_overwrite, std::vector<std::string> const& keys,
1644
47
        unity::storage::provider::Context const& ctx) override;
49
        unity::storage::provider::Context const& ctx) override;
1645
48
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> update(
50
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> update(
1647
49
        std::string const& item_id, int64_t size, std::string const& old_etag,
51
        std::string const& item_id, int64_t size, std::string const& old_etag, std::vector<std::string> const& keys,
1648
50
        unity::storage::provider::Context const& ctx) override;
52
        unity::storage::provider::Context const& ctx) override;
1649
51
53
1650
52
    boost::future<std::unique_ptr<unity::storage::provider::DownloadJob>> download(
54
    boost::future<std::unique_ptr<unity::storage::provider::DownloadJob>> download(
1651
@@ -56,10 +58,12 @@
1652
56
        std::string const& item_id, unity::storage::provider::Context const& ctx) override;
58
        std::string const& item_id, unity::storage::provider::Context const& ctx) override;
1653
57
    boost::future<unity::storage::provider::Item> move(
59
    boost::future<unity::storage::provider::Item> move(
1654
58
        std::string const& item_id, std::string const& new_parent_id,
60
        std::string const& item_id, std::string const& new_parent_id,
1656
59
        std::string const& new_name, unity::storage::provider::Context const& ctx) override;
61
        std::string const& new_name, std::vector<std::string> const& keys,
1657
62
        unity::storage::provider::Context const& ctx) override;
1658
60
    boost::future<unity::storage::provider::Item> copy(
63
    boost::future<unity::storage::provider::Item> copy(
1659
61
        std::string const& item_id, std::string const& new_parent_id,
64
        std::string const& item_id, std::string const& new_parent_id,
1661
62
        std::string const& new_name, unity::storage::provider::Context const& ctx) override;
65
        std::string const& new_name, std::vector<std::string> const& keys,
1662
66
        unity::storage::provider::Context const& ctx) override;
1663
63
67
1664
64
private:
68
private:
1665
65
    std::string cmd_;
69
    std::string cmd_;
1666
66
70
1667
=== modified file 'tests/remote-client/MockProvider.cpp'
1668
--- tests/remote-client/MockProvider.cpp	2016-10-17 12:40:31 +0000
1669
+++ tests/remote-client/MockProvider.cpp	2016-11-02 04:28:58 +0000
1670
@@ -44,7 +44,7 @@
1671
44
{
44
{
1672
45
}
45
}
1673
46
46
1675
47
boost::future<ItemList> MockProvider::roots(Context const&)
47
boost::future<ItemList> MockProvider::roots(vector<string> const& keys, Context const&)
1676
48
{
48
{
1677
49
    if (cmd_ == "roots_slow")
49
    if (cmd_ == "roots_slow")
1678
50
    {
50
    {
1679
@@ -72,7 +72,7 @@
1680
72
}
72
}
1681
73
73
1682
74
boost::future<tuple<ItemList,string>> MockProvider::list(
74
boost::future<tuple<ItemList,string>> MockProvider::list(
1684
75
    string const& item_id, string const& page_token,
75
    string const& item_id, string const& page_token, vector<string> const& keys,
1685
76
    Context const&)
76
    Context const&)
1686
77
{
77
{
1687
78
    if (cmd_ == "list_slow")
78
    if (cmd_ == "list_slow")
1688
@@ -156,7 +156,7 @@
1689
156
}
156
}
1690
157
157
1691
158
boost::future<ItemList> MockProvider::lookup(
158
boost::future<ItemList> MockProvider::lookup(
1693
159
    string const& parent_id, string const& name, Context const&)
159
    string const& parent_id, string const& name, vector<string> const& keys, Context const&)
1694
160
{
160
{
1695
161
    if (parent_id != "root_id")
161
    if (parent_id != "root_id")
1696
162
    {
162
    {
1697
@@ -176,7 +176,7 @@
1698
176
    return make_ready_future<ItemList>(children);
176
    return make_ready_future<ItemList>(children);
1699
177
}
177
}
1700
178
178
1702
179
boost::future<Item> MockProvider::metadata(string const& item_id, Context const&)
179
boost::future<Item> MockProvider::metadata(string const& item_id, vector<string> const& keys, Context const&)
1703
180
{
180
{
1704
181
    static int num_calls = 0;
181
    static int num_calls = 0;
1705
182
182
1706
@@ -246,7 +246,7 @@
1707
246
}
246
}
1708
247
247
1709
248
boost::future<Item> MockProvider::create_folder(
248
boost::future<Item> MockProvider::create_folder(
1711
249
    string const& parent_id, string const& name,
249
    string const& parent_id, string const& name, vector<string> const& keys,
1712
250
    Context const&)
250
    Context const&)
1713
251
{
251
{
1714
252
    if (cmd_ == "create_folder_returns_file")
252
    if (cmd_ == "create_folder_returns_file")
1715
@@ -260,13 +260,13 @@
1716
260
260
1717
261
boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
261
boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
1718
262
    string const&, string const&,
262
    string const&, string const&,
1720
263
    int64_t, string const&, bool, Context const&)
263
    int64_t, string const&, bool, vector<string> const&, Context const&)
1721
264
{
264
{
1722
265
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(cmd_));
265
    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(cmd_));
1723
266
}
266
}
1724
267
267
1725
268
boost::future<unique_ptr<UploadJob>> MockProvider::update(
268
boost::future<unique_ptr<UploadJob>> MockProvider::update(
1727
269
    string const&, int64_t, string const&, Context const&)
269
    string const&, int64_t, string const&, vector<string> const&, Context const&)
1728
270
{
270
{
1729
271
    if (cmd_ == "upload_slow")
271
    if (cmd_ == "upload_slow")
1730
272
    {
272
    {
1731
@@ -328,7 +328,7 @@
1732
328
328
1733
329
boost::future<Item> MockProvider::move(
329
boost::future<Item> MockProvider::move(
1734
330
    string const& item_id, string const& new_parent_id,
330
    string const& item_id, string const& new_parent_id,
1736
331
    string const& new_name, Context const&)
331
    string const& new_name, vector<string> const& keys, Context const&)
1737
332
{
332
{
1738
333
    if (cmd_ == "move_returns_root")
333
    if (cmd_ == "move_returns_root")
1739
334
    {
334
    {
1740
@@ -358,7 +358,7 @@
1741
358
358
1742
359
boost::future<Item> MockProvider::copy(
359
boost::future<Item> MockProvider::copy(
1743
360
    string const&, string const& new_parent_id,
360
    string const&, string const& new_parent_id,
1745
361
    string const& new_name, Context const&)
361
    string const& new_name, vector<string> const& keys, Context const&)
1746
362
{
362
{
1747
363
    if (cmd_ == "copy_type_mismatch")
363
    if (cmd_ == "copy_type_mismatch")
1748
364
    {
364
    {
1749
365
365
1750
=== modified file 'tests/remote-client/MockProvider.h'
1751
--- tests/remote-client/MockProvider.h	2016-09-08 08:33:59 +0000
1752
+++ tests/remote-client/MockProvider.h	2016-11-02 04:28:58 +0000
1753
@@ -28,25 +28,27 @@
1754
28
    MockProvider();
28
    MockProvider();
1755
29
    MockProvider(std::string const& cmd);
29
    MockProvider(std::string const& cmd);
1756
30
30
1758
31
    boost::future<unity::storage::provider::ItemList> roots(unity::storage::provider::Context const& ctx) override;
31
    boost::future<unity::storage::provider::ItemList> roots(std::vector<std::string> const& keys,
1759
32
                                                            unity::storage::provider::Context const& ctx) override;
1760
32
    boost::future<std::tuple<unity::storage::provider::ItemList, std::string>> list(
33
    boost::future<std::tuple<unity::storage::provider::ItemList, std::string>> list(
1762
33
        std::string const& item_id,  std::string const& page_token,
34
        std::string const& item_id,  std::string const& page_token, std::vector<std::string> const& keys,
1763
34
        unity::storage::provider::Context const& ctx) override;
35
        unity::storage::provider::Context const& ctx) override;
1764
35
    boost::future<unity::storage::provider::ItemList> lookup(
36
    boost::future<unity::storage::provider::ItemList> lookup(
1766
36
        std::string const& parent_id,  std::string const& name,
37
        std::string const& parent_id,  std::string const& name, std::vector<std::string> const& keys,
1767
37
        unity::storage::provider::Context const& ctx) override;
38
        unity::storage::provider::Context const& ctx) override;
1768
38
    boost::future<unity::storage::provider::Item> metadata(
39
    boost::future<unity::storage::provider::Item> metadata(
1770
39
        std::string const& item_id, unity::storage::provider::Context const& ctx) override;
40
        std::string const& item_id, std::vector<std::string> const& keys,
1771
41
        unity::storage::provider::Context const& ctx) override;
1772
40
    boost::future<unity::storage::provider::Item> create_folder(
42
    boost::future<unity::storage::provider::Item> create_folder(
1774
41
        std::string const& parent_id,  std::string const& name,
43
        std::string const& parent_id,  std::string const& name, std::vector<std::string> const& keys,
1775
42
        unity::storage::provider::Context const& ctx) override;
44
        unity::storage::provider::Context const& ctx) override;
1776
43
45
1777
44
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> create_file(
46
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> create_file(
1778
45
        std::string const& parent_id, std::string const& name,
47
        std::string const& parent_id, std::string const& name,
1780
46
        int64_t size, std::string const& content_type, bool allow_overwrite,
48
        int64_t size, std::string const& content_type, bool allow_overwrite, std::vector<std::string> const& keys,
1781
47
        unity::storage::provider::Context const& ctx) override;
49
        unity::storage::provider::Context const& ctx) override;
1782
48
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> update(
50
    boost::future<std::unique_ptr<unity::storage::provider::UploadJob>> update(
1784
49
        std::string const& item_id, int64_t size, std::string const& old_etag,
51
        std::string const& item_id, int64_t size, std::string const& old_etag, std::vector<std::string> const& keys,
1785
50
        unity::storage::provider::Context const& ctx) override;
52
        unity::storage::provider::Context const& ctx) override;
1786
51
53
1787
52
    boost::future<std::unique_ptr<unity::storage::provider::DownloadJob>> download(
54
    boost::future<std::unique_ptr<unity::storage::provider::DownloadJob>> download(
1788
@@ -56,10 +58,12 @@
1789
56
        std::string const& item_id, unity::storage::provider::Context const& ctx) override;
58
        std::string const& item_id, unity::storage::provider::Context const& ctx) override;
1790
57
    boost::future<unity::storage::provider::Item> move(
59
    boost::future<unity::storage::provider::Item> move(
1791
58
        std::string const& item_id, std::string const& new_parent_id,
60
        std::string const& item_id, std::string const& new_parent_id,
1793
59
        std::string const& new_name, unity::storage::provider::Context const& ctx) override;
61
        std::string const& new_name, std::vector<std::string> const& keys,
1794
62
        unity::storage::provider::Context const& ctx) override;
1795
60
    boost::future<unity::storage::provider::Item> copy(
63
    boost::future<unity::storage::provider::Item> copy(
1796
61
        std::string const& item_id, std::string const& new_parent_id,
64
        std::string const& item_id, std::string const& new_parent_id,
1798
62
        std::string const& new_name, unity::storage::provider::Context const& ctx) override;
65
        std::string const& new_name, std::vector<std::string> const& keys,
1799
66
        unity::storage::provider::Context const& ctx) override;
1800
63
67
1801
64
private:
68
private:
1802
65
    std::string cmd_;
69
    std::string cmd_;
Status:	Merged
Approved by:	James Henstridge on 2016-11-02
Approved revision:	84
Merged at revision:	82
Proposed branch:	lp:~michihenning/storage-framework/specify-metadata
Merge into:	lp:storage-framework/devel
Diff against target:	1802 lines (+365/-232) 25 files modified data/provider.xml (+27/-0) demo/provider_test/provider-test.cpp (+18/-17) include/unity/storage/provider/ProviderBase.h (+9/-8) include/unity/storage/provider/internal/ProviderInterface.h (+25/-9) include/unity/storage/qt/Account.h (+3/-4) include/unity/storage/qt/Item.h (+17/-10) include/unity/storage/qt/internal/AccountImpl.h (+2/-2) include/unity/storage/qt/internal/ItemImpl.h (+9/-8) src/provider/internal/ProviderInterface.cpp (+90/-30) src/qt/Account.cpp (+4/-4) src/qt/Item.cpp (+32/-31) src/qt/client/internal/remote_client/AccountImpl.cpp (+1/-1) src/qt/client/internal/remote_client/FileImpl.cpp (+1/-1) src/qt/client/internal/remote_client/FolderImpl.cpp (+5/-5) src/qt/client/internal/remote_client/ItemImpl.cpp (+2/-2) src/qt/client/internal/remote_client/RootImpl.cpp (+1/-1) src/qt/internal/AccountImpl.cpp (+4/-4) src/qt/internal/ItemImpl.cpp (+20/-18) tests/provider-ProviderInterface/ProviderInterface_test.cpp (+24/-23) tests/provider-ProviderInterface/TestProvider.cpp (+18/-9) tests/provider-ProviderInterface/TestProvider.h (+9/-9) tests/remote-client-v1/MockProvider.cpp (+9/-9) tests/remote-client-v1/MockProvider.h (+13/-9) tests/remote-client/MockProvider.cpp (+9/-9) tests/remote-client/MockProvider.h (+13/-9)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/specify-metadata
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
James Henstridge		2016-10-21	Approve on 2016-11-02
unity-api-1-bot	continuous-integration		Approve on 2016-11-02
Review via email: mp+308997@code.launchpad.net