github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-02-01 03:46:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

local: fix unit tests

Browse Source 
* Change log.Printf into fs.Log
  * Re-read metadata on SetModtime
This commit is contained in:
Nick Craig-Wood 2014-07-24 22:51:34 +01:00
parent b013c58537
commit 1660903aa2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
local/local.go
View File

@ -8,7 +8,6 @@ import (
"hash" "hash"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@ -100,12 +99,12 @@ func (f *FsLocal) List() fs.ObjectsChan {
err := filepath.Walk(f.root, func(path string, fi os.FileInfo, err error) error { err := filepath.Walk(f.root, func(path string, fi os.FileInfo, err error) error {
if err != nil { if err != nil {
fs.Stats.Error() fs.Stats.Error()
log.Printf("Failed to open directory: %s: %s", path, err) fs.Log(f, "Failed to open directory: %s: %s", path, err)
} else { } else {
remote, err := filepath.Rel(f.root, path) remote, err := filepath.Rel(f.root, path)
if err != nil { if err != nil {
fs.Stats.Error() fs.Stats.Error()
log.Printf("Failed to get relative path %s: %s", path, err) fs.Log(f, "Failed to get relative path %s: %s", path, err)
return nil return nil
} }
if remote == "." { if remote == "." {
@ -122,7 +121,7 @@ func (f *FsLocal) List() fs.ObjectsChan {
}) })
if err != nil { if err != nil {
fs.Stats.Error() fs.Stats.Error()
log.Printf("Failed to open directory: %s: %s", f.root, err) fs.Log(f, "Failed to open directory: %s: %s", f.root, err)
} }
close(out) close(out)
}() }()
@ -137,7 +136,7 @@ func (f *FsLocal) ListDir() fs.DirChan {
items, err := ioutil.ReadDir(f.root) items, err := ioutil.ReadDir(f.root)
if err != nil { if err != nil {
fs.Stats.Error() fs.Stats.Error()
log.Printf("Couldn't find read directory: %s", err) fs.Log(f, "Couldn't find read directory: %s", err)
} else { } else {
for _, item := range items { for _, item := range items {
if item.IsDir() { if item.IsDir() {
@ -152,7 +151,7 @@ func (f *FsLocal) ListDir() fs.DirChan {
err := filepath.Walk(dirpath, func(path string, fi os.FileInfo, err error) error { err := filepath.Walk(dirpath, func(path string, fi os.FileInfo, err error) error {
if err != nil { if err != nil {
fs.Stats.Error() fs.Stats.Error()
log.Printf("Failed to open directory: %s: %s", path, err) fs.Log(f, "Failed to open directory: %s: %s", path, err)
} else { } else {
dir.Count += 1 dir.Count += 1
dir.Bytes += fi.Size() dir.Bytes += fi.Size()
@ -161,7 +160,7 @@ func (f *FsLocal) ListDir() fs.DirChan {
}) })
if err != nil { if err != nil {
fs.Stats.Error() fs.Stats.Error()
log.Printf("Failed to open directory: %s: %s", dirpath, err) fs.Log(f, "Failed to open directory: %s: %s", dirpath, err)
} }
out <- dir out <- dir
} }
@ -325,6 +324,13 @@ func (o *FsObjectLocal) SetModTime(modTime time.Time) {
err := os.Chtimes(o.path, modTime, modTime) err := os.Chtimes(o.path, modTime, modTime)
if err != nil { if err != nil {
fs.Debug(o, "Failed to set mtime on file: %s", err) fs.Debug(o, "Failed to set mtime on file: %s", err)
return
}
// Re-read metadata
err = o.lstat()
if err != nil {
fs.Debug(o, "Failed to stat: %s", err)
return
} }
} }