Improve error reporting when moving a transcoded file fails (stashapp…

…#4101)
Dankonite · Sep 11, 2023 · 798db1a · 798db1a
1 parent 06d7630
commit 798db1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/fsutil/file.go b/pkg/fsutil/file.go
@@ -59,9 +59,9 @@ func SafeMove(src, dst string) error {
 	err := os.Rename(src, dst)
 
 	if err != nil {
-		err = CopyFile(src, dst)
-		if err != nil {
-			return err
+		copyErr := CopyFile(src, dst)
+		if copyErr != nil {
+			return fmt.Errorf("copying file during SaveMove failed with: '%w'; renaming file failed previously with: '%v'", copyErr, err)
 		}
 
 		err = os.Remove(src)

diff --git a/pkg/scene/generate/generator.go b/pkg/scene/generate/generator.go
@@ -97,7 +97,7 @@ func (g Generator) generateFile(lockCtx *fsutil.LockContext, p Paths, pattern st
 	}
 
 	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