8c575ae · hakyll · git.iko.soy

Fix apparent remaining provider rewrite issues

commit8c575ae52115f09d5b6e53ed409d934f5168de59 authorJasper Van der Jeugt <m@jaspervdj.be> dateSun 10 Feb 2013, 22:15 (14 years ago) parent4616838

2 files changed+8−10

unifiedsplit

src/Hakyll/Core/Provider.hs+4−7

@@ -23,7 +23,6 @@ module Hakyll.Core.Provider

2323

2424

2525--------------------------------------------------------------------------------

26−import Control.Monad (forM_)

2726import qualified Hakyll.Core.Provider.Internal as Internal

2827import qualified Hakyll.Core.Provider.MetadataCache as Internal

2928import Hakyll.Core.Store (Store)

@@ -37,9 +36,7 @@ newProvider :: Store -- ^ Store to use

3736 -> IO Internal.Provider -- ^ Resulting provider

3837newProvider store ignore directory = do

3938 -- Delete metadata cache where necessary

40− provider <- Internal.newProvider store ignore directory

41− forM_ (Internal.resourceList provider) $ \identifier ->

42− if Internal.resourceModified provider identifier

43− then Internal.resourceInvalidateMetadataCache provider identifier

44− else return ()

45− return provider

39+ p <- Internal.newProvider store ignore directory

40+ mapM_ (Internal.resourceInvalidateMetadataCache p) $

41+ filter (Internal.resourceModified p) $ Internal.resourceList p

42+ return p

src/Hakyll/Core/Provider/Internal.hs+4−3

@@ -172,12 +172,13 @@ resourceLBS p i = BL.readFile $ resourceFilePath p i

172172-- | A resource is modified if it or its metadata has changed

173173resourceModified :: Provider -> Identifier -> Bool

174174resourceModified p r = case (ri, oldRi) of

175− (Nothing, _) -> True

175+ (Nothing, _) -> False

176176 (Just _, Nothing) -> True

177177 (Just n, Just o) -> resourceInfoModified n > resourceInfoModified o

178178 where

179− ri = M.lookup (setVersion Nothing r) (providerFiles p)

180− oldRi = ri >>= resourceInfoMetadata >>= flip M.lookup (providerFiles p)

179+ normal = setVersion Nothing r

180+ ri = M.lookup normal (providerFiles p)

181+ oldRi = M.lookup normal (providerOldFiles p)

181182

182183

183184--------------------------------------------------------------------------------