fbc43b3 · hakyll · git.iko.soy

git.iko.soy/hakyll

Merge branch 'upstream-master'

commitfbc43b3a04583a3c23e30cb3382f32faacb39a4d authorEric Stolten <stoltene2@gmail.com> dateTue 20 Aug 2013, 22:03 (13 years ago) parentf14f520 5679681

4 files changed+10−4

compare with master

unifiedsplit

src/Hakyll/Core/Provider/Internal.hs+1−1 src/Hakyll/Core/Provider/Metadata.hs+3−2 src/Hakyll/Core/Store.hs+5 src/Hakyll/Web/Template/Context.hs+1−1

src/Hakyll/Core/Provider/Internal.hs+1−1

@@ -98,7 +98,7 @@ data Provider = Provider

9898 providerOldFiles :: Map Identifier ResourceInfo

9999 , -- | Underlying persistent store for caching

100100 providerStore :: Store

101− }

101+ } deriving (Show)

102102

103103

104104--------------------------------------------------------------------------------

src/Hakyll/Core/Provider/Metadata.hs+3−2

@@ -44,8 +44,9 @@ loadMetadata p identifier = do

4444

4545 return (M.union md emd, body)

4646 where

47− fp = resourceFilePath p identifier

48− mi = M.lookup identifier (providerFiles p) >>= resourceInfoMetadata

47+ normal = setVersion Nothing identifier

48+ fp = resourceFilePath p identifier

49+ mi = M.lookup normal (providerFiles p) >>= resourceInfoMetadata

4950

5051

5152--------------------------------------------------------------------------------

src/Hakyll/Core/Store.hs+5

@@ -49,6 +49,11 @@ data Store = Store

4949 }

5050

5151

52+--------------------------------------------------------------------------------

53+instance Show Store where

54+ show _ = "<Store>"

55+

56+

5257--------------------------------------------------------------------------------

5358-- | Result of a store query

5459data Result a

src/Hakyll/Web/Template/Context.hs+1−1

@@ -130,7 +130,7 @@ bodyField key = field key $ return . itemBody

130130

131131--------------------------------------------------------------------------------

132132-- | Map any field to its metadata value, if present

133−metadataField :: Context String

133+metadataField :: Context a

134134metadataField = Context $ \k i -> do

135135 value <- getMetadataField (itemIdentifier i) k

136136 maybe empty (return . StringField) value