shoopea/gowebdav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor copymove

Browse Source
This commit is contained in:
Christoph Polcin 2014-10-27 16:27:57 +01:00
parent b947e819ed
commit f03693b770
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
requests.go
View File

@ -71,7 +71,7 @@ func (c *Client) propfind(path string, self bool, body string, resp interface{},
return parseXML(rs.Body, resp, parse) return parseXML(rs.Body, resp, parse)
} }
func (c *Client) copymove(method string, oldpath string, newpath string, overwrite bool) error { func (c *Client) doCopyMove(method string, oldpath string, newpath string, overwrite bool) (int, io.ReadCloser) {
rs, err := c.req(method, oldpath, nil, func(rq *http.Request) { rs, err := c.req(method, oldpath, nil, func(rq *http.Request) {
rq.Header.Add("Destination", Join(c.root, newpath)) rq.Header.Add("Destination", Join(c.root, newpath))
if overwrite { if overwrite {
@ -81,24 +81,30 @@ func (c *Client) copymove(method string, oldpath string, newpath string, overwri
} }
}) })
if err != nil { if err != nil {
return newPathErrorErr(method, oldpath, err) return 400, nil
}
return rs.StatusCode, rs.Body
} }
defer rs.Body.Close()
// TODO handle result outside ... func (c *Client) copymove(method string, oldpath string, newpath string, overwrite bool) error {
switch rs.StatusCode { s, data := c.doCopyMove(method, oldpath, newpath, overwrite)
if data != nil {
defer data.Close()
}
switch s {
case 201, 204: case 201, 204:
return nil return nil
case 207: case 207:
// TODO handle multistat errors, worst case ... // TODO handle multistat errors, worst case ...
log(String(rs.Body)) log(fmt.Sprintf(" TODO handle %s - %s multistatus result %s", method, oldpath, String(data)))
case 409: case 409:
// TODO create dst path // TODO create dst path
} }
return newPathError(method, oldpath, rs.StatusCode) return newPathError(method, oldpath, s)
} }
func (c *Client) put(path string, stream io.Reader) int { func (c *Client) put(path string, stream io.Reader) int {