Skip to content

Commit

Permalink
rclone: Rework backend option parsing
Browse files Browse the repository at this point in the history
This change allows passing no arguments to rclone, using `-o
rclone.args=""`. It is helpful when running rclone remotely via SSH
using a key with a forced command (via `command=` in `authorized_keys`).
  • Loading branch information
fd0 committed Mar 2, 2019
1 parent 7b8d1dc commit 3865b59
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 0 additions & 6 deletions internal/backend/rclone/backend.go
Expand Up @@ -127,8 +127,6 @@ func New(cfg Config, lim limiter.Limiter) (*Backend, error) {
return nil, err
}
args = append(args, a...)
} else {
args = append(args, "rclone")
}

// then add the arguments
Expand All @@ -139,10 +137,6 @@ func New(cfg Config, lim limiter.Limiter) (*Backend, error) {
}

args = append(args, a...)
} else {
args = append(args,
"serve", "restic", "--stdio",
"--b2-hard-delete", "--drive-use-trash=false")
}

// finally, add the remote
Expand Down
10 changes: 7 additions & 3 deletions internal/backend/rclone/config.go
Expand Up @@ -15,15 +15,19 @@ type Config struct {
Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 5)"`
}

var defaultConfig = Config{
Program: "rclone",
Args: "serve restic --stdio --b2-hard-delete --drive-use-trash=false",
Connections: 5,
}

func init() {
options.Register("rclone", Config{})
}

// NewConfig returns a new Config with the default values filled in.
func NewConfig() Config {
return Config{
Connections: 5,
}
return defaultConfig
}

// ParseConfig parses the string s and extracts the remote server URL.
Expand Down
4 changes: 3 additions & 1 deletion internal/backend/rclone/config_test.go
Expand Up @@ -14,7 +14,9 @@ func TestParseConfig(t *testing.T) {
"rclone:local:foo:/bar",
Config{
Remote: "local:foo:/bar",
Connections: 5,
Program: defaultConfig.Program,
Args: defaultConfig.Args,
Connections: defaultConfig.Connections,
},
},
}
Expand Down

0 comments on commit 3865b59

Please sign in to comment.