sashakoshka/step
sashakoshka/step
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

providers/os: readDir now returns a slice of fs.DirEntry

Browse Source
This commit is contained in:
Sasha Koshka 2024-12-10 02:18:42 -05:00
parent dc378008d6
commit eb7da68de6
1 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
providers/os/os.go
View File

@ -2,23 +2,12 @@ package os
import "os"
import "io"
import "time"
import "io/fs"
import "html/template"
import "git.tebibyte.media/sashakoshka/step"
var _ step.FuncProviderFor = new(Provider)
// FileInfo is like the fs.FileInfo interface, but it directly contains the
// values instead of having getters for them.
type FileInfo struct {
Name string
Size int64
Mode fs.FileMode
ModTime time.Time
IsDir bool
}
// Provider provides OS functions.
type Provider struct {
@ -80,18 +69,10 @@ func (this *state) funcIsDir (name string) (bool, error) {
return info.IsDir(), nil
}
func (this *state) funcStatFile (name string) (FileInfo, error) {
func (this *state) funcStatFile (name string) (fs.FileInfo, error) {
name, err := this.document.Rel(name)
if err != nil { return FileInfo { }, err }
info, err := os.Stat(name)
if err != nil { return FileInfo { }, err }
return FileInfo {
Name: info.Name(),
Size: info.Size(),
Mode: info.Mode(),
ModTime: info.ModTime(),
IsDir: info.IsDir(),
}, nil
if err != nil { return nil, err }
return os.Stat(name)
}
func (this *state) funcReadFile (name string) (string, error) {
@ -105,16 +86,10 @@ func (this *state) funcReadFile (name string) (string, error) {
return string(buffer), nil
}
func (this *state) funcReadDir (name string) ([]string, error) {
func (this *state) funcReadDir (name string) ([]fs.DirEntry, error) {
name, err := this.document.Rel(name)
if err != nil { return nil, err }
entries, err := os.ReadDir(name)
if err != nil { return nil, err }
names := make([]string, len(entries))
for index, entry := range entries {
names[index] = entry.Name()
}
return names, nil
return os.ReadDir(name)
}
func (this *state) funcWriteFile (name, content string) error {