github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-29 12:04:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make listremotes long output backwards compatible - fixes #7995
Some checks are pending
Docker beta build / Build image job (push) Waiting to run
Details

Browse Source 
The format was changed to include the source attribute in #7404, but that is now
reverted and the source information is only shown in json output.
This commit is contained in:
albertony 2024-08-09 12:09:32 +02:00 committed by Nick Craig-Wood
parent 642d4082ac
commit e334366345
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/listremotes/listremotes.go
View File

@ -30,11 +30,11 @@ var (
func init() { func init() {
cmd.Root.AddCommand(commandDefinition) cmd.Root.AddCommand(commandDefinition)
cmdFlags := commandDefinition.Flags() cmdFlags := commandDefinition.Flags()
flags.BoolVarP(cmdFlags, &listLong, "long", "", false, "Show type, source and description in addition to name", "") flags.BoolVarP(cmdFlags, &listLong, "long", "", false, "Show type and description in addition to name", "")
flags.StringVarP(cmdFlags, &filterName, "name", "", "", "Filter remotes by name", "") flags.StringVarP(cmdFlags, &filterName, "name", "", "", "Filter remotes by name", "")
flags.StringVarP(cmdFlags, &filterType, "type", "", "", "Filter remotes by type", "") flags.StringVarP(cmdFlags, &filterType, "type", "", "", "Filter remotes by type", "")
flags.StringVarP(cmdFlags, &filterSource, "source", "", "", "filter remotes by source", "") flags.StringVarP(cmdFlags, &filterSource, "source", "", "", "Filter remotes by source, e.g. 'file' or 'environment'", "")
flags.StringVarP(cmdFlags, &filterDescription, "description", "", "", "filter remotes by description", "") flags.StringVarP(cmdFlags, &filterDescription, "description", "", "", "Filter remotes by description", "")
flags.StringVarP(cmdFlags, &orderBy, "order-by", "", "", "Instructions on how to order the result, e.g. 'type,name=descending'", "") flags.StringVarP(cmdFlags, &orderBy, "order-by", "", "", "Instructions on how to order the result, e.g. 'type,name=descending'", "")
flags.BoolVarP(cmdFlags, &jsonOutput, "json", "", false, "Format output as JSON", "") flags.BoolVarP(cmdFlags, &jsonOutput, "json", "", false, "Format output as JSON", "")
} }
@ -120,9 +120,9 @@ or the remotes matching an optional filter.
Prints the result in human-readable format by default, and as a simple list of Prints the result in human-readable format by default, and as a simple list of
remote names, or if used with flag ` + "`--long`" + ` a tabular format including remote names, or if used with flag ` + "`--long`" + ` a tabular format including
all attributes of the remotes: name, type, source and description. Using flag the remote names, types and descriptions. Using flag ` + "`--json`" + ` produces
` + "`--json`" + ` produces machine-readable output instead, which always includes machine-readable output instead, which always includes all attributes - including
all attributes. the source (file or environment).
Result can be filtered by a filter argument which applies to all attributes, Result can be filtered by a filter argument which applies to all attributes,
and/or filter flags specific for each attribute. The values must be specified and/or filter flags specific for each attribute. The values must be specified
@ -157,7 +157,6 @@ according to regular rclone filtering pattern syntax.
remotes := config.GetRemotes() remotes := config.GetRemotes()
maxName := 0 maxName := 0
maxType := 0 maxType := 0
maxSource := 0
i := 0 i := 0
for _, remote := range remotes { for _, remote := range remotes {
include := true include := true
@ -181,9 +180,6 @@ according to regular rclone filtering pattern syntax.
if len(remote.Type) > maxType { if len(remote.Type) > maxType {
maxType = len(remote.Type) maxType = len(remote.Type)
} }
if len(remote.Source) > maxSource {
maxSource = len(remote.Source)
}
remotes[i] = remote remotes[i] = remote
i++ i++
} }
@ -225,7 +221,7 @@ according to regular rclone filtering pattern syntax.
fmt.Println("]") fmt.Println("]")
} else if listLong { } else if listLong {
for _, remote := range remotes { for _, remote := range remotes {
fmt.Printf("%-*s %-*s %-*s %s\n", maxName+1, remote.Name+":", maxType, remote.Type, maxSource, remote.Source, remote.Description) fmt.Printf("%-*s %-*s %s\n", maxName+1, remote.Name+":", maxType, remote.Type, remote.Description)
} }
} else { } else {
for _, remote := range remotes { for _, remote := range remotes {