From b37da38d3911bbc8381a39fe526e69599d9ddcf1 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Tue, 12 Apr 2011 10:09:03 +0200 Subject: Major refactoring of identifiers/resources/groups --- src/Hakyll/Core/Resource/Provider/File.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/Hakyll/Core/Resource/Provider') diff --git a/src/Hakyll/Core/Resource/Provider/File.hs b/src/Hakyll/Core/Resource/Provider/File.hs index 953d61c..5383b51 100644 --- a/src/Hakyll/Core/Resource/Provider/File.hs +++ b/src/Hakyll/Core/Resource/Provider/File.hs @@ -12,7 +12,6 @@ import qualified Data.ByteString.Lazy as LB import Hakyll.Core.Resource import Hakyll.Core.Resource.Provider -import Hakyll.Core.Identifier import Hakyll.Core.Util.File import Hakyll.Core.Configuration @@ -20,8 +19,8 @@ import Hakyll.Core.Configuration -- fileResourceProvider :: HakyllConfiguration -> IO ResourceProvider fileResourceProvider configuration = do - -- Retrieve a list of identifiers - list <- map parseIdentifier . filter (not . ignoreFile configuration) <$> + -- Retrieve a list of paths + list <- filter (not . ignoreFile configuration) <$> getRecursiveContents False "." -- MVar for the cache @@ -30,7 +29,7 @@ fileResourceProvider configuration = do -- Construct a resource provider return ResourceProvider { resourceList = map Resource list - , resourceString = readFile . toFilePath . unResource - , resourceLazyByteString = LB.readFile . toFilePath . unResource + , resourceString = readFile . unResource + , resourceLazyByteString = LB.readFile . unResource , resourceModifiedCache = mvar } -- cgit v1.2.3