diff options
Diffstat (limited to 'src/Network/URI/Charset.hs')
| -rw-r--r-- | src/Network/URI/Charset.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Network/URI/Charset.hs b/src/Network/URI/Charset.hs index ac1df5d..2b200fb 100644 --- a/src/Network/URI/Charset.hs +++ b/src/Network/URI/Charset.hs @@ -7,19 +7,23 @@ import Data.ByteString.Lazy (ByteString) import qualified Data.ByteString.Lazy as B import Data.Text.Encoding import Debug.Trace (trace) +import Data.List (intercalate) -- | If the MIMEtype specifies a charset parameter, apply it. resolveCharset :: [String] -- ^ The MIMEtype, split by ';' -> ByteString -- ^ The bytes received from the server -> (String, Either Text ByteString) -- ^ The MIMEtype (minus parameters) & possibly decoded text, to be returned from protocol handlers. -resolveCharset (mime:('c':'h':'a':'r':'s':'e':'t':'=':charset):_) response = - (mime, Left $ convertCharset charset $ B.toStrict response) -resolveCharset (mime:_:params) response = resolveCharset (mime:params) response +resolveCharset (mime:('c':'h':'a':'r':'s':'e':'t':'=':charset):params) response = + (parameterizedMIME mime params, Left $ convertCharset charset $ B.toStrict response) +resolveCharset (mime:param:params) response = + resolveCharset (parameterizedMIME mime [param]:params) response resolveCharset [mime] response = (mime, Right $ response) -- NOTE I can't localize this error string because resolveCharset doesn't know the locale. -- I don't think this is worth fixing, because hitting this indicates the server is badly misbehaving. resolveCharset [] response = ("text/x-error\t", Left "Filetype unspecified") +parameterizedMIME mime params = mime ++ ";" ++ intercalate ";" params + -- | As per `resolveCharset`, but also returns given URI (or other type). resolveCharset' :: a -> [String] -> ByteString -> (a, String, Either Text ByteString) resolveCharset' a mimes resp = let (mime, resp') = resolveCharset mimes resp in (a, mime, resp') |