yo/reaction
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use -l limit flag instead of optional positional argument

Browse Source
This commit is contained in:
ppom 2023-09-05 16:44:40 +02:00
parent 8e4f683fcc
commit 9555342741
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/main.go
View File

@ -27,24 +27,19 @@ func addBoolFlag(names []string, f *flag.FlagSet) *bool {
var SocketPath *string var SocketPath *string
func addSocketFlag(f *flag.FlagSet) *string { func addSocketFlag(f *flag.FlagSet) *string {
return addStringFlag( return addStringFlag([]string{"s", "socket"}, "/run/reaction/reaction.sock", f)
[]string{"s", "socket"},
"/run/reaction/reaction.sock",
f)
} }
func addConfFlag(f *flag.FlagSet) *string { func addConfFlag(f *flag.FlagSet) *string {
return addStringFlag( return addStringFlag([]string{"c", "config"}, "", f)
[]string{"c", "config"},
"",
f)
} }
func addFormatFlag(f *flag.FlagSet) *string { func addFormatFlag(f *flag.FlagSet) *string {
return addStringFlag( return addStringFlag([]string{"f", "format"}, "yaml", f)
[]string{"f", "format"}, }
"yaml",
f) func addLimitFlag(f *flag.FlagSet) *string {
return addStringFlag([]string{"l", "limit"}, "", f)
} }
func subCommandParse(f *flag.FlagSet, maxRemainingArgs int) { func subCommandParse(f *flag.FlagSet, maxRemainingArgs int) {
@ -79,22 +74,20 @@ func basicUsage() {
` + bold + `reaction example-conf` + reset + ` ` + bold + `reaction example-conf` + reset + `
# print a configuration file example # print a configuration file example
` + bold + `reaction show` + reset + ` [.STREAM[.FILTER]] ` + bold + `reaction show` + reset + `
# show which actions are still to be run # show which actions are still to be run
# (e.g know what is currenly banned) # (e.g know what is currenly banned)
# optional argument: limit to STREAM and FILTER
# options: # options:
-f/--format yaml|json # (default: yaml) -f/--format yaml|json # (default: yaml)
-l/--limit .STREAM[.FILTER] # limit to stream and filter
-s/--socket SOCKET # path to the client-daemon communication socket -s/--socket SOCKET # path to the client-daemon communication socket
` + bold + `reaction flush` + reset + ` TARGET [.STREAM[.FILTER]] ` + bold + `reaction flush` + reset + ` TARGET
# run currently pending actions for the specified TARGET # run currently pending actions for the specified TARGET
# optional argument: limit to STREAM and FILTER
# options: # options:
-l/--limit .STREAM[.FILTER] # limit to stream and filter
-s/--socket SOCKET # path to the client-daemon communication socket -s/--socket SOCKET # path to the client-daemon communication socket
` + bold + `reaction test-regex` + reset + ` REGEX LINE # test REGEX against LINE ` + bold + `reaction test-regex` + reset + ` REGEX LINE # test REGEX against LINE
@ -137,7 +130,8 @@ func Main() {
case "show": case "show":
SocketPath = addSocketFlag(f) SocketPath = addSocketFlag(f)
queryFormat := addFormatFlag(f) queryFormat := addFormatFlag(f)
subCommandParse(f, 1) limit := addLimitFlag(f)
subCommandParse(f, 0)
// if *queryFormat != "yaml" && *queryFormat != "json" { // if *queryFormat != "yaml" && *queryFormat != "json" {
// fmt.Println("only `yaml` and `json` formats are supported.") // fmt.Println("only `yaml` and `json` formats are supported.")
// f.PrintDefaults() // f.PrintDefaults()
@ -147,22 +141,24 @@ func Main() {
fmt.Println("for now, only `yaml` format is supported.") fmt.Println("for now, only `yaml` format is supported.")
os.Exit(1) os.Exit(1)
} }
if f.Arg(0) != "" { if *limit != "" {
fmt.Println("for now, .STREAM.FILTER is not supported") fmt.Println("for now, -l/--limit is not supported")
os.Exit(1) os.Exit(1)
} }
// f.Arg(0) is "" if there is no remaining argument // f.Arg(0) is "" if there is no remaining argument
ClientQuery(f.Arg(0)) ClientQuery(*limit)
case "flush": case "flush":
SocketPath = addSocketFlag(f) SocketPath = addSocketFlag(f)
subCommandParse(f, 2) limit := addLimitFlag(f)
subCommandParse(f, 1)
if f.Arg(0) == "" { if f.Arg(0) == "" {
fmt.Println("subcommand flush takes at least one TARGET argument") fmt.Println("subcommand flush takes one TARGET argument")
basicUsage()
os.Exit(1) os.Exit(1)
} }
if f.Arg(1) != "" { if *limit != "" {
fmt.Println("for now, the .stream[.filter] argument is not supported") fmt.Println("for now, -l/--limit is not supported")
os.Exit(1) os.Exit(1)
} }
ClientFlush(f.Arg(0), f.Arg(1)) ClientFlush(f.Arg(0), f.Arg(1))