34c8af74ba
I've been disliking how the command seek actions were written for some time, with their inversion of control and ugly workarounds. The last straw to fix it was sync --content, which didn't fit the Annex [CommandStart] interface well at all. I have not yet made it take advantage of the changed interface though. The crucial change, and probably why I didn't do it this way from the beginning, is to make each CommandStart action be run with exceptions caught, and if it fails, increment a failure counter in annex state. So I finally remove the very first code I wrote for git-annex, which was before I had exception handling in the Annex monad, and so ran outside that monad, passing state explicitly as it ran each CommandStart action. This was a real slog from 1 to 5 am. Test suite passes. Memory usage is lower than before, sometimes by a couple of megabytes, and remains constant, even when running in a large repo, and even when repeatedly failing and incrementing the error counter. So no accidental laziness space leaks. Wall clock speed is identical, even in large repos. This commit was sponsored by an anonymous bitcoiner.
59 lines
1.7 KiB
Haskell
59 lines
1.7 KiB
Haskell
{- git-annex plumbing command (for use by old assistant, and users)
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.TransferKey where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import Annex.Content
|
|
import Logs.Location
|
|
import Logs.Transfer
|
|
import qualified Remote
|
|
import Types.Remote
|
|
import GitAnnex.Options
|
|
import qualified Option
|
|
|
|
def :: [Command]
|
|
def = [withOptions transferKeyOptions $
|
|
noCommit $ command "transferkey" paramKey seek SectionPlumbing
|
|
"transfers a key from or to a remote"]
|
|
|
|
transferKeyOptions :: [Option]
|
|
transferKeyOptions = fileOption : fromToOptions
|
|
|
|
fileOption :: Option
|
|
fileOption = Option.field [] "file" paramFile "the associated file"
|
|
|
|
seek :: CommandSeek
|
|
seek ps = do
|
|
to <- getOptionField toOption Remote.byNameWithUUID
|
|
from <- getOptionField fromOption Remote.byNameWithUUID
|
|
file <- getOptionField fileOption return
|
|
withKeys (start to from file) ps
|
|
|
|
start :: Maybe Remote -> Maybe Remote -> AssociatedFile -> Key -> CommandStart
|
|
start to from file key =
|
|
case (from, to) of
|
|
(Nothing, Just dest) -> next $ toPerform dest key file
|
|
(Just src, Nothing) -> next $ fromPerform src key file
|
|
_ -> error "specify either --from or --to"
|
|
|
|
toPerform :: Remote -> Key -> AssociatedFile -> CommandPerform
|
|
toPerform remote key file = go $
|
|
upload (uuid remote) key file forwardRetry $ \p -> do
|
|
ok <- Remote.storeKey remote key file p
|
|
when ok $
|
|
Remote.logStatus remote key InfoPresent
|
|
return ok
|
|
|
|
fromPerform :: Remote -> Key -> AssociatedFile -> CommandPerform
|
|
fromPerform remote key file = go $
|
|
download (uuid remote) key file forwardRetry $ \p ->
|
|
getViaTmp key $ \t -> Remote.retrieveKeyFile remote key file t p
|
|
|
|
go :: Annex Bool -> CommandPerform
|
|
go a = a >>= liftIO . exitBool
|