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

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 4128f53..dfaef11 100644
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -19,9 +19,11 @@ import Data.Ascii (Ascii, CIAscii)
 import qualified Data.Ascii as A
 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
 
@@ -30,7 +32,7 @@ import Prelude.Unicode
 data MIMEType = MIMEType {
       mtMajor  ∷ !CIAscii
     , mtMinor  ∷ !CIAscii
-    , mtParams ∷ ![ (CIAscii, Ascii) ]
+    , mtParams ∷ !(Map CIAscii Text)
     } deriving (Eq, Show)
 
 -- |Convert a 'MIMEType' to 'Ascii'.
@@ -40,21 +42,8 @@ printMIMEType (MIMEType maj min params)
       ( A.toAsciiBuilder (A.fromCIAscii maj) ⊕
         A.toAsciiBuilder "/" ⊕
         A.toAsciiBuilder (A.fromCIAscii min) ⊕
-        if null params then
-            (∅)
-        else
-            A.toAsciiBuilder "; " ⊕
-            joinWith "; " (map printPair params)
+        printParams params
       )
-    where
-      printPair ∷ (CIAscii, Ascii) → A.AsciiBuilder
-      printPair (name, value)
-          = A.toAsciiBuilder (A.fromCIAscii name) ⊕
-            A.toAsciiBuilder "=" ⊕
-            if C8.any ((¬) ∘ isToken) (A.toByteString value) then
-                quoteStr value
-            else
-                A.toAsciiBuilder value
 
 -- |Parse 'MIMEType' from an 'Ascii'. This function throws an
 -- exception for parse error.
@@ -70,22 +59,11 @@ parseMIMEType str
           Left err → error ("unparsable MIME Type: " ⧺ C8.unpack bs ⧺ ": " ⧺ err)
 
 mimeTypeP ∷ Parser MIMEType
-mimeTypeP = try $
-            do maj    ← A.toCIAscii <$> token
+mimeTypeP = do maj    ← A.toCIAscii <$> token
                _      ← char '/'
                min    ← A.toCIAscii <$> token
-               params ← P.many paramP
+               params ← paramsP
                return $ MIMEType maj min params
-    where
-      paramP ∷ Parser (CIAscii, Ascii)
-      paramP = try $
-               do skipMany lws
-                  _     ← char ';'
-                  skipMany lws
-                  name  ← A.toCIAscii <$> token
-                  _     ← char '='
-                  value ← token <|> quotedStr
-                  return (name, value)
 
 mimeTypeListP ∷ Parser [MIMEType]
 mimeTypeListP = listOf mimeTypeP