)
where
import Control.Applicative
-import Data.Ascii (Ascii, CIAscii)
+import Data.Ascii (Ascii, AsciiBuilder, 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
data MIMEType = MIMEType {
mtMajor ∷ !CIAscii
, mtMinor ∷ !CIAscii
- , mtParams ∷ ![ (CIAscii, Ascii) ]
+ , mtParams ∷ !(Map CIAscii Text)
} deriving (Eq, Show)
--- |Convert a 'MIMEType' to 'Ascii'.
-printMIMEType ∷ MIMEType → Ascii
+-- |Convert a 'MIMEType' to 'AsciiBuilder'.
+printMIMEType ∷ MIMEType → AsciiBuilder
printMIMEType (MIMEType maj min params)
- = A.fromAsciiBuilder $
- ( A.toAsciiBuilder (A.fromCIAscii maj) ⊕
- A.toAsciiBuilder "/" ⊕
- A.toAsciiBuilder (A.fromCIAscii 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 C8.any ((¬) ∘ isToken) (A.toByteString value) then
- quoteStr value
- else
- A.toAsciiBuilder value
+ = A.toAsciiBuilder (A.fromCIAscii maj) ⊕
+ A.toAsciiBuilder "/" ⊕
+ A.toAsciiBuilder (A.fromCIAscii min) ⊕
+ printParams params
-- |Parse 'MIMEType' from an 'Ascii'. This function throws an
-- exception for parse error.
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