use tokio streams in upload

Author: metame

server/Cargo.toml

@@ -104,7 +104,7 @@ features = ["derive"]
 version = "1"
 
 [dependencies.tokio]
-features = ["time"]
+features = ["time", "fs"]
 version = "1"
 
 [dependencies.tracing-subscriber]

server/src/files.rs

@@ -1,6 +1,7 @@
 use std::{fmt, path::PathBuf, time::Duration};
 
 use opendal::{services::S3, Operator};
+use tokio::fs::File;
 
 use crate::{appstate::AppState, config::Config, errors::AtomicServerResult};
 
@@ -39,7 +40,6 @@ impl FileStore {
     pub fn encoded(&self) -> String {
         urlencoding::encode(self.prefix()).into_owned()
     }
-
 }
 
 impl fmt::Display for FileStore {
@@ -78,9 +78,13 @@ pub async fn s3_upload_object(
 
     let op: Operator = Operator::new(builder)?.finish();
 
-    let buffer = std::fs::read(file_path)?;
-    op.write(&format!("{}/{}", path, &file_id), buffer).await?;
+    let mut tmp_file = File::open(file_path).await?;
+    let length = tmp_file.metadata().await?.len();
 
+    let s3_path = format!("{}/{}", path, &file_id);
+    let mut w = op.writer_with(&s3_path).content_length(length).await?;
+    tokio::io::copy(&mut tmp_file, &mut w).await?;
+    w.close().await?;
     Ok(())
 }
 
@@ -123,7 +127,11 @@ pub async fn get_s3_signed_url(
 
     let op: Operator = Operator::new(builder)?.finish();
 
-    let uri = op.presign_read(&format!("{}/{}", &path, file_id), duration).await?.uri().to_string();
+    let uri = op
+        .presign_read(&format!("{}/{}", &path, file_id), duration)
+        .await?
+        .uri()
+        .to_string();
 
     Ok(uri)
 }

server/src/handlers/download.rs

@@ -4,7 +4,12 @@ use actix_files::NamedFile;
 use actix_web::{web, HttpRequest, HttpResponse, Responder};
 use atomic_lib::{urls, Storelike};
 
-use crate::{appstate::AppState, errors::AtomicServerResult, files::{self, FileStore}, helpers::get_client_agent};
+use crate::{
+    appstate::AppState,
+    errors::AtomicServerResult,
+    files::{self, FileStore},
+    helpers::get_client_agent,
+};
 
 /// Downloads the File of the Resource that matches the same URL minus the `/download` path.
 #[tracing::instrument(skip(appstate, req))]
@@ -60,8 +65,7 @@ async fn signed_url_redirect_handler(
     req: &HttpRequest,
     appstate: &AppState,
 ) -> AtomicServerResult<HttpResponse> {
-    let signed_url = files::get_s3_signed_url(appstate, Duration::from_secs(3600), file_id)
-        .await?;
+    let signed_url = files::get_s3_signed_url(appstate, Duration::from_secs(3600), file_id).await?;
     Ok(web::Redirect::to(signed_url)
         .respond_to(req)
         .map_into_boxed_body())

server/src/handlers/upload.rs

@@ -13,7 +13,12 @@ use atomic_lib::{
 use futures::{StreamExt, TryStreamExt};
 use serde::Deserialize;
 
-use crate::{appstate::AppState, errors::AtomicServerResult, files::{self, FileStore}, helpers::get_client_agent};
+use crate::{
+    appstate::AppState,
+    errors::AtomicServerResult,
+    files::{self, FileStore},
+    helpers::get_client_agent,
+};
 
 #[derive(Deserialize, Debug)]
 pub struct UploadQuery {