X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FMIMEType.hs;h=dfaef11172d472666545301c7255043b34aae5b7;hb=dfc778742934b8f2ac6a6709741c79ecd40c5ff1;hp=88a2eeffde0ad8e7e673af93c425f506c6d5706e;hpb=9bb89434103e9a22f100d6ecb7e65a5d461e0454;p=Lucu.git

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 88a2eef..dfaef11 100644
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE
-    UnboxedTuples
+    OverloadedStrings
   , UnicodeSyntax
   #-}
 {-# OPTIONS_HADDOCK prune #-}
@@ -14,70 +14,56 @@ module Network.HTTP.Lucu.MIMEType
     , mimeTypeListP
     )
     where
+import Control.Applicative
 import Data.Ascii (Ascii, CIAscii)
 import qualified Data.Ascii as A
-import qualified Data.ByteString.Lazy as B
+import Data.Attoparsec.Char8 as P
+import qualified Data.ByteString.Char8 as C8
+import Data.Map (Map)
+import Data.Monoid.Unicode
+import Data.Text (Text)
 import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Utils
+import Network.HTTP.Lucu.RFC2231
 import Prelude hiding (min)
+import Prelude.Unicode
 
 -- |@'MIMEType' \"major\" \"minor\" [(\"name\", \"value\")]@
 -- represents \"major\/minor; name=value\".
 data MIMEType = MIMEType {
-      mtMajor  :: !CIAscii
-    , mtMinor  :: !CIAscii
-    , mtParams :: ![ (CIAscii, Ascii) ]
+      mtMajor  ∷ !CIAscii
+    , mtMinor  ∷ !CIAscii
+    , mtParams ∷ !(Map CIAscii Text)
     } deriving (Eq, Show)
 
 -- |Convert a 'MIMEType' to 'Ascii'.
 printMIMEType ∷ MIMEType → Ascii
 printMIMEType (MIMEType maj min params)
     = A.fromAsciiBuilder $
-      ( A.toAsciiBuilder maj ⊕
+      ( A.toAsciiBuilder (A.fromCIAscii maj) ⊕
         A.toAsciiBuilder "/" ⊕
-        A.toAsciiBuilder min ⊕
-        if null params then
-            (∅)
-        else
-            A.toAsciiBuilder "; " ⊕
-            joinWith "; " (map printPair params)
+        A.toAsciiBuilder (A.fromCIAscii min) ⊕
+        printParams params
       )
-    where
-      printPair ∷ (CIAscii, Ascii) → A.AsciiBuilder
-      printPair (name, value)
-          = A.toAsciiBuilder (A.fromCIAscii name) ⊕
-            A.toAsciiBuilder "=" ⊕
-            if any ((¬) ∘ isToken) value then
-                quoteStr value
-            else
-                A.toAsciiBuilder value
 
--- |Parse 'MIMEType' from a 'Prelude.String'. This function throws an
+-- |Parse 'MIMEType' from an 'Ascii'. This function throws an
 -- exception for parse error.
-parseMIMEType :: String -> MIMEType
-parseMIMEType str = case parseStr mimeTypeP str of
-                      (# Success t, r #) -> if B.null r
-                                            then t
-                                            else error ("unparsable MIME Type: " ++ str)
-                      (# _        , _ #) -> error ("unparsable MIME Type: " ++ str)
-
+parseMIMEType ∷ Ascii → MIMEType
+parseMIMEType str
+    = let p  = do t ← mimeTypeP
+                  endOfInput
+                  return t
+          bs = A.toByteString str
+      in
+        case parseOnly p bs of
+          Right  t → t
+          Left err → error ("unparsable MIME Type: " ⧺ C8.unpack bs ⧺ ": " ⧺ err)
 
-mimeTypeP :: Parser MIMEType
-mimeTypeP = allowEOF $!
-            do maj    <- token
-               _      <- char '/'
-               min    <- token
-               params <- many paramP
+mimeTypeP ∷ Parser MIMEType
+mimeTypeP = do maj    ← A.toCIAscii <$> token
+               _      ← char '/'
+               min    ← A.toCIAscii <$> token
+               params ← paramsP
                return $ MIMEType maj min params
-    where
-      paramP :: Parser (String, String)
-      paramP = do _     <- many lws
-                  _     <- char ';'
-                  _     <- many lws
-                  name  <- token
-                  _     <- char '='
-                  value <- token <|> quotedStr
-                  return (name, value)
 
-mimeTypeListP :: Parser [MIMEType]
-mimeTypeListP = allowEOF $! listOf mimeTypeP
+mimeTypeListP ∷ Parser [MIMEType]
+mimeTypeListP = listOf mimeTypeP