1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
use super::*;
use aws_sdk_s3::operation::put_object::builders::PutObjectFluentBuilder;
use aws_sdk_s3::primitives::ByteStream;
impl S3Algo {
/// Upload multiple files to S3.
///
/// `upload_files` provides counting of uploaded files and bytes through the `progress` closure:
///
/// For common use cases it is adviced to use [`files_recursive`](files_recursive) for the `files` parameter.
///
/// `progress` will be called after the upload of each file, with some data about that upload.
/// The first `usize` parameter is the number of this file in the upload, while [`RequestReport`](struct.RequestReport.html)
/// holds more data such as size in bytes, and the duration of the upload. It is thus possible to
/// report progress both in amount of files, or amount of bytes, depending on what granularity is
/// desired.
/// `progress` returns a generic `F: Future` to support async operations like, for example, logging the
/// results to a file; this future will be run as part of the upload algorithm.
///
/// `default_request` constructs the default request struct - only the fields `bucket`, `key`,
/// `body` and `content_length` are overwritten by the upload algorithm.
pub async fn upload_files<P, F, I, R>(
&self,
bucket: String,
files: I,
progress: P,
default_request: R,
) -> Result<(), Error>
where
P: Fn(RequestReport) -> F + Clone + Send + Sync + 'static,
F: Future<Output = ()> + Send + 'static,
I: Iterator<Item = ObjectSource> + Send + 'static,
R: Fn(&Client) -> PutObjectFluentBuilder + Clone + Unpin + Sync + Send + 'static,
{
let copy_parallelization = self.config.copy_parallelization;
let n_retries = self.config.algorithm.n_retries;
let timeout_state = Arc::new(Mutex::new(TimeoutState::new(
self.config.algorithm.clone(),
self.config.put_requests.clone(),
)));
let timeout_state2 = timeout_state.clone();
let jobs = files.map(move |src| {
let (default, bucket, s3) = (default_request.clone(), bucket.clone(), self.s3.clone());
s3_request(
move || {
src.clone()
.create_upload_future(s3.clone(), bucket.clone(), default.clone())
},
|_, size| size,
n_retries,
timeout_state.clone(),
)
.boxed()
});
// Run jobs in parallel,
// adding eventual delays after each file upload and also at the end,
// and counting the progress
stream::iter(jobs)
.buffer_unordered(copy_parallelization)
.zip(stream::iter(0..))
.map(|(result, i)| result.map(|result| (i, result)))
.try_for_each(move |(i, (mut result, _))| {
let progress = progress.clone();
let timeout_state = timeout_state2.clone();
async move {
result.seq = i;
timeout_state.lock().await.update(&result);
progress(result).map(Ok).await
}
})
.await
}
}
#[derive(Clone, Debug)]
pub enum ObjectSource {
File { path: PathBuf, key: String },
Data { data: Vec<u8>, key: String },
}
impl ObjectSource {
pub fn file(path: PathBuf, key: String) -> Self {
Self::File { path, key }
}
pub fn data<D: Into<Vec<u8>>>(data: D, key: String) -> Self {
Self::Data {
data: data.into(),
key,
}
}
pub async fn create_stream(&self) -> Result<(ByteStream, usize), Error> {
match self {
Self::File { path, .. } => {
let file = tokio::fs::File::open(path.clone()).await.with_context({
let path = path.clone();
move || err::Io {
description: path.display().to_string(),
}
})?;
let metadata = file.metadata().await.with_context({
let path = path.clone();
move || err::Io {
description: path.display().to_string(),
}
})?;
let len = metadata.len() as usize;
// let boxbody = BoxBody::new(
// FramedRead::new(file, BytesCodec::new()).map_ok(bytes::BytesMut::freeze),
// );
// let sdk_body = SdkBody::from_dyn(boxbody);
Ok((ByteStream::read_from().file(file).build().await?, len))
}
Self::Data { data, .. } => Ok((data.clone().into(), data.len())),
}
}
pub async fn create_upload_future<R>(
self,
s3: aws_sdk_s3::Client,
bucket: String,
default: R,
) -> Result<(impl Future<Output = Result<(), Error>>, usize), Error>
where
R: Fn(&Client) -> PutObjectFluentBuilder + Clone + Unpin + Sync + Send + 'static,
{
let (stream, len) = self.create_stream().await?;
let key = self.get_key().to_owned();
let (s3, bucket, default) = (s3.clone(), bucket.clone(), default.clone());
let future = async move {
default(&s3)
.set_bucket(Some(bucket.clone()))
.set_key(Some(key.clone()))
.set_body(Some(stream))
.set_content_length(Some(len as i64))
.send()
.await
.map_err(|e| e.into())
// .await
.map(drop)
};
Ok((future, len))
}
pub fn get_key(&self) -> &str {
match self {
Self::File { key, .. } => key,
Self::Data { key, .. } => key,
}
}
}
/// Convenience function (using `walkdir`) to traverse all files in directory `src_dir`. Returns an
/// iterator that can be used as input to `S3Algo::upload_files`, which uploads files
/// with a key equal to the file's path with `src_dir` stripped away, and with `key_prefix`
/// prepended.
pub fn files_recursive(
src_dir: PathBuf,
key_prefix: PathBuf,
) -> impl Iterator<Item = ObjectSource> {
#[cfg(windows)]
use path_slash::PathExt;
walkdir::WalkDir::new(&src_dir)
.into_iter()
.filter_map(move |entry| {
let src_dir = src_dir.clone();
let key_prefix = key_prefix.clone();
entry.ok().and_then(move |entry| {
if entry.file_type().is_file() {
let path = entry.path().to_owned();
let key_suffix = path.strip_prefix(&src_dir).unwrap().to_path_buf();
let key = key_prefix.join(&key_suffix);
Some(ObjectSource::File {
path,
#[cfg(unix)]
key: key.to_string_lossy().to_string(),
#[cfg(windows)]
key: key.to_slash_lossy().to_string(),
})
} else {
None
}
})
})
}
#[cfg(test)]
mod test {
use super::*;
use tempdir::TempDir;
#[test]
fn test_files_recursive() {
let tmp_dir = TempDir::new("s3-testing").unwrap();
let dir = tmp_dir.path();
for i in 0..10 {
std::fs::write(dir.join(format!("img_{}.tif", i)), "file contents").unwrap();
}
let files = files_recursive(dir.to_owned(), PathBuf::new());
assert_eq!(files.count(), 10);
}
}