Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-01 20:36:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

move getting and writing message info to packing-

Browse Source 
step, this could decrease memory usage
This commit is contained in:
Simon Laux
2020-11-25 23:57:43 +01:00
parent b8cbcc6648
commit 9f2b5feda2
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/export_chat.rs
View File

@@ -26,8 +26,8 @@ use crate::constants::Viewtype;
use crate::contact::*; use crate::contact::*;
use crate::context::Context; use crate::context::Context;
// use crate::error::Error; // use crate::error::Error;
use crate::message::*;
use crate::dc_tools::time; use crate::dc_tools::time;
use crate::message::*;
use std::collections::HashMap; use std::collections::HashMap;
use std::fs::File; use std::fs::File;
use std::io::prelude::*; use std::io::prelude::*;
@@ -42,21 +42,21 @@ use serde::Serialize;
struct ExportChatResult { struct ExportChatResult {
chat_json: String, chat_json: String,
// locations_geo_json: String, // locations_geo_json: String,
message_info: Vec<(u32, String, Option<String>)>, message_ids: Vec<MsgId>,
referenced_blobs: Vec<String>, referenced_blobs: Vec<String>,
} }
pub async fn export_chat_to_zip(context: &Context, chat_id: ChatId, filename: &str) { pub async fn export_chat_to_zip(context: &Context, chat_id: ChatId, filename: &str) {
let res = export_chat_data(&context, chat_id).await; let res = export_chat_data(&context, chat_id).await;
let destination = std::path::Path::new(filename); let destination = std::path::Path::new(filename);
let pack_res = pack_exported_chat(&context, res, destination); let pack_res = pack_exported_chat(&context, res, destination).await;
match &pack_res { match &pack_res {
Ok(()) => println!("Exported chat successfully to {}", filename), Ok(()) => println!("Exported chat successfully to {}", filename),
Err(err) => println!("Error {:?}", err), Err(err) => println!("Error {:?}", err),
}; };
} }
fn pack_exported_chat( async fn pack_exported_chat(
context: &Context, context: &Context,
artifact: ExportChatResult, artifact: ExportChatResult,
destination: &Path, destination: &Path,
@@ -86,17 +86,15 @@ fn pack_exported_chat(
zip.add_directory("msg_info/", Default::default())?; zip.add_directory("msg_info/", Default::default())?;
zip.add_directory("msg_source/", Default::default())?; zip.add_directory("msg_source/", Default::default())?;
for msg_info in artifact.message_info { for id in artifact.message_ids {
zip.start_file(format!("msg_info/{}.txt", msg_info.0), options)?; zip.start_file(format!("msg_info/{}.txt", id.to_u32()), options)?;
zip.write_all((msg_info.1).as_bytes())?; zip.write_all((get_msg_info(&context, id).await).as_bytes())?;
if let Some(mime_headers) = msg_info.2 { if let Some(mime_headers) = get_mime_headers(&context, id).await {
zip.start_file(format!("msg_source/{}.eml", msg_info.0), options)?; zip.start_file(format!("msg_source/{}.eml", id.to_u32()), options)?;
zip.write_all((mime_headers).as_bytes())?; zip.write_all((mime_headers).as_bytes())?;
} }
} }
// todo maybe memory optimisation -> load message source here and pack it directly into zip
zip.finish()?; zip.finish()?;
Ok(()) Ok(())
} }
@@ -269,22 +267,20 @@ async fn export_chat_data(context: &Context, chat_id: ChatId) -> ExportChatResul
None => None, None => None,
}; };
let mut message_info: Vec<( let mut message_ids: Vec<MsgId> = Vec::new();
u32, for message in &messages {
String, /* message info */ if let Ok(msg) = &message {
Option<String>, /* mime headers */ message_ids.push(msg.id);
)> = Vec::new(); }
}
// drop(messages);
let mut message_json: Vec<MessageJSON> = Vec::new(); let mut message_json: Vec<MessageJSON> = Vec::new();
for message in &messages { for message in &messages {
if let Ok(msg) = &message { if let Ok(msg) = &message {
let msg_json: MessageJSON = MessageJSON::from_message(msg, &context).await; let msg_json: MessageJSON = MessageJSON::from_message(msg, &context).await;
message_json.push(msg_json); message_json.push(msg_json);
message_info.push((
msg.id.to_u32(),
get_msg_info(&context, msg.id).await,
get_mime_headers(&context, msg.id).await,
));
} else { } else {
// todo // todo
} }
@@ -306,7 +302,7 @@ async fn export_chat_data(context: &Context, chat_id: ChatId) -> ExportChatResul
blobs.dedup(); blobs.dedup();
ExportChatResult { ExportChatResult {
chat_json: serde_json::to_string(&chat_json).unwrap(), chat_json: serde_json::to_string(&chat_json).unwrap(),
message_info, message_ids,
referenced_blobs: blobs, referenced_blobs: blobs,
} }
} }