From 7052768e4bc490d63503f6b7edf7a84bcccdf968 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Fri, 18 May 2012 18:24:57 +0200 Subject: Resource invariant: / as path separator --- src/Hakyll/Core/Resource/Provider/Dummy.hs | 2 +- src/Hakyll/Core/Resource/Provider/File.hs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Hakyll/Core/Resource/Provider') diff --git a/src/Hakyll/Core/Resource/Provider/Dummy.hs b/src/Hakyll/Core/Resource/Provider/Dummy.hs index dad7b0b..548f845 100644 --- a/src/Hakyll/Core/Resource/Provider/Dummy.hs +++ b/src/Hakyll/Core/Resource/Provider/Dummy.hs @@ -19,7 +19,7 @@ import Hakyll.Core.Resource.Provider -- dummyResourceProvider :: Map String ByteString -> IO ResourceProvider dummyResourceProvider vfs = makeResourceProvider - (map Resource (M.keys vfs)) + (map resource (M.keys vfs)) (return . TL.unpack . TL.decodeUtf8 . (vfs M.!) . unResource) (return . (vfs M.!) . unResource) (const getCurrentTime) diff --git a/src/Hakyll/Core/Resource/Provider/File.hs b/src/Hakyll/Core/Resource/Provider/File.hs index abb7ebe..b2172b8 100644 --- a/src/Hakyll/Core/Resource/Provider/File.hs +++ b/src/Hakyll/Core/Resource/Provider/File.hs @@ -22,13 +22,13 @@ import Hakyll.Core.Configuration fileResourceProvider :: HakyllConfiguration -> IO ResourceProvider fileResourceProvider configuration = do -- Retrieve a list of paths - list <- map Resource . filter (not . shouldIgnoreFile configuration) <$> + list <- map resource . filter (not . shouldIgnoreFile configuration) <$> getRecursiveContents False "." makeResourceProvider list (readFile . unResource) (LB.readFile . unResource) - mtime + (mtime . unResource) where - mtime (Resource r) = do + mtime r = do ct <- toCalendarTime =<< getModificationTime r let str = formatCalendarTime defaultTimeLocale "%s" ct return $ readTime defaultTimeLocale "%s" str -- cgit v1.2.3