"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
oracleobjectstorage: upload empty streams without multipart
tomasznie85836d4c792
diff --git a/backend/oracleobjectstorage/object.go b/backend/oracleobjectstorage/object.goindex b26509b78..694c6730c 100644--- a/backend/oracleobjectstorage/object.go+++ b/backend/oracleobjectstorage/object.go@@ -3,6 +3,7 @@package oracleobjectstorageimport (+ "bufio""bytes""context""encoding/base64"@@ -396,6 +397,9 @@ func isZeroLength(streamReader io.Reader) bool {return v.Len() == 0case *strings.Reader:return v.Len() == 0+ case *bufio.Reader:+ _, err := v.Peek(1)+ return err == io.EOFcase *os.File:fi, err := v.Stat()if err != nil {diff --git a/backend/oracleobjectstorage/oracleobjectstorage.go b/backend/oracleobjectstorage/oracleobjectstorage.goindex 06605f5d9..fca233b32 100644--- a/backend/oracleobjectstorage/oracleobjectstorage.go+++ b/backend/oracleobjectstorage/oracleobjectstorage.go@@ -4,6 +4,7 @@package oracleobjectstorageimport (+ "bufio""context""errors""fmt"@@ -565,7 +566,7 @@ func (f *Fs) Put(ctx context.Context, in io.Reader, src fs.ObjectInfo, options .// PutStream uploads to the remote path with the modTime given of indeterminate sizefunc (f *Fs) PutStream(ctx context.Context, in io.Reader, src fs.ObjectInfo, options ...fs.OpenOption) (fs.Object, error) {- return f.Put(ctx, in, src, options...)+ return f.Put(ctx, bufio.NewReader(in), src, options...)}// Mkdir creates the bucket if it doesn't existdiff --git a/backend/oracleobjectstorage/oracleobjectstorage_test.go b/backend/oracleobjectstorage/oracleobjectstorage_test.goindex 899fd3a17..2daab6af0 100644--- a/backend/oracleobjectstorage/oracleobjectstorage_test.go+++ b/backend/oracleobjectstorage/oracleobjectstorage_test.go@@ -3,12 +3,16 @@package oracleobjectstorageimport (+ "bufio""bytes""compress/gzip""context""crypto/md5"+ "errors""fmt""io"+ "os"+ "strings""sync""testing""time"@@ -20,6 +24,7 @@ import ("github.com/rclone/rclone/fstest""github.com/rclone/rclone/fstest/fstests""github.com/rclone/rclone/lib/random"+ "github.com/rclone/rclone/lib/readers""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")@@ -36,6 +41,51 @@ func TestIntegration(t *testing.T) {})}+func TestIsZeroLength(t *testing.T) {+ newFile := func(contents string) *os.File {+ file, err := os.CreateTemp(t.TempDir(), "stream")+ require.NoError(t, err)+ _, err = file.WriteString(contents)+ require.NoError(t, err)+ _, err = file.Seek(0, io.SeekStart)+ require.NoError(t, err)+ t.Cleanup(func() { _ = file.Close() })+ return file+ }+ closedFile := newFile("")+ require.NoError(t, closedFile.Close())++ for _, test := range []struct {+ name string+ in io.Reader+ want bool+ wantContents string+ }{+ {name: "EmptyBuffer", in: bytes.NewBuffer(nil), want: true},+ {name: "NonEmptyBuffer", in: bytes.NewBufferString("contents"), want: false},+ {name: "EmptyBytesReader", in: bytes.NewReader(nil), want: true},+ {name: "NonEmptyBytesReader", in: bytes.NewReader([]byte("contents")), want: false},+ {name: "EmptyStringsReader", in: strings.NewReader(""), want: true},+ {name: "NonEmptyStringsReader", in: strings.NewReader("contents"), want: false},+ {name: "EmptyBufferedStream", in: bufio.NewReader(io.TeeReader(bytes.NewReader(nil), io.Discard)), want: true},+ {name: "NonEmptyBufferedStream", in: bufio.NewReader(io.TeeReader(bytes.NewBufferString("contents"), io.Discard)), want: false, wantContents: "contents"},+ {name: "BufferedStreamError", in: bufio.NewReader(readers.ErrorReader{Err: errors.New("stream error")}), want: false},+ {name: "EmptyFile", in: newFile(""), want: true},+ {name: "NonEmptyFile", in: newFile("contents"), want: false},+ {name: "ClosedFile", in: closedFile, want: false},+ {name: "OpaqueEmptyStream", in: io.TeeReader(bytes.NewReader(nil), io.Discard), want: false},+ } {+ t.Run(test.name, func(t *testing.T) {+ assert.Equal(t, test.want, isZeroLength(test.in))+ if test.wantContents != "" {+ contents, err := io.ReadAll(test.in)+ require.NoError(t, err)+ assert.Equal(t, test.wantContents, string(contents))+ }+ })+ }+}+func gz(t *testing.T, s string) string {var buf bytes.Bufferzw := gzip.NewWriter(&buf)diff --git a/fstest/test_all/config.yaml b/fstest/test_all/config.yamlindex 6f6cd07e8..d53db4eaa 100644--- a/fstest/test_all/config.yaml+++ b/fstest/test_all/config.yaml@@ -644,7 +644,6 @@ backends:remote: "TestOracleObjectStorage:"fastlist: trueignore:- - TestIntegration/FsMkdir/FsPutFiles/FsPutStream/0ignoretests:- cmd/bisync- cmd/gitannex