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

refactor FromToHereOptions

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

15
Command/Move.hs
View file

@ -27,31 +27,22 @@ cmd = withGlobalOptions [jobsOption, jsonOptions, jsonProgressOption, annexedMat
data MoveOptions = MoveOptions
{ moveFiles :: CmdParams
, fromToOptions :: Either ToHere FromToOptions
, fromToOptions :: FromToHereOptions
, keyOptions :: Maybe KeyOptions
, batchOption :: BatchMode
}
data ToHere = ToHere
optParser :: CmdParamsDesc -> Parser MoveOptions
optParser desc = MoveOptions
<$> cmdParams desc
<*> (parsefrom <|> parseto)
<*> parseFromToHereOptions
<*> optional (parseKeyOptions <|> parseFailedTransfersOption)
<*> parseBatchOption
where
parsefrom = Right . FromRemote . parseRemoteOption <$> parseFromOption
parseto = herespecialcase <$> parseToOption
where
herespecialcase "here" = Left ToHere
herespecialcase "." = Left ToHere
herespecialcase n = Right $ ToRemote $ parseRemoteOption n
instance DeferredParseClass MoveOptions where
finishParse v = MoveOptions
<$> pure (moveFiles v)
<*> either (pure . Left) (Right <$$> finishParse) (fromToOptions v)
<*> finishParse (fromToOptions v)
<*> pure (keyOptions v)
<*> pure (batchOption v)