From 47b8396c94af75832d96e4d3b4e0d7001ff70388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Sun, 30 Jun 2024 16:41:18 +0200 Subject: Replace inotify with multiplatform fsnotify package --- src/Erebos/Storage.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Erebos/Storage.hs') diff --git a/src/Erebos/Storage.hs b/src/Erebos/Storage.hs index 5730b4c..2e6653a 100644 --- a/src/Erebos/Storage.hs +++ b/src/Erebos/Storage.hs @@ -103,8 +103,8 @@ import qualified Data.UUID as U import qualified Data.UUID.V4 as U import System.Directory +import System.FSNotify import System.FilePath -import System.INotify import System.IO.Error import System.IO.Unsafe @@ -543,12 +543,12 @@ watchHeadRaw st tid hid sel cb = do watched <- case stBacking st of StorageDir { dirPath = spath, dirWatchers = mvar } -> modifyMVar mvar $ \(mbmanager, ilist, wl) -> do - manager <- maybe initINotify return mbmanager + manager <- maybe startManager return mbmanager ilist' <- case tid `elem` ilist of True -> return ilist False -> do - void $ addWatch manager [ Move ] (BC.pack $ headTypePath spath tid) $ \case - MovedIn { filePath = fpath } | Just ihid <- HeadID <$> U.fromASCIIBytes fpath -> do + void $ watchDir manager (headTypePath spath tid) (const True) $ \case + Added { eventPath = fpath } | Just ihid <- HeadID <$> U.fromString (takeFileName fpath) -> do loadHeadRaw st tid ihid >>= \case Just ref -> do (_, _, iwl) <- readMVar mvar -- cgit v1.2.3