mirror of
https://github.com/syncthing/syncthing.git
synced 2026-01-04 03:49:12 -05: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>
61 lines
1.4 KiB
Go
61 lines
1.4 KiB
Go
// Copyright (C) 2019 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 (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/alecthomas/kong"
|
|
)
|
|
|
|
type errorsCommand struct {
|
|
Show struct{} `cmd:"" help:"Show pending errors"`
|
|
Push errorsPushCommand `cmd:"" help:"Push an error to active clients"`
|
|
Clear struct{} `cmd:"" help:"Clear pending errors"`
|
|
}
|
|
|
|
type errorsPushCommand struct {
|
|
ErrorMessage string `arg:""`
|
|
}
|
|
|
|
func (e *errorsPushCommand) Run(ctx Context) error {
|
|
client, err := ctx.clientFactory.getClient()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
errStr := e.ErrorMessage
|
|
response, err := client.Post("system/error", strings.TrimSpace(errStr))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if response.StatusCode != 200 {
|
|
errStr = fmt.Sprint("Failed to push error\nStatus code: ", response.StatusCode)
|
|
bytes, err := responseToBArray(response)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
body := string(bytes)
|
|
if body != "" {
|
|
errStr += "\nBody: " + body
|
|
}
|
|
return errors.New(errStr)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (*errorsCommand) Run(ctx Context, kongCtx *kong.Context) error {
|
|
switch kongCtx.Selected().Name {
|
|
case "show":
|
|
return indexDumpOutput("system/error", ctx.clientFactory)
|
|
case "clear":
|
|
return emptyPost("system/error/clear", ctx.clientFactory)
|
|
}
|
|
return nil
|
|
}
|