KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

lsd,lsf: make sure all times we output are in local time - fixes #2183

Browse source 
Previous to this change times from lsd/lsf were output in whatever
timezone they were in whereas times from lsl were converted to
localtime.
This commit is contained in:
Nick Craig-Wood 2018-03-30 20:29:15 +01:00
parent e42cee5e02
commit eca99b33c0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/operations/operations.go
View file

@ -915,7 +915,7 @@ func ListDir(f fs.Fs, w io.Writer) error {
} }
entries.ForDir(func(dir fs.Directory) { entries.ForDir(func(dir fs.Directory) {
if dir != nil { if dir != nil {
syncFprintf(w, "%12d %13s %9d %s\n", dir.Size(), dir.ModTime().Format("2006-01-02 15:04:05"), dir.Items(), dir.Remote()) syncFprintf(w, "%12d %13s %9d %s\n", dir.Size(), dir.ModTime().Local().Format("2006-01-02 15:04:05"), dir.Items(), dir.Remote())
} }
}) })
return nil return nil
@ -1080,7 +1080,7 @@ func dedupeInteractive(remote string, objs []fs.Object) {
if err != nil { if err != nil {
md5sum = err.Error() md5sum = err.Error()
} }
fmt.Printf(" %d: %12d bytes, %s, md5sum %32s\n", i+1, o.Size(), o.ModTime().Format("2006-01-02 15:04:05.000000000"), md5sum) fmt.Printf(" %d: %12d bytes, %s, md5sum %32s\n", i+1, o.Size(), o.ModTime().Local().Format("2006-01-02 15:04:05.000000000"), md5sum)
} }
switch config.Command([]string{"sSkip and do nothing", "kKeep just one (choose which in next step)", "rRename all to be different (by changing file.jpg to file-1.jpg)"}) { switch config.Command([]string{"sSkip and do nothing", "kKeep just one (choose which in next step)", "rRename all to be different (by changing file.jpg to file-1.jpg)"}) {
case 's': case 's':
@ -1676,7 +1676,7 @@ func (l *ListFormat) SetOutput(output []func() string) {
// AddModTime adds file's Mod Time to output // AddModTime adds file's Mod Time to output
func (l *ListFormat) AddModTime() { func (l *ListFormat) AddModTime() {
l.AppendOutput(func() string { return l.entry.ModTime().Format("2006-01-02 15:04:05") }) l.AppendOutput(func() string { return l.entry.ModTime().Local().Format("2006-01-02 15:04:05") })
} }
// AddSize adds file's size to output // AddSize adds file's size to output