scancscode 1.0.31 → 1.0.34

package/src/CmdExecutor.ts

@@ -1,106 +1,107 @@
-import { CSVUtils } from "./CSVUtils";
-import { LiteralCollector } from "./LiteralCollector";
-import commandLineArgs from 'command-line-args'
-
-function isNullOrEmpty<T>(arr: T[]): boolean {
-    return arr == null || arr.length == 0;
-}
-
-export class CmdExecutor {
-    static testConvert() {
-        let cwd = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/"
-        let cscodeFolders = [cwd + "Assets/Bundles/FGUI/"]
-        let gameConfigFolders = [cwd + "Assets/Bundles/GameConfigs/"]
-        let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"
-        let langs = ["zh_cn"];
-        let literalCollector = new LiteralCollector();
-        // 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() {
-        const optionDefinitions = [
-            { name: 'cscodedir', type: String, multiple: true },
-            { name: 'configdir', type: String, multiple: true },
-            { name: 'outcsv', type: String },
-            { name: "langs", type: String, multiple: true, defaultOption: true },
-            { name: "verbose", alias: 'v', type: Boolean },
-            { name: "scanonly", type: Boolean, defaultOption: false },
-            { name: "trmethod", type: String }
-        ]
-        const options = commandLineArgs(optionDefinitions)
-        let cscodedir: string[] = options.cscodedir ?? []
-        let configdir: string[] = options.configdir ?? []
-        let outcsv: string = options.outcsv
-        let langs: string[] = options.langs ?? ["zh_cn"]
-        let verbose: boolean = options.verbose ?? false
-        let scanonly: boolean = options.scanonly ?? false
-        let trmethod: string = options.trmethod ?? "Tr.TR"
-
-        let argv = process.argv
-        if (isNullOrEmpty(cscodedir) && isNullOrEmpty(configdir)) {
-            if (isNullOrEmpty(cscodedir)) {
-                console.error(`cscodedir missing:`, argv)
-                return
-            }
-            if (isNullOrEmpty(configdir)) {
-                console.error(`configdir missing:`, argv)
-                return
-            }
-        }
-        if (outcsv == null) {
-            console.error(`outcsv missing:`, argv)
-            return
-        }
-        if (isNullOrEmpty(langs)) {
-            console.error(`langs missing:`, argv)
-            return
-        }
-        console.log(`convert cmd options: `, cscodedir, configdir, outcsv, langs, verbose)
-        let literalCollector = new LiteralCollector();
-        await literalCollector.convert(cscodedir, configdir, outcsv, langs, trmethod, scanonly, verbose)
-        console.log("convert done.")
-    }
-    static testSlimCsv() {
-        let inCsvFile = ["E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"]
-        let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv"
-        let langs = ["zh_cn"];
-        CSVUtils.slimCsvWithLangs(inCsvFile, outCsvFile, langs);
-        // node bin/slimlangs.js --incsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv --outcsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv --langs zh_cn
-    }
-    static async runSlimCsvWithLangs() {
-        const optionDefinitions = [
-            { name: 'incsv', type: String, multiple: true },
-            { name: 'outcsv', type: String },
-            { name: 'langs', type: String, multiple: true, defaultOption: true },
-        ];
-        const options = commandLineArgs(optionDefinitions);
-        let incsv: string[] = options.incsv ?? [];
-        let outcsv: string = options.outcsv;
-        let langs: string[] = options.langs ?? ["zh_cn"]
-
-        console.log(`slim csv cmd options: `, incsv, outcsv, langs);
-        let argv = process.argv;
-        if (isNullOrEmpty(incsv)) {
-            console.error(`incsv missing:`, argv);
-            return;
-        }
-        if (outcsv == null) {
-            console.error(`outcsv missing:`, argv);
-            return;
-        }
-        if (isNullOrEmpty(langs)) {
-            console.error(`langs missing:`, argv);
-            return;
-        }
-        await CSVUtils.slimCsvWithLangs(incsv, outcsv, langs);
-        console.log("slim csv with langs done.");
-    }
-}
+import { CSVUtils } from "./CSVUtils";
+import { LiteralCollector } from "./LiteralCollector";
+import commandLineArgs from 'command-line-args'
+
+function isNullOrEmpty<T>(arr: T[]): boolean {
+    return arr == null || arr.length == 0;
+}
+
+export class CmdExecutor {
+    static testConvert() {
+        let cwd = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/"
+        let cscodeFolders =
+            [cwd + "Assets/Bundles/FGUI/"]
+
+        // [
+        // "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/",
+        // ]
+
+        let gameConfigFolders = [cwd + "Assets/Bundles/GameConfigs/"]
+        let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"
+        let langs = ["zh_cn"];
+        let literalCollector = new LiteralCollector();
+        // return literalCollector.convert(cscodeFolders, gameConfigFolders, outCsvFile, langs,undefined,false,true)
+        return literalCollector.convert(cscodeFolders, 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() {
+        const optionDefinitions = [
+            { name: 'cscodedir', type: String, multiple: true },
+            { name: 'configdir', type: String, multiple: true },
+            { name: 'outcsv', type: String },
+            { name: "langs", type: String, multiple: true, defaultOption: true },
+            { name: "verbose", alias: 'v', type: Boolean },
+            { name: "scanonly", type: Boolean, defaultOption: false },
+            { name: "trmethod", type: String }
+        ]
+        const options = commandLineArgs(optionDefinitions)
+        let cscodedir: string[] = options.cscodedir ?? []
+        let configdir: string[] = options.configdir ?? []
+        let outcsv: string = options.outcsv
+        let langs: string[] = options.langs ?? ["zh_cn"]
+        let verbose: boolean = options.verbose ?? false
+        let scanonly: boolean = options.scanonly ?? false
+        let trmethod: string = options.trmethod ?? "Tr.TR"
+
+        let argv = process.argv
+        if (isNullOrEmpty(cscodedir) && isNullOrEmpty(configdir)) {
+            if (isNullOrEmpty(cscodedir)) {
+                console.error(`cscodedir missing:`, argv)
+                return
+            }
+            if (isNullOrEmpty(configdir)) {
+                console.error(`configdir missing:`, argv)
+                return
+            }
+        }
+        if (outcsv == null) {
+            console.error(`outcsv missing:`, argv)
+            return
+        }
+        if (isNullOrEmpty(langs)) {
+            console.error(`langs missing:`, argv)
+            return
+        }
+        console.log(`convert cmd options: `, cscodedir, configdir, outcsv, langs, verbose)
+        let literalCollector = new LiteralCollector();
+        await literalCollector.convert(cscodedir, configdir, outcsv, langs, trmethod, scanonly, verbose)
+        console.log("convert done.")
+    }
+    static testSlimCsv() {
+        let inCsvFile = ["E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"]
+        let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv"
+        let langs = ["zh_cn"];
+        CSVUtils.slimCsvWithLangs(inCsvFile, outCsvFile, langs);
+        // node bin/slimlangs.js --incsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv --outcsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv --langs zh_cn
+    }
+    static async runSlimCsvWithLangs() {
+        const optionDefinitions = [
+            { name: 'incsv', type: String, multiple: true },
+            { name: 'outcsv', type: String },
+            { name: 'langs', type: String, multiple: true, defaultOption: true },
+        ];
+        const options = commandLineArgs(optionDefinitions);
+        let incsv: string[] = options.incsv ?? [];
+        let outcsv: string = options.outcsv;
+        let langs: string[] = options.langs ?? ["zh_cn"]
+
+        console.log(`slim csv cmd options: `, incsv, outcsv, langs);
+        let argv = process.argv;
+        if (isNullOrEmpty(incsv)) {
+            console.error(`incsv missing:`, argv);
+            return;
+        }
+        if (outcsv == null) {
+            console.error(`outcsv missing:`, argv);
+            return;
+        }
+        if (isNullOrEmpty(langs)) {
+            console.error(`langs missing:`, argv);
+            return;
+        }
+        await CSVUtils.slimCsvWithLangs(incsv, outcsv, langs);
+        console.log("slim csv with langs done.");
+    }
+}

package/src/LiteralCollector.ts

@@ -1,143 +1,143 @@
-import * as fs from "fs";
-import { glob } from "glob";
-import { CSCodeScanner } from "./CSCodeScanner";
-import { CSVUtils } from "./CSVUtils";
-import { TableScanner } from "./TableScanner";
-
-
-export class LiteralCollector {
-
-    async scanCodeInFolder(folder: string, literals: string[], unexpects: string[], trmethod: string, scanonly: boolean, verbose: boolean) {
-        if (fs.existsSync(folder) == false) {
-            console.warn(`代码目录不存在: ${folder}`);
-            return;
-        }
-
-        let files = glob.sync("**/*.cs", { cwd: folder });
-        let testFullPath = "@";
-        // 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");
-                            }
-                        }
-
-                        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 (testFullPath != "@") {
-                break;
-            }
-        }
-
-        unexpects = [...new Set(unexpects)];
-
-    }
-
-    async scanTablesInFolder(folder: string, literals: string[], verbose: boolean) {
-        if (fs.existsSync(folder) == false) {
-            console.warn(`表格目录不存在: ${folder}`);
-            return;
-        }
-        let scanner = new TableScanner();
-        await scanner.scanTablesLiterals(folder + "Main/", literals, verbose);
-    }
-
-    static needTranslate(literal: string): boolean {
-        let match = literal.match(/^[\da-zA-Z!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/? ]+$/m);
-        return match == null;
-    }
-
-    /**
-     * 去重
-     * @param literals 
-     */
-    filterLiterals(literals: string[]) {
-        let literalsSet = new Set(literals);
-        literalsSet.delete("");
-        for (let literal of literals) {
-            let needTr = LiteralCollector.needTranslate(literal);
-            if (!needTr) {
-                literalsSet.delete(literal)
-            }
-        }
-        literals.length = 0;
-        literals.push(...literalsSet);
-    }
-
-    async convert(cscodeFolders: string[], gameConfigFolders: string[], outCsvFile: string, langs: string[], trmethod: string = "Tr.TR", scanonly: boolean = false, verbose: boolean = false) {
-
-        let literals: string[] = [];
-        let unexpects: string[] = [];
-        
-        // 并行处理代码文件夹
-        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) {
-            console.log("扫描合并结果:", literals);
-        }
-        if (!scanonly) {
-            await CSVUtils.updateToFile(outCsvFile, literals, langs);
-        }
-        for (const unexpect of unexpects) {
-            console.error(unexpect);
-        }
-    }
-}
+import * as fs from "fs";
+import { glob } from "glob";
+import { CSCodeScanner } from "./CSCodeScanner";
+import { CSVUtils } from "./CSVUtils";
+import { TableScanner } from "./TableScanner";
+
+
+export class LiteralCollector {
+
+    async scanCodeInFolder(folder: string, literals: string[], unexpects: string[], trmethod: string, scanonly: boolean, verbose: boolean) {
+        if (fs.existsSync(folder) == false) {
+            console.warn(`代码目录不存在: ${folder}`);
+            return;
+        }
+
+        let files = glob.sync("**/*.cs", { cwd: folder });
+        let testFullPath = "@";
+        // 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");
+                            }
+                        }
+
+                        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 (testFullPath != "@") {
+                break;
+            }
+        }
+
+        unexpects = [...new Set(unexpects)];
+
+    }
+
+    async scanTablesInFolder(folder: string, literals: string[], verbose: boolean) {
+        if (fs.existsSync(folder) == false) {
+            console.warn(`表格目录不存在: ${folder}`);
+            return;
+        }
+        let scanner = new TableScanner();
+        await scanner.scanTablesLiterals(folder + "Main/", literals, verbose);
+    }
+
+    static needTranslate(literal: string): boolean {
+        let match = literal.match(/^[\da-zA-Z!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/? ]+$/m);
+        return match == null;
+    }
+
+    /**
+     * 去重
+     * @param literals 
+     */
+    filterLiterals(literals: string[]) {
+        let literalsSet = new Set(literals);
+        literalsSet.delete("");
+        for (let literal of literals) {
+            let needTr = LiteralCollector.needTranslate(literal);
+            if (!needTr) {
+                literalsSet.delete(literal)
+            }
+        }
+        literals.length = 0;
+        literals.push(...literalsSet);
+    }
+
+    async convert(cscodeFolders: string[], gameConfigFolders: string[], outCsvFile: string, langs: string[], trmethod: string = "Tr.TR", scanonly: boolean = false, verbose: boolean = false) {
+
+        let literals: string[] = [];
+        let unexpects: string[] = [];
+        
+        // 并行处理代码文件夹
+        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) {
+            console.log("扫描合并结果:", literals);
+        }
+        if (!scanonly) {
+            await CSVUtils.updateToFile(outCsvFile, literals, langs);
+        }
+        for (const unexpect of unexpects) {
+            console.error(unexpect);
+        }
+    }
+}

package/src/RunConvert.ts

@@ -1,3 +1,3 @@
-import { CmdExecutor } from "./CmdExecutor";
-
-CmdExecutor.runConvertWithCmdOptions()
+import { CmdExecutor } from "./CmdExecutor";
+
+CmdExecutor.runConvertWithCmdOptions()

package/src/RunSlimLangs.ts

@@ -1,3 +1,3 @@
-import { CmdExecutor } from "./CmdExecutor";
-
-CmdExecutor.runSlimCsvWithLangs()
+import { CmdExecutor } from "./CmdExecutor";
+
+CmdExecutor.runSlimCsvWithLangs()