mirror of
https://github.com/octoleo/syncthing.git
synced 2025-02-04 12:58:26 +00:00
b71a930bfc
`syncthing cli` subcommand was using urfave/cli as the command parser. This PR replace it with kong, which the main command uses. Some help texts and error message format are changed. Other than that, all the command usage and logic remains unchanged. There's only one place which still uses urfave/cli, which is `syncthing cli config`, because it uses some magic to dynamically build commands from struct reflects. I used kong's `passthrough:""` tag to pass any argument following `syncthing cli config` to urfave/cli parser. This PR also fixes #9041 --------- Co-authored-by: Jakob Borg <jakob@kastelo.net>
98 lines
2.1 KiB
Go
98 lines
2.1 KiB
Go
// Copyright (C) 2021 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package cli
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"github.com/AudriusButkevicius/recli"
|
|
"github.com/alecthomas/kong"
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/urfave/cli"
|
|
)
|
|
|
|
type configHandler struct {
|
|
original, cfg config.Configuration
|
|
client APIClient
|
|
err error
|
|
}
|
|
|
|
type configCommand struct {
|
|
Args []string `arg:"" default:"-h"`
|
|
}
|
|
|
|
func (c *configCommand) Run(ctx Context, _ *kong.Context) error {
|
|
app := cli.NewApp()
|
|
app.Name = "syncthing"
|
|
app.Author = "The Syncthing Authors"
|
|
app.Metadata = map[string]interface{}{
|
|
"clientFactory": ctx.clientFactory,
|
|
}
|
|
|
|
h := new(configHandler)
|
|
h.client, h.err = ctx.clientFactory.getClient()
|
|
if h.err == nil {
|
|
h.cfg, h.err = getConfig(h.client)
|
|
}
|
|
h.original = h.cfg.Copy()
|
|
|
|
// Copy the config and set the default flags
|
|
recliCfg := recli.DefaultConfig
|
|
recliCfg.IDTag.Name = "xml"
|
|
recliCfg.SkipTag.Name = "json"
|
|
|
|
commands, err := recli.New(recliCfg).Construct(&h.cfg)
|
|
if err != nil {
|
|
return fmt.Errorf("config reflect: %w", err)
|
|
}
|
|
|
|
app.Commands = commands
|
|
app.HideHelp = true
|
|
app.Before = h.configBefore
|
|
app.After = h.configAfter
|
|
|
|
return app.Run(append([]string{app.Name}, c.Args...))
|
|
}
|
|
|
|
func (h *configHandler) configBefore(c *cli.Context) error {
|
|
for _, arg := range c.Args() {
|
|
if arg == "--help" || arg == "-h" {
|
|
return nil
|
|
}
|
|
}
|
|
return h.err
|
|
}
|
|
|
|
func (h *configHandler) configAfter(_ *cli.Context) error {
|
|
if h.err != nil {
|
|
// Error was already returned in configBefore
|
|
return nil
|
|
}
|
|
if reflect.DeepEqual(h.cfg, h.original) {
|
|
return nil
|
|
}
|
|
body, err := json.MarshalIndent(h.cfg, "", " ")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
resp, err := h.client.Post("system/config", string(body))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if resp.StatusCode != 200 {
|
|
body, err := responseToBArray(resp)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return errors.New(string(body))
|
|
}
|
|
return nil
|
|
}
|