compiler: extract config and remove utils

4 files changed, 38 insertions, 48 deletions

diff --git a/compiler/src/Utils.hs b/compiler/src/Config.hs
index 794382c..6f04818 100644
--- a/compiler/src/Utils.hs
+++ b/compiler/src/Config.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE DuplicateRecordFields, DeriveGeneric, DeriveAnyClass #-}
+
 -- ldgallery - A static generator which turns a collection of tagged
 --             pictures into a searchable web gallery.
 --
@@ -17,33 +19,31 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-module Utils
-  ( conj, neg
-  , unique
-  , passthrough
+module Config
+  ( GalleryConfig(..)
+  , CompilerConfig(..)
+  , readConfig
   ) where
 
+import GHC.Generics (Generic)
+import Data.Aeson (ToJSON, FromJSON)
+import qualified Data.Aeson as JSON
 
-import qualified Data.List
-import qualified Data.Set
-
-
--- predicates
-
-conj :: (a -> Bool) -> (a -> Bool) -> a -> Bool
-conj p q x = (p x) && (q x)
-
-neg :: (a -> Bool) -> a -> Bool
-neg p x = not (p x)
+import Files (FileName)
+import Input (decodeYamlFile)
 
 
--- lists
+data CompilerConfig = CompilerConfig
+  { dummy :: Maybe String -- TODO
+  } deriving (Generic, FromJSON, Show)
 
-unique :: Ord a => [a] -> [a]
-unique = Data.Set.toList . Data.Set.fromList
+data GalleryConfig = GalleryConfig
+  { compiler :: CompilerConfig
+  , viewer :: JSON.Object
+  } deriving (Generic, FromJSON, Show)
 
+-- TODO: add compiler config keys and their default values
 
--- monads
 
-passthrough :: Monad m => (a -> m b) -> a -> m a
-passthrough f a = return a >>= f >>= \_ -> return a
+readConfig :: FileName -> IO GalleryConfig
+readConfig = decodeYamlFile
diff --git a/compiler/src/Gallery.hs b/compiler/src/Gallery.hs
index 3be62ad..ce52523 100644
--- a/compiler/src/Gallery.hs
+++ b/compiler/src/Gallery.hs
@@ -32,7 +32,8 @@ import Data.Maybe (fromMaybe)
 import Data.Aeson (ToJSON, genericToJSON, genericToEncoding)
 import qualified Data.Aeson as JSON
 
-import Utils
+import qualified Data.Set as Set
+
 import Files
 import Input
 import Resource
@@ -121,3 +122,6 @@ buildGalleryTree (DirResource dirItems path@(dirname:_) thumbnailPath) =
   where
     aggregateChildTags :: [GalleryItem] -> [Tag]
     aggregateChildTags = unique . concatMap (\item -> tags (item::GalleryItem))
+
+    unique :: Ord a => [a] -> [a]
+    unique = Set.toList . Set.fromList
diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs
index fa36d59..681f169 100644
--- a/compiler/src/Input.hs
+++ b/compiler/src/Input.hs
@@ -37,7 +37,6 @@ import Data.Aeson (FromJSON)
 import System.FilePath (isExtensionOf, dropExtension)
 
 import Files
-import Utils
 
 
 data LoadException = LoadException String ParseException deriving Show
@@ -70,7 +69,7 @@ data Sidecar = Sidecar
 
 readInputTree :: AnchoredFSNode -> IO InputTree
 readInputTree (AnchoredFSNode anchor root@Dir{}) =
-  filterDir (neg isHidden) root & mkDirNode
+  filterDir (not . isHidden) root & mkDirNode
   where
     mkInputNode :: FSNode -> IO (Maybe InputTree)
     mkInputNode (File path@(filename:pathto)) | ".yaml" `isExtensionOf` filename =
diff --git a/compiler/src/Lib.hs b/compiler/src/Lib.hs
index 643e5f6..b2bbe15 100644
--- a/compiler/src/Lib.hs
+++ b/compiler/src/Lib.hs
@@ -24,47 +24,28 @@ module Lib
   ) where
 
 
-import GHC.Generics (Generic)
 import Data.Function ((&))
 import Data.Ord (comparing)
 import Data.List (sortBy, length)
 import System.Directory (createDirectoryIfMissing, removePathForcibly)
 import System.FilePath (dropFileName, (</>))
 
-import Data.Aeson (ToJSON, FromJSON)
+import Data.Aeson (ToJSON)
 import qualified Data.Aeson as JSON
 
+import Config
 import Files (FileName, readDirectory, localPath, flattenDir, root, (/>))
 import Input (decodeYamlFile, readInputTree)
 import Resource (ResourceTree, buildResourceTree, outputDiff)
 import Gallery (buildGalleryTree)
 
 
-data CompilerConfig = CompilerConfig
-  { dummy :: Maybe String -- TODO
-  } deriving (Generic, FromJSON, Show)
-
-data GalleryConfig = GalleryConfig
-  { compiler :: CompilerConfig
-  , viewer :: JSON.Object
-  } deriving (Generic, FromJSON, Show)
-
-readConfig :: FileName -> IO GalleryConfig
-readConfig = decodeYamlFile
-
-
 process :: FilePath -> FilePath -> IO ()
 process inputDirPath outputDirPath =
   do
     config <- readConfig (inputDirPath </> "gallery.yaml")
-
     inputDir <- readDirectory inputDirPath
-    putStrLn "\nINPUT DIR"
-    putStrLn (show inputDir)
-
     inputTree <- readInputTree inputDir
-    putStrLn "\nINPUT TREE"
-    putStrLn (show inputTree)
 
     let resourceTree = buildResourceTree inputTree
     putStrLn "\nRESOURCE TREE"
@@ -77,11 +58,11 @@ process inputDirPath outputDirPath =
     --   (or recompile everything if the config file has changed!)
     -- execute in parallel
 
-    cleanup resourceTree outputDirPath
-
     -- TODO: execute (in parallel) the resource compilation strategy list
     -- need to find a good library for that
 
+    cleanup resourceTree outputDirPath
+
     buildGalleryTree resourceTree
       & writeJSON (outputDirPath </> "index.json")
 
@@ -95,7 +76,13 @@ process inputDirPath outputDirPath =
       >>= return . outputDiff resourceTree . root
       >>= return . sortBy (flip $ comparing length) -- nested files before dirs
       >>= return . map (localPath . (/>) outputDir)
-      >>= mapM_ removePathForcibly
+      >>= mapM_ remove
+
+    remove :: FileName -> IO ()
+    remove path =
+      do
+        putStrLn $ "Removing: " ++ path
+        removePathForcibly path
 
     writeJSON :: ToJSON a => FileName -> a -> IO ()
     writeJSON path obj =