Replace inotify with multiplatform fsnotify package

2 files changed, 6 insertions, 6 deletions

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
diff --git a/src/Erebos/Storage/Internal.hs b/src/Erebos/Storage/Internal.hs
index b9cf6dd..d419a5e 100644
--- a/src/Erebos/Storage/Internal.hs
+++ b/src/Erebos/Storage/Internal.hs
@@ -31,8 +31,8 @@ import Data.UUID (UUID)
 import Foreign.Storable (peek)
 
 import System.Directory
+import System.FSNotify (WatchManager)
 import System.FilePath
-import System.INotify (INotify)
 import System.IO
 import System.IO.Error
 import System.IO.Unsafe (unsafePerformIO)
@@ -60,7 +60,7 @@ showParentStorage Storage { stParent = Just st } = "@" ++ show st
 
 data StorageBacking c
          = StorageDir { dirPath :: FilePath
-                      , dirWatchers :: MVar ( Maybe INotify, [ HeadTypeID ], WatchList c )
+                      , dirWatchers :: MVar ( Maybe WatchManager, [ HeadTypeID ], WatchList c )
                       }
          | StorageMemory { memHeads :: MVar [((HeadTypeID, HeadID), Ref' c)]
                          , memObjs :: MVar (Map RefDigest BL.ByteString)