chore: fmt

Author: appflowy

collab-importer/src/zip_tool/async_zip.rs

@@ -20,10 +20,7 @@ use tokio_util::compat::TokioAsyncWriteCompatExt;
 
 use crate::error::ImporterError;
 use crate::zip_tool::util::{
-  has_multi_part_extension,
-  has_multi_part_suffix,
-  is_multi_part_zip_signature,
-  remove_part_suffix,
+  has_multi_part_extension, has_multi_part_suffix, is_multi_part_zip_signature, remove_part_suffix,
   sanitize_file_path,
 };
 use tracing::{error, warn};
@@ -145,9 +142,9 @@ where
       None => Err(ImporterError::FileNotFound),
       Some(default_file_name) => {
         if fs::metadata(&out_dir).await.is_err() {
-          fs::create_dir_all(&out_dir).await.with_context(|| {
-            format!("Failed to create output directory: {}", out_dir.display())
-          })?;
+          fs::create_dir_all(&out_dir)
+            .await
+            .with_context(|| format!("Failed to create output directory: {}", out_dir.display()))?;
         }
         Ok(UnzipFile {
           file_name: default_file_name.clone(),
@@ -161,8 +158,7 @@ where
       if fs::metadata(&target_dir).await.is_err() {
         warn!(
           "Root directory {:?} missing after unzip; falling back to {:?}",
-          target_dir,
-          out_dir
+          target_dir, out_dir
         );
         return Ok(UnzipFile {
           file_name,

collab-importer/src/zip_tool/sync_zip.rs

@@ -1,9 +1,6 @@
 use crate::error::ImporterError;
 use crate::zip_tool::util::{
-  has_multi_part_extension,
-  has_multi_part_suffix,
-  is_multi_part_zip_signature,
-  remove_part_suffix,
+  has_multi_part_extension, has_multi_part_suffix, is_multi_part_zip_signature, remove_part_suffix,
   sanitize_file_path,
 };
 use anyhow::{Result, anyhow};
@@ -98,9 +95,7 @@ pub fn sync_unzip(
                 || has_multi_part_suffix(&filename);
 
               if root_dir.is_none() && is_multipart_candidate {
-                if let Some(file_name) =
-                  Path::new(&filename).file_stem().and_then(|s| s.to_str())
-                {
+                if let Some(file_name) = Path::new(&filename).file_stem().and_then(|s| s.to_str()) {
                   root_dir = Some(remove_part_suffix(file_name));
                 }
               }
@@ -146,8 +141,7 @@ pub fn sync_unzip(
       if !target_dir.exists() {
         warn!(
           "Root directory {:?} missing after unzip; falling back to {:?}",
-          target_dir,
-          out_dir
+          target_dir, out_dir
         );
         return Ok(UnzipFile {
           dir_name: root_dir,

collab-importer/tests/zip_tool.rs

@@ -6,9 +6,9 @@ use collab_importer::zip_tool::async_zip::async_unzip;
 use collab_importer::zip_tool::sync_zip::sync_unzip;
 use tempfile::tempdir;
 use tokio_util::compat::TokioAsyncReadCompatExt;
-use zip::write::FileOptions;
 use zip::CompressionMethod;
 use zip::ZipWriter;
+use zip::write::FileOptions;
 
 const ROOT_DIR: &str = "ExportBlock-7365b89b";
 const FALLBACK_DIR: &str = "fallback";
@@ -22,7 +22,11 @@ fn sync_unzip_preserves_root_directory_with_nested_zip() -> Result<()> {
   let output_dir = temp.path().join("output");
   std::fs::create_dir_all(&output_dir)?;
 
-  let unzip_file = sync_unzip(zip_path.clone(), output_dir.clone(), Some(FALLBACK_DIR.to_string()))?;
+  let unzip_file = sync_unzip(
+    zip_path.clone(),
+    output_dir.clone(),
+    Some(FALLBACK_DIR.to_string()),
+  )?;
 
   let expected_root = output_dir.join(ROOT_DIR);
   assert_eq!(unzip_file.dir_name, ROOT_DIR);
@@ -41,7 +45,11 @@ fn sync_unzip_falls_back_when_root_directory_missing() -> Result<()> {
   let output_dir = temp.path().join("output");
   std::fs::create_dir_all(&output_dir)?;
 
-  let unzip_file = sync_unzip(zip_path.clone(), output_dir.clone(), Some(FALLBACK_DIR.to_string()))?;
+  let unzip_file = sync_unzip(
+    zip_path.clone(),
+    output_dir.clone(),
+    Some(FALLBACK_DIR.to_string()),
+  )?;
 
   assert_eq!(unzip_file.dir_name, FALLBACK_DIR);
   assert_eq!(unzip_file.unzip_dir, output_dir);
@@ -63,12 +71,21 @@ async fn async_unzip_preserves_root_directory_with_nested_zip() -> Result<()> {
   let output_dir = temp.path().join("async_output");
   tokio::fs::create_dir_all(&output_dir).await?;
 
-  let unzip_file = async_unzip(zip_reader, output_dir.clone(), Some(FALLBACK_DIR.to_string())).await?;
+  let unzip_file = async_unzip(
+    zip_reader,
+    output_dir.clone(),
+    Some(FALLBACK_DIR.to_string()),
+  )
+  .await?;
 
   let expected_root = output_dir.join(ROOT_DIR);
   assert_eq!(unzip_file.file_name, ROOT_DIR);
   assert_eq!(unzip_file.unzip_dir_path, expected_root);
-  assert!(tokio::fs::metadata(unzip_file.unzip_dir_path.clone()).await?.is_dir());
+  assert!(
+    tokio::fs::metadata(unzip_file.unzip_dir_path.clone())
+      .await?
+      .is_dir()
+  );
 
   Ok(())
 }
@@ -86,11 +103,20 @@ async fn async_unzip_falls_back_when_root_directory_missing() -> Result<()> {
   let output_dir = temp.path().join("async_output");
   tokio::fs::create_dir_all(&output_dir).await?;
 
-  let unzip_file = async_unzip(zip_reader, output_dir.clone(), Some(FALLBACK_DIR.to_string())).await?;
+  let unzip_file = async_unzip(
+    zip_reader,
+    output_dir.clone(),
+    Some(FALLBACK_DIR.to_string()),
+  )
+  .await?;
 
   assert_eq!(unzip_file.file_name, FALLBACK_DIR);
   assert_eq!(unzip_file.unzip_dir_path, output_dir);
-  assert!(tokio::fs::metadata(&unzip_file.unzip_dir_path).await?.is_dir());
+  assert!(
+    tokio::fs::metadata(&unzip_file.unzip_dir_path)
+      .await?
+      .is_dir()
+  );
 
   Ok(())
 }