WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 1968245

Browse files
authored
multipart upload in upload_video (#1182)
1 parent af2c83d commit 1968245

File tree

1 file changed

+11
-22
lines changed

1 file changed

+11
-22
lines changed

apps/desktop/src-tauri/src/upload.rs

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,19 @@ pub async fn upload_video(
9191

9292
info!("Uploading video {video_id}...");
9393

94-
let (stream, total_size) = file_reader_stream(file_path).await?;
95-
let stream = progress(
96-
app.clone(),
97-
video_id.clone(),
98-
stream.map(move |v| v.map(move |v| (total_size, v))),
99-
);
94+
let upload_id = api::upload_multipart_initiate(&app, &video_id).await?;
10095

101-
let stream = if let Some(channel) = channel {
102-
tauri_progress(channel, stream).boxed()
103-
} else {
104-
stream.boxed()
105-
};
106-
107-
let video_fut = singlepart_uploader(
96+
let video_fut = progress(
10897
app.clone(),
109-
PresignedS3PutRequest {
110-
video_id: video_id.clone(),
111-
subpath: "result.mp4".to_string(),
112-
method: PresignedS3PutRequestMethod::Put,
113-
meta: Some(meta),
114-
},
115-
total_size,
116-
stream.and_then(|(_, c)| async move { Ok(c) }),
117-
);
98+
video_id.clone(),
99+
multipart_uploader(
100+
app.clone(),
101+
video_id.clone(),
102+
upload_id.clone(),
103+
from_pending_file_to_chunks(file_path.clone(), None),
104+
),
105+
)
106+
.try_collect::<Vec<_>>();
118107

119108
// TODO: We don't report progress on image upload
120109
let bytes = compress_image(screenshot_path).await?;

0 commit comments

Comments
 (0)