Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting when moving a transcoded file fails (#4101)

Browse Source
This commit is contained in:
its-josh4
2023-09-10 19:48:39 -07:00
committed by GitHub
parent 06d76307c3
commit 798db1a8ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/fsutil/file.go
View File

@@ -59,9 +59,9 @@ func SafeMove(src, dst string) error {
err := os.Rename(src, dst) err := os.Rename(src, dst)
if err != nil { if err != nil {
err = CopyFile(src, dst) copyErr := CopyFile(src, dst)
if err != nil { if copyErr != nil {
return err return fmt.Errorf("copying file during SaveMove failed with: '%w'; renaming file failed previously with: '%v'", copyErr, err)
} }
err = os.Remove(src) err = os.Remove(src)

2
pkg/scene/generate/generator.go
View File

@@ -97,7 +97,7 @@ func (g Generator) generateFile(lockCtx *fsutil.LockContext, p Paths, pattern st
} }
if err := fsutil.SafeMove(tmpFn, output); err != nil { if err := fsutil.SafeMove(tmpFn, output); err != nil {
return fmt.Errorf("moving %s to %s", tmpFn, output) return fmt.Errorf("moving %s to %s failed: %w", tmpFn, output, err)
} }
return nil return nil