Add transparent reading of hamlet/hakyll templates

1 files changed, 29 insertions, 1 deletions

diff --git a/src/Hakyll/Web/Template.hs b/src/Hakyll/Web/Template.hs
index 06794e8..00c1a27 100644
--- a/src/Hakyll/Web/Template.hs
+++ b/src/Hakyll/Web/Template.hs
@@ -2,11 +2,19 @@ module Hakyll.Web.Template
     ( Template
     , applyTemplate
     , applySelf
+    , templateRead
+    , templateReadWith
     ) where
 
+import Control.Arrow
 import Data.Maybe (fromMaybe)
 import qualified Data.Map as M
+import System.FilePath (takeExtension)
 
+import Text.Hamlet (HamletSettings, defaultHamletSettings)
+
+import Hakyll.Core.Compiler
+import Hakyll.Core.Identifier
 import Hakyll.Web.Template.Internal
 import Hakyll.Web.Template.Read
 import Hakyll.Web.Page
@@ -20,7 +28,7 @@ applyTemplate template page =
     fmap (const $ substitute =<< unTemplate template) page
   where
     substitute (Chunk chunk) = chunk
-    substitute (Identifier key) =
+    substitute (Key key) =
         fromMaybe ('$' : key) $ M.lookup key $ toMap page
     substitute (Escaped) = "$"
 
@@ -29,3 +37,23 @@ applyTemplate template page =
 --
 applySelf :: Page String -> Page String
 applySelf page = applyTemplate (readTemplate $ pageBody page) page
+
+-- | Read a template. If the extension of the file we're compiling is
+-- @.hml@ or @.hamlet@, it will be considered as a Hamlet template, and parsed
+-- as such.
+--
+templateRead :: Compiler a Template
+templateRead = templateReadWith defaultHamletSettings
+
+-- | Version of 'templateRead' that enables custom settings.
+--
+templateReadWith :: HamletSettings -> Compiler a Template
+templateReadWith settings =
+    getIdentifier &&& getResourceString >>^ uncurry read'
+  where
+    read' identifier string =
+        if takeExtension (toFilePath identifier) `elem` [".hml", ".hamlet"]
+            -- Hamlet template
+            then readHamletTemplateWith settings string
+            -- Hakyll template
+            else readTemplate string