mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

disentagle copy and move option parsing

Browse source
This commit is contained in:
Joey Hess 2018-04-09 14:38:46 -04:00
parent 0106752db2
commit ae530f043e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Command/Copy.hs
View file

@ -20,46 +20,55 @@ cmd = withGlobalOptions [jobsOption, jsonOptions, jsonProgressOption, annexedMat
paramPaths (seek <--< optParser) paramPaths (seek <--< optParser)
data CopyOptions = CopyOptions data CopyOptions = CopyOptions
{ moveOptions :: Command.Move.MoveOptions { copyFiles :: CmdParams
, fromToOptions :: FromToHereOptions
, keyOptions :: Maybe KeyOptions
, autoMode :: Bool , autoMode :: Bool
, batchOption :: BatchMode
} }
optParser :: CmdParamsDesc -> Parser CopyOptions optParser :: CmdParamsDesc -> Parser CopyOptions
optParser desc = CopyOptions optParser desc = CopyOptions
<$> Command.Move.optParser desc <$> cmdParams desc
<*> parseFromToHereOptions
<*> optional (parseKeyOptions <|> parseFailedTransfersOption)
<*> parseAutoOption <*> parseAutoOption
<*> parseBatchOption
instance DeferredParseClass CopyOptions where instance DeferredParseClass CopyOptions where
finishParse v = CopyOptions finishParse v = CopyOptions
<$> finishParse (moveOptions v) <$> pure (copyFiles v)
<*> finishParse (fromToOptions v)
<*> pure (keyOptions v)
<*> pure (autoMode v) <*> pure (autoMode v)
<*> pure (batchOption v)
seek :: CopyOptions -> CommandSeek seek :: CopyOptions -> CommandSeek
seek o = allowConcurrentOutput $ do seek o = allowConcurrentOutput $ do
let go = whenAnnexed $ start o let go = whenAnnexed $ start o
case Command.Move.batchOption (moveOptions o) of case batchOption o of
Batch -> batchInput Right (batchCommandAction . go) Batch -> batchInput Right (batchCommandAction . go)
NoBatch -> withKeyOptions NoBatch -> withKeyOptions
(Command.Move.keyOptions $ moveOptions o) (autoMode o) (keyOptions o) (autoMode o)
(Command.Move.startKey (moveOptions o) False) (Command.Move.startKey (fromToOptions o) False)
(withFilesInGit go) (withFilesInGit go)
=<< workTreeItems (Command.Move.moveFiles $ moveOptions o) =<< workTreeItems (copyFiles o)
{- A copy is just a move that does not delete the source file. {- A copy is just a move that does not delete the source file.
- However, auto mode avoids unnecessary copies, and avoids getting or - However, auto mode avoids unnecessary copies, and avoids getting or
- sending non-preferred content. -} - sending non-preferred content. -}
start :: CopyOptions -> FilePath -> Key -> CommandStart start :: CopyOptions -> FilePath -> Key -> CommandStart
start o file key = stopUnless shouldCopy $ start o file key = stopUnless shouldCopy $
Command.Move.start (moveOptions o) False file key Command.Move.start (fromToOptions o) False file key
where where
shouldCopy shouldCopy
| autoMode o = want <||> numCopiesCheck file key (<) | autoMode o = want <||> numCopiesCheck file key (<)
| otherwise = return True | otherwise = return True
want = case Command.Move.fromToOptions (moveOptions o) of want = case fromToOptions o of
Right (ToRemote dest) -> Right (ToRemote dest) ->
(Remote.uuid <$> getParsed dest) >>= checkwantsend (Remote.uuid <$> getParsed dest) >>= checkwantsend
Right (FromRemote _) -> checkwantget Right (FromRemote _) -> checkwantget
Left Command.Move.ToHere -> checkwantget Left ToHere -> checkwantget
checkwantsend = wantSend False (Just key) (AssociatedFile (Just file)) checkwantsend = wantSend False (Just key) (AssociatedFile (Just file))
checkwantget = wantGet False (Just key) (AssociatedFile (Just file)) checkwantget = wantGet False (Just key) (AssociatedFile (Just file))

18
Command/Move.hs
View file

@ -48,25 +48,25 @@ instance DeferredParseClass MoveOptions where
seek :: MoveOptions -> CommandSeek seek :: MoveOptions -> CommandSeek
seek o = allowConcurrentOutput $ do seek o = allowConcurrentOutput $ do
let go = whenAnnexed $ start o True let go = whenAnnexed $ start (fromToOptions o) True
case batchOption o of case batchOption o of
Batch -> batchInput Right (batchCommandAction . go) Batch -> batchInput Right (batchCommandAction . go)
NoBatch -> withKeyOptions (keyOptions o) False NoBatch -> withKeyOptions (keyOptions o) False
(startKey o True) (startKey (fromToOptions o) True)
(withFilesInGit go) (withFilesInGit go)
=<< workTreeItems (moveFiles o) =<< workTreeItems (moveFiles o)
start :: MoveOptions -> Bool -> FilePath -> Key -> CommandStart start :: FromToHereOptions -> Bool -> FilePath -> Key -> CommandStart
start o move f k = start' o move afile k (mkActionItem afile) start fromto move f k = start' fromto move afile k (mkActionItem afile)
where where
afile = AssociatedFile (Just f) afile = AssociatedFile (Just f)
startKey :: MoveOptions -> Bool -> Key -> ActionItem -> CommandStart startKey :: FromToHereOptions -> Bool -> Key -> ActionItem -> CommandStart
startKey o move = start' o move (AssociatedFile Nothing) startKey fromto move = start' fromto move (AssociatedFile Nothing)
start' :: MoveOptions -> Bool -> AssociatedFile -> Key -> ActionItem -> CommandStart start' :: FromToHereOptions -> Bool -> AssociatedFile -> Key -> ActionItem -> CommandStart
start' o move afile key ai = onlyActionOn key $ start' fromto move afile key ai = onlyActionOn key $
case fromToOptions o of case fromto of
Right (FromRemote src) -> Right (FromRemote src) ->
checkFailedTransferDirection ai Download $ checkFailedTransferDirection ai Download $
fromStart move afile key ai =<< getParsed src fromStart move afile key ai =<< getParsed src