ipfs: use standard fs error values

djdv · djdv · commit 31a5c6aefaea · 2024-02-03T13:59:45.000-05:00
diff --git a/internal/filesystem/ipfs/ipfs.go b/internal/filesystem/ipfs/ipfs.go
@@ -319,7 +319,7 @@ func (fsys *IPFS) Open(name string) (fs.File, error) {
 	}
 	const op = "open"
 	if !fs.ValidPath(name) {
-		return nil, fserrors.New(op, name, filesystem.ErrPath, fserrors.InvalidItem)
+		return nil, fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)
 	}
 	cid, err := fsys.toCID(op, name)
 	if err != nil {
@@ -482,7 +482,7 @@ func (id *ipfsDirectory) StreamDir() <-chan filesystem.StreamDirEntry {
 		// TODO: We don't have an error kind
 		// that translates into EBADF
 		errs <- newErrorEntry(
-			fserrors.New(op, id.info.name, filesystem.ErrNotOpen, fserrors.IO),
+			fserrors.New(op, id.info.name, fs.ErrClosed, fserrors.IO),
 		)
 		return errs
 	}
@@ -498,7 +498,7 @@ func (id *ipfsDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	if stream == nil {
 		// TODO: We don't have an error kind
 		// that translates into EBADF
-		return nil, fserrors.New(op, id.info.name, filesystem.ErrNotOpen, fserrors.IO)
+		return nil, fserrors.New(op, id.info.name, fs.ErrClosed, fserrors.IO)
 	}
 	var (
 		ctx       = stream.Context
@@ -519,5 +519,5 @@ func (id *ipfsDirectory) Close() error {
 		id.stream = nil
 		return nil
 	}
-	return fserrors.New(op, id.info.name, filesystem.ErrNotOpen, fserrors.InvalidItem)
+	return fserrors.New(op, id.info.name, fs.ErrClosed, fserrors.InvalidItem)
 }
diff --git a/internal/filesystem/ipfs/ipns.go b/internal/filesystem/ipfs/ipns.go
@@ -257,7 +257,7 @@ func (fsys *IPNS) Open(name string) (fs.File, error) {
 	}
 	const op = "open"
 	if !fs.ValidPath(name) {
-		return nil, fserrors.New(op, name, filesystem.ErrPath, fserrors.InvalidItem)
+		return nil, fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)
 	}
 	cid, err := fsys.toCID(op, name)
 	if err != nil {
diff --git a/internal/filesystem/ipfs/keyfs.go b/internal/filesystem/ipfs/keyfs.go
@@ -112,7 +112,7 @@ func (kfs *KeyFS) Stat(name string) (fs.FileInfo, error) {
 	if subsys := kfs.ipns; subsys != nil {
 		return fs.Stat(subsys, name)
 	}
-	return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)
+	return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)
 }
 
 func (kfs *KeyFS) Open(name string) (fs.File, error) {
@@ -131,7 +131,7 @@ func (kfs *KeyFS) Open(name string) (fs.File, error) {
 	if subsys := kfs.ipns; subsys != nil {
 		return subsys.Open(translated)
 	}
-	return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)
+	return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)
 }
 
 func (kfs *KeyFS) openRoot() (fs.ReadDirFile, error) {
@@ -192,7 +192,7 @@ func (kd *keyDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	}
 	stream := kd.stream
 	if stream == nil {
-		return nil, fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)
+		return nil, fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO)
 	}
 	var (
 		ctx     = stream.Context
@@ -216,7 +216,7 @@ func (kd *keyDirectory) Close() error {
 		kd.stream = nil
 		return nil
 	}
-	return fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.InvalidItem)
+	return fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.InvalidItem)
 }
 
 func pathWithoutNamespace(key coreiface.Key) string {
diff --git a/internal/filesystem/ipfs/pinfs.go b/internal/filesystem/ipfs/pinfs.go
@@ -129,7 +129,7 @@ func (pfs *PinFS) Stat(name string) (fs.FileInfo, error) {
 	if subsys := pfs.ipfs; subsys != nil {
 		return fs.Stat(subsys, name)
 	}
-	return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)
+	return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)
 }
 
 func (pfs *PinFS) Open(name string) (fs.File, error) {
@@ -140,7 +140,7 @@ func (pfs *PinFS) Open(name string) (fs.File, error) {
 	if subsys := pfs.ipfs; subsys != nil {
 		return subsys.Open(name)
 	}
-	return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)
+	return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)
 }
 
 func (pfs *PinFS) openRoot() (fs.ReadDirFile, error) {
@@ -285,7 +285,7 @@ func (pd *pinDirectory) ReadDir(count int) ([]fs.DirEntry, error) {
 	if stream == nil {
 		// TODO: We don't have an error kind
 		// that translates into EBADF
-		return nil, fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)
+		return nil, fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO)
 	}
 	var (
 		ctx       = stream.Context
@@ -307,7 +307,7 @@ func (pd *pinDirectory) StreamDir() <-chan filesystem.StreamDirEntry {
 		// TODO: We don't have an error kind
 		// that translates into EBADF
 		errs <- newErrorEntry(
-			fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO),
+			fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO),
 		)
 		return errs
 	}
