fix(services/aliyun-drive): write op cannot overwrite existing files (#…

…4781)
apache · Jun 21, 2024 · cf7580e · cf7580e
1 parent 8027430
commit cf7580e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/core/src/services/aliyun_drive/backend.rs b/core/src/services/aliyun_drive/backend.rs
@@ -240,6 +240,7 @@ impl Builder for AliyunDriveBuilder {
                     sign,
                 })),
                 client,
+                dir_lock: Arc::new(Mutex::new(())),
             }),
         })
     }
@@ -462,6 +463,17 @@ impl Access for AliyunDriveBackend {
         let parent_path = get_parent(path);
         let parent_file_id = self.core.ensure_dir_exists(parent_path).await?;
 
+        // write can overwrite
+        match self.core.get_by_path(path).await {
+            Err(err) if err.kind() == ErrorKind::NotFound => {}
+            Err(err) => return Err(err),
+            Ok(res) => {
+                let file: AliyunDriveFile =
+                    serde_json::from_reader(res.reader()).map_err(new_json_serialize_error)?;
+                self.core.delete_path(&file.file_id).await?;
+            }
+        };
+
         let executor = args.executor().cloned();
 
         let writer =

diff --git a/core/src/services/aliyun_drive/core.rs b/core/src/services/aliyun_drive/core.rs
@@ -66,6 +66,7 @@ pub struct AliyunDriveCore {
 
     pub signer: Arc<Mutex<AliyunDriveSigner>>,
     pub client: HttpClient,
+    pub dir_lock: Arc<Mutex<()>>,
 }
 
 impl Debug for AliyunDriveCore {
@@ -210,6 +211,7 @@ impl AliyunDriveCore {
         let paths = file_path.split('/').collect::<Vec<&str>>();
         let mut parent: Option<String> = None;
         for path in paths {
+            let _guard = self.dir_lock.lock().await;
             let res = self
                 .create(
                     parent.as_deref(),