mirror of
https://github.com/rclone/rclone.git
synced 2025-02-02 11:39:33 +01:00
lib/readers: add NewContextReader to error on context errors
This commit is contained in:
parent
9dd39e8524
commit
8c5c91e68f
28
lib/readers/context.go
Normal file
28
lib/readers/context.go
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
package readers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewContextReader creates a reader, that returns any errors that ctx gives
|
||||||
|
func NewContextReader(ctx context.Context, r io.Reader) io.Reader {
|
||||||
|
return &contextReader{
|
||||||
|
ctx: ctx,
|
||||||
|
r: r,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type contextReader struct {
|
||||||
|
ctx context.Context
|
||||||
|
r io.Reader
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read bytes as per io.Reader interface
|
||||||
|
func (cr *contextReader) Read(p []byte) (n int, err error) {
|
||||||
|
err = cr.ctx.Err()
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return cr.r.Read(p)
|
||||||
|
}
|
28
lib/readers/context_test.go
Normal file
28
lib/readers/context_test.go
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
package readers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestContextReader(t *testing.T) {
|
||||||
|
r := NewPatternReader(100)
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cr := NewContextReader(ctx, r)
|
||||||
|
|
||||||
|
var buf = make([]byte, 3)
|
||||||
|
|
||||||
|
n, err := cr.Read(buf)
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, 3, n)
|
||||||
|
assert.Equal(t, []byte{0, 1, 2}, buf)
|
||||||
|
|
||||||
|
cancel()
|
||||||
|
|
||||||
|
n, err = cr.Read(buf)
|
||||||
|
assert.Equal(t, context.Canceled, err)
|
||||||
|
assert.Equal(t, 0, n)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user