From ec4bf00276930d40d2ac279fc7e70a468d5f082a Mon Sep 17 00:00:00 2001 From: SwitchUpCB <81384235+switchupcb@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:33:14 -0600 Subject: [PATCH 1/2] remove redudant call in filesys RemoveDir --- internal/utils/filesys/filesys.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/internal/utils/filesys/filesys.go b/internal/utils/filesys/filesys.go index 07244707..a8612ab7 100644 --- a/internal/utils/filesys/filesys.go +++ b/internal/utils/filesys/filesys.go @@ -59,20 +59,10 @@ func EnsureDirPathExist(dirPath string) error { // RemoveDir deletes everything at folder dir. func RemoveDir(dir string) error { - exist, err := DirExists(dir) - - if err != nil { + if err := os.RemoveAll(dir); err != nil { return err } - if exist { - err := os.RemoveAll(dir) - - if err != nil { - return err - } - } - return nil } From 77dc0bcb57413fc60cff31d5e96d596778c35695 Mon Sep 17 00:00:00 2001 From: SwitchUpCB <81384235+switchupcb@users.noreply.github.com> Date: Tue, 11 Mar 2025 15:39:22 +0000 Subject: [PATCH 2/2] remove unused https://github.com/go-jet/jet/pull/458#discussion_r1986128416 --- generator/template/process.go | 9 +++++---- internal/utils/filesys/filesys.go | 21 --------------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/generator/template/process.go b/generator/template/process.go index 28e6c0ab..493713ff 100644 --- a/generator/template/process.go +++ b/generator/template/process.go @@ -4,11 +4,13 @@ import ( "bytes" "errors" "fmt" - "github.com/go-jet/jet/v2/internal/utils/filesys" + "os" "path/filepath" "strings" "text/template" + "github.com/go-jet/jet/v2/internal/utils/filesys" + "github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/internal/jet" ) @@ -24,12 +26,11 @@ func ProcessSchema(dirPath string, schemaMetaData metadata.Schema, generatorTemp fmt.Println("Destination directory:", schemaPath) fmt.Println("Cleaning up destination directory...") - err := filesys.RemoveDir(schemaPath) - if err != nil { + if err := os.RemoveAll(schemaPath); err != nil { return errors.New("failed to cleanup generated files") } - err = processModel(schemaPath, schemaMetaData, schemaTemplate) + err := processModel(schemaPath, schemaMetaData, schemaTemplate) if err != nil { return fmt.Errorf("failed to generate model types: %w", err) } diff --git a/internal/utils/filesys/filesys.go b/internal/utils/filesys/filesys.go index a8612ab7..5a0be8c1 100644 --- a/internal/utils/filesys/filesys.go +++ b/internal/utils/filesys/filesys.go @@ -56,24 +56,3 @@ func EnsureDirPathExist(dirPath string) error { return nil } - -// RemoveDir deletes everything at folder dir. -func RemoveDir(dir string) error { - if err := os.RemoveAll(dir); err != nil { - return err - } - - return nil -} - -// DirExists checks if folder at path exist. -func DirExists(path string) (bool, error) { - _, err := os.Stat(path) - if err == nil { - return true, nil - } - if os.IsNotExist(err) { - return false, nil - } - return true, err -}