7 files changed, 45 insertions, 47 deletions

diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index 061fab7..e71e0db 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -21,6 +21,7 @@ module Main where
 import GHC.Generics (Generic)
 import Paths_ldgallery_compiler (version, getDataFileName)
 import Control.Monad (when)
+import Data.Functor ((<&>))
 import Data.Maybe (isJust)
 import Data.Version (showVersion)
 import Data.Aeson (ToJSON)
@@ -32,7 +33,7 @@ import Compiler
 import Files (readDirectory, copyTo, remove)
 
 
-data ViewerConfig = ViewerConfig
+newtype ViewerConfig = ViewerConfig
   { galleryRoot :: String
   } deriving (Generic, Show, ToJSON)
 
@@ -92,7 +93,7 @@ options = Options
       &= help "Deploy either the bundled or the given static web viewer to the output directory"
   }
 
-  &= summary ("ldgallery v" ++ (showVersion version) ++ " - a static web gallery generator with tags")
+  &= summary ("ldgallery v" ++ showVersion version ++ " - a static web gallery generator with tags")
   &= program "ldgallery"
   &= help "Compile a gallery"
   &= helpArg [explicit, name "h", name "help"]
@@ -146,7 +147,7 @@ main =
 
     deployViewer :: FilePath -> Options -> IO ()
     deployViewer distPath Options{outputDir, cleanOutput} =
-      (when cleanOutput $ cleanViewerDir outputDir)
+      when cleanOutput (cleanViewerDir outputDir)
       >> copyViewer distPath outputDir
       >> writeJSON (outputDir </> "config.json") viewerConfig
 
@@ -154,8 +155,8 @@ main =
         cleanViewerDir :: FilePath -> IO ()
         cleanViewerDir target =
           listDirectory target
-          >>= return . filter (/= gallerySubdir)
-          >>= mapM_ remove . map (target </>)
+          <&> filter (/= gallerySubdir)
+          >>= mapM_ (remove . (target </>))
 
         copyViewer :: FilePath -> FilePath -> IO ()
         copyViewer dist target =
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index 749872d..2bb27f9 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -81,16 +81,16 @@ writeJSON outputPath object =
 (|||) = liftM2 (||)
 
 anyPattern :: [String] -> String -> Bool
-anyPattern patterns string = any (flip Glob.match string) (map Glob.compile patterns)
+anyPattern patterns string = any (flip Glob.match string . Glob.compile) patterns
 
 galleryDirFilter :: GalleryConfig -> [FilePath] -> FSNode -> Bool
 galleryDirFilter config excludedCanonicalDirs =
       (not . isHidden)
   &&& (not . isExcludedDir)
-  &&& ((matchesDir $ anyPattern $ includedDirectories config) |||
-       (matchesFile $ anyPattern $ includedFiles config))
-  &&& (not . ((matchesDir $ anyPattern $ excludedDirectories config) |||
-              (matchesFile $ anyPattern $ excludedFiles config)))
+  &&& (matchesDir (anyPattern $ includedDirectories config) |||
+       matchesFile (anyPattern $ includedFiles config))
+  &&& (not . (matchesDir (anyPattern $ excludedDirectories config) |||
+              matchesFile (anyPattern $ excludedFiles config)))
 
   where
     matchesDir :: (FileName -> Bool) -> FSNode -> Bool
@@ -102,17 +102,17 @@ galleryDirFilter config excludedCanonicalDirs =
     matchesFile _ Dir{} = False
 
     isExcludedDir :: FSNode -> Bool
-    isExcludedDir Dir{canonicalPath} = any (canonicalPath ==) excludedCanonicalDirs
+    isExcludedDir Dir{canonicalPath} = canonicalPath `elem` excludedCanonicalDirs
     isExcludedDir File{} = False
 
 inputTreeFilter :: GalleryConfig -> InputTree -> Bool
 inputTreeFilter GalleryConfig{includedTags, excludedTags} =
-      (hasTagMatching $ anyPattern includedTags)
-  &&& (not . (hasTagMatching $ anyPattern excludedTags))
+      hasTagMatching (anyPattern includedTags)
+  &&& (not . hasTagMatching (anyPattern excludedTags))
 
   where
     hasTagMatching :: (String -> Bool) -> InputTree -> Bool
-    hasTagMatching cond = (any cond) . (fromMaybe [""] . tags) . sidecar
+    hasTagMatching cond = any cond . (fromMaybe [""] . tags) . sidecar
 
 
 compileGallery :: FilePath -> FilePath -> FilePath -> FilePath -> [FilePath] -> Bool -> Bool -> IO ()
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs
index 0ae0fa1..3c38a17 100644
--- a/compiler/src/Config.hs
+++ b/compiler/src/Config.hs
@@ -73,8 +73,8 @@ instance FromJSON GalleryConfig where
     <*> v .:? "includedTags" .!= ["*"]
     <*> v .:? "excludedTags" .!= []
     <*> v .:? "tagCategories" .!= []
