diff --git a/src/Luban.Job.Cfg/Source/GenArgs.cs b/src/Luban.Job.Cfg/Source/GenArgs.cs index 417a2ca..4e42d42 100644 --- a/src/Luban.Job.Cfg/Source/GenArgs.cs +++ b/src/Luban.Job.Cfg/Source/GenArgs.cs @@ -41,22 +41,22 @@ namespace Luban.Job.Cfg [Option("export_exclude_tags", Required = false, HelpText = "export exclude tags. default export all tags")] public string ExportExcludeTags { get; set; } = ""; - [Option('t', "l10n_timezone", Required = false, HelpText = "timezone")] - public string TimeZone { get; set; } + [Option("l10n:timezone", Required = false, HelpText = "timezone")] + public string L10nTimeZone { get; set; } - [Option("input_l10n_text_files", Required = false, HelpText = "input l10n text table files. can be multi, sep by ','")] - public string InputTextTableFiles { get; set; } + [Option("l10n:input_text_files", Required = false, HelpText = "input l10n text table files. can be multi, sep by ','")] + public string L10nInputTextTableFiles { get; set; } - [Option("l10n_text_field_name", Required = false, HelpText = "text value field name of text table files. default is text")] - public string TextValueFieldName { get; set; } + [Option("l10n:text_field_name", Required = false, HelpText = "text value field name of text table files. default is text")] + public string L10nTextValueFieldName { get; set; } - [Option("output_l10n_not_translated_text_file", Required = false, HelpText = "the file save not translated l10n texts.")] - public string OutputNotTranslatedTextFile { get; set; } + [Option("l10n:output_not_translated_text_file", Required = false, HelpText = "the file save not translated l10n texts.")] + public string L10nOutputNotTranslatedTextFile { get; set; } - [Option("patch", Required = false, HelpText = "patch name")] - public string PatchName { get; set; } + [Option("10n:patch", Required = false, HelpText = "patch name")] + public string L10nPatchName { get; set; } - [Option("patch_input_data_dir", Required = false, HelpText = "patch input data root dir")] - public string PatchInputDataDir { get; set; } + [Option("10n:patch_input_data_dir", Required = false, HelpText = "patch input data root dir")] + public string L10nPatchInputDataDir { get; set; } } } diff --git a/src/Luban.Job.Cfg/Source/JobController.cs b/src/Luban.Job.Cfg/Source/JobController.cs index ce664c0..3e93a31 100644 --- a/src/Luban.Job.Cfg/Source/JobController.cs +++ b/src/Luban.Job.Cfg/Source/JobController.cs @@ -76,7 +76,7 @@ namespace Luban.Job.Cfg return false; } - if (string.IsNullOrWhiteSpace(options.InputTextTableFiles) ^ string.IsNullOrWhiteSpace(options.OutputNotTranslatedTextFile)) + if (string.IsNullOrWhiteSpace(options.L10nInputTextTableFiles) ^ string.IsNullOrWhiteSpace(options.L10nOutputNotTranslatedTextFile)) { errMsg = "--input_l10n_text_files must be provided with --output_l10n_not_translated_text_file"; return false; @@ -88,7 +88,7 @@ namespace Luban.Job.Cfg } } - if (string.IsNullOrWhiteSpace(options.PatchName) ^ string.IsNullOrWhiteSpace(options.PatchInputDataDir)) + if (string.IsNullOrWhiteSpace(options.L10nPatchName) ^ string.IsNullOrWhiteSpace(options.L10nPatchInputDataDir)) { errMsg = "--patch must be provided with --patch_input_data_dir"; return false; @@ -142,10 +142,10 @@ namespace Luban.Job.Cfg var rawDefines = loader.BuildDefines(); - TimeZoneInfo timeZoneInfo = string.IsNullOrEmpty(args.TimeZone) ? null : TimeZoneInfo.FindSystemTimeZoneById(args.TimeZone); + TimeZoneInfo timeZoneInfo = string.IsNullOrEmpty(args.L10nTimeZone) ? null : TimeZoneInfo.FindSystemTimeZoneById(args.L10nTimeZone); var excludeTags = args.ExportExcludeTags.Split(',').Select(t => t.Trim().ToLowerInvariant()).Where(t => !string.IsNullOrEmpty(t)).ToList(); - var ass = new DefAssembly(args.PatchName, timeZoneInfo, excludeTags, agent) + var ass = new DefAssembly(args.L10nPatchName, timeZoneInfo, excludeTags, agent) { CsUseUnityVectors = args.CsUseUnityVectors, OutputCompactJson = args.OutputCompactJson, @@ -164,7 +164,7 @@ namespace Luban.Job.Cfg bool hasLoadCfgData = false; - bool needL10NTextConvert = !string.IsNullOrWhiteSpace(args.InputTextTableFiles); + bool needL10NTextConvert = !string.IsNullOrWhiteSpace(args.L10nInputTextTableFiles); async Task CheckLoadCfgDataAsync() { @@ -173,13 +173,13 @@ namespace Luban.Job.Cfg hasLoadCfgData = true; var timer = new ProfileTimer(); timer.StartPhase("load config data"); - await DataLoaderUtil.LoadCfgDataAsync(agent, ass, args.InputDataDir, args.PatchName, args.PatchInputDataDir, args.InputConvertDataDir); + await DataLoaderUtil.LoadCfgDataAsync(agent, ass, args.InputDataDir, args.L10nPatchName, args.L10nPatchInputDataDir, args.InputConvertDataDir); timer.EndPhaseAndLog(); if (needL10NTextConvert) { - ass.InitL10n(args.TextValueFieldName); - await DataLoaderUtil.LoadTextTablesAsync(agent, ass, ".", args.InputTextTableFiles); + ass.InitL10n(args.L10nTextValueFieldName); + await DataLoaderUtil.LoadTextTablesAsync(agent, ass, ".", args.L10nInputTextTableFiles); } timer.StartPhase("validate"); @@ -228,7 +228,7 @@ namespace Luban.Job.Cfg { var notConvertTextList = DataExporterUtil.GenNotConvertTextList(ass.NotConvertTextSet); var md5 = FileUtil.CalcMD5(notConvertTextList); - string outputNotConvertTextFile = args.OutputNotTranslatedTextFile; + string outputNotConvertTextFile = args.L10nOutputNotTranslatedTextFile; CacheManager.Ins.AddCache(outputNotConvertTextFile, md5, notConvertTextList); genScatteredFiles.Add(new FileInfo() { FilePath = outputNotConvertTextFile, MD5 = md5 }); diff --git a/src/Luban.Job.Db/Source/GenArgs.cs b/src/Luban.Job.Db/Source/GenArgs.cs new file mode 100644 index 0000000..28dcf22 --- /dev/null +++ b/src/Luban.Job.Db/Source/GenArgs.cs @@ -0,0 +1,11 @@ +using CommandLine; +using Luban.Job.Common; + +namespace Luban.Job.Db +{ + class GenArgs : GenArgsBase + { + [Option('g', "gen_type", Required = true, HelpText = "cs,typescript ")] + public string GenType { get; set; } + } +} diff --git a/src/Luban.Job.Db/Source/JobController.cs b/src/Luban.Job.Db/Source/JobController.cs index 21f9f62..f7fe10d 100644 --- a/src/Luban.Job.Db/Source/JobController.cs +++ b/src/Luban.Job.Db/Source/JobController.cs @@ -17,15 +17,9 @@ using FileInfo = Luban.Common.Protos.FileInfo; namespace Luban.Job.Db { + public class JobController : IJobController { - class GenArgs : GenArgsBase - { - [Option('g', "gen_type", Required = true, HelpText = "cs,typescript ")] - public string GenType { get; set; } - } - - private bool TryParseArg(List args, out GenArgs options, out string errMsg) { var helpWriter = new StringWriter();