go/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-13 20:38:12 +02:00
Code Issues Releases Activity

Add synchronization to list output to stop corruptions - fixes #29

Browse Source
This commit is contained in:
Nick Craig-Wood 2015-02-28 15:30:40 +00:00
parent aa093e991e
commit 2360bf907a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/operations.go
View File

@ -436,6 +436,16 @@ func ListFn(f Fs, fn func(Object)) error {
return nil return nil
} }
// mutex for synchronized output
var outMutex sync.Mutex
// Synchronized fmt.Fprintf
func syncFprintf(w io.Writer, format string, a ...interface{}) (n int, err error) {
outMutex.Lock()
defer outMutex.Unlock()
return fmt.Fprintf(w, format, a...)
}
// List the Fs to stdout // List the Fs to stdout
// //
// Shows size and path // Shows size and path
@ -443,7 +453,7 @@ func ListFn(f Fs, fn func(Object)) error {
// Lists in parallel which may get them out of order // Lists in parallel which may get them out of order
func List(f Fs, w io.Writer) error { func List(f Fs, w io.Writer) error {
return ListFn(f, func(o Object) { return ListFn(f, func(o Object) {
fmt.Fprintf(w, "%9d %s\n", o.Size(), o.Remote()) syncFprintf(w, "%9d %s\n", o.Size(), o.Remote())
}) })
} }
@ -457,7 +467,7 @@ func ListLong(f Fs, w io.Writer) error {
Stats.Checking(o) Stats.Checking(o)
modTime := o.ModTime() modTime := o.ModTime()
Stats.DoneChecking(o) Stats.DoneChecking(o)
fmt.Fprintf(w, "%9d %s %s\n", o.Size(), modTime.Format("2006-01-02 15:04:05.000000000"), o.Remote()) syncFprintf(w, "%9d %s %s\n", o.Size(), modTime.Format("2006-01-02 15:04:05.000000000"), o.Remote())
}) })
} }
@ -475,14 +485,14 @@ func Md5sum(f Fs, w io.Writer) error {
Debug(o, "Failed to read MD5: %v", err) Debug(o, "Failed to read MD5: %v", err)
md5sum = "UNKNOWN" md5sum = "UNKNOWN"
} }
fmt.Fprintf(w, "%32s %s\n", md5sum, o.Remote()) syncFprintf(w, "%32s %s\n", md5sum, o.Remote())
}) })
} }
// List the directories/buckets/containers in the Fs to stdout // List the directories/buckets/containers in the Fs to stdout
func ListDir(f Fs, w io.Writer) error { func ListDir(f Fs, w io.Writer) error {
for dir := range f.ListDir() { for dir := range f.ListDir() {
fmt.Fprintf(w, "%12d %13s %9d %s\n", dir.Bytes, dir.When.Format("2006-01-02 15:04:05"), dir.Count, dir.Name) syncFprintf(w, "%12d %13s %9d %s\n", dir.Bytes, dir.When.Format("2006-01-02 15:04:05"), dir.Count, dir.Name)
} }
return nil return nil
} }