-    <*> v .:? "tagsFromDirectories" .!= (TagsFromDirectoriesConfig 0 "")
-    <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300)
+    <*> v .:? "tagsFromDirectories" .!= TagsFromDirectoriesConfig 0 ""
+    <*> v .:? "thumbnailMaxResolution" .!= Resolution 400 300
     <*> v .:? "pictureMaxResolution"
 
 readConfig :: FileName -> IO GalleryConfig
diff --git a/compiler/src/Files.hs b/compiler/src/Files.hs
index c769815..40149e1 100644
--- a/compiler/src/Files.hs
+++ b/compiler/src/Files.hs
@@ -30,6 +30,7 @@ module Files
 
 import Data.List (isPrefixOf, length, subsequences, sortOn)
 import Data.Function ((&))
+import Data.Functor ((<&>))
 import Data.Text (pack)
 import Data.Aeson (ToJSON)
 import qualified Data.Aeson as JSON
@@ -53,7 +54,7 @@ type LocalPath = String
 type WebPath = String
 
 -- | Reversed path component list
-data Path = Path [FileName] deriving Show
+newtype Path = Path [FileName] deriving Show
 
 instance ToJSON Path where
   toJSON = JSON.String . pack . webPath
@@ -120,7 +121,7 @@ isHidden = hiddenName . nodeName
 -- | DFS with intermediate dirs first.
 flattenDir :: FSNode -> [FSNode]
 flattenDir file@File{} = [file]
-flattenDir dir@Dir{items} = dir:(concatMap flattenDir items)
+flattenDir dir@Dir{items} = dir:concatMap flattenDir items
 
 -- | Filters a dir tree. The root is always returned.
 filterDir :: (FSNode -> Bool) -> AnchoredFSNode -> AnchoredFSNode
@@ -133,7 +134,7 @@ filterDir cond (AnchoredFSNode anchor root) =
     filter cond items & map filterNode & Dir path canonicalPath
 
 readDirectory :: LocalPath -> IO AnchoredFSNode
-readDirectory root = mkNode (Path []) >>= return . AnchoredFSNode root
+readDirectory root = AnchoredFSNode root <$> mkNode (Path [])
   where
     mkNode :: Path -> IO FSNode
     mkNode path =
@@ -151,10 +152,10 @@ readDirectory root = mkNode (Path []) >>= return . AnchoredFSNode root
 
     mkDirNode :: Path -> FilePath -> IO FSNode
     mkDirNode path canonicalPath =
-      (listDirectory $ localPath (root /> path))
-      >>= mapM (mkNode . ((</) path))
-      >>= return . sortOn nodeName
-      >>= return . Dir path canonicalPath
+      listDirectory (localPath (root /> path))
+      >>= mapM (mkNode . (path </))
+      <&> sortOn nodeName
+      <&> Dir path canonicalPath
 
 copyTo :: FilePath -> AnchoredFSNode -> IO ()
 copyTo target AnchoredFSNode{anchor, root} = copyNode root
diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs
index 6ed7471..1316cdd 100644
--- a/compiler/src/Input.hs
+++ b/compiler/src/Input.hs
@@ -27,6 +27,7 @@ import GHC.Generics (Generic)
 import Control.Exception (Exception, AssertionFailed(..), throw, throwIO)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Data.Function ((&))
+import Data.Functor ((<&>))
 import Data.Maybe (catMaybes)
 import Data.Bool (bool)
 import Data.List (find)
@@ -90,7 +91,7 @@ readSidecarFile :: FilePath -> IO Sidecar
 readSidecarFile filepath =
   doesFileExist filepath
   >>= bool (return Nothing) (decodeYamlFile filepath)
-  >>= return . maybe emptySidecar id
+  <&> maybe emptySidecar id
 
 
 readInputTree :: AnchoredFSNode -> IO InputTree
@@ -100,13 +101,13 @@ readInputTree (AnchoredFSNode anchor root@Dir{}) = mkDirNode root
   where
     mkInputNode :: FSNode -> IO (Maybe InputTree)
     mkInputNode file@File{path}
-      | (not $ isSidecar file) && (not $ isThumbnail file) =
+      | not (isSidecar file) && not (isThumbnail file) =
         do
           sidecar <- readSidecarFile $ localPath (anchor /> path <.> sidecarExt)