d988921 · hakyll · git.iko.soy

hakyll.cabal+1

compare with master

unifiedsplit

@@ -23,5 +23,6 @@ library

23 exposed-modules: Text.Hakyll.Render

24 Text.Hakyll.Renderable

25 Text.Hakyll.Page

26+ Text.Hakyll.CustomPage

26 Text.Hakyll.RenderableFilePath

27 Text.Hakyll.RenderableFilePath

27 Text.Hakyll.Util

28 Text.Hakyll.Util

src/Text/Hakyll/CustomPage.hsnew file+29

@@ -0,0 +1,29 @@

1+module Text.Hakyll.CustomPage

2+ ( CustomPage,

3+ createCustomPage

4+ ) where

5+

6+import System.FilePath

7+import qualified Data.ByteString.Lazy.Char8 as B

8+import qualified Data.Map as M

9+import Control.Monad

10+import Text.Hakyll.Renderable

11+

12+data CustomPage = CustomPage { url :: String,

13+ dependencies :: [FilePath],

14+ mapping :: [(String, Either String (IO B.ByteString))]

15+ }

16+

17+createCustomPage :: String

18+ -> [FilePath]

19+ -> [(String, Either String (IO B.ByteString))]

20+ -> CustomPage

21+createCustomPage = CustomPage

22+

23+instance Renderable CustomPage where

24+ getDependencies = dependencies

25+ getURL = url

26+ toContext page = do

27+ values <- mapM (either (return . B.pack) (>>= return) . snd) (mapping page)

28+ let keys = map (B.pack . fst) (mapping page)

29+ return $ M.fromList $ (B.pack "url", B.pack $ url page) : zip keys values

src/Text/Hakyll/Render.hs+5−6

@@ -40,12 +40,11 @@ writePage page = do

40 makeDirectories destination

41 B.writeFile destination (getBody page)

42

43−renderAndConcat :: FilePath -> [FilePath] -> IO B.ByteString

43+renderAndConcat :: Renderable a => FilePath -> [a] -> IO B.ByteString

44−renderAndConcat templatePath paths = foldM concatRender' B.empty paths

44+renderAndConcat templatePath renderables = foldM concatRender' B.empty renderables

45− where concatRender' :: B.ByteString -> FilePath -> IO B.ByteString

45+ where concatRender' :: Renderable a => B.ByteString -> a -> IO B.ByteString

46− concatRender' chunk path = do

46+ concatRender' chunk renderable = do

47− page <- readPage path

48− rendered <- render templatePath page

47+ rendered <- render templatePath renderable

49 let body = getBody rendered

48 let body = getBody rendered

50 return $ B.append chunk $ body

49 return $ B.append chunk $ body

51

50