From a567a27c696caa046b388485c869fff5863531b0 Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Sat, 17 Dec 2022 22:44:29 +0400 Subject: [PATCH] A deprecated ioutil was replaced with os.ReadDir. And a bit mask compare was used instead of a symbol compare. --- pkg/files/files.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/files/files.go b/pkg/files/files.go index 9597e48..6901c62 100644 --- a/pkg/files/files.go +++ b/pkg/files/files.go @@ -1,7 +1,6 @@ package files import ( - "io/ioutil" "net/url" "os" "path/filepath" @@ -28,11 +27,16 @@ func ScanDirectory(path, urlBase string) (entries []DirEntry, stats DirStats, er var fileEntries []DirEntry = make([]DirEntry, 0) var totalFilesSize int64 = 0 - dir, err := ioutil.ReadDir(path) - for _, entry := range dir { + dir, err := os.ReadDir(path) + if err != nil { + return + } + + for _, ent := range dir { + entry, _ := ent.Info() var isDirLink bool - if entry.Mode().Type().String()[0] == 'L' { + if entry.Mode().Type()&os.ModeSymlink != 0 { if slp, err := filepath.EvalSymlinks(filepath.Join(path, entry.Name())); err == nil { lStat, _ := os.Lstat(slp) isDirLink = lStat.IsDir()