rust/lettre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(transport-file): Store email as string when possible (fixes #385)

Browse Source
This commit is contained in:
Alexis Mousset
2020-04-28 22:43:09 +02:00
parent 7f22a98f2f
commit 0ac3438d32
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/transport/file/mod.rs
View File

@@ -8,6 +8,7 @@ use std::{
fs::File, fs::File,
io::prelude::*, io::prelude::*,
path::{Path, PathBuf}, path::{Path, PathBuf},
str,
}; };
use uuid::Uuid; use uuid::Uuid;
@@ -31,9 +32,10 @@ impl FileTransport {
#[derive(PartialEq, Eq, Clone, Debug)] #[derive(PartialEq, Eq, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
struct SerializableEmail { struct SerializableEmail<'a> {
envelope: Envelope, envelope: Envelope,
message: Vec<u8>, raw_message: Option<&'a [u8]>,
message: Option<&'a str>,
} }
impl<'a> Transport<'a> for FileTransport { impl<'a> Transport<'a> for FileTransport {
@@ -45,10 +47,19 @@ impl<'a> Transport<'a> for FileTransport {
let mut file = self.path.clone(); let mut file = self.path.clone();
file.push(format!("{}.json", email_id)); file.push(format!("{}.json", email_id));
let serialized = serde_json::to_string(&SerializableEmail { let serialized = match str::from_utf8(email) {
envelope: envelope.clone(), // Serialize as UTF-8 string if possible
message: email.to_vec(), Ok(m) => serde_json::to_string(&SerializableEmail {
})?; envelope: envelope.clone(),
message: Some(m),
raw_message: None,
}),
Err(_) => serde_json::to_string(&SerializableEmail {
envelope: envelope.clone(),
message: None,
raw_message: Some(email),
}),
}?;
File::create(file.as_path())?.write_all(serialized.as_bytes())?; File::create(file.as_path())?.write_all(serialized.as_bytes())?;
Ok(email_id.to_string()) Ok(email_id.to_string())