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/3] 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 0724470..a8612ab 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/3] 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 28e6c0a..493713f 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 a8612ab..5a0be8c 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 -} From 8bcf8824eab523675c6a123c4a1a04be422303f2 Mon Sep 17 00:00:00 2001 From: go-jet Date: Sat, 26 Apr 2025 14:17:56 +0200 Subject: [PATCH 3/3] Add FUNDING.yml --- .github/FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..a633b07 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,4 @@ + + +kofi: goranbjelanovic +custom: ["https://mempool.space/address/bc1qtjhxe8mqx0yzff2l0f6stjpjj92kgwr0a53wxv", "https://etherscan.io/address/0xe98e4535C744c617e8E45828B63fDFf9367E3574"]