@@ -323,7 +323,7 @@ func (pd *pinDirectory) Close() error {
 	}
 	// TODO: We don't have an error kind
 	// that translates into EBADF
-	return fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)
+	return fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO)
 }
 
 func (pe *pinDirEntry) Name() string {

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ func (fsys *IPFS) Open(name string) (fs.File, error) {`
`319`	`319`	`}`
`320`	`320`	`const op = "open"`
`321`	`321`	`if !fs.ValidPath(name) {`
`322`		`- return nil, fserrors.New(op, name, filesystem.ErrPath, fserrors.InvalidItem)`
	`322`	`+ return nil, fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)`
`323`	`323`	`}`
`324`	`324`	`cid, err := fsys.toCID(op, name)`
`325`	`325`	`if err != nil {`
`@@ -482,7 +482,7 @@ func (id *ipfsDirectory) StreamDir() <-chan filesystem.StreamDirEntry {`
`482`	`482`	`// TODO: We don't have an error kind`
`483`	`483`	`// that translates into EBADF`
`484`	`484`	`errs <- newErrorEntry(`
`485`		`- fserrors.New(op, id.info.name, filesystem.ErrNotOpen, fserrors.IO),`
	`485`	`+ fserrors.New(op, id.info.name, fs.ErrClosed, fserrors.IO),`
`486`	`486`	`)`
`487`	`487`	`return errs`
`488`	`488`	`}`
`@@ -498,7 +498,7 @@ func (id *ipfsDirectory) ReadDir(count int) ([]fs.DirEntry, error) {`
`498`	`498`	`if stream == nil {`
`499`	`499`	`// TODO: We don't have an error kind`
`500`	`500`	`// that translates into EBADF`
`501`		`- return nil, fserrors.New(op, id.info.name, filesystem.ErrNotOpen, fserrors.IO)`
	`501`	`+ return nil, fserrors.New(op, id.info.name, fs.ErrClosed, fserrors.IO)`
`502`	`502`	`}`
`503`	`503`	`var (`
`504`	`504`	`ctx = stream.Context`
`@@ -519,5 +519,5 @@ func (id *ipfsDirectory) Close() error {`
`519`	`519`	`id.stream = nil`
`520`	`520`	`return nil`
`521`	`521`	`}`
`522`		`- return fserrors.New(op, id.info.name, filesystem.ErrNotOpen, fserrors.InvalidItem)`
	`522`	`+ return fserrors.New(op, id.info.name, fs.ErrClosed, fserrors.InvalidItem)`
`523`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ func (fsys *IPNS) Open(name string) (fs.File, error) {`
`257`	`257`	`}`
`258`	`258`	`const op = "open"`
`259`	`259`	`if !fs.ValidPath(name) {`
`260`		`- return nil, fserrors.New(op, name, filesystem.ErrPath, fserrors.InvalidItem)`
	`260`	`+ return nil, fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)`
`261`	`261`	`}`
`262`	`262`	`cid, err := fsys.toCID(op, name)`
`263`	`263`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (kfs *KeyFS) Stat(name string) (fs.FileInfo, error) {`
`112`	`112`	`if subsys := kfs.ipns; subsys != nil {`
`113`	`113`	`return fs.Stat(subsys, name)`
`114`	`114`	`}`
`115`		`- return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)`
	`115`	`+ return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`func (kfs *KeyFS) Open(name string) (fs.File, error) {`
`@@ -131,7 +131,7 @@ func (kfs *KeyFS) Open(name string) (fs.File, error) {`
`131`	`131`	`if subsys := kfs.ipns; subsys != nil {`
`132`	`132`	`return subsys.Open(translated)`
`133`	`133`	`}`
`134`		`- return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)`
	`134`	`+ return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`func (kfs *KeyFS) openRoot() (fs.ReadDirFile, error) {`
`@@ -192,7 +192,7 @@ func (kd *keyDirectory) ReadDir(count int) ([]fs.DirEntry, error) {`
`192`	`192`	`}`
`193`	`193`	`stream := kd.stream`
`194`	`194`	`if stream == nil {`
`195`		`- return nil, fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)`
	`195`	`+ return nil, fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO)`
`196`	`196`	`}`
`197`	`197`	`var (`
`198`	`198`	`ctx = stream.Context`
`@@ -216,7 +216,7 @@ func (kd *keyDirectory) Close() error {`
`216`	`216`	`kd.stream = nil`
`217`	`217`	`return nil`
`218`	`218`	`}`
`219`		`- return fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.InvalidItem)`
	`219`	`+ return fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.InvalidItem)`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`func pathWithoutNamespace(key coreiface.Key) string {`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func (pfs *PinFS) Stat(name string) (fs.FileInfo, error) {`
`129`	`129`	`if subsys := pfs.ipfs; subsys != nil {`
`130`	`130`	`return fs.Stat(subsys, name)`
`131`	`131`	`}`
`132`		`- return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)`
	`132`	`+ return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`func (pfs *PinFS) Open(name string) (fs.File, error) {`
`@@ -140,7 +140,7 @@ func (pfs *PinFS) Open(name string) (fs.File, error) {`
`140`	`140`	`if subsys := pfs.ipfs; subsys != nil {`
`141`	`141`	`return subsys.Open(name)`
`142`	`142`	`}`
`143`		`- return nil, fserrors.New(op, name, filesystem.ErrNotFound, fserrors.NotExist)`
	`143`	`+ return nil, fserrors.New(op, name, fs.ErrNotExist, fserrors.NotExist)`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`func (pfs *PinFS) openRoot() (fs.ReadDirFile, error) {`
`@@ -285,7 +285,7 @@ func (pd *pinDirectory) ReadDir(count int) ([]fs.DirEntry, error) {`
`285`	`285`	`if stream == nil {`
`286`	`286`	`// TODO: We don't have an error kind`
`287`	`287`	`// that translates into EBADF`
`288`		`- return nil, fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)`
	`288`	`+ return nil, fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO)`
`289`	`289`	`}`
`290`	`290`	`var (`
`291`	`291`	`ctx = stream.Context`
`@@ -307,7 +307,7 @@ func (pd *pinDirectory) StreamDir() <-chan filesystem.StreamDirEntry {`
`307`	`307`	`// TODO: We don't have an error kind`
`308`	`308`	`// that translates into EBADF`
`309`	`309`	`errs <- newErrorEntry(`
`310`		`- fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO),`
	`310`	`+ fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO),`
`311`	`311`	`)`
`312`	`312`	`return errs`
`313`	`313`	`}`
`@@ -323,7 +323,7 @@ func (pd *pinDirectory) Close() error {`
`323`	`323`	`}`
`324`	`324`	`// TODO: We don't have an error kind`
`325`	`325`	`// that translates into EBADF`
`326`		`- return fserrors.New(op, filesystem.Root, filesystem.ErrNotOpen, fserrors.IO)`
	`326`	`+ return fserrors.New(op, filesystem.Root, fs.ErrClosed, fserrors.IO)`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`func (pe *pinDirEntry) Name() string {`