71e7617 · typeable/pandoc

git.iko.soy/typeable/pandoc

getT2TMeta: Take list of source files instead of single.

Get latest modification time.

commit71e76175be8a5fabb807a8462a1ab315868c8914 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 30 Jul 2014, 17:25 (12 years ago) parent3e26fb5

2 files changed+9−10

compare with master

unifiedsplit

pandoc.hs+1−3 src/Text/Pandoc/Readers/Txt2Tags.hs+8−7

pandoc.hs+1−3

@@ -69,7 +69,6 @@ import qualified Data.Yaml as Yaml

6969import qualified Data.Text as T

7070import Control.Applicative ((<$>))

7171import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)

72−import Data.List (intersperse)

7372

7473copyrightMessage :: String

@@ -1070,11 +1069,10 @@ main = do

10701069 else e

10711070 Right w -> return w

10721071

1073− let concatInput = concat (intersperse ", " sources)

10741072 reader <- if "t2t" == readerName'

10751073 then (mkStringReader .

10761074 readTxt2Tags) <$>

1077− (getT2TMeta concatInput outputFile)

1075+ (getT2TMeta sources outputFile)

10781076 else case getReader readerName' of

10791077 Right r -> return r

10801078 Left e -> err 7 e

src/Text/Pandoc/Readers/Txt2Tags.hs+8−7

@@ -70,14 +70,15 @@ instance Default T2TMeta where

7070 def = T2TMeta "" "" "" ""

7171

7272-- | Get the meta information required by Txt2Tags macros

73−getT2TMeta :: FilePath -> FilePath -> IO T2TMeta

74−getT2TMeta inp out = do

73+getT2TMeta :: [FilePath] -> FilePath -> IO T2TMeta

74+getT2TMeta inps out = do

7575 curDate <- formatTime defaultTimeLocale "%F" <$> getZonedTime

76− let getModTime = formatTime defaultTimeLocale "%F"

77− <$> getModificationTime inp

78− curMtime <- catchIOError getModTime (const (return ""))

79−

80− return $ T2TMeta curDate curMtime inp out

76+ let getModTime = fmap (formatTime defaultTimeLocale "%F") .

77+ getModificationTime

78+ curMtime <- catchIOError

79+ (maximum <$> mapM getModTime inps)

80+ (const (return ""))

81+ return $ T2TMeta curDate curMtime (intercalate ", " inps) out

8182

8283-- | Read Txt2Tags from an input string returning a Pandoc document

8384readTxt2Tags :: T2TMeta -> ReaderOptions -> String -> Pandoc