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

update deps, GCS can no finally use attribute selection

Browse Source 
See https://github.com/googleapis/google-cloud-go/pull/2661
This commit is contained in:
Nicola Murino
2020-09-28 12:51:19 +02:00
parent 13d43a2d31
commit 55515fee95
4 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vfs/gcsfs.go
View File

@@ -26,9 +26,7 @@ import (
)
var (
// we can use fields selection only when we don't need directory-like results
// with folders
gcsDefaultFieldsSelection = []string{"Name", "Size", "Deleted", "Updated"}
gcsDefaultFieldsSelection = []string{"Name", "Size", "Deleted", "Updated", "ContentType"}
)
// GCSFs is a Fs implementation for Google Cloud Storage.
@@ -93,6 +91,10 @@ func (fs GCSFs) Stat(name string) (os.FileInfo, error) {
}
prefix := fs.getPrefixForStat(name)
query := &storage.Query{Prefix: prefix, Delimiter: "/"}
err = query.SetAttrSelection(gcsDefaultFieldsSelection)
if err != nil {
return nil, err
}
ctx, cancelFn := context.WithDeadline(context.Background(), time.Now().Add(fs.ctxTimeout))
defer cancelFn()
bkt := fs.svc.Bucket(fs.config.Bucket)
@@ -323,6 +325,10 @@ func (fs GCSFs) ReadDir(dirname string) ([]os.FileInfo, error) {
}
}
query := &storage.Query{Prefix: prefix, Delimiter: "/"}
err := query.SetAttrSelection(gcsDefaultFieldsSelection)
if err != nil {
return nil, err
}
ctx, cancelFn := context.WithDeadline(context.Background(), time.Now().Add(fs.ctxTimeout))
defer cancelFn()
bkt := fs.svc.Bucket(fs.config.Bucket)