From c72bf535799b16ac3b63d3fca5dd188aa528acd1 Mon Sep 17 00:00:00 2001 From: walon Date: Thu, 23 Sep 2021 14:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91proto?= =?UTF-8?q?=E7=9A=84gen=5Ftypes=20ts=E6=94=B9=E4=B8=BA=20typescript?= =?UTF-8?q?=EF=BC=8C=E4=B8=8Edb=E5=92=8Ccfg=E7=BB=9F=E4=B8=80=20=E3=80=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91=E5=88=A0=E9=99=A4=20cfg=E7=9A=84gen?= =?UTF-8?q?=5Ftypes=20data=5Ferlang=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81erlang=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E4=BD=86=E4=BB=8D=E7=84=B6=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E5=AF=B9=20erlang=20data=20template=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Client/Luban.Client.csproj | 6 +++ src/Luban.Client/Source/Utils/FileCleaner.cs | 2 +- .../Source/Cache/FileRecordCacheManager.cs | 1 - src/Luban.Job.Cfg/Source/GenArgs.cs | 1 - .../Source/Generate/DataScatterRender.cs | 1 - .../Source/Utils/DataExporterUtil.cs | 44 +++++++++---------- src/Luban.Job.Common/Source/Defs/DefConst.cs | 1 - src/Luban.Job.Proto/Source/JobController.cs | 4 +- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/Luban.Client/Luban.Client.csproj b/src/Luban.Client/Luban.Client.csproj index bec2f38..68ab704 100644 --- a/src/Luban.Client/Luban.Client.csproj +++ b/src/Luban.Client/Luban.Client.csproj @@ -5,6 +5,12 @@ net5.0 + + + + + + diff --git a/src/Luban.Client/Source/Utils/FileCleaner.cs b/src/Luban.Client/Source/Utils/FileCleaner.cs index 7dcf39e..4f5ce5f 100644 --- a/src/Luban.Client/Source/Utils/FileCleaner.cs +++ b/src/Luban.Client/Source/Utils/FileCleaner.cs @@ -78,7 +78,7 @@ namespace Luban.Client.Common.Utils // 清除空目录 var subDirs = new List(Directory.GetDirectories(dir, "*", SearchOption.AllDirectories)); - subDirs.Sort((a, b) => -String.Compare(a, b, StringComparison.Ordinal)); + subDirs.Sort((a, b) => -string.Compare(a, b, StringComparison.Ordinal)); foreach (var subDir in subDirs) { string fullSubDirPath = Path.GetFullPath(subDir); diff --git a/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs b/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs index 60925b5..59c2ca3 100644 --- a/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs +++ b/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs @@ -41,7 +41,6 @@ namespace Luban.Job.Cfg.Cache public bool TryGetCacheLoadedRecords(DefTable table, string md5, string originFile, string sheetName, out List cacheRecords) { - // TODO text localization check cacheRecords = null; if (!_caches.TryGetValue((table.FullName, md5, sheetName), out var r)) { diff --git a/src/Luban.Job.Cfg/Source/GenArgs.cs b/src/Luban.Job.Cfg/Source/GenArgs.cs index 2af8f98..fa1e96d 100644 --- a/src/Luban.Job.Cfg/Source/GenArgs.cs +++ b/src/Luban.Job.Cfg/Source/GenArgs.cs @@ -5,7 +5,6 @@ namespace Luban.Job.Cfg { public class GenArgs : GenArgsBase { - [Option("input_data_dir", Required = true, HelpText = "input data dir")] public string InputDataDir { get; set; } diff --git a/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs b/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs index 0a569cf..b493532 100644 --- a/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs @@ -12,7 +12,6 @@ namespace Luban.Job.Cfg.Generate [Render("data_lua")] [Render("data_xml")] [Render("data_yaml")] - [Render("data_erlang")] class DataScatterRender : DataRenderBase { public override void Render(GenContext ctx) diff --git a/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs b/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs index 8af7dd4..d2912d3 100644 --- a/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs +++ b/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs @@ -84,28 +84,28 @@ namespace Luban.Job.Cfg.Utils } return string.Join('\n', content); } - case "data_erlang": - { - var content = new StringBuilder(); - switch (table.Mode) - { - case ETableMode.ONE: - { - ErlangExport.Ins.ExportTableSingleton(table, records[0], content); - break; - } - case ETableMode.MAP: - { - ErlangExport.Ins.ExportTableMap(table, records, content); - break; - } - default: - { - throw new NotSupportedException(); - } - } - return content.ToString(); - } + //case "data_erlang": + //{ + // var content = new StringBuilder(); + // switch (table.Mode) + // { + // case ETableMode.ONE: + // { + // ErlangExport.Ins.ExportTableSingleton(table, records[0], content); + // break; + // } + // case ETableMode.MAP: + // { + // ErlangExport.Ins.ExportTableMap(table, records, content); + // break; + // } + // default: + // { + // throw new NotSupportedException(); + // } + // } + // return content.ToString(); + //} default: { throw new ArgumentException($"not support datatype:{dataType}"); diff --git a/src/Luban.Job.Common/Source/Defs/DefConst.cs b/src/Luban.Job.Common/Source/Defs/DefConst.cs index 8ccdbd4..0950fef 100644 --- a/src/Luban.Job.Common/Source/Defs/DefConst.cs +++ b/src/Luban.Job.Common/Source/Defs/DefConst.cs @@ -36,7 +36,6 @@ namespace Luban.Job.Common.Defs public override void Compile() { - var FullName = this.FullName; HashSet names = new HashSet(); foreach (var item in Items) diff --git a/src/Luban.Job.Proto/Source/JobController.cs b/src/Luban.Job.Proto/Source/JobController.cs index ceef506..7e70e5c 100644 --- a/src/Luban.Job.Proto/Source/JobController.cs +++ b/src/Luban.Job.Proto/Source/JobController.cs @@ -24,7 +24,7 @@ namespace Luban.Job.Proto class GenArgs : GenArgsBase { - [Option('g', "gen_type", Required = true, HelpText = "cs,lua,java,cpp,ts")] + [Option('g', "gen_type", Required = true, HelpText = "cs,lua,java,cpp,typescript")] public string GenType { get; set; } [Option('s', "service", Required = true, HelpText = "service")] @@ -150,7 +150,7 @@ namespace Luban.Job.Proto })); break; } - case "ts": + case "typescript": { var render = new TypescriptRender(); var brightRequirePath = args.TypescriptBrightRequirePath;