Merge pull request #8 from Ferada/fix-read-status-code

Handle error response when reading a file.

client.go

@@ -6,7 +6,9 @@ import (
 	"encoding/xml"
 	"io"
 	"net/http"
+	"net/url"
 	"os"
+	pathpkg "path"
 	"strings"
 	"time"
 )
@@ -31,6 +33,14 @@ func NewClient(uri string, user string, pw string) *Client {
 	return c
 }
 
+func (c *Client) SetHeader(key, value string) {
+	c.headers.Add(key, value)
+}
+
+func (c *Client) SetTransport(transport http.RoundTripper) {
+	c.c.Transport = transport
+}
+
 func (c *Client) Connect() error {
 	rs, err := c.options("/")
 	if err == nil {
@@ -84,17 +94,20 @@ func (c *Client) ReadDir(path string) ([]os.FileInfo, error) {
 
 		if p := getProps(r, "200"); p != nil {
 			f := new(File)
+			if ps, err := url.QueryUnescape(r.Href); err == nil {
+				f.name = pathpkg.Base(ps)
+			} else {
 				f.name = p.Name
+			}
 			f.path = path + f.name
+			f.modified = parseModified(&p.Modified)
 
 			if p.Type.Local == "collection" {
 				f.path += "/"
 				f.size = 0
-				f.modified = time.Unix(0, 0)
 				f.isdir = true
 			} else {
 				f.size = parseInt64(&p.Size)
-				f.modified = parseModified(&p.Modified)
 				f.isdir = false
 			}
 
@@ -183,7 +196,7 @@ func (c *Client) RemoveAll(path string) error {
 	}
 	rs.Body.Close()
 
-	if rs.StatusCode == 200 || rs.StatusCode == 404 {
+	if rs.StatusCode == 200 || rs.StatusCode == 204 || rs.StatusCode == 404  {
 		return nil
 	} else {
 		return newPathError("Remove", path, rs.StatusCode)
@@ -248,7 +261,12 @@ func (c *Client) ReadStream(path string) (io.ReadCloser, error) {
 	if err != nil {
 		return nil, newPathErrorErr("ReadStream", path, err)
 	}
+	if rs.StatusCode == 200 {
 		return rs.Body, nil
+	} else {
+		rs.Body.Close()
+		return nil, newPathError("ReadStream", path, rs.StatusCode)
+	}
 }
 
 func (c *Client) Write(path string, data []byte, _ os.FileMode) error {