ca80171 · hakyll · git.iko.soy

git.iko.soy/hakyll

Minor style changes

commitca80171caf1328bc869c61d2f51b1fd657779532 authorJasper Van der Jeugt <m@jaspervdj.be> dateSat 4 May 2013, 15:18 (13 years ago) parent3ac3037

3 files changed+14−19

compare with master

unifiedsplit

src/Hakyll/Core/Provider/MetadataCache.hs+4−4 src/Hakyll/Core/Store.hs+7−9 tests/Hakyll/Core/Store/Tests.hs+3−6

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

@@ -7,8 +7,8 @@ module Hakyll.Core.Provider.MetadataCache

99--------------------------------------------------------------------------------

10+import Control.Monad (unless)

1011import qualified Data.Map as M

11−import Control.Monad (unless)

1212

1313--------------------------------------------------------------------------------

1414import Hakyll.Core.Identifier

@@ -51,9 +51,9 @@ load :: Provider -> Identifier -> IO ()

5151load p r = do

5252 mmof <- Store.isMember store mdk

5353 unless mmof $ do

54− (md, body) <- loadMetadata p r

55− Store.set store mdk md

56− Store.set store bk body

54+ (md, body) <- loadMetadata p r

55+ Store.set store mdk md

56+ Store.set store bk body

5757 where

5858 store = providerStore p

5959 mdk = [name, toFilePath r, "metadata"]

src/Hakyll/Core/Store.hs+7−9

@@ -24,6 +24,7 @@ import qualified Data.ByteString as B

2424import qualified Data.ByteString.Lazy as BL

2525import qualified Data.Cache.LRU.IO as Lru

2626import Data.List (intercalate)

27+import Data.Maybe (isJust)

2728import qualified Data.Text as T

2829import qualified Data.Text.Encoding as T

2930import Data.Typeable (TypeRep, Typeable, cast, typeOf)

@@ -103,12 +104,8 @@ cacheLookup (Store _ (Just lru)) key = do

103104

104105--------------------------------------------------------------------------------

105106cacheIsMember :: Store -> String -> IO Bool

106−cacheIsMember (Store _ Nothing) _ = return False

107−cacheIsMember (Store _ (Just lru)) key = do

108− res <- Lru.lookup key lru

109− case res of

110− Nothing -> return False

111− _ -> return True

107+cacheIsMember (Store _ Nothing) _ = return False

108+cacheIsMember (Store _ (Just lru)) key = isJust <$> Lru.lookup key lru

112109

113110

114111--------------------------------------------------------------------------------

@@ -168,9 +165,10 @@ isMember :: Store -> [String] -> IO Bool

168165isMember store identifier = do

169166 inCache <- cacheIsMember store key

170167 if inCache then return True else doesFileExist path

171− where

172− key = hash identifier

173− path = storeDirectory store </> key

168+ where

169+ key = hash identifier

170+ path = storeDirectory store </> key

171+

174172

175173--------------------------------------------------------------------------------

176174-- | Delete an item

tests/Hakyll/Core/Store/Tests.hs+3−6

@@ -72,15 +72,12 @@ wrongType = do

7272

7373

7474--------------------------------------------------------------------------------

75−

7675isMembertest :: H.Assertion

7776isMembertest = do

7877 store <- newTestStore

7978 Store.set store ["foo", "bar"] ("qux" :: String)

80− --value <- Store.get store ["foo", "bar"] :: IO (Store.Result Int)

8179 good <- Store.isMember store ["foo", "bar"]

82−

83− bad <- Store.isMember store ["foo", "baz"]

84− H.assert good

80+ bad <- Store.isMember store ["foo", "baz"]

81+ H.assert good

8582 H.assert (not bad)

86− cleanTestEnv

83+ cleanTestEnv