Skip to content

Update s3fs.go #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fdefilippo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update s3fs.go #2086

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion internal/vfs/s3fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,28 @@ func init() {
version.AddFeature("+s3")
}

func getLocalTimeFromPointer(t *time.Time) time.Time {
if t == nil {
return time.Time{}
}

originalTime := *t

// 1. UTC.
utcTime := originalTime.In(time.UTC)

// 2. Local.
loc, err := time.LoadLocation("Local")
if err != nil {
return utcTime
}

// 3. Convert
localTime := utcTime.In(loc)

return localTime
}

// NewS3Fs returns an S3Fs object that allows to interact with an s3 compatible
// object storage
func NewS3Fs(connectionID, localTempDir, mountPath string, s3Config S3FsConfig) (Fs, error) {
Expand Down Expand Up @@ -1288,7 +1310,7 @@ func (l *s3DirLister) Next(limit int) ([]os.FileInfo, error) {
l.prefixes[name] = true
}
for _, fileObject := range page.Contents {
objectModTime := util.GetTimeFromPointer(fileObject.LastModified)
objectModTime := getLocalTimeFromPointer(fileObject.LastModified)
objectSize := util.GetIntFromPointer(fileObject.Size)
name, isDir := l.resolve(fileObject.Key)
if name == "" || name == "/" {
Expand Down