Moved some more functions from the IO monad to the Hakyll monad stack.

1 files changed, 13 insertions, 9 deletions

diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs
index 6c73ff3..652a1c6 100644
--- a/src/Text/Hakyll/Page.hs
+++ b/src/Text/Hakyll/Page.hs
@@ -84,26 +84,30 @@ isDelimiter = L.isPrefixOf "---"
 
 -- | Used for caching of files.
 cachePage :: Page -> Hakyll ()
-cachePage page@(Page mapping) = liftIO $ do
-    let destination = toCache $ getURL page
+cachePage page@(Page mapping) = do
     makeDirectories destination
-    handle <- openFile destination WriteMode
-    hPutStrLn handle "---"
-    mapM_ (writePair handle) $ M.toList $ M.delete "body" mapping
-    hPutStrLn handle "---"
-    hPutStr handle $ getBody page
-    hClose handle
+    liftIO writePageToCache
   where
+    writePageToCache = do
+        handle <- openFile destination WriteMode
+        hPutStrLn handle "---"
+        mapM_ (writePair handle) $ M.toList $ M.delete "body" mapping
+        hPutStrLn handle "---"
+        hPutStr handle $ getBody page
+        hClose handle
+
     writePair h (k, v) = do hPutStr h $ k ++ ": " ++ v
                             hPutStrLn h ""
 
+    destination = toCache $ getURL page
+
 -- | Read a page from a file. Metadata is supported, and if the filename
 --   has a .markdown extension, it will be rendered using pandoc. Note that
 --   pages are not templates, so they should not contain $identifiers.
 readPage :: FilePath -> Hakyll Page
 readPage pagePath = do
     -- Check cache.
-    getFromCache <- liftIO $ isCacheValid cacheFile [pagePath]
+    getFromCache <- isCacheValid cacheFile [pagePath]
     let path = if getFromCache then cacheFile else pagePath
 
     -- Read file.