Merge pull request #458 from switchupcb/patch-1

remove redundant call in filesys RemoveDir
This commit is contained in:
go-jet 2025-03-16 18:50:17 +01:00 committed by GitHub
commit 06530363f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 35 deletions

View file

@ -4,11 +4,13 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"github.com/go-jet/jet/v2/internal/utils/filesys" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"text/template" "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/generator/metadata"
"github.com/go-jet/jet/v2/internal/jet" "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("Destination directory:", schemaPath)
fmt.Println("Cleaning up destination directory...") fmt.Println("Cleaning up destination directory...")
err := filesys.RemoveDir(schemaPath) if err := os.RemoveAll(schemaPath); err != nil {
if err != nil {
return errors.New("failed to cleanup generated files") return errors.New("failed to cleanup generated files")
} }
err = processModel(schemaPath, schemaMetaData, schemaTemplate) err := processModel(schemaPath, schemaMetaData, schemaTemplate)
if err != nil { if err != nil {
return fmt.Errorf("failed to generate model types: %w", err) return fmt.Errorf("failed to generate model types: %w", err)
} }

View file

@ -56,34 +56,3 @@ func EnsureDirPathExist(dirPath string) error {
return nil return nil
} }
// RemoveDir deletes everything at folder dir.
func RemoveDir(dir string) error {
exist, err := DirExists(dir)
if err != nil {
return err
}
if exist {
err := os.RemoveAll(dir)
if 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
}