git.iko.soy/hakyll
on master help sign in
Rewrite Run module a bit, get rid off obsolete
3ea3c52Jasper Van der Jeugt
src/Hakyll/Core/Run.hs+21−15
compare with master
unifiedsplit
@@ -12,7 +12,7 @@ import Control.Arrow ((&&&))
12import Control.Monad (foldM, forM_, forM, filterM)
12import Control.Monad (foldM, forM_, forM, filterM)
13import Data.Map (Map)
13import Data.Map (Map)
14import qualified Data.Map as M
14import qualified Data.Map as M
15−import Data.Monoid (mempty)
15+import Data.Monoid (mempty, mappend)
16import Data.Typeable (Typeable)
16import Data.Typeable (Typeable)
17import Data.Binary (Binary)
17import Data.Binary (Binary)
18import System.FilePath ((</>))
18import System.FilePath ((</>))
@@ -56,7 +56,6 @@ hakyll rules = do
56
56
57 state = HakyllState
57 state = HakyllState
58 { hakyllModified = S.empty
58 { hakyllModified = S.empty
59− , hakyllObsolete = S.empty
60 , hakyllGraph = mempty
59 , hakyllGraph = mempty
61 }
60 }
62
61
@@ -68,7 +67,6 @@ data HakyllEnvironment = HakyllEnvironment
68
67
69data HakyllState = HakyllState
68data HakyllState = HakyllState
70 { hakyllModified :: Set Identifier
69 { hakyllModified :: Set Identifier
71− , hakyllObsolete :: Set Identifier
72 , hakyllGraph :: DirectedGraph Identifier
70 , hakyllGraph :: DirectedGraph Identifier
73 }
71 }
74
72
@@ -98,7 +96,10 @@ addNewCompilers oldCompilers newCompilers = Hakyll $ do
98 provider <- hakyllResourceProvider <$> ask
96 provider <- hakyllResourceProvider <$> ask
99 store <- hakyllStore <$> ask
97 store <- hakyllStore <$> ask
100
98
99+ let -- Create a set of new compilers
100+ newCompilerIdentifiers = S.fromList $ map fst newCompilers
101+
101− let -- All compilers
102+ -- All compilers
102 compilers = oldCompilers ++ newCompilers
103 compilers = oldCompilers ++ newCompilers
103
104
104 -- Get all dependencies for the compilers
105 -- Get all dependencies for the compilers
@@ -110,39 +111,44 @@ addNewCompilers oldCompilers newCompilers = Hakyll $ do
110 compilerMap = M.fromList compilers
111 compilerMap = M.fromList compilers
111
112
112 -- Create the dependency graph
113 -- Create the dependency graph
113− graph = fromList dependencies
114+ currentGraph = fromList dependencies
115+
116+ -- Find the old graph and append the new graph to it. This forms the
117+ -- complete graph
118+ completeGraph <- (mappend currentGraph) . hakyllGraph <$> get
114
119
115− liftIO $ writeDot "dependencies.dot" show graph
120+ liftIO $ writeDot "dependencies.dot" show completeGraph
116
121
117 -- Check which items are up-to-date. This only needs to happen for the new
122 -- Check which items are up-to-date. This only needs to happen for the new
118 -- compilers
123 -- compilers
119 oldModified <- hakyllModified <$> get
124 oldModified <- hakyllModified <$> get
120 newModified <- liftIO $ modified provider store $ map fst newCompilers
125 newModified <- liftIO $ modified provider store $ map fst newCompilers
121− oldObsolete <- hakyllObsolete <$> get
122
126
123 let modified' = oldModified `S.union` newModified
127 let modified' = oldModified `S.union` newModified
124
128
125− -- Find obsolete items
129+ -- Find obsolete items. Every item that is reachable from a modified
126− obsolete = reachableNodes (oldObsolete `S.union` modified') $
130+ -- item is considered obsolete. From these obsolete items, we are only
127− reverse graph
131+ -- interested in ones that are in the current subgraph.
132+ obsolete = S.filter (`S.member` newCompilerIdentifiers)
133+ $ reachableNodes modified' $ reverse completeGraph
128
134
129− -- Solve the graph, retain only the obsolete items
135+ -- Solve the graph and retain only the obsolete items
130− ordered = filter (`S.member` obsolete) $ solveDependencies graph
136+ ordered = filter (`S.member` obsolete) $ solveDependencies currentGraph
131
137
132 -- Join the order with the compilers again
138 -- Join the order with the compilers again
133 orderedCompilers = map (id &&& (compilerMap M.!)) ordered
139 orderedCompilers = map (id &&& (compilerMap M.!)) ordered
134
140
135 liftIO $ putStrLn "Adding compilers..."
141 liftIO $ putStrLn "Adding compilers..."
136
142
137− modify $ updateState modified' obsolete
143+ modify $ updateState modified' completeGraph
138
144
139 -- Now run the ordered list of compilers
145 -- Now run the ordered list of compilers
140 unHakyll $ runCompilers orderedCompilers
146 unHakyll $ runCompilers orderedCompilers
141 where
147 where
142 -- Add the modified information for the new compilers
148 -- Add the modified information for the new compilers
143− updateState modified' obsolete state = state
149+ updateState modified' graph state = state
144 { hakyllModified = modified'
150 { hakyllModified = modified'
145− , hakyllObsolete = obsolete
151+ , hakyllGraph = graph
146 }
152 }
147
153
148runCompilers :: [(Identifier, Compiler () CompileRule)]
154runCompilers :: [(Identifier, Compiler () CompileRule)]