scancscode 1.0.28 → 1.0.29

package/src/CmdExecutor.ts

@@ -14,7 +14,15 @@ export class CmdExecutor {
         let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"
         let langs = ["zh_cn"];
         let literalCollector = new LiteralCollector();
-        literalCollector.convert(cscodeFolders, gameConfigFolders, outCsvFile, langs)
+        // return literalCollector.convert(cscodeFolders, gameConfigFolders, outCsvFile, langs,undefined,false,true)
+        return literalCollector.convert(cscodeFolders,
+            // [
+            // "E:/DATA/Projects/ZhiYou/DXTSProject/Client/Assets/Bundles/UI/",
+            //  "E:/DATA/Projects/ZhiYou/DXTSProject/Client/Assets/Bundles/Battle/",
+            //  "E:/DATA/Projects/ZhiYou/DXTSProject/Client/Assets/Scripts/",
+            // "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/",
+            // ],
+             gameConfigFolders, outCsvFile, langs)
         // node . --cscodedir ../../../GameClient/Assets/Bundles/FGUI/ --configdir ../../../GameClient/Assets/Bundles/GameConfigs/ --outcsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv --langs zh_cn
     }
     static async runConvertWithCmdOptions() {

package/src/LiteralCollector.ts

@@ -7,7 +7,7 @@ import { TableScanner } from "./TableScanner";
 
 export class LiteralCollector {
 
-    scanCodeInFolder(folder: string, literals: string[], unexpects: string[], trmethod: string, scanonly: boolean, verbose: boolean) {
+    async scanCodeInFolder(folder: string, literals: string[], unexpects: string[], trmethod: string, scanonly: boolean, verbose: boolean) {
         if (fs.existsSync(folder) == false) {
             console.warn(`代码目录不存在: ${folder}`);
             return;
@@ -15,32 +15,54 @@ export class LiteralCollector {
 
         let files = glob.sync("**/*.cs", { cwd: folder });
         let testFullPath = "@";
-        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/SutraUI_Detail/MainSutraDetailDialog.cs";
-        for (const filePath of files) {
-            let fullPath = folder + filePath;
-            if (testFullPath != "@") {
-                fullPath = testFullPath;
-            }
-            if (verbose) {
-                console.log(`处理文件: ${filePath}`);
-            }
-            const content = fs.readFileSync(fullPath, "utf-8");
-            const snippets = CSCodeScanner.scanFile(fullPath, content, trmethod);
-            if (snippets.length > 0) {
-                if (!scanonly) {
-                    let convertedContent = CSCodeScanner.replaceInFile(content, snippets);
-                    if (convertedContent != content) {
-                        fs.writeFileSync(fullPath, convertedContent, "utf-8");
-                    }
+        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/GameConfigs/Main/UnitAttributeTable-UnitAttributeTable.cs";
+        
+        // 限制并行处理的文件数量，避免内存占用过高
+        const batchSize = 10;
+        for (let i = 0; i < files.length; i += batchSize) {
+            const batchFiles = files.slice(i, i + batchSize);
+            const batchPromises = batchFiles.map(async (filePath) => {
+                let fullPath = folder + filePath;
+                if (testFullPath != "@") {
+                    fullPath = testFullPath;
+                }
+                if (verbose) {
+                    console.log(`处理文件: ${filePath}, ${fullPath}`);
                 }
+                try {
+                    const content = await fs.promises.readFile(fullPath, "utf-8");
+                    const snippets = CSCodeScanner.scanFile(fullPath, content, trmethod);
+                    CSCodeScanner.filterSnippets(snippets);
+                    
+                    if (snippets.length > 0) {
+                        if (!scanonly) {
+                            let convertedContent = CSCodeScanner.replaceInFile(content, snippets);
+                            if (convertedContent != content) {
+                                await fs.promises.writeFile(fullPath, convertedContent, "utf-8");
+                            }
+                        }
 
-                for (const snippet of snippets) {
-                    literals.push(...snippet.literals);
-                    unexpects.push(...snippet.unexpects);
+                        const fileLiterals: string[] = [];
+                        const fileUnexpects: string[] = [];
+                        for (const snippet of snippets) {
+                            fileLiterals.push(...snippet.literals);
+                            fileUnexpects.push(...snippet.unexpects);
+                        }
+                        return { literals: fileLiterals, unexpects: fileUnexpects };
+                    }
+                } catch (error) {
+                    console.error(`处理文件失败: ${fullPath}`, error);
                 }
+                return { literals: [], unexpects: [] };
+            });
+
+            const batchResults = await Promise.all(batchPromises);
+            for (const result of batchResults) {
+                literals.push(...result.literals);
+                unexpects.push(...result.unexpects);
             }
 
-            if (fullPath == testFullPath) {
+            if (testFullPath != "@") {
                 break;
             }
         }
@@ -49,13 +71,18 @@ export class LiteralCollector {
 
     }
 
-    scanTablesInFolder(folder: string, literals: string[], verbose: boolean) {
+    async scanTablesInFolder(folder: string, literals: string[], verbose: boolean) {
         if (fs.existsSync(folder) == false) {
             console.warn(`表格目录不存在: ${folder}`);
             return;
         }
         let scanner = new TableScanner();
-        scanner.scanTablesLiterals(folder + "Main/", literals, verbose);
+        await scanner.scanTablesLiterals(folder + "Main/", literals, verbose);
+    }
+
+    static needTranslate(literal: string): boolean {
+        let match = literal.match(/^[\da-zA-Z!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/? ]+$/m);
+        return match == null;
     }
 
     /**
@@ -66,8 +93,8 @@ export class LiteralCollector {
         let literalsSet = new Set(literals);
         literalsSet.delete("");
         for (let literal of literals) {
-            let match = literal.match(/^[\da-zA-Z!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+$/m);
-            if (match != null) {
+            let needTr = LiteralCollector.needTranslate(literal);
+            if (!needTr) {
                 literalsSet.delete(literal)
             }
         }
@@ -79,12 +106,28 @@ export class LiteralCollector {
 
         let literals: string[] = [];
         let unexpects: string[] = [];
-        for (const cscodeFolder of cscodeFolders) {
-            this.scanCodeInFolder(cscodeFolder, literals, unexpects, trmethod, scanonly, verbose);
-        }
-        for (const gameConfigFolder of gameConfigFolders) {
-            this.scanTablesInFolder(gameConfigFolder, literals, verbose);
+        
+        // 并行处理代码文件夹
+        const codeFolderPromises = cscodeFolders.map(async (cscodeFolder) => {
+            const folderLiterals: string[] = [];
+            const folderUnexpects: string[] = [];
+            await this.scanCodeInFolder(cscodeFolder, folderLiterals, folderUnexpects, trmethod, scanonly, verbose);
+            return { literals: folderLiterals, unexpects: folderUnexpects };
+        });
+        
+        const codeFolderResults = await Promise.all(codeFolderPromises);
+        for (const result of codeFolderResults) {
+            literals.push(...result.literals);
+            unexpects.push(...result.unexpects);
         }
+        
+        // 并行处理表格文件夹
+        const tableFolderPromises = gameConfigFolders.map(async (gameConfigFolder) => {
+            await this.scanTablesInFolder(gameConfigFolder, literals, verbose);
+        });
+        await Promise.all(tableFolderPromises);
+        
+        // 去重和过滤
         this.filterLiterals(literals);
 
         if (verbose) {

package/src/TableScanner.ts

@@ -14,55 +14,79 @@ export class TableScanner {
         }
     }
     scanJsonWords(jsonContent: string, fields: string[], literals: string[]) {
-        let arr = JSON.parse(jsonContent);
-        for (const jsonRow of arr) {
-            for (const key of fields) {
-                let value = jsonRow[key];
-                if (typeof (value) == "string") {
-                    literals.push(value);
-                } else if (Array.isArray(value)) {
-                    literals.push(...value);
+        try {
+            let arr = JSON.parse(jsonContent);
+            for (const jsonRow of arr) {
+                for (const key of fields) {
+                    let value = jsonRow[key];
+                    if (typeof (value) == "string") {
+                        literals.push(value);
+                    } else if (Array.isArray(value)) {
+                        literals.push(...value);
+                    }
                 }
             }
+        } catch (error) {
+            console.error(`解析JSON失败: ${error}`);
         }
     }
-    scanTableLiterals(csFullPath: string, literals: string[], verbose: boolean) {
+    async scanTableLiterals(csFullPath: string, literals: string[], verbose: boolean) {
         // csFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/GameConfigs/Main/RefinerTable-RefinerEventTable.cs";
         let jsonFullPath = csFullPath.replace("/Main/", "/Auto/").replace(/\.cs$/, ".json");
-        if (fs.existsSync(jsonFullPath) && fs.existsSync(csFullPath)) {
-            let csContent = fs.readFileSync(csFullPath, "utf-8");
-            let trstrFields = this.parseTrStrFields(csContent);
-            if (trstrFields.length > 0) {
-                if (verbose) {
-                    console.log(`扫描表格: ${csFullPath} , 需要翻译字段: ${trstrFields}`);
+        try {
+            const [csExists, jsonExists] = await Promise.all([
+                fs.promises.access(csFullPath).then(() => true).catch(() => false),
+                fs.promises.access(jsonFullPath).then(() => true).catch(() => false)
+            ]);
+            
+            if (jsonExists && csExists) {
+                const [csContent, jsonContent] = await Promise.all([
+                    fs.promises.readFile(csFullPath, "utf-8"),
+                    fs.promises.readFile(jsonFullPath, "utf-8")
+                ]);
+                
+                let trstrFields = this.parseTrStrFields(csContent);
+                if (trstrFields.length > 0) {
+                    if (verbose) {
+                        console.log(`扫描表格: ${csFullPath} , 需要翻译字段: ${trstrFields}`);
+                    }
+                    this.scanJsonWords(jsonContent, trstrFields, literals);
+                } else {
+                    if (verbose) {
+                        console.log(`跳过表格: ${csFullPath}`);
+                    }
                 }
-                let jsonContent = fs.readFileSync(jsonFullPath, "utf-8");
-                this.scanJsonWords(jsonContent, trstrFields, literals);
             } else {
                 if (verbose) {
-                    console.log(`跳过表格: ${csFullPath}`);
-                }
-            }
-        } else {
-            if (verbose) {
-                if (fs.existsSync(csFullPath) == false) {
-                    console.warn(`表格 CS 文件不存在: ${jsonFullPath}`);
-                }
-                if (fs.existsSync(jsonFullPath) == false) {
-                    console.warn(`表格 JSON 文件不存在: ${csFullPath}`);
+                    if (!csExists) {
+                        console.warn(`表格 CS 文件不存在: ${jsonFullPath}`);
+                    }
+                    if (!jsonExists) {
+                        console.warn(`表格 JSON 文件不存在: ${csFullPath}`);
+                    }
                 }
             }
+        } catch (error) {
+            console.error(`处理表格文件失败: ${csFullPath}`, error);
         }
     }
     /**
      * 扫描
      */
-    scanTablesLiterals(folder: string, literals: string[], verbose: boolean) {
+    async scanTablesLiterals(folder: string, literals: string[], verbose: boolean) {
         let dir = folder;
         let files = glob.sync("*.cs", { cwd: dir });
-        for (const filePath of files.reverse()) {
-            let csFullPath = folder + filePath;
-            this.scanTableLiterals(csFullPath, literals, verbose);
+        
+        // 限制并行处理的文件数量，避免内存占用过高
+        const batchSize = 10;
+        for (let i = 0; i < files.length; i += batchSize) {
+            const batchFiles = files.slice(i, i + batchSize).reverse();
+            const batchPromises = batchFiles.map(async (filePath) => {
+                let csFullPath = folder + filePath;
+                await this.scanTableLiterals(csFullPath, literals, verbose);
+            });
+            
+            await Promise.all(batchPromises);
         }
     }
 }