Skip to content

Commit

Permalink
webdav: introduce MoveOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
emersion committed Jan 18, 2024
1 parent 790ebfc commit b821d8c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
8 changes: 6 additions & 2 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,18 @@ func (c *Client) Copy(ctx context.Context, name, dest string, options *CopyOptio
}

// Move moves a file.
func (c *Client) Move(ctx context.Context, name, dest string, overwrite bool) error {
func (c *Client) Move(ctx context.Context, name, dest string, options *MoveOptions) error {
if options == nil {
options = new(MoveOptions)
}

req, err := c.ic.NewRequest("MOVE", name, nil)
if err != nil {
return err
}

req.Header.Set("Destination", c.ic.ResolveHref(dest).String())
req.Header.Set("Overwrite", internal.FormatOverwrite(overwrite))
req.Header.Set("Overwrite", internal.FormatOverwrite(!options.NoOverwrite))

resp, err := c.ic.Do(req.WithContext(ctx))
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions fs_local.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (fs LocalFileSystem) Copy(ctx context.Context, src, dst string, options *Co
return created, nil
}

func (fs LocalFileSystem) Move(ctx context.Context, src, dst string, overwrite bool) (created bool, err error) {
func (fs LocalFileSystem) Move(ctx context.Context, src, dst string, options *MoveOptions) (created bool, err error) {
srcPath, err := fs.localPath(src)
if err != nil {
return false, err
Expand All @@ -230,7 +230,7 @@ func (fs LocalFileSystem) Move(ctx context.Context, src, dst string, overwrite b
}
created = true
} else {
if !overwrite {
if options.NoOverwrite {
return false, os.ErrExist
}
if err := os.RemoveAll(dstPath); err != nil {
Expand Down
7 changes: 5 additions & 2 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type FileSystem interface {
RemoveAll(ctx context.Context, name string) error
Mkdir(ctx context.Context, name string) error
Copy(ctx context.Context, name, dest string, options *CopyOptions) (created bool, err error)
Move(ctx context.Context, name, dest string, overwrite bool) (created bool, err error)
Move(ctx context.Context, name, dest string, options *MoveOptions) (created bool, err error)
}

// Handler handles WebDAV HTTP requests. It can be used to create a WebDAV
Expand Down Expand Up @@ -243,7 +243,10 @@ func (b *backend) Copy(r *http.Request, dest *internal.Href, recursive, overwrit
}

func (b *backend) Move(r *http.Request, dest *internal.Href, overwrite bool) (created bool, err error) {
created, err = b.FileSystem.Move(r.Context(), r.URL.Path, dest.Path, overwrite)
options := MoveOptions{
NoOverwrite: !overwrite,
}
created, err = b.FileSystem.Move(r.Context(), r.URL.Path, dest.Path, &options)
if os.IsExist(err) {
return false, &internal.HTTPError{http.StatusPreconditionFailed, err}
}
Expand Down
4 changes: 4 additions & 0 deletions webdav.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ type CopyOptions struct {
NoRecursive bool
NoOverwrite bool
}

type MoveOptions struct {
NoOverwrite bool
}

0 comments on commit b821d8c

Please sign in to comment.