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

providers/os: Add readDirDate function to match listFilesDate

Browse Source
This commit is contained in:
Sasha Koshka 2025-03-27 19:30:20 -04:00
parent 7e0c0b079b
commit 78ed9964a3
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
providers/os/os.go
View File

@ -33,6 +33,7 @@ func (this *Provider) FuncMapFor (document *step.Document) template.FuncMap {
"statFile": stat.funcStatFile, "statFile": stat.funcStatFile,
"readFile": stat.funcReadFile, "readFile": stat.funcReadFile,
"readDir": stat.funcReadDir, "readDir": stat.funcReadDir,
"readDirDate": stat.funcReadDirDate,
"listFiles": stat.funcListFiles, "listFiles": stat.funcListFiles,
"listFilesDate": stat.funcListFilesDate, "listFilesDate": stat.funcListFilesDate,
"writeFile": stat.funcWriteFile, "writeFile": stat.funcWriteFile,
@ -96,6 +97,15 @@ func (this *state) funcReadDir (name string) ([]fs.DirEntry, error) {
return os.ReadDir(name) return os.ReadDir(name)
} }
func (this *state) funcReadDirDate (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 }
sortDirEntriesByDate(entries)
return entries, nil
}
func (this *state) funcListFiles (name string) ([]string, error) { func (this *state) funcListFiles (name string) ([]string, error) {
name, err := this.document.Rel(name) name, err := this.document.Rel(name)
if err != nil { return nil, err } if err != nil { return nil, err }
@ -113,17 +123,7 @@ func (this *state) funcListFilesDate (name string) ([]string, error) {
if err != nil { return nil, err } if err != nil { return nil, err }
entries, err := os.ReadDir(name) entries, err := os.ReadDir(name)
if err != nil { return nil, err } if err != nil { return nil, err }
sort.Slice(entries, func(left, right int) bool{ sortDirEntriesByDate(entries)
var leftTime time.Time
if leftInfo, err := entries[left].Info(); err == nil {
leftTime = leftInfo.ModTime()
}
var rightTime time.Time
if rightInfo, err := entries[right].Info(); err == nil {
rightTime = rightInfo.ModTime()
}
return leftTime.Before(rightTime)
})
strings := make([]string, len(entries)) strings := make([]string, len(entries))
for index, entry := range entries { for index, entry := range entries {
strings[index] = entry.Name() strings[index] = entry.Name()
@ -160,3 +160,17 @@ func (this *state) funcRemoveFile (name string) error {
if err != nil { return err } if err != nil { return err }
return os.Remove(name) return os.Remove(name)
} }
func sortDirEntriesByDate(entries []fs.DirEntry) {
sort.Slice(entries, func(left, right int) bool{
var leftTime time.Time
if leftInfo, err := entries[left].Info(); err == nil {
leftTime = leftInfo.ModTime()
}
var rightTime time.Time
if rightInfo, err := entries[right].Info(); err == nil {
rightTime = rightInfo.ModTime()
}
return leftTime.Before(rightTime)
})
}