Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@tuta-sudipg
tuta-sudipg committed Dec 11, 2024
1 parent aa6f92f commit 013ca48
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 112 deletions.
105 changes: 7 additions & 98 deletions packages/node-mimimi/src/importer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use tutasdk::crypto::randomizer_facade::RandomizerFacade;
use tutasdk::entities::generated::sys::{BlobReferenceTokenWrapper, StringWrapper};

use tutasdk::entities::generated::tutanota::{
ImportMailPostIn, ImportMailPostOut, ImportMailState,
ImportAttachment, ImportMailData, ImportMailPostIn, ImportMailPostOut, ImportMailState,
};
use tutasdk::entities::json_size_estimator::estimate_json_size;
use tutasdk::rest_error::PreconditionFailedReason::ImportFailure;
Expand Down Expand Up @@ -225,98 +225,6 @@ impl Importer {

Ok(())
}

/// once we get the ImportableMail from either of source,
/// continue to the uploading counterpart
async fn import_all_mail(&mut self) -> Result<(), ImportError> {
self.essentials.verify_import_feature_is_enabled().await?;
self.initialize_remote_state().await?;

let Self {
essentials: import_essentials,
state: import_state,
source: import_source,
} = self;

let mapped_import_source = import_source.into_iter().map(|importable_mail| {
UnitImport::create_from_importable_mail(
&import_essentials.randomizer_facade,
&import_essentials.mail_group_key,
importable_mail,
)
});

let chunked_mails_provider =
ImportableMailsButcher::new(mapped_import_source, |unit_import| {
let size = estimate_json_size(&unit_import.import_mail_data);
//println!("some import import mail data size {size}");
size
});

for maybe_importable_chunk in chunked_mails_provider {
import_state.change_status(ImportStatus::Running);
import_state
.update_import_state_on_server(&import_essentials.logged_in_sdk)
.await?;

let importable_post_data = match maybe_importable_chunk {
Ok(importable_chunk) => {
let mail_count = importable_chunk.len();
let size = importable_chunk
.iter()
.fold(0, |acc, i| acc + estimate_json_size(&i.import_mail_data));
println!("some import chunk size {size}");
println!("some import mailcount size {mail_count}");

let importable_serialized_chunk = import_essentials
.make_serialized_chunk(importable_chunk)
.await;

match importable_serialized_chunk {
Ok(chunk) => chunk,
Err(_e) => {
eprintln!("FIXMEE!!");
// what to do now?
continue;
},
}
},

Err(_too_big_chunk) => {
// what to do?
// for now move to next chunk
eprintln!("FIXMEE!!");
continue;
},
};

let response = import_essentials
.make_import_service_call(importable_post_data)
.await;
match response {
// this import has been success,
Ok(mut imported_post_out) => {
import_state.add_imported_mails_count(imported_post_out.mails.len());
import_state
.imported_mail_ids
.append(&mut imported_post_out.mails);
},

Err(_err) => {
// todo: save the ImportableMails to some fail list,
// since, in this iteration the source will not give these mail again,
todo!()
},
}
}

import_state.change_status(ImportStatus::Finished);
import_state
.update_import_state_on_server(&import_essentials.logged_in_sdk)
.await?;

Ok(())
}
}

impl ImportEssential {
Expand Down Expand Up @@ -382,8 +290,7 @@ impl ImportEssential {

let attachments_file_data_flattened_refs: Vec<&FileData> =
attachments_file_data_per_mail.iter().flatten().collect();
let count = attachments_file_data_flattened_refs.len();
println!("attachments_file_data_refs {count}");

if attachments_file_data_flattened_refs.len() > 0 {
// upload all attachments in this chunk in one call to the blob_facade
// the blob_facade chunks them into efficient request to the BlobService
Expand All @@ -395,7 +302,8 @@ impl ImportEssential {
&self.target_owner_group,
attachments_file_data_flattened_refs,
)
.await?;
.await
.map_err(|e| ImportError::sdk("uploading multiple attachments", e))?;

// reference mails and received reference tokens again, by using the attachments count per mail
let mut all_reference_tokens_per_mail: Vec<Vec<Vec<BlobReferenceTokenWrapper>>> =
Expand Down Expand Up @@ -452,7 +360,8 @@ impl ImportEssential {

let serialized_import = self
.logged_in_sdk
.serialize_instance_to_json(import_mail_data, &session_key)?;
.serialize_instance_to_json(import_mail_data, &session_key)
.map_err(|e| ImportError::sdk("serializing import_mail_data to json", e))?;
let wrapped_import_data = StringWrapper {
_id: Some(Importer::make_random_aggregate_id(&self.randomizer_facade)),
value: serialized_import,
Expand All @@ -469,7 +378,7 @@ impl ImportEssential {
let serialized_import = self
.logged_in_sdk
.serialize_instance_to_json(import_mail_data, &session_key)
.map_err(|e| ImportError::sdk("serializing instance to json", e))?;
.map_err(|e| ImportError::sdk("serializing instance to json", e))?;
let wrapped_import_data = StringWrapper {
_id: Some(Importer::make_random_aggregate_id(&self.randomizer_facade)),
value: serialized_import,
Expand Down
14 changes: 0 additions & 14 deletions src/common/desktop/mailimport/DesktopMailImportFacade.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@ export class DesktopMailImportFacade implements NativeMailImportFacade {
ImporterApi.initLog()
}

async setupImapImport(apiUrl: string, unencTutaCredentials: UnencryptedCredentials): Promise<void> {
// not yet implemented
}

startImapImport(): Promise<void> {
throw new Error("Method not implemented.")
}

stopImapImport(): Promise<void> {
throw new Error("Method not implemented.")
}

async importFromFiles(
apiUrl: string,
unencTutaCredentials: UnencryptedCredentials,
Expand Down Expand Up @@ -50,8 +38,6 @@ export class DesktopMailImportFacade implements NativeMailImportFacade {
shouldPause: false,
}
})

return "importSuccessful"
}

async stopImport(): Promise<void> {
Expand Down

0 comments on commit 013ca48

Please sign in to comment.