client: extend APPEND to support optional flags

According to RFC3501[1], the APPEND command supports optional flags for
the datetime of the message receipt, and a set of flags to be applied to
the message. Implement this in imap-rust, using the same formatting as
the Python imaplib equivalent code.

[1]: https://tools.ietf.org/html/rfc3501#section-6.3.11

Signed-off-by: Aleksa Sarai <[email protected]>

Author: cyphar

Cargo.toml

@@ -28,6 +28,7 @@ path = "src/lib.rs"
 native-tls = "0.1"
 regex = "0.2"
 bufstream = "0.1"
+chrono = "0.4"
 
 [dev-dependencies]
 base64 = "0.7"

src/client.rs

@@ -1,8 +1,10 @@
+use std::fmt;
 use std::net::{TcpStream, ToSocketAddrs};
 use native_tls::{TlsConnector, TlsStream};
 use std::io::{self, Read, Write};
 use std::time::Duration;
 use bufstream::BufStream;
+use chrono::prelude::*;
 
 use super::mailbox::Mailbox;
 use super::authenticator::Authenticator;
@@ -448,9 +450,46 @@ impl<T: Read + Write> Client<T> {
         IdleHandle::new(self)
     }
 
-    /// The APPEND command adds a mail to a mailbox.
-    pub fn append(&mut self, folder: &str, content: &[u8]) -> Result<Vec<String>> {
-        try!(self.run_command(&format!("APPEND \"{}\" {{{}}}", folder, content.len())));
+    /// The APPEND command adds a mail to a mailbox. If the datetime or flags are unspecified they
+    /// are not included in the request.
+    pub fn append<Tz: TimeZone>(
+        &mut self,
+        folder: &str,
+        flags: Option<Vec<String>>,
+        datetime: Option<DateTime<Tz>>,
+        content: &[u8],
+    ) -> Result<Vec<String>>
+    where
+        Tz::Offset: fmt::Display,
+    {
+        // Set up optional flags.
+        let mut optionals = String::new();
+        match flags {
+            None => (),
+            Some(flags) => {
+                optionals.push_str(&format!(
+                    "({})",
+                    flags
+                        .iter()
+                        .fold(String::new(), |acc, ref flag| acc + &flag)
+                        .trim()
+                ));
+            }
+        }
+        optionals.push(' ');
+        match datetime {
+            None => (),
+            Some(datetime) => {
+                optionals.push_str(&format!("\"{}\"", datetime.format("%d-%b-%Y %H:%M:%S %z")))
+            }
+        }
+
+        try!(self.run_command(&format!(
+            "APPEND \"{}\" {} {{{}}}",
+            folder,
+            optionals,
+            content.len()
+        )));
         let line = try!(self.readline());
         if !line.starts_with(b"+") {
             return Err(Error::Append);

src/lib.rs

@@ -4,6 +4,7 @@
 //! imap is a IMAP client for Rust.
 
 extern crate bufstream;
+extern crate chrono;
 extern crate native_tls;
 extern crate regex;