Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

fix CLI.BuildAssetMap --types behavior #84

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions AssetStudio.CLI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,22 @@ public static void Run(Options o)
}
else
{
Task.Run(() => AssetsHelper.BuildAssetMap(files, o.MapName, game, o.Output.FullName, o.MapType, classTypeFilter, o.NameFilter, o.ContainerFilter)).Wait();
Task.Run(() => AssetsHelper.BuildAssetMap(
files, o.MapName, game, o.Output.FullName, o.MapType,
classTypeFilter.Length > 0 ? classTypeFilter : null,
o.NameFilter.Length > 0 ? o.NameFilter : null,
o.ContainerFilter.Length > 0 ? o.ContainerFilter : null
)).Wait();
}
}
if (o.MapOp.HasFlag(MapOpType.Both))
{
Task.Run(() => AssetsHelper.BuildBoth(files, o.MapName, o.Input.FullName, game, o.Output.FullName, o.MapType, classTypeFilter, o.NameFilter, o.ContainerFilter)).Wait();
Task.Run(() => AssetsHelper.BuildBoth(
files, o.MapName, o.Input.FullName, game, o.Output.FullName, o.MapType,
classTypeFilter.Length > 0 ? classTypeFilter : null,
o.NameFilter.Length > 0 ? o.NameFilter : null,
o.ContainerFilter.Length > 0 ? o.ContainerFilter : null
)).Wait();
}
if (o.MapOp.Equals(MapOpType.None) || o.MapOp.HasFlag(MapOpType.Load))
{
Expand Down