diff options
| -rw-r--r-- | Command/Watch.hs | 55 | ||||
| -rw-r--r-- | GitAnnex.hs | 2 |
2 files changed, 57 insertions, 0 deletions
diff --git a/Command/Watch.hs b/Command/Watch.hs new file mode 100644 index 000000000..e0fa97ac5 --- /dev/null +++ b/Command/Watch.hs @@ -0,0 +1,55 @@ +{- git-annex command + - + - Copyright 2012 Joey Hess <joey@kitenet.net> + - + - Licensed under the GNU GPL version 3 or higher. + -} + +module Command.Watch where + +import Common.Annex +import Command +import qualified Annex +import CmdLine +import Utility.Inotify +import Control.Exception as E +import qualified Command.Add as Add + +import System.INotify + +def :: [Command] +def = [command "watch" paramPaths seek "watch for changes"] + +seek :: [CommandSeek] +seek = [withNothing start] + +start :: CommandStart +start = notBareRepo $ do + showStart "watch" "." + showAction "scanning" + state <- Annex.getState id + next $ next $ liftIO $ withINotify $ \i -> do + watchDir i notgit (Just $ run state onAdd) Nothing "." + putStrLn "(started)" + waitForTermination + return True + where + notgit dir = takeFileName dir /= ".git" + +{- Inotify events are run in separate threads, and so each is a + - self-contained Annex monad. Exceptions by the handlers are ignored, + - otherwise a whole watcher thread could be crashed. -} +run :: Annex.AnnexState -> (FilePath -> Annex a) -> FilePath -> IO () +run startstate a f = do + r <- E.try go :: IO (Either E.SomeException ()) + case r of + Left e -> putStrLn (show e) + _ -> return () + where + go = Annex.eval startstate $ do + _ <- a f + _ <- shutdown True + return () + +onAdd :: FilePath -> Annex Bool +onAdd file = doCommand $ Add.start file diff --git a/GitAnnex.hs b/GitAnnex.hs index 52886c308..5caa93499 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -56,6 +56,7 @@ import qualified Command.AddUrl import qualified Command.Map import qualified Command.Upgrade import qualified Command.Version +import qualified Command.Watch cmds :: [Command] cmds = concat @@ -95,6 +96,7 @@ cmds = concat , Command.Map.def , Command.Upgrade.def , Command.Version.def + , Command.Watch.def ] options :: [Option] |