From 0a322480cdb379a44d1b5aabe0411966d86e78ea Mon Sep 17 00:00:00 2001 From: Sigbjorn Finne Date: Mon, 21 Dec 2009 07:47:29 +0100 Subject: 0.3.2: extend export list for C.M.Parse; updated maintainer info --- CHANGES | 5 +++++ Codec/MIME/Base64.hs | 2 +- Codec/MIME/Decode.hs | 2 +- Codec/MIME/Parse.hs | 21 ++++++++++----------- Codec/MIME/QuotedPrintable.hs | 4 ++-- Codec/MIME/Type.hs | 2 +- Codec/MIME/Utils.hs | 3 +-- mime.cabal | 5 +++-- 8 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 CHANGES diff --git a/CHANGES b/CHANGES new file mode 100644 index 0000000..da09e50 --- /dev/null +++ b/CHANGES @@ -0,0 +1,5 @@ +Version 0.3.2: released 2009-12-21 + +* sub-point release. +* extend exports of Codec.MIME.Parse to include misc + local utility functions: parseMIMEMessage, parseContentType diff --git a/Codec/MIME/Base64.hs b/Codec/MIME/Base64.hs index 33fa3b8..f60419b 100644 --- a/Codec/MIME/Base64.hs +++ b/Codec/MIME/Base64.hs @@ -4,7 +4,7 @@ -- Copyright : (c) 2006-2009, Galois, Inc. -- License : BSD3 -- --- Maintainer: Sigbjorn Finne +-- Maintainer: Sigbjorn Finne -- Stability : provisional -- Portability: portable -- diff --git a/Codec/MIME/Decode.hs b/Codec/MIME/Decode.hs index ea1cf00..364e0fb 100644 --- a/Codec/MIME/Decode.hs +++ b/Codec/MIME/Decode.hs @@ -4,7 +4,7 @@ -- Copyright : (c) 2006-2009, Galois, Inc. -- License : BSD3 -- --- Maintainer: Sigbjorn Finne +-- Maintainer: Sigbjorn Finne -- Stability : provisional -- Portability: portable -- diff --git a/Codec/MIME/Parse.hs b/Codec/MIME/Parse.hs index 488331c..df3549f 100644 --- a/Codec/MIME/Parse.hs +++ b/Codec/MIME/Parse.hs @@ -4,7 +4,7 @@ -- Copyright : (c) 2006-2009, Galois, Inc. -- License : BSD3 -- --- Maintainer: Sigbjorn Finne +-- Maintainer: Sigbjorn Finne -- Stability : provisional -- Portability: portable -- @@ -12,8 +12,14 @@ -- -------------------------------------------------------------------- module Codec.MIME.Parse - ( parseMIMEBody - , parseMIMEType + ( parseMIMEBody -- :: [(String,String)] -> String -> MIMEValue + , parseMIMEType -- :: String -> Maybe Type + , parseMIMEMessage -- :: String -> MIMEValue + + , parseHeaders -- :: String -> ([(String,String)], String) + , parseMultipart -- :: Type -> String -> (MIMEValue, String) + , parseContentType -- :: String -> Maybe Type + , splitMulti -- :: String -> String -> ([MIMEValue], String) ) where import Codec.MIME.Type @@ -75,7 +81,6 @@ parseContentDisp headers = "form-data" -> DispFormData _ -> DispOther t - processBody :: [(String,String)] -> String -> String processBody headers body = case lookupField "content-transfer-encoding" headers of @@ -164,7 +169,6 @@ parseContentType str = Just ctor -> ctor b _ -> Other a b - parseParams :: String -> [(String,String)] parseParams "" = [] parseParams (';':xs) = @@ -199,7 +203,6 @@ mediaTypes = 'x':'-':_ -> Extension b _ -> OtherMulti b - multipartTypes :: [(String, Multipart)] multipartTypes = [ ("alternative", Alternative) @@ -213,7 +216,6 @@ multipartTypes = , ("signed", Signed) ] - untilMatch :: String -> String -> Maybe String untilMatch str xs = go str xs where go "" rs = Just rs @@ -227,14 +229,11 @@ matchUntil str xs | str `isPrefixOf` xs = ("", drop (length str) xs) matchUntil str (x:xs) = let (as,bs) = matchUntil str xs in (x:as,bs) - - isHSpace :: Char -> Bool isHSpace c = c == ' ' || c == '\t' isTSpecial :: Char -> Bool -isTSpecial x = x `elem` "()<>@,;:\\\"/[]?=" - +isTSpecial x = x `elem` "()<>@,;:\\\"/[]?=" -- " dropFoldingWSP :: String -> String dropFoldingWSP "" = "" diff --git a/Codec/MIME/QuotedPrintable.hs b/Codec/MIME/QuotedPrintable.hs index 92e468a..cdc2266 100644 --- a/Codec/MIME/QuotedPrintable.hs +++ b/Codec/MIME/QuotedPrintable.hs @@ -4,11 +4,11 @@ -- Copyright : (c) 2006-2009, Galois, Inc. -- License : BSD3 -- --- Maintainer: Sigbjorn Finne +-- Maintainer: Sigbjorn Finne -- Stability : provisional -- Portability: -- --- +-- To and from QP content encoding. -- -------------------------------------------------------------------- module Codec.MIME.QuotedPrintable diff --git a/Codec/MIME/Type.hs b/Codec/MIME/Type.hs index 998c6b0..5b91b14 100644 --- a/Codec/MIME/Type.hs +++ b/Codec/MIME/Type.hs @@ -4,7 +4,7 @@ -- Copyright : (c) 2006-2009, Galois, Inc. -- License : BSD3 -- --- Maintainer: Sigbjorn Finne +-- Maintainer: Sigbjorn Finne -- Stability : provisional -- Portability: portable -- diff --git a/Codec/MIME/Utils.hs b/Codec/MIME/Utils.hs index 8c4e921..624d433 100644 --- a/Codec/MIME/Utils.hs +++ b/Codec/MIME/Utils.hs @@ -4,7 +4,7 @@ -- Copyright : (c) 2006-2009, Galois, Inc. -- License : BSD3 -- --- Maintainer: Sigbjorn Finne +-- Maintainer: Sigbjorn Finne -- Stability : provisional -- Portability: portable -- @@ -30,4 +30,3 @@ findMultipartNamed nm mv = return mv where withDispName a (Name b) = a == b withDispName _ _ = False - diff --git a/mime.cabal b/mime.cabal index 8ba2e1a..09f1837 100644 --- a/mime.cabal +++ b/mime.cabal @@ -1,15 +1,16 @@ name: mime -version: 0.3.1 +version: 0.3.2 synopsis: Working with MIME types. description: Working with MIME types. category: Codec license: BSD3 license-file: LICENSE -author: Galois Inc. +author: Sigbjorn Finne, Galois, Inc. maintainer: Sigbjorn Finne Copyright: (c) 2006-2009 Galois Inc. cabal-version: >= 1.2.0 build-type: Simple +Extra-Source-Files: CHANGES flag split-base -- cgit v1.2.3