1
=== added file 'include/unity/storage/provider/Item.h'
2
--- include/unity/storage/provider/Item.h	1970-01-01 00:00:00 +0000
3
+++ include/unity/storage/provider/Item.h	2017-03-17 02:54:00 +0000
4
@@ -0,0 +1,54 @@
5
1
/*
6
2
 * Copyright (C) 2016 Canonical Ltd
7
3
 *
8
4
 * This program is free software: you can redistribute it and/or modify
9
5
 * it under the terms of the GNU Lesser General Public License version 3 as
10
6
 * published by the Free Software Foundation.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU Lesser General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU Lesser General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 *
20
16
 * Authors: James Henstridge <james.henstridge@canonical.com>
21
17
 */
22
18
23
19
#pragma once
24
20
25
21
#include <unity/storage/common.h>
26
22
#include <unity/storage/visibility.h>
27
23
28
24
#include <boost/variant.hpp>
29
25
30
26
#include <map>
31
27
#include <vector>
32
28
33
29
namespace unity
34
30
{
35
31
namespace storage
36
32
{
37
33
namespace provider
38
34
{
39
35
40
36
// Note: When growing the set of supported variant types, add new types
41
37
// to the *end* of the list, and update the marshaling code in dbusmarshal.cpp.
42
38
typedef boost::variant<std::string, int64_t> MetadataValue;
43
39
44
40
struct UNITY_STORAGE_EXPORT Item
45
41
{
46
42
    std::string item_id;
47
43
    std::vector<std::string> parent_ids;
48
44
    std::string name;
49
45
    std::string etag;
50
46
    unity::storage::ItemType type;
51
47
    std::map<std::string, MetadataValue> metadata;
52
48
};
53
49
54
50
typedef std::vector<Item> ItemList;
55
51
56
52
}
57
53
}
58
54
}
59
0
55
60
=== modified file 'include/unity/storage/provider/ProviderBase.h'
61
--- include/unity/storage/provider/ProviderBase.h	2016-11-03 02:43:43 +0000
62
+++ include/unity/storage/provider/ProviderBase.h	2017-03-17 02:54:00 +0000
63
@@ -21,6 +21,7 @@
64
21
#include <unity/storage/common.h>
21
#include <unity/storage/common.h>
65
22
#include <unity/storage/visibility.h>
22
#include <unity/storage/visibility.h>
66
23
#include <unity/storage/provider/Credentials.h>
23
#include <unity/storage/provider/Credentials.h>
67
24
#include <unity/storage/provider/Item.h>
68
24
25
69
25
#include <boost/thread/future.hpp>
26
#include <boost/thread/future.hpp>
70
26
#include <boost/variant.hpp>
27
#include <boost/variant.hpp>
71
@@ -50,22 +51,6 @@
72
50
    Credentials credentials;
51
    Credentials credentials;
73
51
};
52
};
74
52
53
75
53
// Note: When growing the set of supported variant types, add new types
76
54
// to the *end* of the list, and update the marshaling code in dbusmarshal.cpp.
77
55
typedef boost::variant<std::string, int64_t> MetadataValue;
78
56
79
57
struct UNITY_STORAGE_EXPORT Item
80
58
{
81
59
    std::string item_id;
82
60
    std::vector<std::string> parent_ids;
83
61
    std::string name;
84
62
    std::string etag;
85
63
    unity::storage::ItemType type;
86
64
    std::map<std::string, MetadataValue> metadata;
87
65
};
88
66
89
67
typedef std::vector<Item> ItemList;
90
68
91
69
class UNITY_STORAGE_EXPORT ProviderBase : public std::enable_shared_from_this<ProviderBase>
54
class UNITY_STORAGE_EXPORT ProviderBase : public std::enable_shared_from_this<ProviderBase>
92
70
{
55
{
93
71
public:
56
public:
94
72
57
95
=== modified file 'src/local-provider/LocalUploadJob.cpp'
96
--- src/local-provider/LocalUploadJob.cpp	2017-03-17 02:54:00 +0000
97
+++ src/local-provider/LocalUploadJob.cpp	2017-03-17 02:54:00 +0000
98
@@ -22,7 +22,6 @@
99
22
#include "utils.h"
22
#include "utils.h"
100
23
#include <unity/storage/internal/safe_strerror.h>
23
#include <unity/storage/internal/safe_strerror.h>
101
24
#include <unity/storage/provider/Exceptions.h>
24
#include <unity/storage/provider/Exceptions.h>
102
25
#include <unity/storage/provider/ProviderBase.h>  // TODO: Should not be needed
103
26
25
104
27
#include <fcntl.h>
26
#include <fcntl.h>
105
28
27
Reviewer	Review Type	Date Requested	Status
James Henstridge		2017-03-16	Approve on 2017-03-17
unity-api-1-bot	continuous-integration		Approve on 2017-03-17
Review via email: mp+320009@code.launchpad.net