10b5f79e2d
Fix behavior when importing a tree from a directory remote when the
directory does not exist. An empty tree was imported, rather than the
import failing. Merging that tree would delete every file in the
branch, if those files had been exported to the directory before.
The problem was that dirContentsRecursive returned [] when the directory
did not exist. Better for it to throw an exception. But in commit
74f0d67aa3 back in 2012, I made it never
theow exceptions, because exceptions throw inside unsafeInterleaveIO become
untrappable when the list is being traversed.
So, changed it to list the contents of the directory before entering
unsafeInterleaveIO. So exceptions are thrown for the directory. But still
not if it's unable to list the contents of a subdirectory. That's less of a
problem, because the subdirectory does exist (or if not, it got removed
after being listed, and it's ok to not include it in the list). A
subdirectory that has permissions that don't allow listing it will have its
contents omitted from the list still.
(Might be better to have it return a type that includes indications of
errors listing contents of subdirectories?)
The rest of the changes are making callers of dirContentsRecursive
use emptyWhenDoesNotExist when they relied on the behavior of it not
throwing an exception when the directory does not exist. Note that
it's possible some callers of dirContentsRecursive that used to ignore
permissions problems listing a directory will now start throwing exceptions
on them.
The fix to the directory special remote consisted of not making its
call in listImportableContentsM use emptyWhenDoesNotExist. So it will
throw an exception as desired.
Sponsored-by: Joshua Antonishen on Patreon
67 lines
2 KiB
Haskell
67 lines
2 KiB
Haskell
{- Win32-notify interface
|
|
-
|
|
- Copyright 2013 Joey Hess <id@joeyh.name>
|
|
-
|
|
- License: BSD-2-clause
|
|
-}
|
|
|
|
module Utility.DirWatcher.Win32Notify (watchDir) where
|
|
|
|
import Common
|
|
import Utility.DirWatcher.Types
|
|
import qualified Utility.RawFilePath as R
|
|
|
|
import System.Win32.Notify
|
|
import System.PosixCompat.Files (isRegularFile)
|
|
|
|
watchDir :: FilePath -> (FilePath -> Bool) -> Bool -> WatchHooks -> IO WatchManager
|
|
watchDir dir ignored scanevents hooks = do
|
|
scan dir
|
|
wm <- initWatchManager
|
|
void $ watchDirectory wm dir True [Create, Delete, Modify, Move] dispatch
|
|
return wm
|
|
where
|
|
dispatch evt
|
|
| ignoredPath ignored (filePath evt) = noop
|
|
| otherwise = case evt of
|
|
(Deleted _ _)
|
|
| isDirectory evt -> runhook delDirHook Nothing
|
|
| otherwise -> runhook delHook Nothing
|
|
(Created _ _)
|
|
| isDirectory evt -> noop
|
|
| otherwise -> runhook addHook Nothing
|
|
(Modified _ _)
|
|
| isDirectory evt -> noop
|
|
{- Add hooks are run when a file is modified for
|
|
- compatibility with INotify, which calls the add
|
|
- hook when a file is closed, and so tends to call
|
|
- both add and modify for file modifications. -}
|
|
| otherwise -> do
|
|
runhook addHook Nothing
|
|
runhook modifyHook Nothing
|
|
where
|
|
runhook h s = maybe noop (\a -> a (filePath evt) s) (h hooks)
|
|
|
|
scan d = unless (ignoredPath ignored d) $
|
|
mapM_ go =<< emptyWhenDoesNotExist (dirContentsRecursiveSkipping (const False) False d)
|
|
where
|
|
go f
|
|
| ignoredPath ignored f = noop
|
|
| otherwise = do
|
|
ms <- getstatus f
|
|
case ms of
|
|
Nothing -> noop
|
|
Just s
|
|
| isRegularFile s ->
|
|
when scanevents $
|
|
runhook addHook ms
|
|
| otherwise ->
|
|
noop
|
|
where
|
|
runhook h s = maybe noop (\a -> a f s) (h hooks)
|
|
|
|
getstatus = catchMaybeIO . R.getFileStatus . toRawFilePath
|
|
|
|
{- Check each component of the path to see if it's ignored. -}
|
|
ignoredPath :: (FilePath -> Bool) -> FilePath -> Bool
|
|
ignoredPath ignored = any ignored . map dropTrailingPathSeparator . splitPath
|