DrakiaXYZ/AssemblyTool
0
0
Fork 0
Code Pull Requests Activity

Fix some automapper bugs

Browse Source
This commit is contained in:
Cj 2024-06-26 20:44:22 -04:00
parent d33f1f3c9b
commit e4a8daaba3
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RecodeItGUI/GUI/Main.cs
View File

@ -842,7 +842,7 @@ public partial class ReCodeItForm : Form
if (result != string.Empty) if (result != string.Empty)
{ {
AppSettings.AutoMapper.AssemblyPath = result; AppSettings.AutoMapper.AssemblyPath = result;
TargetAssemblyPath.Text = result; AutoMapperTargetPath.Text = result;
} }
} }
@ -853,7 +853,7 @@ public partial class ReCodeItForm : Form
if (result != string.Empty) if (result != string.Empty)
{ {
AppSettings.AutoMapper.OutputPath = result; AppSettings.AutoMapper.OutputPath = result;
RemapperOutputDirectoryPath.Text = result; AutoMapperOuputPath.Text = result;
} }
} }

20
RecodeItLib/AutoMapper/ReCodeItAutoMapper.cs
View File

@ -46,12 +46,11 @@ public class ReCodeItAutoMapper
TotalPropertyRenameCount = 0; TotalPropertyRenameCount = 0;
var types = Module.GetTypes(); var types = Module.GetTypes();
AllTypes.AddRange(types);
FindCompilerGeneratedObjects(types); FindCompilerGeneratedObjects(types);
GetAllTypes(types); Logger.Log($"Found {AllTypes.Count - CompilerGeneratedClasses.Count} potential remappable types");
Logger.Log($"Found {CompilerGeneratedClasses.Count - AllTypes.Count} potential remappable types");
Logger.Log($"Found {CompilerGeneratedClasses.Count} compiler generated objects"); Logger.Log($"Found {CompilerGeneratedClasses.Count} compiler generated objects");
foreach (var type in types) foreach (var type in types)
@ -78,19 +77,6 @@ public class ReCodeItAutoMapper
WriteChanges(); WriteChanges();
} }
private void GetAllTypes(IEnumerable<TypeDef> types)
{
AllTypes.AddRange(types);
foreach (var type in types)
{
if (type.HasNestedTypes)
{
GetAllTypes(type.NestedTypes);
}
}
}
/// <summary> /// <summary>
/// Finds any compiler generated code so we can ignore it, its mostly LINQ garbage /// Finds any compiler generated code so we can ignore it, its mostly LINQ garbage
/// </summary> /// </summary>
@ -154,6 +140,8 @@ public class ReCodeItAutoMapper
//Logger.Log($"Paremeter Names: {string.Join(", ", parmNames)}"); //Logger.Log($"Paremeter Names: {string.Join(", ", parmNames)}");
//Logger.Log($"Paremeter Types: {string.Join(", ", parmTypes)}\n"); //Logger.Log($"Paremeter Types: {string.Join(", ", parmTypes)}\n");
if (parm.Type.TryGetTypeDef() is null) continue;
var mapPair = new MappingPair( var mapPair = new MappingPair(
parm.Type.TryGetTypeDef(), parm.Type.TryGetTypeDef(),
parm.Name, parm.Name,