local
/
storage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rclone ns

master
bel 2020-01-22 02:14:04 +00:00
parent 898f7e886a
commit 428218f45f
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rclone.go
View File

@ -35,8 +35,11 @@ func NewRClone(rclone string, ns ...string) (*RClone, error) {
} }
func (rc *RClone) Get(key string, ns ...string) ([]byte, error) { func (rc *RClone) Get(key string, ns ...string) ([]byte, error) {
namespace := resolveNamespace(ns) namespace := rc.ns
namespace = path.Join(rc.ns, namespace) if len(ns) > 0 {
namespace = path.Join(rc.ns, resolveNamespace(ns))
}
key = path.Join(namespace, key) key = path.Join(namespace, key)
f, err := fs.NewFs(path.Dir(key)) f, err := fs.NewFs(path.Dir(key))
if err != nil { if err != nil {
@ -57,8 +60,11 @@ func (rc *RClone) Set(key string, value []byte, ns ...string) error {
if len(value) == 0 { if len(value) == 0 {
return rc.Del(key, ns...) return rc.Del(key, ns...)
} }
namespace := resolveNamespace(ns) namespace := rc.ns
namespace = path.Join(rc.ns, namespace) if len(ns) > 0 {
namespace = path.Join(rc.ns, resolveNamespace(ns))
}
key = path.Join(namespace, key) key = path.Join(namespace, key)
f, err := fs.NewFs(path.Dir(key)) f, err := fs.NewFs(path.Dir(key))
if err != nil { if err != nil {
@ -70,8 +76,11 @@ func (rc *RClone) Set(key string, value []byte, ns ...string) error {
} }
func (rc *RClone) Del(key string, ns ...string) error { func (rc *RClone) Del(key string, ns ...string) error {
namespace := resolveNamespace(ns) namespace := rc.ns
namespace = path.Join(rc.ns, namespace) if len(ns) > 0 {
namespace = path.Join(rc.ns, resolveNamespace(ns))
}
key = path.Join(namespace, key) key = path.Join(namespace, key)
f, err := fs.NewFs(path.Dir(key)) f, err := fs.NewFs(path.Dir(key))
if err != nil { if err != nil {