diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-13 14:41:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-13 14:41:10 -0400 |
| commit | fa7934c035ff09b46d646353683c6d9745f0c94d (patch) | |
| tree | ccdbbe618762679e9bc2932e8d92bbee86067fd9 /Remote/External | |
| parent | 2d9784fae4ea1830865bc77de1a1c4c1b4ce3714 (diff) | |
add GETAVAILABILITY to external special remote protocol
And some reworking of types, and added an annex-availability git config
setting.
Diffstat (limited to 'Remote/External')
| -rw-r--r-- | Remote/External/Types.hs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Remote/External/Types.hs b/Remote/External/Types.hs index c7085e39a..42c71b760 100644 --- a/Remote/External/Types.hs +++ b/Remote/External/Types.hs @@ -38,6 +38,7 @@ import Utility.Metered (BytesProcessed(..)) import Logs.Transfer (Direction(..)) import Config.Cost (Cost) import Types.Remote (RemoteConfig) +import Types.Availability (Availability(..)) import Data.Char import Control.Concurrent.STM @@ -105,6 +106,7 @@ data Request = PREPARE | INITREMOTE | GETCOST + | GETAVAILABILITY | TRANSFER Direction Key FilePath | CHECKPRESENT Key | REMOVE Key @@ -120,6 +122,7 @@ instance Sendable Request where formatMessage PREPARE = ["PREPARE"] formatMessage INITREMOTE = ["INITREMOTE"] formatMessage GETCOST = ["GETCOST"] + formatMessage GETAVAILABILITY = ["GETAVAILABILITY"] formatMessage (TRANSFER direction key file) = [ "TRANSFER", serialize direction, serialize key, serialize file ] formatMessage (CHECKPRESENT key) = [ "CHECKPRESENT", serialize key ] @@ -137,6 +140,7 @@ data Response | REMOVE_SUCCESS Key | REMOVE_FAILURE Key ErrorMsg | COST Cost + | AVAILABILITY Availability | INITREMOTE_SUCCESS | INITREMOTE_FAILURE ErrorMsg | UNSUPPORTED_REQUEST @@ -153,6 +157,7 @@ instance Receivable Response where parseCommand "REMOVE-SUCCESS" = parse1 REMOVE_SUCCESS parseCommand "REMOVE-FAILURE" = parse2 REMOVE_FAILURE parseCommand "COST" = parse1 COST + parseCommand "AVAILABILITY" = parse1 AVAILABILITY parseCommand "INITREMOTE-SUCCESS" = parse0 INITREMOTE_SUCCESS parseCommand "INITREMOTE-FAILURE" = parse1 INITREMOTE_FAILURE parseCommand "UNSUPPORTED-REQUEST" = parse0 UNSUPPORTED_REQUEST @@ -252,6 +257,14 @@ instance Serializable Cost where serialize = show deserialize = readish +instance Serializable Availability where + serialize GloballyAvailable = "GLOBAL" + serialize LocallyAvailable = "LOCAL" + + deserialize "GLOBAL" = Just GloballyAvailable + deserialize "LOCAL" = Just LocallyAvailable + deserialize _ = Nothing + instance Serializable BytesProcessed where serialize (BytesProcessed n) = show n deserialize = BytesProcessed <$$> readish |