[CLI] Add --filter-exclude-mode support for Live2D mode

This commit is contained in:
VaDiM
2026-10-03 17:40:34 +03:00
parent 6cf7f76488
commit cc9bd41c27
+20 -10
View File
@@ -1151,6 +1151,7 @@ namespace AssetStudioCLI
private static Dictionary<MonoBehaviour, CubismModel> FilterMocDict() private static Dictionary<MonoBehaviour, CubismModel> FilterMocDict()
{ {
var regexMode = CLIOptions.f_filterWithRegex.Value; var regexMode = CLIOptions.f_filterWithRegex.Value;
var excludeMode = CLIOptions.f_filterExcludeMode.Value;
var filterList = CLIOptions.o_filterByText.Value; var filterList = CLIOptions.o_filterByText.Value;
var filteredDict = new Dictionary<MonoBehaviour, CubismModel>(); var filteredDict = new Dictionary<MonoBehaviour, CubismModel>();
var regex = regexMode ? new Regex(filterList[0]) : null; var regex = regexMode ? new Regex(filterList[0]) : null;
@@ -1160,20 +1161,29 @@ namespace AssetStudioCLI
var mocContainer = containers.TryGetValue(kvp.Key, out var container) var mocContainer = containers.TryGetValue(kvp.Key, out var container)
? container ? container
: ""; : "";
if (regexMode) var isMatch = regexMode
{ ? regex.IsMatch(mocContainer) || regex.IsMatch(mocName)
if (regex.IsMatch(mocContainer) || regex.IsMatch(mocName)) : filterList.Any(str => mocContainer.IndexOf(str, StringComparison.OrdinalIgnoreCase) >= 0 || mocName.IndexOf(str, StringComparison.OrdinalIgnoreCase) >= 0);
filteredDict[kvp.Key] = kvp.Value;
continue; if ((!excludeMode && isMatch) || (excludeMode && !isMatch))
}
if (filterList.Any(str => mocContainer.IndexOf(str, StringComparison.OrdinalIgnoreCase) >= 0 || mocName.IndexOf(str, StringComparison.OrdinalIgnoreCase) >= 0))
{ {
filteredDict[kvp.Key] = kvp.Value; filteredDict[kvp.Key] = kvp.Value;
} }
} }
var log = regexMode
? $"Found {filteredDict.Count} Live2D model(s) which names or containers match {regex.ToString().Color(Ansi.BrightYellow)} regexp" string log;
: $"Found {filteredDict.Count} Live2D model(s) that contain {$"\"{string.Join("\", \"", filterList)}\"".Color(Ansi.BrightYellow)} in their names or containers"; if (excludeMode)
{
var excludeCount = l2dAssetsManager.ModelDict.Count - filteredDict.Count;
var filterType = regexMode ? $"{regex.ToString().Color(Ansi.BrightYellow)} regexp" : "filter";
log = $"Excluded {excludeCount} model(s) that match the {filterType}.";
}
else
{
log = regexMode
? $"Found {filteredDict.Count} Live2D model(s) which names or containers match {regex.ToString().Color(Ansi.BrightYellow)} regexp"
: $"Found {filteredDict.Count} Live2D model(s) that contain {$"\"{string.Join("\", \"", filterList)}\"".Color(Ansi.BrightYellow)} in their names or containers";
}
Logger.Info(log); Logger.Info(log);
return filteredDict; return filteredDict;