scancscode 1.0.8 → 1.0.10

package/dist/CSCodeScanner.js

@@ -35,7 +35,7 @@ class CSCodeScanner {
         let lineColumn = content.lastIndexOf('\n', index);
         return [lineIndex + 1, index - lineColumn];
     }
-    static scanFile(filePath, content) {
+    static scanFile(filePath, content, trclassname) {
         const snippets = [];
         const assignMatches = [...content.matchAll(CSCodeScanner.assignmentPattern)];
         for (let j = 0; j < assignMatches.length; j++) {
@@ -177,7 +177,7 @@ class CSCodeScanner {
             else {
                 convertedAssignLine = assignLine;
             }
-            let convertedAssignLine2 = convertedAssignLine.replaceAll(this.stringFormatPattern, "Tr.Format");
+            let convertedAssignLine2 = convertedAssignLine.replaceAll(this.stringFormatPattern, `${trclassname}.Format`);
             snippets.push({
                 originalIndex: assignMatch.index,
                 originalCode: assignLine,

package/dist/CmdExecutor.js

@@ -29,6 +29,7 @@ class CmdExecutor {
             { name: "langs", type: String, multiple: true, defaultOption: true },
             { name: "verbose", alias: 'v', type: Boolean },
             { name: "scanonly", type: Boolean, defaultOption: false },
+            { name: "trclassname", type: String }
         ];
         const options = (0, command_line_args_1.default)(optionDefinitions);
         let cscodedir = options.cscodedir ?? [];
@@ -37,6 +38,7 @@ class CmdExecutor {
         let langs = options.langs ?? ["zh_cn"];
         let verbose = options.verbose ?? false;
         let scanonly = options.scanonly ?? false;
+        let trclassname = options.trclassname ?? "Tr";
         let argv = process.argv;
         if (isNullOrEmpty(cscodedir) && isNullOrEmpty(configdir)) {
             if (isNullOrEmpty(cscodedir)) {
@@ -58,7 +60,7 @@ class CmdExecutor {
         }
         console.log(`convert cmd options: `, cscodedir, configdir, outcsv, langs, verbose);
         let literalCollector = new LiteralCollector_1.LiteralCollector();
-        await literalCollector.convert(cscodedir, configdir, outcsv, langs, scanonly, verbose);
+        await literalCollector.convert(cscodedir, configdir, outcsv, langs, trclassname, scanonly, verbose);
         console.log("convert done.");
     }
     static testSlimCsv() {

package/dist/LiteralCollector.js

@@ -40,14 +40,14 @@ const CSCodeScanner_1 = require("./CSCodeScanner");
 const CSVUtils_1 = require("./CSVUtils");
 const TableScanner_1 = require("./TableScanner");
 class LiteralCollector {
-    scanCodeInFolder(folder, literals, unexpects, scanonly, verbose) {
+    scanCodeInFolder(folder, literals, unexpects, trclassname, scanonly, verbose) {
         if (fs.existsSync(folder) == false) {
             console.warn(`代码目录不存在: ${folder}`);
             return;
         }
         let files = glob_1.glob.sync("**/*.cs", { cwd: folder });
-        // let testFullPath = "@";
-        let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/ShopCommon/ShopCommonDialog.cs";
+        let testFullPath = "@";
+        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/ShopCommon/ShopCommonDialog.cs";
         for (const filePath of files) {
             let fullPath = folder + filePath;
             if (testFullPath != "@") {
@@ -57,7 +57,7 @@ class LiteralCollector {
                 console.log(`处理文件: ${filePath}`);
             }
             const content = fs.readFileSync(fullPath, "utf-8");
-            const snippets = CSCodeScanner_1.CSCodeScanner.scanFile(fullPath, content);
+            const snippets = CSCodeScanner_1.CSCodeScanner.scanFile(fullPath, content, trclassname);
             if (snippets.length > 0) {
                 if (!scanonly) {
                     let convertedContent = CSCodeScanner_1.CSCodeScanner.replaceInFile(content, snippets);
@@ -94,11 +94,11 @@ class LiteralCollector {
         literals.length = 0;
         literals.push(...literalsSet);
     }
-    async convert(cscodeFolders, gameConfigFolders, outCsvFile, langs, scanonly = false, verbose = false) {
+    async convert(cscodeFolders, gameConfigFolders, outCsvFile, langs, trclassname = "Tr", scanonly = false, verbose = false) {
         let literals = [];
         let unexpects = [];
         for (const cscodeFolder of cscodeFolders) {
-            this.scanCodeInFolder(cscodeFolder, literals, unexpects, scanonly, verbose);
+            this.scanCodeInFolder(cscodeFolder, literals, unexpects, trclassname, scanonly, verbose);
         }
         for (const gameConfigFolder of gameConfigFolders) {
             this.scanTablesInFolder(gameConfigFolder, literals, verbose);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scancscode",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "",
   "main": "./dist/index.js",
   "bin": {

package/src/CSCodeScanner.ts

@@ -41,7 +41,7 @@ export class CSCodeScanner {
         return [lineIndex + 1, index - lineColumn];
     }
 
-    public static scanFile(filePath: string, content: string): CodeSnippet[] {
+    public static scanFile(filePath: string, content: string, trclassname: string): CodeSnippet[] {
         const snippets: CodeSnippet[] = [];
 
         const assignMatches = [...content.matchAll(CSCodeScanner.assignmentPattern)];
@@ -186,7 +186,7 @@ export class CSCodeScanner {
                 convertedAssignLine = assignLine;
             }
 
-            let convertedAssignLine2 = convertedAssignLine.replaceAll(this.stringFormatPattern, "Tr.Format");
+            let convertedAssignLine2 = convertedAssignLine.replaceAll(this.stringFormatPattern, `${trclassname}.Format`);
             snippets.push({
                 originalIndex: assignMatch.index,
                 originalCode: assignLine,

package/src/CmdExecutor.ts

@@ -25,6 +25,7 @@ export class CmdExecutor {
             { name: "langs", type: String, multiple: true, defaultOption: true },
             { name: "verbose", alias: 'v', type: Boolean },
             { name: "scanonly", type: Boolean, defaultOption: false },
+            { name: "trclassname", type: String }
         ]
         const options = commandLineArgs(optionDefinitions)
         let cscodedir: string[] = options.cscodedir ?? []
@@ -33,6 +34,7 @@ export class CmdExecutor {
         let langs: string[] = options.langs ?? ["zh_cn"]
         let verbose: boolean = options.verbose ?? false
         let scanonly: boolean = options.scanonly ?? false
+        let trclassname: string = options.trclassname ?? "Tr"
 
         let argv = process.argv
         if (isNullOrEmpty(cscodedir) && isNullOrEmpty(configdir)) {
@@ -55,7 +57,7 @@ export class CmdExecutor {
         }
         console.log(`convert cmd options: `, cscodedir, configdir, outcsv, langs, verbose)
         let literalCollector = new LiteralCollector();
-        await literalCollector.convert(cscodedir, configdir, outcsv, langs, scanonly, verbose)
+        await literalCollector.convert(cscodedir, configdir, outcsv, langs, trclassname, scanonly, verbose)
         console.log("convert done.")
     }
     static testSlimCsv() {

package/src/LiteralCollector.ts

@@ -7,15 +7,15 @@ import { TableScanner } from "./TableScanner";
 
 export class LiteralCollector {
 
-    scanCodeInFolder(folder: string, literals: string[], unexpects: string[], scanonly: boolean, verbose: boolean) {
+    scanCodeInFolder(folder: string, literals: string[], unexpects: string[], trclassname: 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/FGUI/ShopCommon/ShopCommonDialog.cs";
+        let testFullPath = "@";
+        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/ShopCommon/ShopCommonDialog.cs";
         for (const filePath of files) {
             let fullPath = folder + filePath;
             if (testFullPath != "@") {
@@ -25,7 +25,7 @@ export class LiteralCollector {
                 console.log(`处理文件: ${filePath}`);
             }
             const content = fs.readFileSync(fullPath, "utf-8");
-            const snippets = CSCodeScanner.scanFile(fullPath, content);
+            const snippets = CSCodeScanner.scanFile(fullPath, content, trclassname);
             if (snippets.length > 0) {
                 if (!scanonly) {
                     let convertedContent = CSCodeScanner.replaceInFile(content, snippets);
@@ -69,12 +69,12 @@ export class LiteralCollector {
         literals.push(...literalsSet);
     }
 
-    async convert(cscodeFolders: string[], gameConfigFolders: string[], outCsvFile: string, langs: string[], scanonly: boolean = false, verbose: boolean = false) {
+    async convert(cscodeFolders: string[], gameConfigFolders: string[], outCsvFile: string, langs: string[], trclassname: string = "Tr", scanonly: boolean = false, verbose: boolean = false) {
 
         let literals: string[] = [];
         let unexpects: string[] = [];
         for (const cscodeFolder of cscodeFolders) {
-            this.scanCodeInFolder(cscodeFolder, literals, unexpects, scanonly, verbose);
+            this.scanCodeInFolder(cscodeFolder, literals, unexpects, trclassname, scanonly, verbose);
         }
         for (const gameConfigFolder of gameConfigFolders) {
             this.scanTablesInFolder(gameConfigFolder, literals, verbose);