mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

OSX build fixes

Browse source
This commit is contained in:
Joey Hess 2025-02-17 13:59:52 -04:00
parent 5324f34092
commit 66b8ba8fb0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Utility/DirWatcher/FSEvents.hs
View file

@ -15,7 +15,7 @@ import System.OSX.FSEvents
import qualified System.Posix.Files as Files import qualified System.Posix.Files as Files
import Data.Bits ((.&.)) import Data.Bits ((.&.))
watchDir :: FilePath -> (FilePath -> Bool) -> Bool -> WatchHooks -> IO EventStream watchDir :: OsPath -> (OsPath -> Bool) -> Bool -> WatchHooks -> IO EventStream
watchDir dir ignored scanevents hooks = do watchDir dir ignored scanevents hooks = do
unlessM fileLevelEventsSupported $ unlessM fileLevelEventsSupported $
giveup "Need at least OSX 10.7.0 for file-level FSEvents" giveup "Need at least OSX 10.7.0 for file-level FSEvents"
@ -23,7 +23,7 @@ watchDir dir ignored scanevents hooks = do
eventStreamCreate [dir] 1.0 True True True dispatch eventStreamCreate [dir] 1.0 True True True dispatch
where where
dispatch evt dispatch evt
| ignoredPath ignored (eventPath evt) = noop | ignoredPath ignored (toOsPath (eventPath evt)) = noop
| otherwise = do | otherwise = do
{- More than one flag may be set, if events occurred {- More than one flag may be set, if events occurred
- close together. - close together.
@ -45,8 +45,8 @@ watchDir dir ignored scanevents hooks = do
- received for both its old and its new name. -} - received for both its old and its new name. -}
when (hasflag eventFlagItemRenamed) $ when (hasflag eventFlagItemRenamed) $
if hasflag eventFlagItemIsDir if hasflag eventFlagItemIsDir
then ifM (doesDirectoryExist $ eventPath evt) then ifM (doesDirectoryExist $ toOsPath $ eventPath evt)
( scan $ eventPath evt ( scan $ toOsPath $ eventPath evt
, runhook delDirHook Nothing , runhook delDirHook Nothing
) )
else maybe (runhook delHook Nothing) handleadd else maybe (runhook delHook Nothing) handleadd
@ -61,7 +61,7 @@ watchDir dir ignored scanevents hooks = do
runhook modifyHook ms runhook modifyHook ms
where where
hasflag f = eventFlags evt .&. f /= 0 hasflag f = eventFlags evt .&. f /= 0
runhook h s = maybe noop (\a -> a (eventPath evt) s) (h hooks) runhook h s = maybe noop (\a -> a (toOsPath (eventPath evt)) s) (h hooks)
handleadd s handleadd s
| Files.isSymbolicLink s = runhook addSymlinkHook $ Just s | Files.isSymbolicLink s = runhook addSymlinkHook $ Just s
| Files.isRegularFile s = runhook addHook $ Just s | Files.isRegularFile s = runhook addHook $ Just s
@ -70,13 +70,13 @@ watchDir dir ignored scanevents hooks = do
scan d = unless (ignoredPath ignored d) $ scan d = unless (ignoredPath ignored d) $
-- Do not follow symlinks when scanning. -- Do not follow symlinks when scanning.
-- This mirrors the inotify startup scan behavior. -- This mirrors the inotify startup scan behavior.
mapM_ (go . fromRawFilePath) =<< emptyWhenDoesNotExist mapM_ go =<< emptyWhenDoesNotExist
(dirContentsRecursiveSkipping (const False) False (toRawFilePath d)) (dirContentsRecursiveSkipping (const False) False d)
where where
go f go f
| ignoredPath ignored f = noop | ignoredPath ignored f = noop
| otherwise = do | otherwise = do
ms <- getstatus f ms <- getstatus (fromOsPath f)
case ms of case ms of
Nothing -> noop Nothing -> noop
Just s Just s
@ -94,5 +94,5 @@ watchDir dir ignored scanevents hooks = do
getstatus = catchMaybeIO . R.getSymbolicLinkStatus . toRawFilePath getstatus = catchMaybeIO . R.getSymbolicLinkStatus . toRawFilePath
{- Check each component of the path to see if it's ignored. -} {- Check each component of the path to see if it's ignored. -}
ignoredPath :: (FilePath -> Bool) -> FilePath -> Bool ignoredPath :: (OsPath -> Bool) -> OsPath -> Bool
ignoredPath ignored = any ignored . map dropTrailingPathSeparator . splitPath ignoredPath ignored = any ignored . map dropTrailingPathSeparator . splitPath