e0fdfb2e70
Kqueue needs to remember which files failed to be added due to being open, and retry them. This commit gets the data in place for such a retry thread. Broke KeySource out into its own file, and added Eq and Ord instances so it can be stored in a Set.
128 lines
3.8 KiB
Haskell
128 lines
3.8 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2010 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Add where
|
|
|
|
import Common.Annex
|
|
import Annex.Exception
|
|
import Command
|
|
import qualified Annex
|
|
import qualified Annex.Queue
|
|
import Types.KeySource
|
|
import Backend
|
|
import Logs.Location
|
|
import Annex.Content
|
|
import Annex.Perms
|
|
import Utility.Touch
|
|
import Utility.FileMode
|
|
|
|
def :: [Command]
|
|
def = [command "add" paramPaths seek "add files to annex"]
|
|
|
|
{- Add acts on both files not checked into git yet, and unlocked files. -}
|
|
seek :: [CommandSeek]
|
|
seek = [withFilesNotInGit start, withFilesUnlocked start]
|
|
|
|
{- The add subcommand annexes a file, storing it in a backend, and then
|
|
- moving it into the annex directory and setting up the symlink pointing
|
|
- to its content. -}
|
|
start :: FilePath -> CommandStart
|
|
start file = notBareRepo $ ifAnnexed file fixup add
|
|
where
|
|
add = do
|
|
s <- liftIO $ getSymbolicLinkStatus file
|
|
if isSymbolicLink s || not (isRegularFile s)
|
|
then stop
|
|
else do
|
|
showStart "add" file
|
|
next $ perform file
|
|
fixup (key, _) = do
|
|
-- fixup from an interrupted add; the symlink
|
|
-- is present but not yet added to git
|
|
showStart "add" file
|
|
liftIO $ removeFile file
|
|
next $ next $ cleanup file key =<< inAnnex key
|
|
|
|
{- The file that's being added is locked down before a key is generated,
|
|
- to prevent it from being modified in between. It's hard linked into a
|
|
- temporary location, and its writable bits are removed. It could still be
|
|
- written to by a process that already has it open for writing. -}
|
|
lockDown :: FilePath -> Annex KeySource
|
|
lockDown file = do
|
|
liftIO $ preventWrite file
|
|
tmp <- fromRepo gitAnnexTmpDir
|
|
createAnnexDirectory tmp
|
|
liftIO $ do
|
|
(tmpfile, _handle) <- openTempFile tmp (takeFileName file)
|
|
nukeFile tmpfile
|
|
createLink file tmpfile
|
|
return $ KeySource { keyFilename = file , contentLocation = tmpfile }
|
|
|
|
{- Moves a locked down file into the annex. -}
|
|
ingest :: KeySource -> Annex (Maybe Key)
|
|
ingest source = do
|
|
backend <- chooseBackend $ keyFilename source
|
|
genKey source backend >>= go
|
|
where
|
|
go Nothing = do
|
|
liftIO $ nukeFile $ contentLocation source
|
|
return Nothing
|
|
go (Just (key, _)) = do
|
|
handle (undo (keyFilename source) key) $
|
|
moveAnnex key $ contentLocation source
|
|
liftIO $ nukeFile $ keyFilename source
|
|
return $ Just key
|
|
|
|
perform :: FilePath -> CommandPerform
|
|
perform file =
|
|
maybe stop (\key -> next $ cleanup file key True)
|
|
=<< ingest =<< lockDown file
|
|
|
|
{- On error, put the file back so it doesn't seem to have vanished.
|
|
- This can be called before or after the symlink is in place. -}
|
|
undo :: FilePath -> Key -> IOException -> Annex a
|
|
undo file key e = do
|
|
whenM (inAnnex key) $ do
|
|
liftIO $ nukeFile file
|
|
handle tryharder $ fromAnnex key file
|
|
logStatus key InfoMissing
|
|
throw e
|
|
where
|
|
-- fromAnnex could fail if the file ownership is weird
|
|
tryharder :: IOException -> Annex ()
|
|
tryharder _ = do
|
|
src <- inRepo $ gitAnnexLocation key
|
|
liftIO $ moveFile src file
|
|
|
|
{- Creates the symlink to the annexed content, returns the link target. -}
|
|
link :: FilePath -> Key -> Bool -> Annex String
|
|
link file key hascontent = handle (undo file key) $ do
|
|
l <- calcGitLink file key
|
|
liftIO $ createSymbolicLink l file
|
|
|
|
when hascontent $ do
|
|
logStatus key InfoPresent
|
|
|
|
-- touch the symlink to have the same mtime as the
|
|
-- file it points to
|
|
liftIO $ do
|
|
mtime <- modificationTime <$> getFileStatus file
|
|
touch file (TimeSpec mtime) False
|
|
|
|
return l
|
|
|
|
{- Note: Several other commands call this, and expect it to
|
|
- create the symlink and add it. -}
|
|
cleanup :: FilePath -> Key -> Bool -> CommandCleanup
|
|
cleanup file key hascontent = do
|
|
_ <- link file key hascontent
|
|
params <- ifM (Annex.getState Annex.force)
|
|
( return [Param "-f"]
|
|
, return []
|
|
)
|
|
Annex.Queue.addCommand "add" (params++[Param "--"]) [file]
|
|
return True
|