From 0c3bf314c5f1286d9ef0aa3ee573d24b290222b6 Mon Sep 17 00:00:00 2001 From: mkvolkov Date: Sat, 20 Aug 2022 11:18:41 +0300 Subject: [PATCH] RemoveAll started, slash fixed --- rclonefs/fs.go | 39 ++++++++++++++++++++++++++++++++++----- rclonetest/main.go | 10 +++++----- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/rclonefs/fs.go b/rclonefs/fs.go index aadcee3..18cace3 100644 --- a/rclonefs/fs.go +++ b/rclonefs/fs.go @@ -2,6 +2,8 @@ package rclonefs import ( "context" + "fmt" + "io/fs" "os" "os/user" "path/filepath" @@ -9,7 +11,7 @@ import ( "time" _ "github.com/rclone/rclone/backend/all" - "github.com/rclone/rclone/fs" + rclfs "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/config" "github.com/rclone/rclone/fs/config/configfile" "github.com/rclone/rclone/vfs" @@ -38,8 +40,9 @@ func CreateRCFS(path string) (*RCFS, error) { rootdir, cwd, _ := strings.Cut(path, ":") rootdir += ":" + cwd = filepath.Join("/", cwd) - rfs, e := fs.NewFs(context.Background(), rootdir) + rfs, e := rclfs.NewFs(context.Background(), rootdir) if e != nil { return nil, e } @@ -104,7 +107,9 @@ func (rcfs *RCFS) Remove(name string) error { } func (rcfs *RCFS) RemoveAll(path string) error { - // TODO + path = rcfs.AbsPath(path) + afero.Walk(rcfs, path, printNode) + return nil } @@ -131,8 +136,32 @@ func (rcfs *RCFS) Chtimes(name string, atime time.Time, mtime time.Time) error { return rcfs.Fs.Chtimes(name, atime, mtime) } - - +func printNode(path string, info fs.FileInfo, err error) error { + if err != nil { + fmt.Printf("prevent panic by handling failure accessing a path %q: %v\n", path, err) + return err + } + if info.IsDir() { + fmt.Printf("visited dir: %q\n", path) + return nil + } else { + fmt.Printf("visited file: %q\n", path) + return nil + } +} +/* +func rmNode(path string, info fs.FileInfo, err error) error { + if err != nil { + return err + } + + if info.IsDir() { + return nil + } else { + a + } +} +*/ diff --git a/rclonetest/main.go b/rclonetest/main.go index d62f592..f2e9452 100644 --- a/rclonetest/main.go +++ b/rclonetest/main.go @@ -4,18 +4,18 @@ import ( "fmt" "os" - "github.com/spf13/afero" +// "github.com/spf13/afero" "github.com/spf13/afero/rclonefs" ) func main() { - RFS, _ := rclonefs.CreateRCFS("godrive1:") + RFS, _ := rclonefs.CreateRCFS("pcloud_mv1:cfg") - data, err := afero.ReadFile(RFS, "mock.json") + name := "ycfg" + + err := RFS.RemoveAll(name) if err != nil { fmt.Printf("Error: %v\n", err) os.Exit(1) } - - fmt.Printf("%s\n", string(data)) }