diff options
author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-05-18 18:24:57 +0200 |
---|---|---|
committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-05-18 18:24:57 +0200 |
commit | 7052768e4bc490d63503f6b7edf7a84bcccdf968 (patch) | |
tree | 2c3fdf868f20da1b8a8327cdb532c1c1a1dc02bd /src/Hakyll/Core/Resource/Provider.hs | |
parent | 264aeed33d0bd8772a16fc5461d3bfabcf4eb16a (diff) | |
download | hakyll-7052768e4bc490d63503f6b7edf7a84bcccdf968.tar.gz |
Resource invariant: / as path separator
Diffstat (limited to 'src/Hakyll/Core/Resource/Provider.hs')
-rw-r--r-- | src/Hakyll/Core/Resource/Provider.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Hakyll/Core/Resource/Provider.hs b/src/Hakyll/Core/Resource/Provider.hs index c3bc9ab..d91c374 100644 --- a/src/Hakyll/Core/Resource/Provider.hs +++ b/src/Hakyll/Core/Resource/Provider.hs @@ -68,17 +68,17 @@ resourceDigest provider = fmap MD5.hashlazy . resourceLBS provider -- | Check if a resource was modified -- resourceModified :: ResourceProvider -> Store -> Resource -> IO Bool -resourceModified provider store resource = do +resourceModified provider store r = do cache <- readMVar mvar - case M.lookup resource cache of + case M.lookup r cache of -- Already in the cache Just m -> return m -- Not yet in the cache, check digests (if it exists) Nothing -> do - m <- if resourceExists provider resource - then digestModified provider store resource + m <- if resourceExists provider r + then digestModified provider store r else return False - modifyMVar_ mvar (return . M.insert resource m) + modifyMVar_ mvar (return . M.insert r m) return m where mvar = resourceModifiedCache provider @@ -86,11 +86,11 @@ resourceModified provider store resource = do -- | Check if a resource digest was modified -- digestModified :: ResourceProvider -> Store -> Resource -> IO Bool -digestModified provider store resource = do +digestModified provider store r = do -- Get the latest seen digest from the store lastDigest <- storeGet store itemName identifier -- Calculate the digest for the resource - newDigest <- resourceDigest provider resource + newDigest <- resourceDigest provider r -- Check digests if Found newDigest == lastDigest -- All is fine, not modified @@ -99,5 +99,5 @@ digestModified provider store resource = do else do storeSet store itemName identifier newDigest return True where - identifier = toIdentifier resource + identifier = toIdentifier r itemName = "Hakyll.Core.ResourceProvider.digestModified" |