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

Change git annex info remote encryption description to use wording closer to what's used in initremote.

Browse source
This commit is contained in:
Joey Hess 2016-05-11 16:09:39 -04:00
parent 695fa2ea3e
commit 7cacd7888b
Failed to extract signature
3 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Remote/Helper/Encryptable.hs
View file

@ -87,7 +87,7 @@ encryptionSetup c = do
use m a = do
showNote m
cipher <- liftIO a
mapM_ showNote (describeCipher cipher)
showNote (describeCipher cipher)
return (storeCipher cipher c', EncryptionIsSetup)
highRandomQuality =
(&&) (maybe True ( /= "false") $ M.lookup "highRandomQuality" c)
@ -169,24 +169,20 @@ extractCipher c = case (M.lookup "cipher" c,
describeEncryption :: RemoteConfig -> String
describeEncryption c = case extractCipher c of
Nothing -> "not encrypted"
Just cip -> "encrypted " ++ unwords (map paren (describeCipher cip))
where
paren s = "(" ++ s ++ ")"
Nothing -> "none"
Just cip -> nameCipher cip ++ " (" ++ describeCipher cip ++ ")"
describeCipher :: StorableCipher -> [String]
nameCipher :: StorableCipher -> String
nameCipher (SharedCipher _) = "shared"
nameCipher (EncryptedCipher _ PubKey _) = "pubkey"
nameCipher (EncryptedCipher _ Hybrid _) = "hybrid"
nameCipher (SharedPubKeyCipher _ _) = "sharedpubkey"
describeCipher :: StorableCipher -> String
describeCipher c = case c of
(SharedCipher _) -> ["encryption key stored in git repository"]
(EncryptedCipher _ v ks) -> catMaybes
[ Just $ showkeys ks
, case v of
PubKey -> Nothing
Hybrid -> Just "hybrid mode"
]
(SharedPubKeyCipher _ ks) ->
[ showkeys ks
, "shared cipher"
]
(SharedCipher _) -> "encryption key stored in git repository"
(EncryptedCipher _ _ ks) -> showkeys ks
(SharedPubKeyCipher _ ks) -> showkeys ks
where
showkeys (KeyIds { keyIds = ks }) = "to gpg keys: " ++ unwords ks