ensure sort is performed before validations

ayoisaiah · Jul 22, 2024 · 877ae04 · 877ae04
1 parent bc22222
commit 877ae04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/rename/rename.go b/rename/rename.go
@@ -22,7 +22,6 @@ import (
 	"github.com/ayoisaiah/f2/internal/file"
 	"github.com/ayoisaiah/f2/internal/jsonutil"
 	"github.com/ayoisaiah/f2/internal/osutil"
-	"github.com/ayoisaiah/f2/internal/sortfiles"
 	"github.com/ayoisaiah/f2/report"
 )
 
@@ -214,10 +213,6 @@ func Rename(
 	conf *config.Config,
 	fileChanges []*file.Change,
 ) error {
-	if conf.IncludeDir {
-		sortfiles.ForRenamingAndUndo(fileChanges, conf.Revert)
-	}
-
 	if !conf.Interactive && !conf.Exec && !conf.JSON {
 		report.NonInteractive(fileChanges)
 		return nil

diff --git a/replace/replace.go b/replace/replace.go
@@ -777,5 +777,9 @@ func Replace(
 		return nil, err
 	}
 
+	if conf.IncludeDir {
+		sortfiles.ForRenamingAndUndo(changes, conf.Revert)
+	}
+
 	return changes, nil
 }
diff --git a/replace/replace_test/replace_test.go b/replace/replace_test/replace_test.go
@@ -166,10 +166,10 @@ func TestReplace(t *testing.T) {
 				},
 			},
 			Want: []string{
-				"music/2013/overgrown",
 				"music/Overgrown (2013)/01-overgrown.flac",
 				"music/Overgrown (2013)/02-i-am-sold.flac",
 				"music/Overgrown (2013)/cover.jpg",
+				"music/2013/overgrown",
 			},
 			Args: []string{
 				"-f",