From aa5768850b832b50ba9cc79f86bef9cbcf1e3145 Mon Sep 17 00:00:00 2001 From: middlered <98752512+MiddleRed@users.noreply.github.com> Date: Sun, 9 Nov 2025 19:38:18 +0800 Subject: [PATCH] [CLI] Add flag to allow filtering assets in blacklist mode. - Added --filter-blacklist-mode flag --- AssetStudioCLI/Options/CLIOptions.cs | 20 +++++++++++++++++++- AssetStudioCLI/ReadMe.md | 3 +++ AssetStudioCLI/Studio.cs | 8 ++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/AssetStudioCLI/Options/CLIOptions.cs b/AssetStudioCLI/Options/CLIOptions.cs index 37cd044..d0b93b2 100644 --- a/AssetStudioCLI/Options/CLIOptions.cs +++ b/AssetStudioCLI/Options/CLIOptions.cs @@ -118,6 +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; //advanced public static Option o_bundleBlockInfoCompression; public static Option o_bundleBlockCompression; @@ -456,7 +457,17 @@ namespace AssetStudioCLI.Options optionDefaultValue: false, optionName: "--filter-with-regex", optionDescription: "(Flag) If specified, the filter options will handle the specified text\n" + - "as a regular expression (doesn't apply to --filter-by-pathid)", + "as a regular expression (doesn't apply to --filter-by-pathid)\n", + optionExample: "", + optionHelpGroup: HelpGroups.Filter, + isFlag: true + ); + f_filterBlackListMode = new GroupedOption + ( + optionDefaultValue: false, + optionName: "--filter-blacklist-mode", + optionDescription: "(Flag) If specified, the filter options will work as a blacklist\n" + + "(i.e. assets that match the filter conditions will be excluded)", optionExample: "", optionHelpGroup: HelpGroups.Filter, isFlag: true @@ -739,6 +750,10 @@ namespace AssetStudioCLI.Options f_filterWithRegex.Value = true; flagIndexes.Add(i); break; + case "--filter-blacklist-mode": + f_filterBlackListMode.Value = true; + flagIndexes.Add(i); + break; case "--decompress-to-disk": f_decompressToDisk.Value = true; flagIndexes.Add(i); @@ -1457,12 +1472,14 @@ namespace AssetStudioCLI.Options } sb.AppendLine(ShowCurrentFilter()); sb.AppendLine($"# Filter With Regex: {f_filterWithRegex}"); + sb.AppendLine($"# Filter Blacklist mode: {f_filterBlackListMode}"); 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($"# 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}"); @@ -1476,6 +1493,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($"# 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 29f21af..5e872ef 100644 --- a/AssetStudioCLI/ReadMe.md +++ b/AssetStudioCLI/ReadMe.md @@ -152,6 +152,9 @@ 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 + (i.e. assets that match the filter conditions will be excluded) + Advanced Options: --blockinfo-comp Specify the compression type of bundle's blockInfo data diff --git a/AssetStudioCLI/Studio.cs b/AssetStudioCLI/Studio.cs index 9bb0a11..93eaca8 100644 --- a/AssetStudioCLI/Studio.cs +++ b/AssetStudioCLI/Studio.cs @@ -637,6 +637,14 @@ namespace AssetStudioCLI ); break; } + + if (CLIOptions.f_filterBlackListMode.Value) + { + var blackListedCount = assetsCount - filteredAssets.Count; + Logger.Info($"Black list mode enabled: Excluding {blackListedCount} asset(s) from export."); + filteredAssets = parsedAssetsList.Except(filteredAssets).ToList(); + } + parsedAssetsList.Clear(); parsedAssetsList = filteredAssets; }