Skip to content

remove redundant call in filesys RemoveDir #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
go-jet merged 2 commits into from
Mar 16, 2025
Merged

remove redundant call in filesys RemoveDir #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec4bf00
remove redudant call in filesys RemoveDir
switchupcb Mar 6, 2025
77dc0bc
remove unused
switchupcb Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions generator/template/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -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)
}
Expand Down
31 changes: 0 additions & 31 deletions internal/utils/filesys/filesys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,34 +56,3 @@ func EnsureDirPathExist(dirPath string) error {

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
}
Loading