diff options
Diffstat (limited to 'fs.go')
| -rw-r--r-- | fs.go | 33 |
1 files changed, 9 insertions, 24 deletions
@@ -140,7 +140,7 @@ func (fs *Fs) Remove(name string) error { defer cancel() err := fs.client.RemoveObject(ctx, fs.bucket, name, minio.RemoveObjectOptions{}) if err != nil { - return transformError(err) + return fromErrorResponse(err) } return nil } @@ -158,7 +158,7 @@ func (fs *Fs) RemoveAll(path string) error { errc := fs.client.RemoveObjects(ctx, fs.bucket, objectsCh, minio.RemoveObjectsOptions{}) for err := range errc { if err.Err != nil { - return transformError(err.Err) + return fromErrorResponse(err.Err) } } return nil @@ -173,11 +173,11 @@ func (fs *Fs) Rename(oldname, newname string) error { minio.CopyDestOptions{Bucket: fs.bucket, Object: newname}, minio.CopySrcOptions{Bucket: fs.bucket, Object: oldname}) if err != nil { - return transformError(err) + return fromErrorResponse(err) } err = fs.client.RemoveObject(ctx, fs.bucket, oldname, minio.RemoveObjectOptions{}) if err != nil { - return transformError(err) + return fromErrorResponse(err) } return nil @@ -190,9 +190,9 @@ func (fs *Fs) Stat(name string) (os.FileInfo, error) { defer cancel() info, err := fs.client.StatObject(ctx, fs.bucket, name, minio.GetObjectOptions{}) if err != nil { - return nil, transformError(err) + return nil, fromErrorResponse(err) } - return transformObjectInfo(info), nil + return fromObjectInfo(info), nil } // Chmod changes the mode of the named file to mode. @@ -219,7 +219,7 @@ func (fs *Fs) newObjectReader(key string) (io.ReadSeekCloser, context.CancelFunc obj, err := fs.client.GetObject(ctx, fs.bucket, key, minio.GetObjectOptions{}) if err != nil { cancel() - return nil, nil, transformError(err) + return nil, nil, fromErrorResponse(err) } return obj, cancel, nil } @@ -236,7 +236,7 @@ func (fs *Fs) newObjectWriter(key string) (io.WriteCloser, context.CancelFunc, < return } _, err = fs.client.PutObject(ctx, fs.bucket, key, bytes.NewReader(b), int64(len(b)), minio.PutObjectOptions{}) - errc <- transformError(err) + errc <- fromErrorResponse(err) }() return w, cancel, errc @@ -259,7 +259,7 @@ func (fs *Fs) readdir(directory string, count int, onlyDir bool) ([]os.FileInfo, if onlyDir && !isDirPath(objectInfo.Key) { continue } - results = append(results, transformObjectInfo(objectInfo)) + results = append(results, fromObjectInfo(objectInfo)) n += 1 if n > maxcount { break @@ -269,21 +269,6 @@ func (fs *Fs) readdir(directory string, count int, onlyDir bool) ([]os.FileInfo, return results, nil } -func transformError(err error) error { - resp, ok := err.(minio.ErrorResponse) - if !ok { - return err - } - - switch resp.Code { - case "NoSuchKey": - return afero.ErrFileNotFound - case "EntityTooLarge": - return afero.ErrTooLarge - } - return err -} - func isDirPath(p string) bool { return strings.HasSuffix(p, "/") } |