Skip to content

Commit fe38f80

Browse files
author
Matt Brittan
committed
Resolve "cannot use os.ReadDir" introduced in PR #665
1 parent b7215e4 commit fe38f80

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

filestore.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package mqtt
2020

2121
import (
22+
"io/fs"
2223
"os"
2324
"path"
2425
"sort"
@@ -158,15 +159,20 @@ func (store *FileStore) Reset() {
158159
func (store *FileStore) all() []string {
159160
var err error
160161
var keys []string
161-
var files fileInfos
162162

163163
if !store.opened {
164164
ERROR.Println(STR, "trying to use file store, but not open")
165165
return nil
166166
}
167167

168-
files, err = os.ReadDir(store.directory)
168+
entries, err := os.ReadDir(store.directory)
169169
chkerr(err)
170+
files := make(fileInfos, 0, len(entries))
171+
for _, entry := range entries {
172+
info, err := entry.Info()
173+
chkerr(err)
174+
files = append(files, info)
175+
}
170176
sort.Sort(files)
171177
for _, f := range files {
172178
DEBUG.Println(STR, "file in All():", f.Name())
@@ -245,7 +251,7 @@ func exists(file string) bool {
245251
return true
246252
}
247253

248-
type fileInfos []os.FileInfo
254+
type fileInfos []fs.FileInfo
249255

250256
func (f fileInfos) Len() int {
251257
return len(f)

0 commit comments

Comments
 (0)