From aa38ccf0e1123cb91b63b2bded2ad6a4995b9f28 Mon Sep 17 00:00:00 2001 From: Mattias Wadman Date: Tue, 28 Sep 2021 13:08:22 +0200 Subject: [PATCH] format,interp: Use MustGroup and add probe order test --- format/all/all.fqtest | 21 +++++++++++++++++++++ pkg/interp/funcs.go | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 format/all/all.fqtest diff --git a/format/all/all.fqtest b/format/all/all.fqtest new file mode 100644 index 0000000000..1036afc765 --- /dev/null +++ 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 index 12b042208c..dd0c3815c9 100644 --- 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