github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-02-01 18:41:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

webdav: fix directory detection when creating a remote

Browse Source 
Factor the is a directory check out and use it everywhere.
This commit is contained in:
Nick Craig-Wood 2017-10-25 12:00:23 +01:00
parent cd146415d1
commit fd2406f94e
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webdav/webdav.go
View File

@ -159,6 +159,21 @@ func shouldRetry(resp *http.Response, err error) (bool, error) {
return fs.ShouldRetry(err) || fs.ShouldRetryHTTP(resp, retryErrorCodes), err return fs.ShouldRetry(err) || fs.ShouldRetryHTTP(resp, retryErrorCodes), err
} }
// itemIsDir returns true if the item is a directory
//
// When a client sees a resourcetype it doesn't recognize it should
// assume it is a regular non-collection resource. [WebDav book by
// Lisa Dusseault ch 7.5.8 p170]
func itemIsDir(item *api.Response) bool {
if t := item.Props.Type; t != nil {
if t.Space == "DAV:" && t.Local == "collection" {
return true
}
fs.Debugf(nil, "Unknown resource type %q/%q on %q", t.Space, t.Local, item.Props.Name)
}
return false
}
// readMetaDataForPath reads the metadata from the path // readMetaDataForPath reads the metadata from the path
func (f *Fs) readMetaDataForPath(path string) (info *api.Prop, err error) { func (f *Fs) readMetaDataForPath(path string) (info *api.Prop, err error) {
// FIXME how do we read back additional properties? // FIXME how do we read back additional properties?
@ -188,7 +203,7 @@ func (f *Fs) readMetaDataForPath(path string) (info *api.Prop, err error) {
if !item.Props.StatusOK() { if !item.Props.StatusOK() {
return nil, fs.ErrorObjectNotFound return nil, fs.ErrorObjectNotFound
} }
if strings.HasSuffix(item.Href, "/") { if itemIsDir(&item) {
return nil, fs.ErrorNotAFile return nil, fs.ErrorNotAFile
} }
return &item.Props, nil return &item.Props, nil
@ -386,20 +401,7 @@ func (f *Fs) listAll(dir string, directoriesOnly bool, filesOnly bool, fn listAl
} }
for i := range result.Responses { for i := range result.Responses {
item := &result.Responses[i] item := &result.Responses[i]
isDir := itemIsDir(item)
// Figure out what this is
isDir := false
if t := item.Props.Type; t != nil {
// When a client sees a resourcetype it
// doesn't recognize it should assume it is a
// regular non-collection resource. [WebDav
// book by Lisa Dusseault ch 7.5.8 p170]
if t.Space == "DAV:" && t.Local == "collection" {
isDir = true
} else {
fs.Debugf(nil, "Unknown resource type %q/%q on %q", t.Space, t.Local, item.Props.Name)
}
}
// Find name // Find name
u, err := rest.URLJoin(baseURL, item.Href) u, err := rest.URLJoin(baseURL, item.Href)