"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
lib/readers: return the cache length when RepeatableReader.Seek goes past it
kevin9327337c130c1260
diff --git a/lib/readers/repeatable.go b/lib/readers/repeatable.goindex 73de3fe90..498ca9b18 100644--- a/lib/readers/repeatable.go+++ b/lib/readers/repeatable.go@@ -41,7 +41,7 @@ func (r *RepeatableReader) Seek(offset int64, whence int) (int64, error) {return 0, errors.New("fs.RepeatableReader.Seek: negative position")}if abs > cacheLen {- return offset - (abs - cacheLen), errors.New("fs.RepeatableReader.Seek: offset is unavailable")+ return cacheLen, errors.New("fs.RepeatableReader.Seek: offset is unavailable")}r.i = absreturn abs, nildiff --git a/lib/readers/repeatable_test.go b/lib/readers/repeatable_test.goindex d6a4c560b..73a5e53ae 100644--- a/lib/readers/repeatable_test.go+++ b/lib/readers/repeatable_test.go@@ -98,3 +98,28 @@ func TestRepeatableReader(t *testing.T) {assert.Equal(t, b[2:7], dst)}++func TestRepeatableReaderSeekUnavailableReturnsCacheLength(t *testing.T) {+ r := NewRepeatableReader(bytes.NewBufferString("0123456789abcdef"))+ dst := make([]byte, 10)+ n, err := r.Read(dst)+ require.NoError(t, err)+ require.Equal(t, 10, n)++ // Past the cache from the current position+ _, err = r.Seek(-2, io.SeekCurrent)+ require.NoError(t, err)+ pos, err := r.Seek(5, io.SeekCurrent)+ assert.EqualError(t, err, "fs.RepeatableReader.Seek: offset is unavailable")+ assert.Equal(t, int64(10), pos)++ // Past the cache from the end+ pos, err = r.Seek(5, io.SeekEnd)+ assert.EqualError(t, err, "fs.RepeatableReader.Seek: offset is unavailable")+ assert.Equal(t, int64(10), pos)++ // The read position is unchanged by a failed seek+ pos, err = r.Seek(0, io.SeekCurrent)+ require.NoError(t, err)+ assert.Equal(t, int64(8), pos)+}