Merge branch '8-see-filepath-implementation' into 'master'

Resolve "Add Walk to WebDav interface"

Closes #8

See merge request partitio/Nextcloud-Partitio/gonextcloud!3
This commit is contained in:
Adphi 2019-07-16 06:29:38 +00:00
commit 04fe0dc872
4 changed files with 101 additions and 4 deletions

View File

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
req "github.com/levigross/grequests" req "github.com/levigross/grequests"
"github.com/studio-b12/gowebdav"
"gitlab.bertha.cloud/partitio/Nextcloud-Partitio/gonextcloud/types" "gitlab.bertha.cloud/partitio/Nextcloud-Partitio/gonextcloud/types"
) )
@ -37,7 +36,7 @@ func (c *Client) Login(username string, password string) error {
return &e return &e
} }
// Create webdav client // Create webdav client
c.webdav = gowebdav.NewClient(c.baseURL.String()+"/remote.php/webdav", c.username, c.password) c.webdav = newWebDav(c.baseURL.String()+"/remote.php/webdav", c.username, c.password)
return nil return nil
} }

View File

@ -26,7 +26,7 @@ type Client struct {
shares *Shares shares *Shares
users *Users users *Users
groups *Groups groups *Groups
webdav *gowebdav.Client webdav *webDav
} }
// NewClient create a new Client from the Nextcloud Instance URL // NewClient create a new Client from the Nextcloud Instance URL
@ -56,7 +56,7 @@ func NewClient(hostname string) (*Client, error) {
c.groups = &Groups{c} c.groups = &Groups{c}
// Create empty webdav client // Create empty webdav client
// It will be replaced after login // It will be replaced after login
c.webdav = &gowebdav.Client{} c.webdav = &webDav{Client: &gowebdav.Client{}}
return c, nil return c, nil
} }

View File

@ -3,6 +3,7 @@ package types
import ( import (
"io" "io"
"os" "os"
"path/filepath"
) )
// WebDav available methods // WebDav available methods
@ -31,4 +32,8 @@ type WebDav interface {
Write(path string, data []byte, _ os.FileMode) error Write(path string, data []byte, _ os.FileMode) error
// WriteStream writes a stream // WriteStream writes a stream
WriteStream(path string, stream io.Reader, _ os.FileMode) error WriteStream(path string, stream io.Reader, _ os.FileMode) error
// Walk walks the file tree rooted at root, calling walkFn for each file or
// directory in the tree, including root.
Walk(path string, walkFunc filepath.WalkFunc) error
} }

93
webdav.go Normal file
View File

@ -0,0 +1,93 @@
package gonextcloud
import (
"os"
"path/filepath"
"sort"
"github.com/studio-b12/gowebdav"
)
type webDav struct {
*gowebdav.Client
}
func newWebDav(url string, user string, password string) *webDav {
wb := gowebdav.NewClient(url, user, password)
return &webDav{Client: wb}
}
// Implementation adapted from filepath.Walk
// Walk walks the file tree rooted at root, calling walkFn for each file or
// directory in the tree, including root. All errors that arise visiting files
// and directories are filtered by walkFn. The files are walked in lexical
// order, which makes the output deterministic but means that for very
// large directories Walk can be inefficient.
// Walk does not follow symbolic links.
func (wd *webDav) Walk(root string, walkFn filepath.WalkFunc) error {
info, err := wd.Stat(root)
if err != nil {
err = walkFn(root, nil, err)
} else {
err = wd.walk(root, info, walkFn)
}
if err == filepath.SkipDir {
return nil
}
return err
}
// walk recursively descends path, calling walkFn.
func (wd *webDav) walk(path string, info os.FileInfo, walkFn filepath.WalkFunc) error {
if !info.IsDir() {
return walkFn(path, info, nil)
}
names, err := wd.readDirNames(path)
err1 := walkFn(path, info, err)
// If err != nil, walk can't walk into this directory.
// err1 != nil means walkFn want walk to skip this directory or stop walking.
// Therefore, if one of err and err1 isn't nil, walk will return.
if err != nil || err1 != nil {
// The caller's behavior is controlled by the return value, which is decided
// by walkFn. walkFn may ignore err and return nil.
// If walkFn returns SkipDir, it will be handled by the caller.
// So walk should return whatever walkFn returns.
return err1
}
for _, name := range names {
filename := filepath.Join(path, name)
fileInfo, err := wd.Stat(filename)
if err != nil {
if err := walkFn(filename, fileInfo, err); err != nil && err != filepath.SkipDir {
return err
}
} else {
err = wd.walk(filename, fileInfo, walkFn)
if err != nil {
if !fileInfo.IsDir() || err != filepath.SkipDir {
return err
}
}
}
}
return nil
}
// readDirNames reads the directory named by dirname and returns
// a sorted list of directory entries.
func (wd *webDav) readDirNames(dirname string) ([]string, error) {
fs, err := wd.ReadDir(dirname)
if err != nil {
return nil, err
}
var names []string
for _, i := range fs {
if i.IsDir() {
names = append(names, i.Name())
}
}
sort.Strings(names)
return names, nil
}