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

hubic: don't check the container exists before creating it

Browse source 
This fixes being able to create containers for Hubic.
This commit is contained in:
Nick Craig-Wood 2017-08-30 15:54:49 +01:00
parent 672c410235
commit e96c5b5f39
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hubic/hubic.go
View file

@ -165,7 +165,7 @@ func NewFs(name, root string) (fs.Fs, error) {
} }
// Make inner swift Fs from the connection // Make inner swift Fs from the connection
swiftFs, err := swift.NewFsWithConnection(name, root, c) swiftFs, err := swift.NewFsWithConnection(name, root, c, true)
if err != nil && err != fs.ErrorIsFile { if err != nil && err != fs.ErrorIsFile {
return nil, err return nil, err
} }

16
swift/swift.go
View file

@ -121,6 +121,7 @@ type Fs struct {
containerOKMu sync.Mutex // mutex to protect container OK containerOKMu sync.Mutex // mutex to protect container OK
containerOK bool // true if we have created the container containerOK bool // true if we have created the container
segmentsContainer string // container to store the segments (if any) in segmentsContainer string // container to store the segments (if any) in
noCheckContainer bool // don't check the container before creating it
} }
// Object describes a swift object // Object describes a swift object
@ -215,8 +216,11 @@ func swiftConnection(name string) (*swift.Connection, error) {
} }
// NewFsWithConnection contstructs an Fs from the path, container:path // NewFsWithConnection contstructs an Fs from the path, container:path
// and authenticated connection // and authenticated connection.
func NewFsWithConnection(name, root string, c *swift.Connection) (fs.Fs, error) { //
// if noCheckContainer is set then the Fs won't check the container
// exists before creating it.
func NewFsWithConnection(name, root string, c *swift.Connection, noCheckContainer bool) (fs.Fs, error) {
container, directory, err := parsePath(root) container, directory, err := parsePath(root)
if err != nil { if err != nil {
return nil, err return nil, err
@ -227,6 +231,7 @@ func NewFsWithConnection(name, root string, c *swift.Connection) (fs.Fs, error)
container: container, container: container,
segmentsContainer: container + "_segments", segmentsContainer: container + "_segments",
root: directory, root: directory,
noCheckContainer: noCheckContainer,
} }
f.features = (&fs.Features{ f.features = (&fs.Features{
ReadMimeType: true, ReadMimeType: true,
@ -263,7 +268,7 @@ func NewFs(name, root string) (fs.Fs, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewFsWithConnection(name, root, c) return NewFsWithConnection(name, root, c, false)
} }
// Return an Object from a path // Return an Object from a path
@ -480,7 +485,10 @@ func (f *Fs) Mkdir(dir string) error {
return nil return nil
} }
// Check to see if container exists first // Check to see if container exists first
_, _, err := f.c.Container(f.container) var err error = swift.ContainerNotFound
if !f.noCheckContainer {
_, _, err = f.c.Container(f.container)
}
if err == swift.ContainerNotFound { if err == swift.ContainerNotFound {
err = f.c.ContainerCreate(f.container, nil) err = f.c.ContainerCreate(f.container, nil)
} }