It is not a purpose of walker

kachick · Aug 23, 2023 · 0222807 · 0222807
1 parent 786c70f
commit 0222807
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/cmd/fmt/main.go b/cmd/fmt/main.go
@@ -3,22 +3,23 @@
 package main
 
 import (
+	"dotfiles/internal/constants"
 	"dotfiles/internal/fileutils"
 	"dotfiles/internal/runner"
 )
 
 func main() {
-	wr := fileutils.GetWalker()
+	walker := fileutils.GetWalker()
 
-	bashPaths := wr.GetAllBash()
-	nixPaths := wr.GetAllNix()
+	bashPaths := walker.GetAllBash()
+	nixPaths := walker.GetAllNix()
 
 	// Do not cover the same files in another formatter for parallel processing
 	cmds := runner.Commands{
 		{Path: "dprint", Args: []string{"fmt"}},
 		{Path: "shfmt", Args: append([]string{"--language-dialect", "bash", "--write"}, bashPaths...)},
 		{Path: "nixpkgs-fmt", Args: nixPaths},
-		{Path: "typos", Args: append(fileutils.GetTyposTargetedRoots(), "--write-changes")},
+		{Path: "typos", Args: append(constants.GetTyposTargetedRoots(), "--write-changes")},
 		{Path: "go", Args: []string{"fmt", "./..."}},
 	}
 

diff --git a/cmd/lint/main.go b/cmd/lint/main.go
@@ -3,6 +3,7 @@
 package main
 
 import (
+	"dotfiles/internal/constants"
 	"dotfiles/internal/fileutils"
 	"dotfiles/internal/runner"
 )
@@ -18,7 +19,7 @@ func main() {
 		{Path: "shfmt", Args: append([]string{"--language-dialect", "bash", "--diff"}, bashPaths...)},
 		{Path: "shellcheck", Args: bashPaths},
 		{Path: "nixpkgs-fmt", Args: append([]string{"--check"}, nixPaths...)},
-		{Path: "typos", Args: fileutils.GetTyposTargetedRoots()},
+		{Path: "typos", Args: constants.GetTyposTargetedRoots()},
 		{Path: "gitleaks", Args: []string{"detect"}},
 		{Path: "go", Args: []string{"vet", "./..."}},
 	}

diff --git a/internal/constants/main.go b/internal/constants/main.go
@@ -0,0 +1,9 @@
+package constants
+
+func GetTyposTargetedRoots() []string {
+	return []string{
+		".",
+		".github", ".vscode",
+		"home/.config", "home/.stack",
+	}
+}
diff --git a/internal/fileutils/walker.go b/internal/fileutils/walker.go
@@ -8,14 +8,6 @@ import (
 	"golang.org/x/exp/slices"
 )
 
-func GetTyposTargetedRoots() []string {
-	return []string{
-		".",
-		".github", ".vscode",
-		"home/.config", "home/.stack",
-	}
-}
-
 type WalkedReport struct {
 	Path string
 	Dir  fs.DirEntry