Merge changes from old repository

Author: djc

imap-proto/src/parser.rs

@@ -305,6 +305,15 @@ named!(capability_data<Response>, do_parse!(
     (Response::Capabilities(capabilities))
 ));
 
+named!(mailbox_data_search<Response>, do_parse!(
+    tag_s!("SEARCH") >>
+    ids: many0!(do_parse!(
+            tag_s!(" ") >>
+            id: number >>
+            (id))) >>
+    (Response::IDs(ids))
+));
+
 named!(mailbox_data_flags<Response>, do_parse!(
     tag_s!("FLAGS ") >>
     flags: flag_list >>
@@ -405,7 +414,8 @@ named!(mailbox_data<Response>, alt!(
     mailbox_data_list |
     mailbox_data_lsub |
     mailbox_data_status |
-    mailbox_data_recent
+    mailbox_data_recent |
+    mailbox_data_search
 ));
 
 named!(nstring<Option<&[u8]>>, map!(
@@ -726,4 +736,21 @@ mod tests {
             rsp @ _ => panic!("unexpected response {:?}", rsp),
         }
     }
+
+    #[test]
+    fn test_search() {
+        match parse_response(b"* SEARCH\r\n") {
+            IResult::Done(_, Response::IDs(ids)) => {
+                assert!(ids.is_empty());
+            },
+            rsp @ _ => panic!("unexpected response {:?}", rsp),
+        }
+        match parse_response(b"* SEARCH 12345 67890\r\n") {
+            IResult::Done(_, Response::IDs(ids)) => {
+                assert_eq!(ids[0], 12345);
+                assert_eq!(ids[1], 67890);
+            },
+            rsp @ _ => panic!("unexpected response {:?}", rsp),
+        }
+    }
 }

imap-proto/src/types.rs

@@ -31,6 +31,7 @@ pub enum Response<'a> {
     Expunge(u32),
     Fetch(u32, Vec<AttributeValue<'a>>),
     MailboxData(MailboxDatum<'a>),
+    IDs(Vec<u32>),
 }
 
 #[derive(Debug, Eq, PartialEq)]