Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-16 20:07:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid share causing error during cleaning (#4570)

Browse Source
This commit is contained in:
WithoutPants
2024-02-19 10:24:10 +11:00
committed by GitHub
parent 6e9718a600
commit e7f610ce18
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/file/clean.go
View File

@@ -318,11 +318,22 @@ func (j *cleanJob) flagFolderForDelete(ctx context.Context, toDelete *deleteSet,
return nil return nil
} }
func isNotFound(err error) bool {
// ErrInvalid can occur in zip files where the zip file path changed
// and the underlying folder did not
// #3877 - fs.PathError can occur if the network share no longer exists
var pathErr *fs.PathError
return err != nil &&
(errors.Is(err, fs.ErrNotExist) ||
!errors.Is(err, fs.ErrInvalid) ||
!errors.As(err, &pathErr))
}
func (j *cleanJob) shouldClean(ctx context.Context, f models.File) bool { func (j *cleanJob) shouldClean(ctx context.Context, f models.File) bool {
path := f.Base().Path path := f.Base().Path
info, err := f.Base().Info(j.FS) info, err := f.Base().Info(j.FS)
if err != nil && !errors.Is(err, fs.ErrNotExist) { if err != nil && !isNotFound(err) {
logger.Errorf("error getting file info for %q, not cleaning: %v", path, err) logger.Errorf("error getting file info for %q, not cleaning: %v", path, err)
return false return false
} }
@@ -344,9 +355,8 @@ func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool
path := f.Path path := f.Path
info, err := f.Info(j.FS) info, err := f.Info(j.FS)
// ErrInvalid can occur in zip files where the zip file path changed
// and the underlying folder did not if err != nil && !isNotFound(err) {
if err != nil && !errors.Is(err, fs.ErrNotExist) && !errors.Is(err, fs.ErrInvalid) {
logger.Errorf("error getting folder info for %q, not cleaning: %v", path, err) logger.Errorf("error getting folder info for %q, not cleaning: %v", path, err)
return false return false
} }
@@ -367,7 +377,7 @@ func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool
} }
info, err = j.FS.Lstat(finalPath) info, err = j.FS.Lstat(finalPath)
if err != nil { if err != nil && !isNotFound(err) {
logger.Errorf("error getting file info for %q (-> %s), not cleaning: %v", path, finalPath, err) logger.Errorf("error getting file info for %q (-> %s), not cleaning: %v", path, finalPath, err)
return false return false
} }