From f0f39381c3e13bd599cdb2e94515516cc7de865b Mon Sep 17 00:00:00 2001 From: walon Date: Wed, 1 Sep 2021 09:34:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=80=A7=E3=80=91cfg?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20--data=5Ffile=5Fextension=E9=80=89?= =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=8C=87=E5=AE=9A=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/GenArgs.cs | 3 +++ src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs | 2 +- .../Source/Generate/TemplateDataScatterRender.cs | 2 +- src/Luban.Job.Common/Source/Utils/RenderFileUtil.cs | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/GenArgs.cs b/src/Luban.Job.Cfg/Source/GenArgs.cs index 8d8baaf..0295164 100644 --- a/src/Luban.Job.Cfg/Source/GenArgs.cs +++ b/src/Luban.Job.Cfg/Source/GenArgs.cs @@ -27,6 +27,9 @@ namespace Luban.Job.Cfg [Option("template_name", Required = false, HelpText = "template name. use with gen_types=data_template")] public string TemplateName { get; set; } + [Option("data_file_extension", Required = false, HelpText = "data file name extension. default choose by gen_type")] + public string DataFileExtension { get; set; } + [Option('s', "service", Required = true, HelpText = "service")] public string Service { get; set; } diff --git a/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs b/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs index d684450..238c822 100644 --- a/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs @@ -26,7 +26,7 @@ namespace Luban.Job.Cfg.Generate { ctx.Tasks.Add(Task.Run(() => { - var file = RenderFileUtil.GetOutputFileName(genType, table.OutputDataFile); + var file = RenderFileUtil.GetOutputFileName(genType, table.OutputDataFile, ctx.GenArgs.DataFileExtension); var records = ctx.Assembly.GetTableExportDataList(table); if (!FileRecordCacheManager.Ins.TryGetRecordOutputData(table, records, genType, out string md5)) { diff --git a/src/Luban.Job.Cfg/Source/Generate/TemplateDataScatterRender.cs b/src/Luban.Job.Cfg/Source/Generate/TemplateDataScatterRender.cs index f4ed52b..e9e452d 100644 --- a/src/Luban.Job.Cfg/Source/Generate/TemplateDataScatterRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/TemplateDataScatterRender.cs @@ -20,7 +20,7 @@ namespace Luban.Job.Cfg.Generate { ctx.Tasks.Add(Task.Run(() => { - var file = RenderFileUtil.GetOutputFileName(genType, table.OutputDataFile); + var file = RenderFileUtil.GetOutputFileName(genType, table.OutputDataFile, ctx.GenArgs.DataFileExtension); var records = ctx.Assembly.GetTableExportDataList(table); if (!FileRecordCacheManager.Ins.TryGetRecordOutputData(table, records, genType, out string md5)) { diff --git a/src/Luban.Job.Common/Source/Utils/RenderFileUtil.cs b/src/Luban.Job.Common/Source/Utils/RenderFileUtil.cs index 9d0b180..ef0d84b 100644 --- a/src/Luban.Job.Common/Source/Utils/RenderFileUtil.cs +++ b/src/Luban.Job.Common/Source/Utils/RenderFileUtil.cs @@ -135,9 +135,9 @@ namespace Luban.Job.Common.Utils throw new Exception($"not support output data type:{genType}"); } - public static string GetOutputFileName(string genType, string fileName) + public static string GetOutputFileName(string genType, string fileName, string fileExtension) { - return $"{fileName}.{GetOutputFileSuffix(genType)}"; + return $"{fileName}.{(string.IsNullOrEmpty(fileExtension) ? GetOutputFileSuffix(genType) : fileExtension)}"; } } }