From bc192a127b8c57ccb45ff6c773f5917fdbf7ec85 Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Sat, 24 Nov 2012 10:24:54 +0100
Subject: Small fixes

---
 src/Hakyll/Web/Tags.hs             | 14 +++++++-------
 src/Hakyll/Web/Template/Context.hs |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/Hakyll/Web')

diff --git a/src/Hakyll/Web/Tags.hs b/src/Hakyll/Web/Tags.hs
index e10af56..2aa1cac 100644
--- a/src/Hakyll/Web/Tags.hs
+++ b/src/Hakyll/Web/Tags.hs
@@ -66,6 +66,7 @@ import qualified Text.Blaze.Html5.Attributes     as A
 --------------------------------------------------------------------------------
 import           Hakyll.Core.Compiler
 import           Hakyll.Core.Identifier
+import           Hakyll.Core.Identifier.Pattern
 import           Hakyll.Core.Item
 import           Hakyll.Core.Metadata
 import           Hakyll.Core.Util.String
@@ -102,10 +103,11 @@ getCategory = return . return . takeBaseName . takeDirectory . toFilePath
 
 
 --------------------------------------------------------------------------------
--- | Higher-level function to read tags
+-- | Higher-order function to read tags
 buildTagsWith :: MonadMetadata m
-              => (Identifier -> m [String]) -> [Identifier] -> m Tags
-buildTagsWith f ids = do
+              => (Identifier -> m [String]) -> Pattern -> m Tags
+buildTagsWith f pattern = do
+    ids    <- getMatches pattern
     tagMap <- foldM addTags M.empty ids
     return $ Tags $ M.toList tagMap
   where
@@ -117,15 +119,13 @@ buildTagsWith f ids = do
 
 --------------------------------------------------------------------------------
 -- | Read a tagmap using the @tags@ metadata field
--- TODO: Should use pattern
-buildTags :: MonadMetadata m => [Identifier] -> m Tags
+buildTags :: MonadMetadata m => Pattern -> m Tags
 buildTags = buildTagsWith getTags
 
 
 --------------------------------------------------------------------------------
 -- | Read a tagmap using the @category@ metadata field
--- TODO: Should use pattern
-buildCategory :: MonadMetadata m => [Identifier] -> m Tags
+buildCategory :: MonadMetadata m => Pattern -> m Tags
 buildCategory = buildTagsWith getCategory
 
 
diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs
index 3b98ea3..67c4070 100644
--- a/src/Hakyll/Web/Template/Context.hs
+++ b/src/Hakyll/Web/Template/Context.hs
@@ -28,8 +28,7 @@ import qualified Data.Map                      as M
 import           Data.Monoid                   (Monoid (..))
 import           Data.Time.Clock               (UTCTime (..))
 import           Data.Time.Format              (formatTime, parseTime)
-import           System.FilePath               (takeBaseName, takeDirectory,
-                                                takeFileName)
+import           System.FilePath               (takeBaseName, takeFileName)
 import           System.Locale                 (TimeLocale, defaultTimeLocale)
 
 
-- 
cgit v1.2.3