compiler: add option to ignore files matching a regex

GitHub: closes #10

4 files changed, 42 insertions, 18 deletions

diff --git a/compiler/package.yaml b/compiler/package.yaml
index 0b03887..0577bb5 100644
--- a/compiler/package.yaml
+++ b/compiler/package.yaml
@@ -26,6 +26,7 @@ dependencies:
 - JuicyPixels
 - JuicyPixels-extra
 - parallel-io
+- regex-compat
 
 data-dir: data
 data-files: ["**/*"]
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index 9572d50..0132b1a 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -30,6 +30,8 @@ module Compiler
 import Control.Monad (liftM2)
 import Data.Function ((&))
 import Data.List (any)
+import Data.Maybe (isJust)
+import Text.Regex (Regex, mkRegex, matchRegex)
 import System.FilePath ((</>))
 
 import Data.Aeson (ToJSON)
@@ -52,6 +54,14 @@ import Processors
   , skipCached, withCached )
 
 
+galleryConf = "gallery.yaml"
+indexFile = "index.json"
+viewerMainFile = "index.html"
+viewerConfFile = "viewer.json"
+itemsDir = "items"
+thumbnailsDir = "thumbnails"
+
+
 writeJSON :: ToJSON a => FileName -> a -> IO ()
 writeJSON outputPath object =
   do
@@ -59,6 +69,28 @@ writeJSON outputPath object =
     ensureParentDir JSON.encodeFile outputPath object
 
 
+galleryDirFilter :: Regex -> FSNode -> Bool
+galleryDirFilter excludeRegex =
+      (not . isHidden)
+  &&& (not . isConfigFile)
+  &&& (not . containsOutputGallery)
+  &&& (not . excludedName)
+
+  where
+    (&&&) = liftM2 (&&)
+    (|||) = liftM2 (||)
+
+    isConfigFile = (galleryConf ==) . nodeName
+
+    isGalleryIndex = (indexFile ==)
+    isViewerIndex = (viewerMainFile ==)
+    containsOutputGallery (File _) = False
+    containsOutputGallery (Dir _ items) =
+      any ((isGalleryIndex ||| isViewerIndex) . nodeName) items
+
+    excludedName = isJust . matchRegex excludeRegex . nodeName
+
+
 compileGallery :: FilePath -> FilePath -> Bool -> IO ()
 compileGallery inputDirPath outputDirPath rebuildAll =
   do
@@ -66,7 +98,8 @@ compileGallery inputDirPath outputDirPath rebuildAll =
     let config = compiler fullConfig
 
     inputDir <- readDirectory inputDirPath
-    let sourceTree = filterDir galleryDirFilter inputDir
+    let sourceFilter = galleryDirFilter (mkRegex $ ignoreFiles config)
+    let sourceTree = filterDir sourceFilter inputDir
     inputTree <- readInputTree sourceTree
 
     invalidateCache <- isOutdated False inputGalleryConf outputIndex
@@ -82,22 +115,10 @@ compileGallery inputDirPath outputDirPath rebuildAll =
     writeJSON outputViewerConf $ viewer fullConfig
 
   where
-    galleryConf = "gallery.yaml"
-    indexFile = "index.json"
-    viewerConfFile = "viewer.json"
-    itemsDir = "items"
-    thumbnailsDir = "thumbnails"
-
     inputGalleryConf = inputDirPath </> galleryConf
     outputIndex = outputDirPath </> indexFile
     outputViewerConf = outputDirPath </> viewerConfFile
 
-    (&&&) = liftM2 (&&)
-    galleryDirFilter = (not . containsOutputGallery) &&& (not . isConfigFile) &&& (not . isHidden)
-    isConfigFile = (==) galleryConf . nodeName
-    containsOutputGallery (File _) = False
-    containsOutputGallery (Dir _ items) = any ((==) indexFile . nodeName) items
-
     dirProcessor = dirFileProcessor inputDirPath outputDirPath itemsDir
     itemProcessor maxRes cache =
       itemFileProcessor maxRes cache inputDirPath outputDirPath itemsDir
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs
index d025afd..ca3259f 100644
--- a/compiler/src/Config.hs
+++ b/compiler/src/Config.hs
@@ -42,6 +42,7 @@ import Resource (Resolution(..))
 
 data CompilerConfig = CompilerConfig
   { galleryName :: String
+  , ignoreFiles :: String
   , implicitDirectoryTag :: Bool
   , thumbnailResolution :: Resolution
   , pictureMaxResolution :: Maybe Resolution
@@ -50,6 +51,7 @@ data CompilerConfig = CompilerConfig
 instance FromJSON CompilerConfig where
   parseJSON = withObject "CompilerConfig" $ \v -> CompilerConfig
     <$> v .:? "galleryName" .!= "Gallery"
+    <*> v .:? "ignoreFiles" .!= ".^"
     <*> v .:? "implicitDirectoryTag" .!= False
     <*> v .:? "thumbnailResolution" .!= (Resolution 400 400)
     <*> v .:? "pictureMaxResolution"
diff --git a/example/gallery.yaml b/example/gallery.yaml
index 3fd2265..fb25161 100644
--- a/example/gallery.yaml
+++ b/example/gallery.yaml
@@ -1,11 +1,11 @@
 compiler:
   galleryName: Example gallery
+  ignoreFiles: .*\.md
+  implicitDirectoryTag: false # default
 
-  #implicitDirectoryTag: false # default
-
-  #thumbnailResolution:
-  #  width: 400  # default
-  #  height: 400 # default
+  thumbnailResolution:
+    width: 400  # default
+    height: 400 # default
 
   pictureMaxResolution:
     width: 1024