checkpoint: optionally set printer and config
This commit is contained in:
parent
5b8a407a3f
commit
dee32cc27c
4 changed files with 27 additions and 25 deletions
|
@ -1,7 +1,6 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
@ -20,7 +19,7 @@ func main() {
|
|||
flag.StringVar(&executorsFilePath, "path-to-enbas-executors", "", "The path to the executors Go file")
|
||||
flag.Parse()
|
||||
|
||||
schema, err := readSchemaFile(enbasCLISchemaFilepath)
|
||||
schema, err := newEnbasCLISchemaFromFile(enbasCLISchemaFilepath)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: Unable to read the schema file: %v.\n", err)
|
||||
}
|
||||
|
@ -34,22 +33,6 @@ func main() {
|
|||
}
|
||||
}
|
||||
|
||||
func readSchemaFile(path string) (enbasCLISchema, error) {
|
||||
file, err := os.Open(path)
|
||||
if err != nil {
|
||||
return enbasCLISchema{}, fmt.Errorf("unable to open the schema file: %w", err)
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
var schema enbasCLISchema
|
||||
|
||||
if err := json.NewDecoder(file).Decode(&schema); err != nil {
|
||||
return enbasCLISchema{}, fmt.Errorf("unable to decode the JSON data: %w", err)
|
||||
}
|
||||
|
||||
return schema, nil
|
||||
}
|
||||
|
||||
func generateExecutors(schema enbasCLISchema, output string) error {
|
||||
funcMap := template.FuncMap{
|
||||
"capitalise": capitalise,
|
||||
|
|
|
@ -53,8 +53,8 @@ func (e enbasCLISchemaFlagMap) getDescription(name string) string {
|
|||
}
|
||||
|
||||
type enbasCLISchemaCommand struct {
|
||||
AddPrinter bool `json:"addPrinter"`
|
||||
AddConfig bool `json:"addConfig"`
|
||||
UsePrinter bool `json:"usePrinter"`
|
||||
UseConfig bool `json:"useConfig"`
|
||||
Flags []enbasCLISchemaFlagReference `json:"flags"`
|
||||
Summary string `json:"summary"`
|
||||
}
|
||||
|
|
|
@ -8,6 +8,12 @@ var executorsFileTemplate = `package executor
|
|||
// {{ $struct_name }} is the executor for the {{ $name }} command.
|
||||
type {{ $struct_name }} struct {
|
||||
*flag.FlagSet
|
||||
{{- if $command.UsePrinter }}
|
||||
printer *printer.Printer
|
||||
{{- end }}
|
||||
{{- if $command.UseConfig }}
|
||||
config *config.Config
|
||||
{{- end }}
|
||||
{{- range $flag := $command.Flags -}}
|
||||
{{ print "" }}
|
||||
{{ $flag.Flag }} {{ getFlagType $flag.Flag }}
|
||||
|
@ -15,9 +21,22 @@ type {{ $struct_name }} struct {
|
|||
{{ print "" }}
|
||||
}
|
||||
|
||||
func {{ $new_executor_function_name }}() *{{ $struct_name }} {
|
||||
func {{ $new_executor_function_name }}(
|
||||
{{- if $command.UsePrinter }}
|
||||
printer *printer.Printer,
|
||||
{{- end }}
|
||||
{{- if $command.UseConfig }}
|
||||
config *config.Config,
|
||||
{{- end }}
|
||||
) *{{ $struct_name }} {
|
||||
exe := {{ $struct_name }}{
|
||||
FlagSet: flag.NewFlagSet({{ printf "%q" $name }}, flag.ExitOnError),
|
||||
{{- if $command.UsePrinter }}
|
||||
printer: printer,
|
||||
{{- end }}
|
||||
{{- if $command.UseConfig }}
|
||||
config: config,
|
||||
{{- end }}
|
||||
}
|
||||
{{ print "" }}
|
||||
exe.Usage = commandUsageFunc({{ printf "%q" $name }}, {{ printf "%q" $command.Summary }}, showExe.FlagSet)
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
"commands": {
|
||||
"login": {
|
||||
"addPrinter": true,
|
||||
"addConfig": true,
|
||||
"usePrinter": true,
|
||||
"useConfig": true,
|
||||
"flags": [
|
||||
{ "flag": "instance", "default": "" }
|
||||
],
|
||||
"summary": "Login to an account on GoToSocial"
|
||||
},
|
||||
"version": {
|
||||
"addPrinter": true,
|
||||
"addConfig": false,
|
||||
"usePrinter": true,
|
||||
"useConfig": false,
|
||||
"summary": "Prints the application's version and build information",
|
||||
"flags": [
|
||||
{ "flag": "full", "default": "false" }
|
||||
|
|
Loading…
Reference in a new issue