fix group expansion for local file

Author: ysmood

batch.go

@@ -16,11 +16,13 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
+type Group []string
+
 type Batch struct {
-	Groups map[string][]string `json:"groups"`
-	Admins []string            `json:"admins"`
-	Files  map[string][]string `json:"files"`
-	OutDir string              `json:"outDir"`
+	Groups map[string]Group `json:"groups"`
+	Admins Group            `json:"admins"`
+	Files  map[string]Group `json:"files"`
+	OutDir string           `json:"outDir"`
 
 	root string
 }
@@ -108,18 +110,16 @@ func (b *Batch) ExpandFiles() (map[string][]string, error) { //nolint: gocognit
 		expanded := []string{}
 		members = append(members, b.Admins...)
 		for _, member := range members {
-			if !strings.HasPrefix(member, "@") {
-				member = filepath.Join(b.root, member)
-			}
-
-			if strings.HasPrefix(member, "$") {
+			switch {
+			case strings.HasPrefix(member, "$"):
 				if _, ok := groups[member]; !ok {
 					return nil, fmt.Errorf("%w: %s", ErrGroupNotDefined, member)
 				}
-
 				expanded = append(expanded, groups[member]...)
-			} else {
+			case strings.HasPrefix(member, "@"):
 				expanded = append(expanded, member)
+			default:
+				expanded = append(expanded, filepath.Join(b.root, member))
 			}
 		}
 

batch_test.go

@@ -11,7 +11,7 @@ func TestBatchGroups(t *testing.T) {
 	g := got.T(t)
 
 	batch := Batch{
-		Groups: map[string][]string{
+		Groups: map[string]Group{
 			"$a": {"a", "b"},
 			"$b": {"c", "$a"},
 			"$c": {"$b"},
@@ -24,7 +24,7 @@ func TestBatchGroups(t *testing.T) {
 
 	{
 		batch := Batch{
-			Groups: map[string][]string{
+			Groups: map[string]Group{
 				"$a": {"$b"},
 				"$b": {"$a"},
 			},
@@ -43,10 +43,10 @@ func TestBatchFiles(t *testing.T) {
 	g.WriteFile(filepath.FromSlash(p), "hello world!")
 
 	batch := Batch{
-		Files: map[string][]string{
+		Files: map[string]Group{
 			p: {"$c", "d"},
 		},
-		Groups: map[string][]string{
+		Groups: map[string]Group{
 			"$a": {"a", "b"},
 			"$b": {"c", "$a"},
 			"$c": {"$b"},

lib/whisper.go

@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	APIVersion        = "v0.8.9"
+	APIVersion        = "v0.8.10"
 	WireFormatVersion = byte(8)
 )