feat(attachments): added support for message attachments

Author: Guusvanmeerveld

Cargo.lock

@@ -67,21 +67,14 @@ log = "0.4"
 
 validator = "0.16.1"
 directories = "5.0.1"
+mime = "0.3.17"
 
 [dev-dependencies]
 env_logger = "0.10.0"
 dotenv = "0.15.0"
 
 [features]
-default = [
-	"pop",
-	"imap",
-	"smtp",
-	"discover",
-	"runtime-tokio",
-	"serde",
-	"maildir",
-]
+default = ["pop", "imap", "smtp", "discover", "runtime-tokio", "serde", "maildir"]
 
 maildir = ["dep:maildir"]
 
@@ -97,23 +90,5 @@ imap = ["dep:async-imap"]
 serde = ["dep:serde"]
 json = ["serde", "dep:serde_json"]
 
-runtime-tokio = [
-	"dep:tokio",
-	"async-native-tls/runtime-tokio",
-	"async-imap?/runtime-tokio",
-	"async-smtp?/runtime-tokio",
-	"async-pop?/runtime-tokio",
-	"autoconfig?/runtime-tokio",
-	"ms-autodiscover?/runtime-tokio",
-	"dns-mail-discover?/runtime-tokio",
-]
-runtime-async-std = [
-	"dep:async-std",
-	"async-native-tls/runtime-async-std",
-	"async-imap?/runtime-async-std",
-	"async-smtp?/runtime-async-std",
-	"async-pop?/runtime-async-std",
-	"autoconfig?/runtime-async-std",
-	"ms-autodiscover?/runtime-async-std",
-	"dns-mail-discover?/runtime-async-std",
-]
+runtime-tokio = ["dep:tokio", "async-native-tls/runtime-tokio", "async-imap?/runtime-tokio", "async-smtp?/runtime-tokio", "async-pop?/runtime-tokio", "autoconfig?/runtime-tokio", "ms-autodiscover?/runtime-tokio", "dns-mail-discover?/runtime-tokio"]
+runtime-async-std = ["dep:async-std", "async-native-tls/runtime-async-std", "async-imap?/runtime-async-std", "async-smtp?/runtime-async-std", "async-pop?/runtime-async-std", "autoconfig?/runtime-async-std", "ms-autodiscover?/runtime-async-std", "dns-mail-discover?/runtime-async-std"]

Cargo.toml

@@ -0,0 +1,32 @@
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub struct Attachment {
+    id: String,
+    file_name: Option<String>,
+    size: usize,
+}
+
+impl Attachment {
+    pub fn new(id: String, file_name: Option<String>, size: usize) -> Self {
+        Self {
+            id,
+            file_name,
+            size,
+        }
+    }
+
+    pub fn id(&self) -> &str {
+        self.id.as_ref()
+    }
+
+    pub fn file_name(&self) -> Option<&String> {
+        self.file_name.as_ref()
+    }
+
+    pub fn size(&self) -> usize {
+        self.size
+    }
+}

src/client/attachment.rs

@@ -2,7 +2,10 @@ use std::{collections::HashMap, fmt::Display, result};
 
 use crate::error::{err, Error, ErrorKind, Result};
 
-use super::{address::Address, content::Content, incoming::types::flag::Flag, parser, Headers};
+use super::{
+    address::Address, attachment::Attachment, content::Content, incoming::types::flag::Flag,
+    parser, Headers,
+};
 
 #[derive(Debug)]
 pub struct MessageBuilder {
@@ -15,6 +18,7 @@ pub struct MessageBuilder {
     pub(crate) sent: Option<i64>,
     pub(crate) subject: Option<String>,
     pub(crate) headers: Option<Headers>,
+    pub(crate) attachments: Vec<Attachment>,
     pub(crate) content: Content,
 }
 
@@ -71,6 +75,7 @@ impl MessageBuilder {
             sent: None,
             subject: None,
             content: Content::default(),
+            attachments: Vec::new(),
             headers: None,
         }
     }
@@ -127,6 +132,12 @@ impl MessageBuilder {
         self
     }
 
+    pub fn attachments(mut self, attachments: Vec<Attachment>) -> Self {
+        self.attachments = attachments;
+
+        self
+    }
+
     pub fn subject<S: Display>(mut self, subject: S) -> Self {
         self.subject = Some(subject.to_string());
 
@@ -163,10 +174,14 @@ impl MessageBuilder {
         self
     }
 
-    pub fn build<T: TryFrom<Self>>(self) -> Result<T> {
+    pub fn build<T: TryFrom<Self, Error = impl Display>>(self) -> Result<T> {
         match self.try_into() {
             Ok(message) => Ok(message),
-            Err(_err) => err!(ErrorKind::InvalidMessage, "Could not build a valid message"),
+            Err(err) => err!(
+                ErrorKind::InvalidMessage,
+                "Could not build a valid message: {}",
+                err
+            ),
         }
     }
 }