Merge branch 'mk-dont-source-assets' into 'master'

avoid source dirs

Closes #4

See merge request R3-core/websites-dev/reploy!2

1 files changed, 11 insertions, 5 deletions

diff --git a/site.hs b/site.hs
index f91c007..d3b7f15 100644
--- a/site.hs
+++ b/site.hs
@@ -3,7 +3,7 @@
 -- | The main deployment script.
 module Main where
 
-import Control.Monad ((>=>), join, unless, when)
+import Control.Monad ((>=>), filterM, join, unless, when)
 import Control.Monad.Extra (whenM)
 import Control.Monad.Trans.State.Lazy
 import qualified Data.Aeson as AE
@@ -48,13 +48,19 @@ import FormatOpts
 import Types
 import Utils
 
+-- | Check if a given path should be sourced or not
+isSourceablePath :: FilePath -> Site Bool
+isSourceablePath fp = do
+  notSource <- use notSourceDirs
+  pure $ (&&) <$> hasSuffix ".md" . last <*> not . any (`elem` notSource) . init $
+    splitPath fp
+
 -- | Load the pages from a directory and add them to `pages`.
 sourcePages :: FilePath -> Site ()
 sourcePages fp =
-  io
-    (map (fp </>) . filter (hasSuffix ".md" . last . splitPath) <$>
-     getRecursiveContents (pure . const False) fp) >>=
-  traverse_ loadPage
+  (io $ getRecursiveContents (pure . const False) fp) >>=
+  filterM isSourceablePath >>=
+  traverse_ (loadPage . (fp </>))
 
 {- | Extract `PageInfo` about a single page and save it into `pages` in
  - `SiteState`. -}