oops, 2 datalength headers for put route

This commit is contained in:
Joey Hess 2024-07-11 12:12:33 -04:00
parent 3a55f0eec3
commit 1cff4c9f5b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -510,7 +510,6 @@ type PutAPI result
:> BypassUUIDs :> BypassUUIDs
:> AssociatedFileParam :> AssociatedFileParam
:> OffsetParam :> OffsetParam
:> Header' '[Required] "X-git-annex-data-length" DataLength
:> StreamBody NoFraming OctetStream (SourceIO B.ByteString) :> StreamBody NoFraming OctetStream (SourceIO B.ByteString)
:> Post '[JSON] result :> Post '[JSON] result
@ -526,28 +525,26 @@ servePut
-> [B64UUID Bypass] -> [B64UUID Bypass]
-> Maybe B64FilePath -> Maybe B64FilePath
-> Maybe Offset -> Maybe Offset
-> DataLength
-> S.SourceT IO B.ByteString -> S.SourceT IO B.ByteString
-> Handler t -> Handler t
servePut = undefined -- st resultmangle su apiver datalength k cu bypass af offset servePut = undefined -- st resultmangle su apiver datalength k cu bypass af offset
clientPut clientPut
:: ProtocolVersion :: ProtocolVersion
-> Maybe DataLength -> DataLength
-> B64Key -> B64Key
-> B64UUID ClientSide -> B64UUID ClientSide
-> B64UUID ServerSide -> B64UUID ServerSide
-> [B64UUID Bypass] -> [B64UUID Bypass]
-> Maybe B64FilePath -> Maybe B64FilePath
-> Maybe Offset -> Maybe Offset
-> DataLength
-> S.SourceT IO B.ByteString -> S.SourceT IO B.ByteString
-> ClientM PutResultPlus -> ClientM PutResultPlus
clientPut (ProtocolVersion ver) sz k cu su bypass af o l src = case ver of clientPut (ProtocolVersion ver) sz k cu su bypass af o src = case ver of
3 -> v3 su V3 sz k cu bypass af o l src 3 -> v3 su V3 (Just sz) k cu bypass af o src
2 -> v2 su V2 sz k cu bypass af o l src 2 -> v2 su V2 (Just sz) k cu bypass af o src
1 -> plus <$> v1 su V1 sz k cu bypass af o l src 1 -> plus <$> v1 su V1 (Just sz) k cu bypass af o src
0 -> plus <$> v0 su V0 k cu bypass af o l src 0 -> plus <$> v0 su V0 k cu bypass af o src
_ -> error "unsupported protocol version" _ -> error "unsupported protocol version"
where where
_ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|> _ :<|>