chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- [CLI] update --logger_flags command.

Browse Source
This commit is contained in:
Razmoth
2024-01-22 20:51:59 +04:00
parent 59478d9c05
commit 5e35469435
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AssetStudio.CLI/Components/CommandLine.cs
View File

@@ -49,7 +49,7 @@ namespace AssetStudio.CLI
public class Options public class Options
{ {
public bool Silent { get; set; } public bool Silent { get; set; }
public LoggerEvent LoggerFlags { get; set; } public LoggerEvent[] LoggerFlags { get; set; }
public ClassIDType[] TypeFilter { get; set; } public ClassIDType[] TypeFilter { get; set; }
public Regex[] NameFilter { get; set; } public Regex[] NameFilter { get; set; }
public Regex[] ContainerFilter { get; set; } public Regex[] ContainerFilter { get; set; }
@@ -72,7 +72,7 @@ namespace AssetStudio.CLI
public class OptionsBinder : BinderBase<Options> public class OptionsBinder : BinderBase<Options>
{ {
public readonly Option<bool> Silent; public readonly Option<bool> Silent;
public readonly Option<LoggerEvent> LoggerFlags; public readonly Option<LoggerEvent[]> LoggerFlags;
public readonly Option<ClassIDType[]> TypeFilter; public readonly Option<ClassIDType[]> TypeFilter;
public readonly Option<Regex[]> NameFilter; public readonly Option<Regex[]> NameFilter;
public readonly Option<Regex[]> ContainerFilter; public readonly Option<Regex[]> ContainerFilter;
@@ -94,7 +94,7 @@ namespace AssetStudio.CLI
public OptionsBinder() public OptionsBinder()
{ {
Silent = new Option<bool>("--silent", "Hide log messages."); Silent = new Option<bool>("--silent", "Hide log messages.");
LoggerFlags = new Option<LoggerEvent>("--logger_flags", "Flags to control toggle log events."); LoggerFlags = new Option<LoggerEvent[]>("--logger_flags", "Flags to control toggle log events.") { AllowMultipleArgumentsPerToken = true, ArgumentHelpName = "Verbose|Debug|Info|etc.." };
TypeFilter = new Option<ClassIDType[]>("--types", "Specify unity class type(s)") { AllowMultipleArgumentsPerToken = true, ArgumentHelpName = "Texture2D|Sprite|etc.." }; TypeFilter = new Option<ClassIDType[]>("--types", "Specify unity class type(s)") { AllowMultipleArgumentsPerToken = true, ArgumentHelpName = "Texture2D|Sprite|etc.." };
NameFilter = new Option<Regex[]>("--names", result => result.Tokens.Select(x => new Regex(x.Value, RegexOptions.IgnoreCase)).ToArray(), false, "Specify name regex filter(s).") { AllowMultipleArgumentsPerToken = true }; NameFilter = new Option<Regex[]>("--names", result => result.Tokens.Select(x => new Regex(x.Value, RegexOptions.IgnoreCase)).ToArray(), false, "Specify name regex filter(s).") { AllowMultipleArgumentsPerToken = true };
ContainerFilter = new Option<Regex[]>("--containers", result => result.Tokens.Select(x => new Regex(x.Value, RegexOptions.IgnoreCase)).ToArray(), false, "Specify container regex filter(s).") { AllowMultipleArgumentsPerToken = true }; ContainerFilter = new Option<Regex[]>("--containers", result => result.Tokens.Select(x => new Regex(x.Value, RegexOptions.IgnoreCase)).ToArray(), false, "Specify container regex filter(s).") { AllowMultipleArgumentsPerToken = true };
@@ -126,6 +126,7 @@ namespace AssetStudio.CLI
} }
}, false, "XOR key to decrypt MiHoYoBinData."); }, false, "XOR key to decrypt MiHoYoBinData.");
LoggerFlags.AddValidator(FilterValidator);
TypeFilter.AddValidator(FilterValidator); TypeFilter.AddValidator(FilterValidator);
NameFilter.AddValidator(FilterValidator); NameFilter.AddValidator(FilterValidator);
ContainerFilter.AddValidator(FilterValidator); ContainerFilter.AddValidator(FilterValidator);
@@ -152,7 +153,7 @@ namespace AssetStudio.CLI
GameName.FromAmong(GameManager.GetGameNames()); GameName.FromAmong(GameManager.GetGameNames());
LoggerFlags.SetDefaultValue(LoggerEvent.Default); LoggerFlags.SetDefaultValue(new LoggerEvent[] { LoggerEvent.Debug, LoggerEvent.Info, LoggerEvent.Warning, LoggerEvent.Error });
GroupAssetsType.SetDefaultValue(AssetGroupOption.ByType); GroupAssetsType.SetDefaultValue(AssetGroupOption.ByType);
AssetExportType.SetDefaultValue(ExportType.Convert); AssetExportType.SetDefaultValue(ExportType.Convert);
MapOp.SetDefaultValue(MapOpType.None); MapOp.SetDefaultValue(MapOpType.None);

2
AssetStudio.CLI/Program.cs
View File

@@ -39,7 +39,7 @@ namespace AssetStudio.CLI
} }
Studio.Game = game; Studio.Game = game;
Logger.Default = new ConsoleLogger() { Flags = o.LoggerFlags }; Logger.Default = new ConsoleLogger() { Flags = o.LoggerFlags.Aggregate((e, x) => e |= x) };
Logger.FileLogging = Settings.Default.enableFileLogging; Logger.FileLogging = Settings.Default.enableFileLogging;
AssetsHelper.Minimal = Settings.Default.minimalAssetMap; AssetsHelper.Minimal = Settings.Default.minimalAssetMap;
AssetsHelper.SetUnityVersion(o.UnityVersion); AssetsHelper.SetUnityVersion(o.UnityVersion);

1
AssetStudio/ILogger.cs
View File

@@ -15,7 +15,6 @@ namespace AssetStudio
Info = 4, Info = 4,
Warning = 8, Warning = 8,
Error = 16, Error = 16,
Default = Debug | Info | Warning | Error,
All = Verbose | Debug | Info | Warning | Error, All = Verbose | Debug | Info | Warning | Error,
} }