Reimplement MultipartForm

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

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 88a2eeffde0ad8e7e673af93c425f506c6d5706e..ab0e06596320d343164211017a8725ada3b9f07b 100644 (file)
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -1,83 +1,84 @@
 {-# LANGUAGE
-    UnboxedTuples
+    OverloadedStrings
   , UnicodeSyntax
   #-}
-{-# OPTIONS_HADDOCK prune #-}
 
--- |Manipulation of MIME Types.
+-- |MIME Types
 module Network.HTTP.Lucu.MIMEType
     ( MIMEType(..)
+    , mkMIMEType
+
     , parseMIMEType
     , printMIMEType
 
-    , mimeTypeP
-    , mimeTypeListP
+    , mimeType
+    , mimeTypeList
     )
     where
-import Data.Ascii (Ascii, CIAscii)
+import Control.Applicative
+import Data.Ascii (Ascii, AsciiBuilder, CIAscii)
 import qualified Data.Ascii as A
-import qualified Data.ByteString.Lazy as B
+import Data.Attoparsec.Char8 as P
+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\".
+-- |@'MIMEType' \"major\" \"minor\" [(\"name\", \"value\"), ...]@
+-- represents \"major\/minor; name=value; ...\".
 data MIMEType = MIMEType {
-      mtMajor  :: !CIAscii
-    , mtMinor  :: !CIAscii
-    , mtParams :: ![ (CIAscii, Ascii) ]
-    } deriving (Eq, Show)
+      mtMajor  ∷ !CIAscii
+    , mtMinor  ∷ !CIAscii
+    , mtParams ∷ !(Map CIAscii Text)
+    } deriving (Eq)
 
--- |Convert a 'MIMEType' to 'Ascii'.
-printMIMEType ∷ MIMEType → Ascii
-printMIMEType (MIMEType maj min params)
-    = A.fromAsciiBuilder $
-      ( A.toAsciiBuilder maj ⊕
-        A.toAsciiBuilder "/" ⊕
-        A.toAsciiBuilder min ⊕
-        if null params then
-            (∅)
-        else
-            A.toAsciiBuilder "; " ⊕
-            joinWith "; " (map printPair 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
+instance Show MIMEType where
+    show = A.toString ∘ A.fromAsciiBuilder ∘ printMIMEType
 
--- |Parse 'MIMEType' from a 'Prelude.String'. 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)
+-- |@'mkMIMEType' major minor@ returns a 'MIMEType' with the given
+-- @major@ and @minor@ types but without any parameters.
+mkMIMEType ∷ CIAscii → CIAscii → MIMEType
+{-# INLINE mkMIMEType #-}
+mkMIMEType maj min
+    = MIMEType maj min (∅)
 
+-- |Convert a 'MIMEType' to an 'AsciiBuilder'.
+printMIMEType ∷ MIMEType → AsciiBuilder
+{-# INLINEABLE printMIMEType #-}
+printMIMEType (MIMEType maj min params)
+    = A.toAsciiBuilder (A.fromCIAscii maj) ⊕
+      A.toAsciiBuilder "/" ⊕
+      A.toAsciiBuilder (A.fromCIAscii min) ⊕
+      printMIMEParams params
 
-mimeTypeP :: Parser MIMEType
-mimeTypeP = allowEOF $!
-            do maj    <- token
-               _      <- char '/'
-               min    <- token
-               params <- many paramP
-               return $ MIMEType maj min params
+-- |Parse 'MIMEType' from an 'Ascii'. This function throws an
+-- exception for parse error.
+parseMIMEType ∷ Ascii → MIMEType
+{-# INLINEABLE parseMIMEType #-}
+parseMIMEType str
+    = case parseOnly p $ A.toByteString str of
+        Right  t → t
+        Left err → error ("unparsable MIME Type: " ⧺ A.toString str ⧺ ": " ⧺ err)
     where
-      paramP :: Parser (String, String)
-      paramP = do _     <- many lws
-                  _     <- char ';'
-                  _     <- many lws
-                  name  <- token
-                  _     <- char '='
-                  value <- token <|> quotedStr
-                  return (name, value)
+      p ∷ Parser MIMEType
+      {-# INLINE p #-}
+      p = do t ← mimeType
+             endOfInput
+             return t
+
+-- |'Parser' for an 'MIMEType'.
+mimeType ∷ Parser MIMEType
+{-# INLINEABLE mimeType #-}
+mimeType = do maj    ← A.toCIAscii <$> token
+              _      ← char '/'
+              min    ← A.toCIAscii <$> token
+              params ← mimeParams
+              return $ MIMEType maj min params
 
-mimeTypeListP :: Parser [MIMEType]
-mimeTypeListP = allowEOF $! listOf mimeTypeP
+-- |'Parser' for a list of 'MIMEType's.
+mimeTypeList ∷ Parser [MIMEType]
+{-# INLINE mimeTypeList #-}
+mimeTypeList = listOf mimeType