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

convert configParser to Annex action and add passthrough option

Browse source 
Needed so Remote.External can query the external program for its
configs. When the external program does not support the query,
the passthrough option will make all input fields be available.
This commit is contained in:
Joey Hess 2020-01-14 13:18:15 -04:00
parent 8f142a9279
commit c498269a88
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
16 changed files with 70 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Remote/Helper/Encryptable.hs
View file

@ -12,7 +12,7 @@ module Remote.Helper.Encryptable (
encryptionSetup,
noEncryptionUsed,
encryptionAlreadySetup,
encryptionConfigParser,
encryptionConfigParsers,
parseEncryptionConfig,
remoteCipher,
remoteCipher',
@ -51,8 +51,8 @@ noEncryptionUsed = NoEncryption
encryptionAlreadySetup :: EncryptionIsSetup
encryptionAlreadySetup = EncryptionIsSetup
encryptionConfigParser :: [RemoteConfigParser]
encryptionConfigParser =
encryptionConfigParsers :: [RemoteConfigFieldParser]
encryptionConfigParsers =
[ (encryptionField, \v c -> Just . RemoteConfigValue <$> parseEncryptionMethod (fmap fromProposedAccepted v) c)
, optionalStringParser cipherField
, optionalStringParser cipherkeysField
@ -66,11 +66,13 @@ encryptionConfigParser =
]
encryptionConfigs :: S.Set RemoteConfigField
encryptionConfigs = S.fromList (map fst encryptionConfigParser)
encryptionConfigs = S.fromList (map fst encryptionConfigParsers)
-- Parse only encryption fields, ignoring all others.
parseEncryptionConfig :: RemoteConfig -> Either String ParsedRemoteConfig
parseEncryptionConfig c = parseRemoteConfig (M.restrictKeys c encryptionConfigs) encryptionConfigParser
parseEncryptionConfig c = parseRemoteConfig
(M.restrictKeys c encryptionConfigs)
(RemoteConfigParser encryptionConfigParsers False)
parseEncryptionMethod :: Maybe String -> RemoteConfig -> Either String EncryptionMethod
parseEncryptionMethod (Just "none") _ = Right NoneEncryption