2282e78 · hakyll · git.iko.soy

git.iko.soy/hakyll

Allow markdown/tex/... in templates

commit2282e78e9c9a6fd0919a13a11e070ac52cdce52f authorJasper Van der Jeugt <jaspervdj@gmail.com> dateFri 18 Jun 2010, 00:13 (16 years ago) parent2a21970

2 files changed+14−9

compare with master

unifiedsplit

src/Text/Hakyll/Internal/Page.hs+3−2 src/Text/Hakyll/Internal/Template.hs+11−7

src/Text/Hakyll/Internal/Page.hs+3−2

@@ -22,8 +22,9 @@ import Text.Hakyll.Internal.FileType

2222

2323-- | Get a render function for a given extension.

2424getRenderFunction :: FileType -> Hakyll (String -> String)

25−getRenderFunction Html = return id

26−getRenderFunction Text = return id

25+getRenderFunction Html = return id

26+getRenderFunction Text = return id

27+getRenderFunction UnknownFileType = return id

2728getRenderFunction fileType = do

2829 parserState <- askHakyll pandocParserState

2930 writerOptions <- askHakyll pandocWriterOptions

src/Text/Hakyll/Internal/Template.hs+11−7

@@ -7,18 +7,18 @@ module Text.Hakyll.Internal.Template

77 , finalSubstitute

88 ) where

10−import qualified Data.Map as M

1110import Data.List (isPrefixOf)

1211import Data.Char (isAlphaNum)

1312import Data.Binary

1413import Control.Monad (liftM, liftM2)

1514import Data.Maybe (fromMaybe)

1615import System.FilePath ((</>))

17−import Control.Monad.Reader (liftIO)

16+import qualified Data.Map as M

1817

1918import Text.Hakyll.Context (Context)

2019import Text.Hakyll.HakyllMonad (Hakyll)

2120import Text.Hakyll.Internal.Cache

21+import Text.Hakyll.Internal.Page

2222

2323-- | Datatype used for template substitutions.

2424data Template = Chunk String Template

@@ -44,11 +44,15 @@ fromString string

4444readTemplate :: FilePath -> Hakyll Template

4545readTemplate path = do

4646 isCacheMoreRecent' <- isCacheMoreRecent fileName [path]

47− if isCacheMoreRecent' then getFromCache fileName

48− else do content <- liftIO $ readFile path

49− let template = fromString content

50− storeInCache template fileName

51− return template

47+ if isCacheMoreRecent'

48+ then getFromCache fileName

49+ else do

50+ page <- readPage path

51+ let body = fromMaybe (error $ "No body in template " ++ fileName)

52+ (M.lookup "body" page)

53+ template = fromString body

54+ storeInCache template fileName

55+ return template

5256 where

5357 fileName = "templates" </> path

5458