MIMEType and MultipartForm

[Lucu.git] / Network / HTTP / Lucu / MIMEType.hs

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 9f2cb87739364af2d434d7b36aea40ddc87d4e1f..dfaef11172d472666545301c7255043b34aae5b7 100644 (file)
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -23,7 +23,7 @@ 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
 
@@ -42,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.
@@ -75,18 +62,8 @@ mimeTypeP ∷ Parser MIMEType
 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