Fix UNSEEN and LSUB

All tests now pass

Author: jonhoo

Cargo.toml

@@ -28,7 +28,8 @@ path = "src/lib.rs"
 native-tls = "0.1"
 regex = "0.2"
 bufstream = "0.1"
-imap-proto = "0.1"
+#imap-proto = "0.1"
+imap-proto = { git = "https://github.com/djc/imap-proto.git" }
 nom = "3.2.1"
 
 [dev-dependencies]

src/client.rs

@@ -447,7 +447,9 @@ impl<T: Read + Write> Client<T> {
 
     /// The APPEND command adds a mail to a mailbox.
     pub fn append(&mut self, folder: &str, content: &[u8]) -> Result<()> {
-        try!(self.run_command(&format!("APPEND \"{}\" {{{}}}", folder, content.len())));
+        try!(self.run_command(
+            &format!("APPEND \"{}\" {{{}}}", folder, content.len())
+        ));
         let mut v = Vec::new();
         try!(self.readline(&mut v));
         if !v.starts_with(b"+") {
@@ -499,10 +501,20 @@ impl<T: Read + Write> Client<T> {
                 let line = &data[line_start..];
 
                 match parse_response(line) {
-                    IResult::Done(_, Response::Done(tag, status, _, expl)) => {
+                    IResult::Done(
+                        _,
+                        Response::Done {
+                            tag,
+                            status,
+                            information,
+                            ..
+                        },
+                    ) => {
                         assert_eq!(tag.as_bytes(), match_tag.as_bytes());
                         Some(match status {
-                            Status::Bad | Status::No => Err((status, expl.map(|s| s.to_string()))),
+                            Status::Bad | Status::No => {
+                                Err((status, information.map(|s| s.to_string())))
+                            }
                             Status::Ok => Ok(()),
                             status => Err((status, None)),
                         })
@@ -822,6 +834,7 @@ mod tests {
             recent: 1,
             unseen: Some(1),
             permanent_flags: vec![
+                "\\*".to_string(),
                 "\\Answered".to_string(),
                 "\\Flagged".to_string(),
                 "\\Deleted".to_string(),

src/parse.rs

@@ -55,10 +55,19 @@ pub fn parse_names(lines: Vec<u8>) -> ZeroCopyResult<Vec<Name>> {
     use imap_proto::MailboxDatum;
     let f = |resp| match resp {
         // https://github.com/djc/imap-proto/issues/4
-        Response::MailboxData(MailboxDatum::List(attrs, delim, name)) => MapOrNot::Map(Name {
-            attributes: attrs,
-            delimiter: delim,
-            name: name,
+        Response::MailboxData(MailboxDatum::List {
+            flags,
+            delimiter,
+            name,
+        }) |
+        Response::MailboxData(MailboxDatum::SubList {
+            flags,
+            delimiter,
+            name,
+        }) => MapOrNot::Map(Name {
+            attributes: flags,
+            delimiter,
+            name,
         }),
         resp => MapOrNot::Not(resp),
     };
@@ -128,7 +137,7 @@ pub fn parse_mailbox(mut lines: &[u8]) -> Result<Mailbox> {
 
     loop {
         match imap_proto::parse_response(lines) {
-            IResult::Done(rest, Response::Data(status, rcode, _)) => {
+            IResult::Done(rest, Response::Data { status, code, .. }) => {
                 lines = rest;
 
                 if let imap_proto::Status::Ok = status {
@@ -138,20 +147,21 @@ pub fn parse_mailbox(mut lines: &[u8]) -> Result<Mailbox> {
                 }
 
                 use imap_proto::ResponseCode;
-                match rcode {
+                match code {
                     Some(ResponseCode::UidValidity(uid)) => {
                         mailbox.uid_validity = Some(uid);
                     }
                     Some(ResponseCode::UidNext(unext)) => {
                         mailbox.uid_next = Some(unext);
                     }
+                    Some(ResponseCode::Unseen(n)) => {
+                        mailbox.unseen = Some(n);
+                    }
                     Some(ResponseCode::PermanentFlags(flags)) => {
                         mailbox
                             .permanent_flags
                             .extend(flags.into_iter().map(|s| s.to_string()));
                     }
-                    // TODO: UNSEEN
-                    // https://github.com/djc/imap-proto/issues/2
                     _ => {}
                 }
             }
@@ -171,7 +181,7 @@ pub fn parse_mailbox(mut lines: &[u8]) -> Result<Mailbox> {
                             .flags
                             .extend(flags.into_iter().map(|s| s.to_string()));
                     }
-                    MailboxDatum::List(..) => {}
+                    MailboxDatum::SubList { .. } | MailboxDatum::List { .. } => {}
                 }
             }
             IResult::Done(_, resp) => {