beenull/sftpgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle empty directories with mimetype

Browse source 
Signed-off-by: Amir.h Yeganemehr <yeganemehr@jeyserver.com>
This commit is contained in:
Amir.h Yeganemehr 2022-11-13 01:48:40 +03:30 committed by Nicola Murino
parent 5a222807b7
commit 6591769a07
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/vfs/s3fs.go
View file

@ -159,8 +159,10 @@ func (fs *S3Fs) Stat(name string) (os.FileInfo, error) {
}
obj, err := fs.headObject(name)
if err == nil {
// a "dir" has a trailing "/" so we cannot have a directory here
return updateFileInfoModTime(fs.getStorageID(), name, NewFileInfo(name, false, obj.ContentLength,
// Some s3 providers (like seaweedfs) do not support traling '/' in object key.
// So We have to check Content-type of the object and detect that the object whether is an empty directory or an ordinary object.
isDir := util.GetStringFromPointer(obj.ContentType) == s3DirMimeType
return updateFileInfoModTime(fs.getStorageID(), name, NewFileInfo(name, isDir, obj.ContentLength,
util.GetTimeFromPointer(obj.LastModified), false))
}
if !fs.IsNotExist(err) {