1
mirror of https://github.com/rclone/rclone synced 2025-03-07 07:49:20 +01:00

Use ObjectsAll and ContainersAll to see everything

This commit is contained in:
Nick Craig-Wood 2012-11-28 23:40:09 +00:00
parent 31745ac13b
commit ba24b84396
2 changed files with 12 additions and 6 deletions

View File

@ -18,3 +18,9 @@ FIXME progress meter would be nice! Do this by wrapping the Reader with a progre
Do bandwidth limit by wrapping the Reader too Do bandwidth limit by wrapping the Reader too
Could have an integrity check mode where we check the MD5sums of the local vs the remote Could have an integrity check mode where we check the MD5sums of the local vs the remote
Some stats would be nice!
Windows paths? Do we need to translate / and \?
Make swift timeouts be settable

View File

@ -43,7 +43,7 @@ type FsObject struct {
type FsObjects []FsObject type FsObjects []FsObject
// Write debuging output for this FsObject // Write debuging output for this FsObject
func (fs *FsObject) Debugf(text string, args... interface{}) { func (fs *FsObject) Debugf(text string, args ...interface{}) {
out := fmt.Sprintf(text, args...) out := fmt.Sprintf(text, args...)
log.Printf("%s: %s", fs.rel, out) log.Printf("%s: %s", fs.rel, out)
} }
@ -100,7 +100,7 @@ func (fs *FsObject) changed(c *swift.Connection, container string) bool {
} else { } else {
fs.Debugf("Size and modification time the same - skipping") fs.Debugf("Size and modification time the same - skipping")
return false return false
} }
// mtime is unreadable or different but size is the same so // mtime is unreadable or different but size is the same so
// check the MD5SUM // check the MD5SUM
@ -123,7 +123,7 @@ func (fs *FsObject) changed(c *swift.Connection, container string) bool {
fs.Debugf("Failed to update mtime: %s", err) fs.Debugf("Failed to update mtime: %s", err)
} }
fs.Debugf("Updated mtime") fs.Debugf("Updated mtime")
fs.Debugf("Size and MD5SUM identical - skipping") fs.Debugf("Size and MD5SUM identical - skipping")
return false return false
} }
@ -231,7 +231,7 @@ func upload(c *swift.Connection, root, container string) {
// Lists the containers // Lists the containers
func listContainers(c *swift.Connection) { func listContainers(c *swift.Connection) {
containers, err := c.Containers(nil) containers, err := c.ContainersAll(nil)
if err != nil { if err != nil {
log.Fatalf("Couldn't list containers: %s", err) log.Fatalf("Couldn't list containers: %s", err)
} }
@ -242,8 +242,8 @@ func listContainers(c *swift.Connection) {
// Lists files in a container // Lists files in a container
func list(c *swift.Connection, container string) { func list(c *swift.Connection, container string) {
//objects, err := c.Objects(container, &swift.ObjectsOpts{Prefix: "", Delimiter: '/'}) //objects, err := c.ObjectsAll(container, &swift.ObjectsOpts{Prefix: "", Delimiter: '/'})
objects, err := c.Objects(container, nil) objects, err := c.ObjectsAll(container, nil)
if err != nil { if err != nil {
log.Fatalf("Couldn't read container %q: %s", container, err) log.Fatalf("Couldn't read container %q: %s", container, err)
} }