summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2011-04-13 17:42:57 +0200
committerJasper Van der Jeugt <jaspervdj@gmail.com>2011-04-13 17:42:57 +0200
commitc463eb6a16b77558f2992f4b25eaf506a4737bf3 (patch)
tree44a81748a3dff6cc72cbf738ee58e294834adef4
parent4ae03a797f8901e1f606e07ce70c3fedea443285 (diff)
downloadhakyll-c463eb6a16b77558f2992f4b25eaf506a4737bf3.tar.gz
Pick first compiler on overlap
-rw-r--r--src/Hakyll/Core/Rules/Internal.hs11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs
index bcba414..83783b5 100644
--- a/src/Hakyll/Core/Rules/Internal.hs
+++ b/src/Hakyll/Core/Rules/Internal.hs
@@ -17,6 +17,7 @@ import Control.Monad.Reader (ReaderT, runReaderT)
import Control.Monad.State (State, evalState)
import Data.Monoid (Monoid, mempty, mappend)
import Data.Set (Set)
+import qualified Data.Map as M
import Hakyll.Core.Resource
import Hakyll.Core.Resource.Provider
@@ -80,7 +81,7 @@ type Rules = RulesM ()
-- | Run a Rules monad, resulting in a 'RuleSet'
--
runRules :: Rules -> ResourceProvider -> RuleSet
-runRules rules provider =
+runRules rules provider = nubCompilers $
evalState (execWriterT $ runReaderT (unRulesM rules) env) state
where
state = RuleState {rulesMetaCompilerIndex = 0}
@@ -88,3 +89,11 @@ runRules rules provider =
, rulesPattern = mempty
, rulesGroup = Nothing
}
+
+-- | Remove duplicate compilers from the 'RuleSet'. When two compilers match an
+-- item, we prefer the first one
+--
+nubCompilers :: RuleSet -> RuleSet
+nubCompilers set = set { rulesCompilers = nubCompilers' (rulesCompilers set) }
+ where
+ nubCompilers' = M.toList . M.fromListWith (flip const)