rename RemoteConfigKey to RemoteConfigField

And some associated renames.
I was going to have some values named fooKeyKey otherwise..
This commit is contained in:
Joey Hess 2019-10-10 15:31:10 -04:00
parent d1130ea04a
commit 59908586f4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
11 changed files with 39 additions and 39 deletions

View file

@ -8,30 +8,30 @@
module Annex.SpecialRemote.Config where
import Common
import Types.Remote (RemoteConfigKey, RemoteConfig)
import Types.Remote (RemoteConfigField, RemoteConfig)
import qualified Data.Map as M
{- The name of a configured remote is stored in its config using this key. -}
nameKey :: RemoteConfigKey
nameKey = "name"
nameField :: RemoteConfigField
nameField = "name"
{- The name of a sameas remote is stored using this key instead.
- This prevents old versions of git-annex getting confused. -}
sameasNameKey :: RemoteConfigKey
sameasNameKey = "sameas-name"
sameasNameField :: RemoteConfigField
sameasNameField = "sameas-name"
lookupName :: RemoteConfig -> Maybe String
lookupName c = M.lookup nameKey c <|> M.lookup sameasNameKey c
lookupName c = M.lookup nameField c <|> M.lookup sameasNameField c
{- The uuid that a sameas remote is the same as is stored in this key. -}
sameasUUIDKey :: RemoteConfigKey
sameasUUIDKey = "sameas-uuid"
sameasUUIDField :: RemoteConfigField
sameasUUIDField = "sameas-uuid"
{- The type of a remote is stored in its config using this key. -}
typeKey :: RemoteConfigKey
typeKey = "type"
typeField :: RemoteConfigField
typeField = "type"
autoEnableKey :: RemoteConfigKey
autoEnableKey = "autoenable"
autoEnableField :: RemoteConfigField
autoEnableField = "autoenable"