mirror of
https://github.com/octoleo/restic.git
synced 2024-11-26 14:56:29 +00:00
local/sftp: Create dirs on open()
This commit is contained in:
parent
03f66b8d74
commit
9032ab2eec
@ -35,6 +35,14 @@ func Open(cfg Config) (*Local, error) {
|
||||
|
||||
be := &Local{Config: cfg, Layout: l}
|
||||
|
||||
// create paths for data and refs. MkdirAll does nothing if the directory already exists.
|
||||
for _, d := range be.Paths() {
|
||||
err := fs.MkdirAll(d, backend.Modes.Dir)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "MkdirAll")
|
||||
}
|
||||
}
|
||||
|
||||
return be, nil
|
||||
}
|
||||
|
||||
@ -89,26 +97,8 @@ func (b *Local) Save(ctx context.Context, h restic.Handle, rd io.Reader) (err er
|
||||
|
||||
filename := b.Filename(h)
|
||||
|
||||
// create directories if necessary, ignore errors
|
||||
if h.Type == restic.DataFile {
|
||||
err = fs.MkdirAll(filepath.Dir(filename), backend.Modes.Dir)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "MkdirAll")
|
||||
}
|
||||
}
|
||||
|
||||
// create new file
|
||||
f, err := fs.OpenFile(filename, os.O_CREATE|os.O_EXCL|os.O_WRONLY, backend.Modes.File)
|
||||
if os.IsNotExist(errors.Cause(err)) {
|
||||
// create the locks dir, then try again
|
||||
err = fs.MkdirAll(b.Dirname(h), backend.Modes.Dir)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "MkdirAll")
|
||||
}
|
||||
|
||||
return b.Save(ctx, h, rd)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "OpenFile")
|
||||
}
|
||||
|
@ -126,6 +126,15 @@ func Open(cfg Config) (*SFTP, error) {
|
||||
|
||||
debug.Log("layout: %v\n", sftp.Layout)
|
||||
|
||||
// create paths for data and refs. mkdirAll does nothing if the paths already exist.
|
||||
for _, d := range sftp.Paths() {
|
||||
err = sftp.mkdirAll(d, backend.Modes.Dir)
|
||||
debug.Log("mkdirAll %v -> %v", d, err)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
sftp.Config = cfg
|
||||
sftp.p = cfg.Path
|
||||
return sftp, nil
|
||||
|
Loading…
Reference in New Issue
Block a user