From e5ff3759486f09a074f5f9d1143e6b8d6804d051 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Mon, 21 May 2018 14:54:58 +0100
Subject: [PATCH] Use config.FileGet instead of fs.ConfigFileGet
---
backend/cache/cache_internal_test.go | 6 +++---
backend/mega/mega.go | 5 +++--
backend/opendrive/opendrive.go | 5 +++--
cmd/listremotes/listremotes.go | 3 +--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/backend/cache/cache_internal_test.go b/backend/cache/cache_internal_test.go
index 00a45c48f..43c2ea821 100644
--- a/backend/cache/cache_internal_test.go
+++ b/backend/cache/cache_internal_test.go
@@ -1396,7 +1396,7 @@ func (r *run) newCacheFs(t *testing.T, remote, id string, needRemote, purge bool
config.FileSet(remote, "type", "cache")
config.FileSet(remote, "remote", localRemote+":/var/tmp/"+localRemote)
} else {
- remoteType := fs.ConfigFileGet(remote, "type", "")
+ remoteType := config.FileGet(remote, "type", "")
if remoteType == "" {
t.Skipf("skipped due to invalid remote type for %v", remote)
return nil, nil
@@ -1407,14 +1407,14 @@ func (r *run) newCacheFs(t *testing.T, remote, id string, needRemote, purge bool
config.FileSet(remote, "password", cryptPassword1)
config.FileSet(remote, "password2", cryptPassword2)
}
- remoteRemote := fs.ConfigFileGet(remote, "remote", "")
+ remoteRemote := config.FileGet(remote, "remote", "")
if remoteRemote == "" {
t.Skipf("skipped due to invalid remote wrapper for %v", remote)
return nil, nil
}
remoteRemoteParts := strings.Split(remoteRemote, ":")
remoteWrapping := remoteRemoteParts[0]
- remoteType := fs.ConfigFileGet(remoteWrapping, "type", "")
+ remoteType := config.FileGet(remoteWrapping, "type", "")
if remoteType != "cache" {
t.Skipf("skipped due to invalid remote type for %v: '%v'", remoteWrapping, remoteType)
return nil, nil
diff --git a/backend/mega/mega.go b/backend/mega/mega.go
index 5dbb03030..d864640a6 100644
--- a/backend/mega/mega.go
+++ b/backend/mega/mega.go
@@ -24,6 +24,7 @@ import (
"time"
"github.com/ncw/rclone/fs"
+ "github.com/ncw/rclone/fs/config"
"github.com/ncw/rclone/fs/config/flags"
"github.com/ncw/rclone/fs/config/obscure"
"github.com/ncw/rclone/fs/fshttp"
@@ -144,8 +145,8 @@ func (f *Fs) readMetaDataForPath(remote string) (info *mega.Node, err error) {
// NewFs constructs an Fs from the path, container:path
func NewFs(name, root string) (fs.Fs, error) {
- user := fs.ConfigFileGet(name, "user")
- pass := fs.ConfigFileGet(name, "pass")
+ user := config.FileGet(name, "user")
+ pass := config.FileGet(name, "pass")
if pass != "" {
var err error
pass, err = obscure.Reveal(pass)
diff --git a/backend/opendrive/opendrive.go b/backend/opendrive/opendrive.go
index 9a2f9aeb0..be9958072 100644
--- a/backend/opendrive/opendrive.go
+++ b/backend/opendrive/opendrive.go
@@ -12,6 +12,7 @@ import (
"time"
"github.com/ncw/rclone/fs"
+ "github.com/ncw/rclone/fs/config"
"github.com/ncw/rclone/fs/config/obscure"
"github.com/ncw/rclone/fs/fserrors"
"github.com/ncw/rclone/fs/fshttp"
@@ -111,11 +112,11 @@ func (f *Fs) DirCacheFlush() {
// NewFs contstructs an Fs from the path, bucket:path
func NewFs(name, root string) (fs.Fs, error) {
root = parsePath(root)
- username := fs.ConfigFileGet(name, "username")
+ username := config.FileGet(name, "username")
if username == "" {
return nil, errors.New("username not found")
}
- password, err := obscure.Reveal(fs.ConfigFileGet(name, "password"))
+ password, err := obscure.Reveal(config.FileGet(name, "password"))
if err != nil {
return nil, errors.New("password coudl not revealed")
}
diff --git a/cmd/listremotes/listremotes.go b/cmd/listremotes/listremotes.go
index f7ccd43b2..6ecb9f107 100644
--- a/cmd/listremotes/listremotes.go
+++ b/cmd/listremotes/listremotes.go
@@ -5,7 +5,6 @@ import (
"sort"
"github.com/ncw/rclone/cmd"
- "github.com/ncw/rclone/fs"
"github.com/ncw/rclone/fs/config"
"github.com/spf13/cobra"
)
@@ -40,7 +39,7 @@ When uses with the -l flag it lists the types too.
}
for _, remote := range remotes {
if listLong {
- remoteType := fs.ConfigFileGet(remote, "type", "UNKNOWN")
+ remoteType := config.FileGet(remote, "type", "UNKNOWN")
fmt.Printf("%-*s %s\n", maxlen+1, remote+":", remoteType)
} else {
fmt.Printf("%s:\n", remote)