split ProvidedInfo and UserProvidedInfo

The latter is for git-annex matchexpression and matching against it can
throw an exception. Splitting out the former reduces the potential for
mistakes and avoids needing to worry about matching against that
throwing an exception.

This is more groundwork for matching largefiles while importing,
without downloading content.

This commit was sponsored by Graham Spencer on Patreon.
This commit is contained in:
Joey Hess 2020-09-28 12:06:10 -04:00
parent 00dbe35fbc
commit 8b74f01a26
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 93 additions and 62 deletions

View file

@ -37,9 +37,9 @@ optParser desc = MatchExpressionOptions
( long "largefiles"
<> help "parse as annex.largefiles expression"
)
<*> (MatchingInfo . addkeysize <$> dataparser)
<*> (MatchingUserInfo . addkeysize <$> dataparser)
where
dataparser = ProvidedInfo
dataparser = UserProvidedInfo
<$> optinfo "file" (strOption
( long "file" <> metavar paramFile
<> help "specify filename to match against"
@ -65,9 +65,9 @@ optParser desc = MatchExpressionOptions
<|> (pure $ Left $ missingdata datadesc)
missingdata datadesc = bail $ "cannot match this expression without " ++ datadesc ++ " data"
-- When a key is provided, make its size also be provided.
addkeysize p = case providedKey p of
addkeysize p = case userProvidedKey p of
Right k -> case fromKey keySize k of
Just sz -> p { providedFileSize = Right sz }
Just sz -> p { userProvidedFileSize = Right sz }
Nothing -> p
Left _ -> p