From 1681138729e6650598019ee21028e7a8f16ebde6 Mon Sep 17 00:00:00 2001
From: Gucheng Wang <nomeguy@qq.com>
Date: Fri, 6 Jan 2023 19:04:38 +0800
Subject: [PATCH] Add getAllFilePathsInFolder()

---
 i18n/generate.go         | 10 ++++------
 i18n/generate_backend.go | 27 ---------------------------
 i18n/generate_test.go    |  2 +-
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/i18n/generate.go b/i18n/generate.go
index 675030db..3388ef88 100644
--- a/i18n/generate.go
+++ b/i18n/generate.go
@@ -46,17 +46,15 @@ func getAllI18nStrings(fileContent string) []string {
 	return res
 }
 
-func getAllJsFilePaths() []string {
-	path := "../web/src"
-
+func getAllFilePathsInFolder(folder string, fileSuffix string) []string {
 	res := []string{}
-	err := filepath.Walk(path,
+	err := filepath.Walk(folder,
 		func(path string, info os.FileInfo, err error) error {
 			if err != nil {
 				return err
 			}
 
-			if !strings.HasSuffix(info.Name(), ".js") {
+			if !strings.HasSuffix(info.Name(), fileSuffix) {
 				return nil
 			}
 
@@ -73,7 +71,7 @@ func getAllJsFilePaths() []string {
 
 func parseToData() *I18nData {
 	allWords := []string{}
-	paths := getAllJsFilePaths()
+	paths := getAllFilePathsInFolder("../web/src", ".js")
 	for _, path := range paths {
 		fileContent := util.ReadStringFromPath(path)
 		words := getAllI18nStrings(fileContent)
diff --git a/i18n/generate_backend.go b/i18n/generate_backend.go
index 6cdeb281..8332f12e 100644
--- a/i18n/generate_backend.go
+++ b/i18n/generate_backend.go
@@ -15,8 +15,6 @@
 package i18n
 
 import (
-	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -57,31 +55,6 @@ func GetAllI18nStrings(fileContent string, path string) []string {
 	return res
 }
 
-func getAllGoFilePaths() []string {
-	path := "../"
-
-	res := []string{}
-	err := filepath.Walk(path,
-		func(path string, info os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-
-			if !strings.HasSuffix(info.Name(), ".go") {
-				return nil
-			}
-
-			res = append(res, path)
-			// fmt.Println(path, info.Name())
-			return nil
-		})
-	if err != nil {
-		panic(err)
-	}
-
-	return res
-}
-
 func getErrName(paths []string) map[string]string {
 	ErrName := make(map[string]string)
 	for i := 0; i < len(paths); i++ {
diff --git a/i18n/generate_test.go b/i18n/generate_test.go
index f70104e4..e130a0e7 100644
--- a/i18n/generate_test.go
+++ b/i18n/generate_test.go
@@ -40,7 +40,7 @@ func TestGenerateI18nStringsForFrontend(t *testing.T) {
 }
 
 func TestGenerateI18nStringsForBackend(t *testing.T) {
-	paths := getAllGoFilePaths()
+	paths := getAllFilePathsInFolder("../", ".go")
 
 	errName := getErrName(paths)