Rename blacklist to exclude

sounds better
This commit is contained in:
MidRed
2025-11-10 03:38:48 +08:00
committed by GitHub
parent de967527ef
commit 5bd31db955
3 changed files with 13 additions and 13 deletions
+9 -9
View File
@@ -118,7 +118,7 @@ namespace AssetStudioCLI.Options
public static Option<List<string>> o_filterByPathID; public static Option<List<string>> o_filterByPathID;
public static Option<List<string>> o_filterByText; public static Option<List<string>> o_filterByText;
public static Option<bool> f_filterWithRegex; public static Option<bool> f_filterWithRegex;
public static Option<bool> f_filterBlackListMode; public static Option<bool> f_filterExcludeMode;
//advanced //advanced
public static Option<CompressionType> o_bundleBlockInfoCompression; public static Option<CompressionType> o_bundleBlockInfoCompression;
public static Option<CompressionType> o_bundleBlockCompression; public static Option<CompressionType> o_bundleBlockCompression;
@@ -463,11 +463,11 @@ namespace AssetStudioCLI.Options
optionHelpGroup: HelpGroups.Filter, optionHelpGroup: HelpGroups.Filter,
isFlag: true isFlag: true
); );
f_filterBlackListMode = new GroupedOption<bool> f_filterExcludeMode = new GroupedOption<bool>
( (
optionDefaultValue: false, optionDefaultValue: false,
optionName: "--filter-blacklist-mode", optionName: "--filter-exclude-mode",
optionDescription: "(Flag) If specified, the filter options will work as a blacklist\n" + optionDescription: "(Flag) If specified, the filter options will work as a exclude\n" +
"(i.e. assets that match the filter conditions will be excluded)", "(i.e. assets that match the filter conditions will be excluded)",
optionExample: "", optionExample: "",
optionHelpGroup: HelpGroups.Filter, optionHelpGroup: HelpGroups.Filter,
@@ -759,8 +759,8 @@ namespace AssetStudioCLI.Options
f_filterWithRegex.Value = true; f_filterWithRegex.Value = true;
flagIndexes.Add(i); flagIndexes.Add(i);
break; break;
case "--filter-blacklist-mode": case "--filter-exclude-mode":
f_filterBlackListMode.Value = true; f_filterExcludeMode.Value = true;
flagIndexes.Add(i); flagIndexes.Add(i);
break; break;
case "--decompress-to-disk": case "--decompress-to-disk":
@@ -1488,14 +1488,14 @@ namespace AssetStudioCLI.Options
} }
sb.AppendLine(ShowCurrentFilter()); sb.AppendLine(ShowCurrentFilter());
sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); 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}\""); sb.AppendLine($"# Assembly Path: \"{o_assemblyPath}\"");
break; break;
case WorkMode.Live2D: case WorkMode.Live2D:
sb.AppendLine($"# [{o_workMode} Options]"); sb.AppendLine($"# [{o_workMode} Options]");
sb.AppendLine($"# Filter by Text: \"{string.Join("\", \"", o_filterByText.Value)}\""); sb.AppendLine($"# Filter by Text: \"{string.Join("\", \"", o_filterByText.Value)}\"");
sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); 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.AppendLine($"# Model Group Option: {o_l2dGroupOption}");
sb.AppendFormat("# Search Model-related Assets by: {0}\n", f_l2dAssetSearchByFilename.Value ? "FileName" : "Container"); sb.AppendFormat("# Search Model-related Assets by: {0}\n", f_l2dAssetSearchByFilename.Value ? "FileName" : "Container");
sb.AppendLine($"# Motion Export Method: {o_l2dMotionMode}"); sb.AppendLine($"# Motion Export Method: {o_l2dMotionMode}");
@@ -1509,7 +1509,7 @@ namespace AssetStudioCLI.Options
? ShowCurrentFilter() ? ShowCurrentFilter()
: $"# Filter by Name(s): \"{string.Join("\", \"", o_filterByName.Value)}\""); : $"# Filter by Name(s): \"{string.Join("\", \"", o_filterByName.Value)}\"");
sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); 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($"# Export Image Format: {o_imageFormat}");
sb.AppendLine($"# FBX Scale Factor: {o_fbxScaleFactor}"); sb.AppendLine($"# FBX Scale Factor: {o_fbxScaleFactor}");
sb.AppendLine($"# FBX Bone Size: {o_fbxBoneSize}"); sb.AppendLine($"# FBX Bone Size: {o_fbxBoneSize}");
+1 -1
View File
@@ -152,7 +152,7 @@ Filter Options:
--filter-with-regex (Flag) If specified, the filter options will handle the specified text --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) 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) (i.e. assets that match the filter conditions will be excluded)
Advanced Options: Advanced Options:
+3 -3
View File
@@ -638,10 +638,10 @@ namespace AssetStudioCLI
break; break;
} }
if (CLIOptions.f_filterBlackListMode.Value) if (CLIOptions.f_filterExcludeMode.Value)
{ {
var blackListedCount = assetsCount - filteredAssets.Count; var excludeCount = assetsCount - filteredAssets.Count;
Logger.Info($"Black list mode enabled: Excluding {blackListedCount} asset(s) from export."); Logger.Info($"Excluding {excludeCount} asset(s) from export.");
filteredAssets = parsedAssetsList.Except(filteredAssets).ToList(); filteredAssets = parsedAssetsList.Except(filteredAssets).ToList();
} }