fdc6243 · hakyll · git.iko.soy

git.iko.soy/hakyll

Merge pull request #77 from A1kmm/master

Make Resource Provider keep list of files in a set, rather than as a list

commitfdc62430a6ddde912931e286b6ae76c2505ade0b authorJasper Van der Jeugt <jaspervdj@gmail.com> dateTue 7 Aug 2012, 17:12 (14 years ago) parent961af33 d49694f

3 files changed+30−16

compare with master

unifiedsplit

hakyll.cabal+4−1 src/Hakyll/Core/Resource/Provider.hs+9−3 src/Hakyll/Core/Store.hs+17−12

hakyll.cabal+4−1

@@ -60,6 +60,7 @@ Flag unixFilter

6060

6161Library

6262 Ghc-Options: -Wall

63+ Ghc-Prof-Options: -auto-all -caf-all

6364 Hs-Source-Dirs: src

6465

6566 Build-Depends:

@@ -84,7 +85,8 @@ Library

8485 regex-tdfa >= 1.1 && < 1.2,

8586 tagsoup >= 0.12.6 && < 0.13,

8687 text >= 0.11 && < 1.12,

87− time >= 1.1 && < 1.5

88+ time >= 1.1 && < 1.5,

89+ lrucache >= 1.1.1 && < 1.2

8890

8991 Exposed-Modules:

9092 Hakyll

@@ -192,6 +194,7 @@ Test-suite hakyll-tests

192194 tagsoup >= 0.12.6 && < 0.13,

193195 text >= 0.11 && < 1.12,

194196 time >= 1.1 && < 1.5,

197+ lrucache >= 1.1.1 && < 1.2,

195198 unix >= 2.4 && < 2.6

196199

197200 Other-modules:

src/Hakyll/Core/Resource/Provider.hs+9−3

@@ -12,6 +12,7 @@

1212--

1313module Hakyll.Core.Resource.Provider

1414 ( ResourceProvider (..)

15+ , resourceList

1516 , makeResourceProvider

1617 , resourceExists

1718 , resourceDigest

@@ -22,6 +23,7 @@ import Control.Applicative ((<$>))

2223import Control.Concurrent (MVar, readMVar, modifyMVar_, newMVar)

2324import Data.Map (Map)

2425import qualified Data.Map as M

26+import qualified Data.Set as S

2527

2628import Data.Time (UTCTime)

2729import qualified Crypto.Hash.MD5 as MD5

@@ -35,7 +37,7 @@ import Hakyll.Core.Resource

3537--

3638data ResourceProvider = ResourceProvider

3739 { -- | A list of all resources this provider is able to provide

38− resourceList :: [Resource]

40+ resourceSet :: S.Set Resource

3941 , -- | Retrieve a certain resource as string

4042 resourceString :: Resource -> IO String

4143 , -- | Retrieve a certain resource as lazy bytestring

@@ -53,12 +55,16 @@ makeResourceProvider :: [Resource] -- ^ Resource list

5355 -> (Resource -> IO LB.ByteString) -- ^ ByteString reader

5456 -> (Resource -> IO UTCTime) -- ^ Time checker

5557 -> IO ResourceProvider -- ^ Resulting provider

56−makeResourceProvider l s b t = ResourceProvider l s b t <$> newMVar M.empty

58+makeResourceProvider l s b t = ResourceProvider (S.fromList l) s b t <$> newMVar M.empty

59+

60+-- | Get the list of all resources

61+resourceList :: ResourceProvider -> [Resource]

62+resourceList = S.toList . resourceSet

5763

5864-- | Check if a given identifier has a resource

5965--

6066resourceExists :: ResourceProvider -> Resource -> Bool

61−resourceExists provider = flip elem $ resourceList provider

67+resourceExists provider = flip S.member $ resourceSet provider

6268

6369-- | Retrieve a digest for a given resource

6470--

src/Hakyll/Core/Store.hs+17−12

@@ -22,6 +22,7 @@ import Data.Typeable (Typeable, TypeRep, cast, typeOf)

2222

2323import Hakyll.Core.Identifier

2424import Hakyll.Core.Util.File

25+import qualified Data.Cache.LRU.IO as LRU

2526

2627-- | Items we can store

2728--

@@ -40,40 +41,44 @@ data Store = Store

4041 { -- | All items are stored on the filesystem

4142 storeDirectory :: FilePath

4243 , -- | And some items are also kept in-memory

43− storeMap :: Maybe (MVar (Map FilePath Storable))

44+ storeLRU :: Maybe (LRU.AtomicLRU FilePath Storable)

4445 }

4546

47+-- | The size of the in-memory cache to use in items.

48+storeLRUSize :: Maybe Integer

49+storeLRUSize = Just 500

50+

4651-- | Initialize the store

4752--

4853makeStore :: Bool -- ^ Use in-memory caching

4954 -> FilePath -- ^ Directory to use for hard disk storage

5055 -> IO Store -- ^ Store

5156makeStore inMemory directory = do

52− mvar <- if inMemory then Just <$> newMVar M.empty else return Nothing

57+ lru <- if inMemory then Just <$> LRU.newAtomicLRU storeLRUSize else return Nothing

5358 return Store

5459 { storeDirectory = directory

55− , storeMap = mvar

60+ , storeLRU = lru

5661 }

5762

5863-- | Auxiliary: add an item to the map

5964--

6065cacheInsert :: (Binary a, Typeable a) => Store -> FilePath -> a -> IO ()

6166cacheInsert (Store _ Nothing) _ _ = return ()

62−cacheInsert (Store _ (Just mv)) path value =

63− modifyMVar_ mv $ return . M.insert path (Storable value)

67+cacheInsert (Store _ (Just lru)) path value =

68+ LRU.insert path (Storable value) lru

6469

6570-- | Auxiliary: get an item from the cache

6671--

6772cacheLookup :: forall a. (Binary a, Typeable a)

6873 => Store -> FilePath -> IO (StoreGet a)

6974cacheLookup (Store _ Nothing) _ = return NotFound

70−cacheLookup (Store _ (Just mv)) path = do

71− map' <- readMVar mv

72− case M.lookup path map' of

73− Nothing -> return NotFound

74− Just (Storable s) -> return $ case cast s of

75− Nothing -> WrongType (typeOf s) $ typeOf (undefined :: a)

76− Just s' -> Found s'

75+cacheLookup (Store _ (Just lru)) path = do

76+ res <- LRU.lookup path lru

77+ case res of

78+ Nothing -> return NotFound

79+ Just (Storable s) -> return $ case cast s of

80+ Nothing -> WrongType (typeOf s) $ typeOf (undefined :: a)

81+ Just s' -> Found s'

7782

7883-- | Create a path

7984--