mbox-utility 0.0.1 → 0.0.3

raw patch · 2 files changed

+11/−6 lines, 2 filesdep +timedep −old-timedep ~hsemail

Dependencies added: time

Dependencies removed: old-time

Dependency ranges changed: hsemail

Files

• mbox-utility.cabal +4/−4
• src/Main.hs +7/−2

@@ -1,5 +1,5 @@ Name:                mbox-utility-Version:             0.0.1+Version:             0.0.3 Synopsis:            List contents of an mbox file containing e-mails Description:   List contents of an mbox file containing e-mails.@@ -14,7 +14,7 @@ Cabal-Version:       >=1.8  Source-Repository this-  Tag:         0.0.1+  Tag:         0.0.3   Type:        darcs   Location:    http://hub.darcs.net/thielema/mbox/ @@ -26,9 +26,9 @@   Main-Is: src/Main.hs   GHC-Options: -Wall   Build-Depends:-    hsemail >=2 && <3,+    hsemail >=2.1 && <2.2,     parsec >=2.1 && <4,-    old-time >=1.0 && <1.2,+    time >=1.5 && <1.10,     spreadsheet >=0.1.3 && <0.2,     non-empty >=0.0 && <0.4,     bytestring >=0.9.1 && <0.11,

@@ -3,8 +3,9 @@ import qualified Text.ParserCombinators.Parsec as Parsec import qualified Text.Parsec.Rfc2822 as Parser import Text.ParserCombinators.Parsec ((<|>), )-import System.Time (calendarTimeToString, ) +import qualified Data.Time.Format as Time+ import qualified Data.Spreadsheet as Spreadsheet import qualified Data.ByteString.Lazy.Char8 as BC import qualified Data.NonEmpty.Mixed as NonEmptyM@@ -23,11 +24,15 @@ selectFirst (x:_) = x selectFirst _ = "" +-- compatible to old-time:calenderTimeToString+timeFormat :: String+timeFormat = "%a %b %d %H:%M:%S  %Y"+ messageHeader :: [Parser.Field] -> [String] messageHeader fields =    (selectFirst $ do       Parser.Date date <- fields-      return $ calendarTimeToString date) :+      return $ Time.formatTime Time.defaultTimeLocale timeFormat date) :    (selectFirst $ do       Parser.From addrs <- fields       Parser.NameAddr name addr <- addrs