arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Skip unreadable directories. Fixes #328

Browse Source
This commit is contained in:
Deluan
2020-06-12 10:42:45 -04:00
committed by Deluan Quintão
parent 3190611ec8
commit 01919661e9
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/change_detector.go
+28 -16
View File
@@ -1,6 +1,7 @@
package scanner package scanner
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"time" "time"
@@ -46,18 +47,13 @@ func (s *ChangeDetector) Scan(lastModifiedSince time.Time) (changed []string, de
} }
func (s *ChangeDetector) loadDir(dirPath string) (children []string, lastUpdated time.Time, err error) { func (s *ChangeDetector) loadDir(dirPath string) (children []string, lastUpdated time.Time, err error) {
dir, err := os.Open(dirPath)
if err != nil {
return
}
defer dir.Close()
dirInfo, err := os.Stat(dirPath) dirInfo, err := os.Stat(dirPath)
if err != nil { if err != nil {
return return
} }
lastUpdated = dirInfo.ModTime() lastUpdated = dirInfo.ModTime()
files, err := dir.Readdir(-1) files, err := ioutil.ReadDir(dirPath)
if err != nil { if err != nil {
return return
} }
@@ -67,7 +63,7 @@ func (s *ChangeDetector) loadDir(dirPath string) (children []string, lastUpdated
if err != nil { if err != nil {
continue continue
} }
if isDir && !isDirIgnored(dirPath, f) { if isDir && !isDirIgnored(dirPath, f) && isDirReadable(dirPath, f) {
children = append(children, filepath.Join(dirPath, f.Name())) children = append(children, filepath.Join(dirPath, f.Name()))
} else { } else {
if f.ModTime().After(lastUpdated) { if f.ModTime().After(lastUpdated) {
@@ -78,31 +74,47 @@ func (s *ChangeDetector) loadDir(dirPath string) (children []string, lastUpdated
return return
} }
// isDirOrSymlinkToDir returns true if and only if the dirent represents a file // isDirOrSymlinkToDir returns true if and only if the dirInfo represents a file
// system directory, or a symbolic link to a directory. Note that if the dirent // system directory, or a symbolic link to a directory. Note that if the dirInfo
// is not a directory but is a symbolic link, this method will resolve by // is not a directory but is a symbolic link, this method will resolve by
// sending a request to the operating system to follow the symbolic link. // sending a request to the operating system to follow the symbolic link.
// Copied from github.com/karrick/godirwalk // Copied from github.com/karrick/godirwalk
func isDirOrSymlinkToDir(baseDir string, dirent os.FileInfo) (bool, error) { func isDirOrSymlinkToDir(baseDir string, dirInfo os.FileInfo) (bool, error) {
if dirent.IsDir() { if dirInfo.IsDir() {
return true, nil return true, nil
} }
if dirent.Mode()&os.ModeSymlink == 0 { if dirInfo.Mode()&os.ModeSymlink == 0 {
return false, nil return false, nil
} }
// Does this symlink point to a directory? // Does this symlink point to a directory?
dirent, err := os.Stat(filepath.Join(baseDir, dirent.Name())) dirInfo, err := os.Stat(filepath.Join(baseDir, dirInfo.Name()))
if err != nil { if err != nil {
return false, err return false, err
} }
return dirent.IsDir(), nil return dirInfo.IsDir(), nil
} }
func isDirIgnored(baseDir string, dirent os.FileInfo) bool { // isDirIgnored returns true if the directory represented by dirInfo contains an
_, err := os.Stat(filepath.Join(baseDir, dirent.Name(), consts.SkipScanFile)) // `ignore` file (named after consts.SkipScanFile)
func isDirIgnored(baseDir string, dirInfo os.FileInfo) bool {
_, err := os.Stat(filepath.Join(baseDir, dirInfo.Name(), consts.SkipScanFile))
return err == nil return err == nil
} }
// isDirReadable returns true if the directory represented by dirInfo is readable
func isDirReadable(baseDir string, dirInfo os.FileInfo) bool {
path := filepath.Join(baseDir, dirInfo.Name())
dir, err := os.Open(path)
if err != nil {
log.Debug("Warning: Skipping unreadable directory", "path", path, err)
return false
}
if err := dir.Close(); err != nil {
log.Error("Error closing directory", "path", path, err)
}
return true
}
func (s *ChangeDetector) loadMap(dirMap dirInfoMap, path string, since time.Time, maybe bool) error { func (s *ChangeDetector) loadMap(dirMap dirInfoMap, path string, since time.Time, maybe bool) error {
children, lastUpdated, err := s.loadDir(path) children, lastUpdated, err := s.loadDir(path)
if err != nil { if err != nil {