Skip to content

Added Ignorance for Assemblies and Assets in External Folder #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added Ignorance for Assemblies and Assets in External Folder #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3e16e5
added ignorance for External folder
ch3mbot Apr 7, 2023
ee500cb
updated export check to ignore assemblies as well
ch3mbot Apr 11, 2023
f12ac65
added comments and removed regex
ch3mbot Apr 11, 2023
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
38 changes: 34 additions & 4 deletions ModTool.Editor.Exporting/ExportStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ private List<Asset> GetAssets(string filter)
{
string path = AssetDatabase.GUIDToAssetPath(guid);

if (path.Contains("/ModTool/") || path.Contains("/Editor/"))
if (path.Contains("/ModTool/") || path.Contains("/Editor/") || path.Contains("/External/"))
continue;

if (path.StartsWith("Packages"))
Expand All @@ -330,19 +330,49 @@ private List<Asset> GetAssets(string filter)
return assets;
}

//generate a hashset of assembly names that are from other mods
private HashSet<string> FindIgnoredAssemblies()
{
List<Asset> assets = new List<Asset>();

string[] guids = AssetDatabase.FindAssets("t:asmdef");

HashSet<string> ignoredAssemblies = new HashSet<string>();

foreach (string guid in guids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
if(path.Contains("/External/"))
ignoredAssemblies.Add(Path.GetFileNameWithoutExtension(path));
}

return ignoredAssemblies;
}

private List<Asset> GetAssemblies()
{
List<Asset> assemblies = new List<Asset>();

foreach (string path in AssemblyUtility.GetAssemblies(assetsDirectory))
HashSet<string> ignoredSet = FindIgnoredAssemblies();

foreach (string path in AssemblyUtility.GetAssemblies(assetsDirectory, IsIgnored(ignoredSet, false)))
assemblies.Add(new Asset(path));

foreach (string path in AssemblyUtility.GetAssemblies(assemblyDirectory, IsModAssembly))
foreach (string path in AssemblyUtility.GetAssemblies(assemblyDirectory, IsIgnored(ignoredSet, true)))
assemblies.Add(new Asset(path));

return assemblies;
}

//generate a filter based on ignoredSet. if ignoredSet does not contain assembly name and it passes IsModAssembly, return true
private Func<string, bool> IsIgnored(HashSet<string> ignored, bool IsModAssemblyCheck)
{
if(IsModAssemblyCheck)
return assembly => !ignored.Contains(Path.GetFileNameWithoutExtension(assembly)) && IsModAssembly(assembly);

return assembly => !ignored.Contains(Path.GetFileNameWithoutExtension(assembly));
}

private bool IsModAssembly(string assembly)
{
string name = Path.GetFileNameWithoutExtension(assembly);
Expand Down