mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace splitCommand with splitArgs for more general use

This commit is contained in:
Stefano 2022-03-15 15:37:16 +01:00
parent 70a85c08f6
commit 7e2b14df1f
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/commands.go
View File

@ -85,25 +85,21 @@ func splitMessage(msg string, splitLen int) (msgs []string) {
return append(msgs, msg) return append(msgs, msg)
} }
// splitCommand takes a command of the form <commandPrefix arg0, arg1, ...> func splitArgs(args []string, maxLen int) []string {
// and returns a list of commands of the same form res := make([]string, 0)
// where the len of each command doesn't exceed splitLen
func splitCommand(cmdPrefix string, args []string, maxLen int) []string {
cmds := make([]string, 0)
i := 0 i := 0
for i < len(args) { for i < len(args) {
currCmd := cmdPrefix + args[i] currArg := args[i]
i++ i++
for i < len(args) && len(currCmd)+len(args[i])+1 < maxLen { for i < len(args) && len(currArg)+len(args[i])+1 < maxLen {
currCmd += " " + args[i] currArg += " " + args[i]
i++ i++
} }
cmds = append(cmds, currCmd) res = append(res, currArg)
currCmd = cmdPrefix
} }
return cmds return res
} }
// Raw sends a raw line to the server, should really only be used for // Raw sends a raw line to the server, should really only be used for
@ -324,8 +320,9 @@ func (conn *Conn) Cap(subcommmand string, capabilities ...string) {
// make output predictable for testing // make output predictable for testing
sort.Strings(capabilities) sort.Strings(capabilities)
for _, cmd := range splitCommand(CAP+" "+subcommmand+" :", capabilities, defaultSplit) { cmdPrefix := CAP + " " + subcommmand + " :"
conn.Raw(cmd) for _, args := range splitArgs(capabilities, defaultSplit-len(cmdPrefix)) {
conn.Raw(cmdPrefix + args)
} }
} }
} }

10
client/commands_test.go
View File

@ -3,6 +3,7 @@ package client
import ( import (
"reflect" "reflect"
"strconv" "strconv"
"strings"
"testing" "testing"
) )
@ -214,12 +215,9 @@ func TestSplitCommand(t *testing.T) {
} }
for maxLen := 1; maxLen <= defaultSplit; maxLen *= 2 { for maxLen := 1; maxLen <= defaultSplit; maxLen *= 2 {
for _, cmd := range splitCommand("TEST :", args, maxLen) { for _, argStr := range splitArgs(args, maxLen) {
if len(cmd) > maxLen { if len(argStr) > maxLen && len(strings.Split(argStr, " ")) > 1 {
line := ParseLine(cmd) t.Errorf("maxLen = %d, but len(cmd) = %d", maxLen, len(argStr))
if len(line.Args) > 1 { // len(cmd) can exceed maxLen only if cmd includes a single argument.
t.Fatalf("maxLen = %d, but len(cmd) = %d", maxLen, len(cmd))
}
} }
} }
} }