format,interp: Use MustGroup and add probe order test

wader · Sep 28, 2021 · aa38ccf · aa38ccf
1 parent 8a4f66f
commit aa38ccf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/format/all/all.fqtest b/format/all/all.fqtest
@@ -0,0 +1,21 @@
+$ fq -n _registry.groups.probe
+[
+  "adts",
+  "bzip2",
+  "elf",
+  "flac",
+  "gif",
+  "gzip",
+  "jpeg",
+  "matroska",
+  "mp4",
+  "ogg",
+  "png",
+  "tar",
+  "tiff",
+  "webp",
+  "mpeg_ts",
+  "wav",
+  "mp3",
+  "json"
+]
diff --git a/pkg/interp/funcs.go b/pkg/interp/funcs.go
@@ -395,10 +395,10 @@ func (i *Interp) _registry(c interface{}, a []interface{}) interface{} {
 	groups := map[string]interface{}{}
 	formats := map[string]interface{}{}
 
-	for fsName, fs := range i.registry.Groups {
+	for fsName := range i.registry.Groups {
 		var group []interface{}
 
-		for _, f := range fs {
+		for _, f := range i.registry.MustGroup(fsName) {
 			group = append(group, f.Name)
 			if _, ok := uniqueFormats[f.Name]; ok {
 				continue