diff --git a/bfcodegen/enum-generate.go b/bfcodegen/enum-generate.go index 90d3d6c..aee5eec 100644 --- a/bfcodegen/enum-generate.go +++ b/bfcodegen/enum-generate.go @@ -55,12 +55,13 @@ func GenerateEnumSpecs(sourceDir string, destFile string) error { } } - langext.ArrFilter(files, func(v os.DirEntry) bool { return v.Name() != path.Base(destFile) }) + files = langext.ArrFilter(files, func(v os.DirEntry) bool { return v.Name() != path.Base(destFile) }) + files = langext.ArrFilter(files, func(v os.DirEntry) bool { return strings.HasSuffix(v.Name(), ".go") }) langext.SortBy(files, func(v os.DirEntry) string { return v.Name() }) newChecksumStr := goext.GoextVersion for _, f := range files { - content, err := os.ReadFile(destFile) + content, err := os.ReadFile(path.Join(sourceDir, f.Name())) if err != nil { return err } @@ -81,15 +82,8 @@ func GenerateEnumSpecs(sourceDir string, destFile string) error { pkgname := "" for _, f := range files { - if !strings.HasSuffix(f.Name(), ".go") { - continue - } - if f.Name() == path.Base(destFile) { - continue - } - fmt.Printf("========= %s =========\n\n", f.Name()) - fileEnums, pn, err := processFile(f.Name()) + fileEnums, pn, err := processFile(path.Join(sourceDir, f.Name())) if err != nil { return err } diff --git a/bfcodegen/enum-generate_test.go b/bfcodegen/enum-generate_test.go new file mode 100644 index 0000000..94adb76 --- /dev/null +++ b/bfcodegen/enum-generate_test.go @@ -0,0 +1,15 @@ +package bfcodegen + +import ( + "testing" +) + +func TestApplyEnvOverridesSimple(t *testing.T) { + + err := GenerateEnumSpecs("/home/mike/Code/reiff/badennet/bnet-backend/models", "/home/mike/Code/reiff/badennet/bnet-backend/models/enums_gen.go") + if err != nil { + t.Error(err) + t.Fail() + } + +} diff --git a/goextVersion.go b/goextVersion.go index 9d412fe..7257196 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.144" +const GoextVersion = "0.0.145" -const GoextVersionTimestamp = "2023-06-07T12:39:21+0200" +const GoextVersionTimestamp = "2023-06-07T12:45:48+0200"