From 178a0c8052e341a018351fa7f5d29041892cad84 Mon Sep 17 00:00:00 2001 From: HugoDaniel Date: Thu, 7 Nov 2013 11:15:40 +0000 Subject: [PATCH] Using CL.map in readIt --- yesod-bin/HsFile.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yesod-bin/HsFile.hs b/yesod-bin/HsFile.hs index 4bc6849b..29095d85 100644 --- a/yesod-bin/HsFile.hs +++ b/yesod-bin/HsFile.hs @@ -1,8 +1,9 @@ -{-# LANGUAGE TupleSections, OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} module HsFile (mkHsFile) where import Text.ProjectTemplate (createTemplate) import Data.Conduit ( ($$), (=$), runResourceT, ResourceT, ConduitM, awaitForever, yield ) +import qualified Data.Conduit.List as CL import Data.Conduit.Filesystem (traverse, sourceFile) import Prelude hiding (FilePath) import Filesystem.Path ( FilePath ) @@ -18,7 +19,5 @@ mkHsFile = runResourceT $ traverse False "." -- Reads a filepath from upstream and dumps a pair of (filepath, filecontents) readIt :: ConduitM FilePath (FilePath, ResourceT IO BS.ByteString) (ResourceT IO) () -readIt = awaitForever $ \i -> do bs <- liftIO $ BS.readFile (encodeString i) - yield (i, return bs) - +readIt = CL.map $ \i -> (i, liftIO $ BS.readFile $ encodeString i)