johanels/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-12 06:24:14 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

config: tidy code to use UpdateRemote/CreateRemote instead of editOptions #3455

Browse Source
This commit is contained in:
Nick Craig-Wood
2021-05-11 14:57:37 +01:00
parent dbc5167281
commit 77cda6773c
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/config/ui.go
View File

@@ -422,17 +422,6 @@ func NewRemoteName() (name string) {
}
}
// editOptions edits the options. If new is true then it just allows
// entry and doesn't show any old values.
func editOptions(ctx context.Context, ri *fs.RegInfo, name string, isNew bool) error {
fmt.Printf("** See help for %s backend at: https://rclone.org/%s/ **\n\n", ri.Name, ri.FileName())
m := fs.ConfigMap(ri, name, nil)
choices := configmap.Simple{
fs.ConfigEdit: fmt.Sprint(isNew),
}
return backendConfig(ctx, name, m, ri, choices, fs.ConfigAll)
}
// NewRemote make a new remote from its name
func NewRemote(ctx context.Context, name string) error {
var (
@@ -453,7 +442,9 @@ func NewRemote(ctx context.Context, name string) error {
}
LoadedData().SetValue(name, "type", newType)
err = editOptions(ctx, ri, name, true)
_, err = CreateRemote(ctx, name, newType, nil, UpdateRemoteOpt{
All: true,
})
if err != nil {
return err
}
@@ -469,7 +460,9 @@ func EditRemote(ctx context.Context, ri *fs.RegInfo, name string) error {
ShowRemote(name)
fmt.Printf("Edit remote\n")
for {
err := editOptions(ctx, ri, name, true)
_, err := UpdateRemote(ctx, name, nil, UpdateRemoteOpt{
All: true,
})
if err != nil {
return err
}