summaryrefslogtreecommitdiff
path: root/src/Hakyll
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2013-08-14 00:18:10 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2013-08-14 00:18:31 +0200
commit64569d7b724add2c30ee233a1b73703d0e25a8f0 (patch)
tree9c8749925034e9e60cda4d791a7e1aff74f8bde4 /src/Hakyll
parentfaa90283bfdd13740ebecd91c3f966591d183d79 (diff)
downloadhakyll-64569d7b724add2c30ee233a1b73703d0e25a8f0.tar.gz
Fix versions & metadata loading issue
Closes #171
Diffstat (limited to 'src/Hakyll')
-rw-r--r--src/Hakyll/Core/Provider/Internal.hs2
-rw-r--r--src/Hakyll/Core/Provider/Metadata.hs5
-rw-r--r--src/Hakyll/Core/Store.hs5
3 files changed, 9 insertions, 3 deletions
diff --git a/src/Hakyll/Core/Provider/Internal.hs b/src/Hakyll/Core/Provider/Internal.hs
index 583c665..d566f3a 100644
--- a/src/Hakyll/Core/Provider/Internal.hs
+++ b/src/Hakyll/Core/Provider/Internal.hs
@@ -98,7 +98,7 @@ data Provider = Provider
providerOldFiles :: Map Identifier ResourceInfo
, -- | Underlying persistent store for caching
providerStore :: Store
- }
+ } deriving (Show)
--------------------------------------------------------------------------------
diff --git a/src/Hakyll/Core/Provider/Metadata.hs b/src/Hakyll/Core/Provider/Metadata.hs
index fe2857a..7e4d7ed 100644
--- a/src/Hakyll/Core/Provider/Metadata.hs
+++ b/src/Hakyll/Core/Provider/Metadata.hs
@@ -44,8 +44,9 @@ loadMetadata p identifier = do
return (M.union md emd, body)
where
- fp = resourceFilePath p identifier
- mi = M.lookup identifier (providerFiles p) >>= resourceInfoMetadata
+ normal = setVersion Nothing identifier
+ fp = resourceFilePath p identifier
+ mi = M.lookup normal (providerFiles p) >>= resourceInfoMetadata
--------------------------------------------------------------------------------
diff --git a/src/Hakyll/Core/Store.hs b/src/Hakyll/Core/Store.hs
index 74d9d2f..5c3667d 100644
--- a/src/Hakyll/Core/Store.hs
+++ b/src/Hakyll/Core/Store.hs
@@ -50,6 +50,11 @@ data Store = Store
--------------------------------------------------------------------------------
+instance Show Store where
+ show _ = "<Store>"
+
+
+--------------------------------------------------------------------------------
-- | Result of a store query
data Result a
= Found a -- ^ Found, result