srid/rib
1
1
Fork 0
mirror of https://github.com/srid/rib.git synced 2024-09-11 13:37:20 +03:00
Code Issues Projects Releases Wiki Activity

Fix a bug with watchIgnore

Browse Source 
Need to canonicalize paths before comparing using isPrefixOf
This commit is contained in:
Sridhar Ratnakumar 2020-04-10 12:18:00 -04:00
parent c115fe3963
commit 157f4663ab
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Rib/App.hs
View File

@ -26,6 +26,7 @@ import qualified Rib.Cli as Cli
import Rib.Log
import qualified Rib.Server as Server
import Rib.Watch (onTreeChange)
import System.Directory
import System.FSNotify (Event (..), eventPath)
import System.FilePath
import System.IO (BufferMode (LineBuffering), hSetBuffering)
@ -107,10 +108,12 @@ runShakeAndObserve cfg@CliConfig {..} buildAction = do
where
onSrcChange :: IO () -> IO ()
onSrcChange f = do
-- Canonicalizing path is important as we are comparing path ancestor using isPrefixOf
dir <- canonicalizePath inputDir
-- Top-level directories to ignore from notifications
let isBlacklisted :: FilePath -> Bool
isBlacklisted p = or $ flip fmap watchIgnore $ \b -> (inputDir </> b) `isPrefixOf` p
onTreeChange inputDir $ \allEvents -> do
isBlacklisted p = or $ flip fmap watchIgnore $ \b -> (dir </> b) `isPrefixOf` p
onTreeChange dir $ \allEvents -> do
let events = filter (not . isBlacklisted . eventPath) allEvents
unless (null events) $ do
-- Log the changed events for diagnosis.