filipg/geval
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Follow symbolic links when doing validation

Browse Source 
Needed for files stored with git-annex.
This commit is contained in:
Filip Gralinski 2021-12-18 14:35:14 +01:00
parent 2dbcedb40e
commit 70fc7b8d31
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEval/Validation.hs
View File

@ -15,7 +15,6 @@ import System.FilePath
import System.Directory import System.Directory
import Control.Exception import Control.Exception
import Control.Monad.Trans.Resource import Control.Monad.Trans.Resource
import Control.Monad.IO.Class
import Control.Conditional (unlessM, whenM, unless, when) import Control.Conditional (unlessM, whenM, unless, when)
import Data.Conduit import Data.Conduit
import qualified Data.Conduit.List as CL import qualified Data.Conduit.List as CL
@ -154,8 +153,15 @@ testDirFilter :: FindClause Bool
testDirFilter = (SFF.fileType ==? Directory) &&? (SFF.fileName ~~? "dev-*" testDirFilter = (SFF.fileType ==? Directory) &&? (SFF.fileName ~~? "dev-*"
||? SFF.fileName ~~? "test-*") ||? SFF.fileName ~~? "test-*")
fileTypeFollowed :: FindClause FileType
fileTypeFollowed = do
status <- followStatus
case status of
Just status' -> return $ statusType status'
Nothing -> fileType
fileFilter :: String -> FindClause Bool fileFilter :: String -> FindClause Bool
fileFilter fileName = (SFF.fileType ==? RegularFile) &&? (SFF.fileName ~~? fileName ||? SFF.fileName ~~? fileName ++ exts) fileFilter fileName = (fileTypeFollowed ==? RegularFile) &&? (SFF.fileName ~~? fileName ||? SFF.fileName ~~? fileName ++ exts)
where where
exts = Prelude.concat [ "(", intercalate "|" compressedFilesHandled, ")" ] exts = Prelude.concat [ "(", intercalate "|" compressedFilesHandled, ")" ]