@tutao/node-mimimi 262.250121.1 → 262.250124.0

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "tutao_node-mimimi"
-version = "262.250121.1"
+version = "262.250124.0"
 
 [lib]
 # need to have lib to be able to use this from rust tests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tutao/node-mimimi",
-  "version": "262.250121.1",
+  "version": "262.250124.0",
   "main": "./dist/binding.js",
   "types": "./dist/binding.d.ts",
   "napi": {
@@ -16,7 +16,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@tutao/otest": "262.250121.1",
+    "@tutao/otest": "262.250124.0",
     "@napi-rs/cli": "3.0.0-alpha.65",
     "typescript": "5.3.3",
     "zx": "8.1.5"
@@ -33,8 +33,8 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@tutao/node-mimimi-win32-x64-msvc": "262.250121.1",
-    "@tutao/node-mimimi-linux-x64-gnu": "262.250121.1",
-    "@tutao/node-mimimi-darwin-universal": "262.250121.1"
+    "@tutao/node-mimimi-win32-x64-msvc": "262.250124.0",
+    "@tutao/node-mimimi-linux-x64-gnu": "262.250124.0",
+    "@tutao/node-mimimi-darwin-universal": "262.250124.0"
   }
 }

package/src/importer/file_reader.rs

@@ -50,7 +50,7 @@ impl FileImport {
 			.expect("failed eml path will always have filename");
 		let import_directory = failed_eml_path
 			.parent()
-			.ok_or(std::io::ErrorKind::NotFound)?;
+			.ok_or(std::io::ErrorKind::NotADirectory)?;
 		let new_failed_eml_path = import_directory.join(FAILED_MAILS_SUB_DIR).join(filename);
 
 		fs::rename(failed_eml_path, new_failed_eml_path)
@@ -85,7 +85,7 @@ impl FileImport {
 			let is_eml_file = source_path.extension() == Some("eml".as_ref());
 
 			if is_mbox_file {
-				filename_producer.new_mbox(source_path.clone());
+				filename_producer.new_mbox(&source_path);
 
 				let file_buf_reader =
 					fs::File::open(&source_path)
@@ -116,7 +116,7 @@ impl FileImport {
 					})?;
 				}
 			} else if is_eml_file {
-				let target_eml_file_path = filename_producer.new_plain_eml(source_path.clone());
+				let target_eml_file_path = filename_producer.new_plain_eml(&source_path);
 
 				fs::copy(&source_path, &target_eml_file_path).map_err(|copy_err| {
 					log::error!("Can not copy eml: {source_path:?}. Error: {copy_err:?}");

package/src/importer/filename_producer.rs

@@ -21,45 +21,40 @@ impl<'a> FileNameProducer<'a> {
 		}
 	}
 
-	pub fn new_plain_eml(&mut self, mut eml_path: PathBuf) -> PathBuf {
-		eml_path.set_extension("");
-		let original_filename = eml_path
-			.file_name()
-			.and_then(OsStr::to_str)
-			.unwrap_or("unnamed")
-			.to_string() + "-"
-			+ self.eml_file_count.to_string().as_str()
-			+ ".eml";
+	pub fn new_plain_eml(&mut self, eml_path: &Path) -> PathBuf {
+		let original_filename = Self::format_new_file_name(&eml_path, self.eml_file_count, ".eml");
 
 		self.eml_file_count += 1;
 
 		self.import_directory.join(original_filename)
 	}
 
-	pub fn new_mbox(&mut self, mut mbox_path: PathBuf) {
-		mbox_path.set_extension("");
-		let original_filename = mbox_path
-			.file_name()
-			.and_then(OsStr::to_str)
-			.unwrap_or("unnamed")
-			.to_string() + "-"
-			+ self.mbox_file_count.to_string().as_str()
-			+ ".mbox";
+	pub fn new_mbox(&mut self, mbox_path: &Path) {
+		let original_filename = Self::format_new_file_name(&mbox_path, self.mbox_file_count, ".mbox-item-");
 
 		self.mbox_file_count += 1;
 
-		self.current_mbox_prefix = original_filename + "-item-";
+		self.current_mbox_prefix = original_filename;
 		self.current_mbox_iter_count = 0;
 	}
 
 	pub fn new_file_of_current_mbox(&mut self) -> PathBuf {
-		let new_filename = self.current_mbox_prefix.clone()
-			+ self.current_mbox_iter_count.to_string().as_str()
-			+ ".eml";
+		let current_prefix = &self.current_mbox_prefix;
+		let count = self.current_mbox_iter_count;
+		let new_filename = format!("{current_prefix}{count}.eml");
+
 		self.current_mbox_iter_count += 1;
 
 		self.import_directory.join(new_filename)
 	}
+
+	fn format_new_file_name(path: &Path, count: usize, suffix: &str) -> String {
+		let file_name = path
+			.file_stem()
+			.and_then(OsStr::to_str)
+			.unwrap_or("unnamed");
+		format!("{file_name}-{count}{suffix}")
+	}
 }
 
 #[cfg(test)]
@@ -72,22 +67,22 @@ mod tests {
 		let import_directory = PathBuf::from("/tmp/");
 		let mut producer = FileNameProducer::new(&import_directory);
 		let first_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/somefile.eml"))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/somefile.eml"))
 			.to_str()
 			.unwrap()
 			.to_string();
 		let second_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherfile.eml"))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherfile.eml"))
 			.to_str()
 			.unwrap()
 			.to_string();
 		let third_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherfile"))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherfile"))
 			.to_str()
 			.unwrap()
 			.to_string();
 		let fourth_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherdir/.."))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherdir/.."))
 			.to_str()
 			.unwrap()
 			.to_string();
