From 4fde03c7654dcdad11a8c91ba2bcbb2706695e11 Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 30 Jan 2020 16:03:54 +0100
Subject: compiler: properly exclude out directory

Use canonical paths to exclude the output directory if it is located
inside the input directory instead of guessing based on special files.

GitHub: closes #54
---
 compiler/src/Compiler.hs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'compiler/src/Compiler.hs')

diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index 8819ffc..d392f74 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -26,6 +26,7 @@ import Control.Monad (liftM2)
 import Data.List (any)
 import System.FilePath ((</>))
 import qualified System.FilePath.Glob as Glob
+import System.Directory (canonicalizePath)
 
 import Data.Aeson (ToJSON)
 import qualified Data.Aeson as JSON
@@ -52,9 +53,6 @@ galleryConf = "gallery.yaml"
 indexFile :: String
 indexFile = "index.json"
 
-viewerMainFile :: String
-viewerMainFile = "index.html"
-
 viewerConfFile :: String
 viewerConfFile = "viewer.json"
 
@@ -72,11 +70,11 @@ writeJSON outputPath object =
     ensureParentDir JSON.encodeFile outputPath object
 
 
-galleryDirFilter :: CompilerConfig -> FSNode -> Bool
-galleryDirFilter config =
+galleryDirFilter :: CompilerConfig -> FilePath -> FSNode -> Bool
+galleryDirFilter config outputDir =
       (not . isHidden)
+  &&& (not . isOutputGallery)
   &&& (not . matchesFile (== galleryConf))
-  &&& (not . containsOutputGallery)
   &&& ((matchesDir $ anyPattern $ includedDirectories config) |||
        (matchesFile $ anyPattern $ includedFiles config))
   &&& (not . ((matchesDir $ anyPattern $ excludedDirectories config) |||
@@ -97,10 +95,9 @@ galleryDirFilter config =
     anyPattern :: [String] -> FileName -> Bool
     anyPattern patterns filename = any (flip Glob.match filename) (map Glob.compile patterns)
 
-    containsOutputGallery :: FSNode -> Bool
-    containsOutputGallery File{} = False
-    containsOutputGallery Dir{items} =
-      any (matchesFile (== indexFile) ||| matchesFile (== viewerMainFile)) items
+    isOutputGallery :: FSNode -> Bool
+    isOutputGallery Dir{canonicalPath} = canonicalPath == outputDir
+    isOutputGallery File{} = False
 
 
 compileGallery :: FilePath -> FilePath -> Bool -> Bool -> IO ()
@@ -110,7 +107,8 @@ compileGallery inputDirPath outputDirPath rebuildAll cleanOutput =
     let config = compiler fullConfig
 
     inputDir <- readDirectory inputDirPath
-    let sourceFilter = galleryDirFilter config
+    canonicalOutPath <- canonicalizePath outputDirPath
+    let sourceFilter = galleryDirFilter config canonicalOutPath
     let sourceTree = filterDir sourceFilter inputDir
     inputTree <- readInputTree sourceTree
 
-- 
cgit v1.2.3