change how mechanism work

src/mime/mechanism.rs

@@ -9,7 +9,7 @@ use crate::text::whitespace::cfws;
 use crate::text::words::mime_token as token;
 
 #[derive(Debug, Clone, PartialEq)]
-pub enum Mechanism<'a> {
+pub enum DecodedMechanism<'a> {
     _7Bit,
     _8Bit,
     Binary,
@@ -18,23 +18,23 @@ pub enum Mechanism<'a> {
     Other(&'a [u8]),
 }
 
-pub fn mechanism(input: &[u8]) -> IResult<&[u8], Mechanism> {
+pub struct Mechanism<'a>(pub &'a [u8]);
-    use Mechanism::*;
+impl<'a> Mechanism<'a> {
+    pub fn decode(&self) -> DecodedMechanism {
+        use DecodedMechanism::*;
+        match self.0.to_ascii_lowercase().as_slice() {
+            b"7bit" => _7Bit,
+            b"8bit" => _8Bit,
+            b"binary" => Binary,
+            b"quoted-printable" => QuotedPrintable,
+            b"base64" => Base64,
+            _ => Other(self.0),
+        }
+    }
+}
 
-    alt((
+pub fn mechanism(input: &[u8]) -> IResult<&[u8], Mechanism> {
-        delimited(
+    map(token, Mechanism)(input)
-            opt(cfws),
-            alt(( 
-                value(_7Bit, tag_no_case("7bit")),
-                value(_8Bit, tag_no_case("8bit")),
-                value(Binary, tag_no_case("binary")),
-                value(QuotedPrintable, tag_no_case("quoted-printable")),
-                value(Base64, tag_no_case("base64")),
-            )),
-            opt(cfws),
-        ),
-        map(token, Other),
-    ))(input)
 }
 
 
@@ -44,28 +44,28 @@ mod tests {
     #[test]
     fn test_mechanism() {
         assert_eq!(
-            mechanism(b"7bit"),
+            mechanism(b"7bit").unwrap().1.decode(),
-            Ok((&b""[..], Mechanism::_7Bit)),
+            DecodedMechanism::_7Bit,
         );
 
         assert_eq!(
-            mechanism(b"(youhou) 8bit"),
+            mechanism(b"(youhou) 8bit").unwrap().1.decode(),
-            Ok((&b""[..], Mechanism::_8Bit)),
+            DecodedMechanism::_8Bit,
         );
         
         assert_eq!(
-            mechanism(b"(blip) bInArY (blip blip)"),
+            mechanism(b"(blip) bInArY (blip blip)").unwrap().1.decode(),
-            Ok((&b""[..], Mechanism::Binary)),
+            DecodedMechanism::Binary,
         );
 
         assert_eq!(
-            mechanism(b" base64 "),
+            mechanism(b" base64 ").unwrap().1.decode(),
-            Ok((&b""[..], Mechanism::Base64)),
+            DecodedMechanism::Base64,
         );
 
         assert_eq!(
-            mechanism(b" Quoted-Printable "),
+            mechanism(b" Quoted-Printable ").unwrap().1.decode(),
-            Ok((&b""[..], Mechanism::QuotedPrintable)),
+            DecodedMechanism::QuotedPrintable,
         );
     }
 }