Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

WebClient: improve error message when trying to move non-empty folder

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2024-02-18 11:22:41 +01:00
parent 5a319dc64f
commit d92f85d1dd
7 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/vfs/azblobfs.go
View File

@@ -482,7 +482,7 @@ func (*AzureBlobFs) IsNotSupported(err error) bool {
if err == nil {
return false
}
return err == ErrVfsUnsupported
return errors.Is(err, ErrVfsUnsupported)
}
func (*AzureBlobFs) isBadRequestError(err error) bool {
@@ -782,7 +782,7 @@ func (fs *AzureBlobFs) renameInternal(source, target string, fi os.FileInfo, rec
return numFiles, filesSize, err
}
if hasContents {
return numFiles, filesSize, fmt.Errorf("cannot rename non empty directory: %q", source)
return numFiles, filesSize, fmt.Errorf("%w: cannot rename non empty directory: %q", ErrVfsUnsupported, source)
}
}
if err := fs.mkdirInternal(target); err != nil {

5
internal/vfs/gcsfs.go
View File

@@ -19,6 +19,7 @@ package vfs
import (
"context"
"errors"
"fmt"
"io"
"mime"
@@ -448,7 +449,7 @@ func (*GCSFs) IsNotSupported(err error) bool {
if err == nil {
return false
}
return err == ErrVfsUnsupported
return errors.Is(err, ErrVfsUnsupported)
}
// CheckRootPath creates the specified local root directory if it does not exists
@@ -774,7 +775,7 @@ func (fs *GCSFs) renameInternal(source, target string, fi os.FileInfo, recursion
return numFiles, filesSize, err
}
if hasContents {
return numFiles, filesSize, fmt.Errorf("cannot rename non empty directory: %q", source)
return numFiles, filesSize, fmt.Errorf("%w: cannot rename non empty directory: %q", ErrVfsUnsupported, source)
}
}
if err := fs.mkdirInternal(target); err != nil {

4
internal/vfs/s3fs.go
View File

@@ -482,7 +482,7 @@ func (*S3Fs) IsNotSupported(err error) bool {
if err == nil {
return false
}
return err == ErrVfsUnsupported
return errors.Is(err, ErrVfsUnsupported)
}
// CheckRootPath creates the specified local root directory if it does not exists
@@ -700,7 +700,7 @@ func (fs *S3Fs) renameInternal(source, target string, fi os.FileInfo, recursion
return numFiles, filesSize, err
}
if hasContents {
return numFiles, filesSize, fmt.Errorf("cannot rename non empty directory: %q", source)
return numFiles, filesSize, fmt.Errorf("%w: cannot rename non empty directory: %q", ErrVfsUnsupported, source)
}
}
if err := fs.mkdirInternal(target); err != nil {