@@ -102,7 +97,7 @@ mod tests {
 	fn producer_for_multiple_mbox_only() {
 		let import_directory = PathBuf::from("/tmp/");
 		let mut producer = FileNameProducer::new(&import_directory);
-		producer.new_mbox(PathBuf::from("/usr/var/log/somefile.mbox"));
+		producer.new_mbox(&PathBuf::from("/usr/var/log/somefile.mbox"));
 		let first_name = producer
 			.new_file_of_current_mbox()
 			.to_str()
@@ -113,7 +108,7 @@ mod tests {
 			.to_str()
 			.unwrap()
 			.to_string();
-		producer.new_mbox(PathBuf::from("/usr/var/log/someotherdir/.."));
+		producer.new_mbox(&PathBuf::from("/usr/var/log/someotherdir/.."));
 		let third_name = producer
 			.new_file_of_current_mbox()
 			.to_str()
@@ -124,7 +119,7 @@ mod tests {
 			.to_str()
 			.unwrap()
 			.to_string();
-		producer.new_mbox(PathBuf::from("/usr/var/log/somedir/.."));
+		producer.new_mbox(&PathBuf::from("/usr/var/log/somedir/.."));
 		let fifth_name = producer
 			.new_file_of_current_mbox()
 			.to_str()
@@ -147,7 +142,7 @@ mod tests {
 	fn producer_for_multiple_mbox_and_multiple_eml() {
 		let import_directory = PathBuf::from("/tmp/");
 		let mut producer = FileNameProducer::new(&import_directory);
-		producer.new_mbox(PathBuf::from("/usr/var/log/somefile.mbox"));
+		producer.new_mbox(&PathBuf::from("/usr/var/log/somefile.mbox"));
 		let first_name = producer
 			.new_file_of_current_mbox()
 			.to_str()
@@ -159,12 +154,12 @@ mod tests {
 			.unwrap()
 			.to_string();
 		let third_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherfile"))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherfile"))
 			.to_str()
 			.unwrap()
 			.to_string();
 		let fourth_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherdir/.."))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherdir/.."))
 			.to_str()
 			.unwrap()
 			.to_string();
@@ -181,25 +176,25 @@ mod tests {
 	fn can_import_multiple_files_with_same_name() {
 		let import_directory = PathBuf::from("/tmp/");
 		let mut producer = FileNameProducer::new(&import_directory);
-		producer.new_mbox(PathBuf::from("/usr/var/log/somefile.mbox"));
+		producer.new_mbox(&PathBuf::from("/usr/var/log/somefile.mbox"));
 		let first_name = producer
 			.new_file_of_current_mbox()
 			.to_str()
 			.unwrap()
 			.to_string();
-		producer.new_mbox(PathBuf::from("/usr/var/log/somefile.mbox"));
+		producer.new_mbox(&PathBuf::from("/usr/var/log/somefile.mbox"));
 		let second_name = producer
 			.new_file_of_current_mbox()
 			.to_str()
 			.unwrap()
 			.to_string();
 		let third_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherfile"))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherfile"))
 			.to_str()
 			.unwrap()
 			.to_string();
 		let fourth_name = producer
-			.new_plain_eml(PathBuf::from("/usr/var/log/someotherfile"))
+			.new_plain_eml(&PathBuf::from("/usr/var/log/someotherfile"))
 			.to_str()
 			.unwrap()
 			.to_string();

package/src/importer/messages.rs

@@ -61,19 +61,12 @@ pub struct MailImportMessage {
 #[napi_derive::napi(string_enum)]
 #[repr(u8)]
 #[cfg_attr(test, derive(Debug))]
+#[derive(PartialEq)]
 pub enum PreparationError {
-	/// import state file does not exist at all
-	NoStateFile,
-	/// import state file exists, but it's content can not be deserialized to valid idTuple
-	MalformedStateFile,
 	/// Can not create a native Rest client
 	NoNativeRestClient,
-	/// Can not log in through sdk
-	CanNotLoginToSdk,
-	/// Can not create a sdk
-	CannotCreateSdk,
-	/// some error occurred while preparing import directory
-	ImportDirectoryPreparation,
+	/// some error occurred while reading import directory
+	CannotReadOldStateId,
 	/// Error when trying to resume the session passed from client
 	LoginError,
 	/// Can not read all the eml files in import directory
@@ -140,12 +133,8 @@ pub enum ProgressActionError {
 impl From<PreparationError> for napi::Error {
 	fn from(prep_err: PreparationError) -> Self {
 		let code = match prep_err {
-			PreparationError::NoStateFile => "NoStateFile",
-			PreparationError::MalformedStateFile => "MalformedStateFile",
 			PreparationError::NoNativeRestClient => "NoNativeRestClient",
-			PreparationError::CanNotLoginToSdk => "CanNotLoginToSdk",
-			PreparationError::CannotCreateSdk => "CannotCreateSdk",
-			PreparationError::ImportDirectoryPreparation => "ImportDirectoryPreparation",
+			PreparationError::CannotReadOldStateId => "ImportDirectoryPreparation",
 			PreparationError::LoginError => "LoginError",
 			PreparationError::FailedToReadEmls => "FailedToReadEmls",
 			PreparationError::NoMailGroupKey => "NoMailGroupKey",

package/src/importer_api.rs

@@ -2,7 +2,7 @@ use super::importer::{
 	ImportLoopResult, ImportMailStateId, ImportProgressAction, ImportStatus, Importer,
 };
 use crate::importer::file_reader::FileImport;
-use crate::importer::messages::{MailImportMessage, ProgressActionError};
+use crate::importer::messages::{MailImportMessage, PreparationError, ProgressActionError};
 use napi::threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode};
 use napi::Env;
 use std::path::PathBuf;
@@ -46,7 +46,8 @@ impl ImporterApi {
 	) -> napi::Result<Option<ImporterApi>> {
 		let target_owner_group = GeneratedId(target_owner_group);
 		let import_directory = FileImport::make_import_directory(&config_directory, &mailbox_id);
-		let existing_import = Importer::get_existing_import_id(&import_directory)?;
+		let existing_import = Importer::get_existing_import_id(&import_directory)
+			.map_err(|_| PreparationError::CannotReadOldStateId)?;
 
 		match existing_import {
 			None => Ok(None),