diff --git a/AssetStudioCLI/Options/CLIOptions.cs b/AssetStudioCLI/Options/CLIOptions.cs index f7375ae..4573417 100644 --- a/AssetStudioCLI/Options/CLIOptions.cs +++ b/AssetStudioCLI/Options/CLIOptions.cs @@ -118,7 +118,7 @@ namespace AssetStudioCLI.Options public static Option> o_filterByPathID; public static Option> o_filterByText; public static Option f_filterWithRegex; - public static Option f_filterBlackListMode; + public static Option f_filterExcludeMode; //advanced public static Option o_bundleBlockInfoCompression; public static Option o_bundleBlockCompression; @@ -463,11 +463,11 @@ namespace AssetStudioCLI.Options optionHelpGroup: HelpGroups.Filter, isFlag: true ); - f_filterBlackListMode = new GroupedOption + f_filterExcludeMode = new GroupedOption ( optionDefaultValue: false, - optionName: "--filter-blacklist-mode", - optionDescription: "(Flag) If specified, the filter options will work as a blacklist\n" + + optionName: "--filter-exclude-mode", + optionDescription: "(Flag) If specified, the filter options will work as a exclude\n" + "(i.e. assets that match the filter conditions will be excluded)", optionExample: "", optionHelpGroup: HelpGroups.Filter, @@ -759,8 +759,8 @@ namespace AssetStudioCLI.Options f_filterWithRegex.Value = true; flagIndexes.Add(i); break; - case "--filter-blacklist-mode": - f_filterBlackListMode.Value = true; + case "--filter-exclude-mode": + f_filterExcludeMode.Value = true; flagIndexes.Add(i); break; case "--decompress-to-disk": @@ -1488,14 +1488,14 @@ namespace AssetStudioCLI.Options } sb.AppendLine(ShowCurrentFilter()); sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); - sb.AppendLine($"# Filter Blacklist mode: {f_filterBlackListMode}"); + sb.AppendLine($"# Filter Exclusion Mode: {f_filterExcludeMode}"); sb.AppendLine($"# Assembly Path: \"{o_assemblyPath}\""); break; case WorkMode.Live2D: sb.AppendLine($"# [{o_workMode} Options]"); sb.AppendLine($"# Filter by Text: \"{string.Join("\", \"", o_filterByText.Value)}\""); sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); - sb.AppendLine($"# Filter Blacklist mode: {f_filterBlackListMode}"); + sb.AppendLine($"# Filter Exclusion Mode: {f_filterExcludeMode}"); sb.AppendLine($"# Model Group Option: {o_l2dGroupOption}"); sb.AppendFormat("# Search Model-related Assets by: {0}\n", f_l2dAssetSearchByFilename.Value ? "FileName" : "Container"); sb.AppendLine($"# Motion Export Method: {o_l2dMotionMode}"); @@ -1509,7 +1509,7 @@ namespace AssetStudioCLI.Options ? ShowCurrentFilter() : $"# Filter by Name(s): \"{string.Join("\", \"", o_filterByName.Value)}\""); sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); - sb.AppendLine($"# Filter Blacklist mode: {f_filterBlackListMode}"); + sb.AppendLine($"# Filter Exclusion Mode: {f_filterExcludeMode}"); sb.AppendLine($"# Export Image Format: {o_imageFormat}"); sb.AppendLine($"# FBX Scale Factor: {o_fbxScaleFactor}"); sb.AppendLine($"# FBX Bone Size: {o_fbxBoneSize}"); diff --git a/AssetStudioCLI/ReadMe.md b/AssetStudioCLI/ReadMe.md index 2706a54..c1166e3 100644 --- a/AssetStudioCLI/ReadMe.md +++ b/AssetStudioCLI/ReadMe.md @@ -152,7 +152,7 @@ Filter Options: --filter-with-regex (Flag) If specified, the filter options will handle the specified text as a regular expression (doesn't apply to --filter-by-pathid) - --filter-blacklist-mode (Flag) If specified, the filter options will work as a blacklist + --filter-exclude-mode (Flag) If specified, the filter options will work as a exclusion (i.e. assets that match the filter conditions will be excluded) Advanced Options: diff --git a/AssetStudioCLI/Studio.cs b/AssetStudioCLI/Studio.cs index 0eb43c1..a6b90f1 100644 --- a/AssetStudioCLI/Studio.cs +++ b/AssetStudioCLI/Studio.cs @@ -638,10 +638,10 @@ namespace AssetStudioCLI break; } - if (CLIOptions.f_filterBlackListMode.Value) + if (CLIOptions.f_filterExcludeMode.Value) { - var blackListedCount = assetsCount - filteredAssets.Count; - Logger.Info($"Black list mode enabled: Excluding {blackListedCount} asset(s) from export."); + var excludeCount = assetsCount - filteredAssets.Count; + Logger.Info($"Excluding {excludeCount} asset(s) from export."); filteredAssets = parsedAssetsList.Except(filteredAssets).ToList(); }