From 97044f91c3d3f36bab9db5d9b38dff6a9fe26305 Mon Sep 17 00:00:00 2001 From: risk danger olson Date: Fri, 22 Jul 2016 09:37:40 -0600 Subject: [PATCH] dont send any transfers if the client only wants to use 'basic' --- api/api.go | 6 ++++++ transfer/transfer.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/api.go b/api/api.go index c5873a8d..d9bafc95 100644 --- a/api/api.go +++ b/api/api.go @@ -54,6 +54,12 @@ func Batch(objects []*ObjectResource, operation string, transferAdapters []strin return nil, "", nil } + // Compatibility; omit transfers list when only basic + // older schemas included `additionalproperties=false` + if len(transferAdapters) == 1 && transferAdapters[0] == "basic" { + transferAdapters = nil + } + o := &batchRequest{Operation: operation, Objects: objects, TransferAdapterNames: transferAdapters} by, err := json.Marshal(o) if err != nil { diff --git a/transfer/transfer.go b/transfer/transfer.go index e32427de..d31d22cf 100644 --- a/transfer/transfer.go +++ b/transfer/transfer.go @@ -108,7 +108,7 @@ func GetAdapterNames(dir Direction) []string { func GetDownloadAdapterNames() []string { if config.Config.BasicTransfersOnly() { - return nil + return []string{BasicAdapterName} } initCoreAdaptersIfRequired() @@ -127,7 +127,7 @@ func GetDownloadAdapterNames() []string { func GetUploadAdapterNames() []string { if config.Config.BasicTransfersOnly() { - return nil + return []string{BasicAdapterName} } initCoreAdaptersIfRequired()