ipfs: all - retain ReadDir errors across calls

Author: djdv

internal/filesystem/ipfs/ipfs.go

@@ -44,6 +44,7 @@ type (
 	ipfsDirectory struct {
 		stream *entryStream
 		info   *nodeInfo
+		err    error
 		cid    cid.Cid
 	}
 )
@@ -483,6 +484,9 @@ func (id *ipfsDirectory) StreamDir() <-chan filesystem.StreamDirEntry {
 
 func (id *ipfsDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	const op = "ipfsDirectory.ReadDir"
+	if err := id.err; err != nil {
+		return nil, err
+	}
 	stream := id.stream
 	if stream == nil {
 		// TODO: We don't have an error kind
@@ -497,6 +501,7 @@ func (id *ipfsDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	if err != nil {
 		stream.ch = nil
 		err = readdirErr(op, id.info.name, err)
+		id.err = err
 	}
 	return entries, err
 }

internal/filesystem/ipfs/keyfs.go

@@ -26,6 +26,7 @@ type (
 	keyDirectory struct {
 		ipns   fs.FS
 		stream *entryStream
+		err    error
 		mode   fs.FileMode
 	}
 	keyDirEntry struct {
@@ -186,6 +187,9 @@ func (kd *keyDirectory) Sys() any           { return kd }
 
 func (kd *keyDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	const op = "keyDirectory.ReadDir"
+	if err := kd.err; err != nil {
+		return nil, err
+	}
 	stream := kd.stream
 	if stream == nil {
 		return nil, fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)
@@ -201,6 +205,7 @@ func (kd *keyDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	if err != nil {
 		stream.ch = nil
 		err = readdirErr(op, filesystem.Root, err)
+		kd.err = err
 	}
 	return ents, err
 }

internal/filesystem/ipfs/pinfs.go

@@ -36,6 +36,7 @@ type (
 	pinDirectory struct {
 		*pinShared
 		stream *entryStream
+		err    error
 	}
 	pinDirEntry struct {
 		coreiface.Pin
@@ -277,6 +278,9 @@ func (*pinDirectory) Read([]byte) (int, error) {
 
 func (pd *pinDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	const op = "pinDirectory.ReadDir"
+	if err := pd.err; err != nil {
+		return nil, err
+	}
 	stream := pd.stream
 	if stream == nil {
 		// TODO: We don't have an error kind
@@ -291,6 +295,7 @@ func (pd *pinDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	if err != nil {
 		stream.ch = nil
 		err = readdirErr(op, filesystem.Root, err)
+		pd.err = err
 	}
 	return entries, err
 }