From f1d78c1ae08ec09bfc16b4a04b809349116bb84a Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 18 Sep 2023 23:40:43 +0800 Subject: [PATCH] refactor(services/dropbox): Use OpWrite instead of passing all args as parameters --- core/src/services/dropbox/core.rs | 8 ++++---- core/src/services/dropbox/writer.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/services/dropbox/core.rs b/core/src/services/dropbox/core.rs index 4b3fba758731..8857475735b1 100644 --- a/core/src/services/dropbox/core.rs +++ b/core/src/services/dropbox/core.rs @@ -98,11 +98,11 @@ impl DropboxCore { &self, path: &str, size: Option, - content_type: Option<&str>, + args: &OpWrite, body: AsyncBody, ) -> Result> { let url = "https://content.dropboxapi.com/2/files/upload".to_string(); - let args = DropboxUploadArgs { + let dropbox_update_args = DropboxUploadArgs { path: build_rooted_abs_path(&self.root, path), ..Default::default() }; @@ -112,13 +112,13 @@ impl DropboxCore { } request_builder = request_builder.header( CONTENT_TYPE, - content_type.unwrap_or("application/octet-stream"), + args.content_type().unwrap_or("application/octet-stream"), ); let mut request = request_builder .header( "Dropbox-API-Arg", - serde_json::to_string(&args).map_err(new_json_serialize_error)?, + serde_json::to_string(&dropbox_update_args).map_err(new_json_serialize_error)?, ) .body(body) .map_err(new_request_build_error)?; diff --git a/core/src/services/dropbox/writer.rs b/core/src/services/dropbox/writer.rs index b5a4a69aff6c..e8fdd998fa90 100644 --- a/core/src/services/dropbox/writer.rs +++ b/core/src/services/dropbox/writer.rs @@ -47,7 +47,7 @@ impl oio::OneShotWrite for DropboxWriter { .dropbox_update( &self.path, Some(bs.len()), - self.op.content_type(), + &self.op, AsyncBody::ChunkedBytes(bs), ) .await?;