SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-07-09 02:16:46 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Figure out last couple of nullability issues

Browse Source
This commit is contained in:
Matt Nadareski
2023-10-26 00:27:38 -04:00
parent 259a91dd77
commit fc3be76657
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BinaryObjectScanner/FileType/Executable.cs
View File

@@ -447,11 +447,15 @@ namespace BinaryObjectScanner.FileType
{
return assembly.GetTypes()?
.Where(t => t.IsClass && t.GetInterface(typeof(T).Name) != null)?
#if NET48
.Select(t => (T)Activator.CreateInstance(t))
#else
.Select(t => (T?)Activator.CreateInstance(t))
#endif
.Cast<T>() ?? Array.Empty<T>();
}
#endregion
#endregion
#region Helpers

29
BinaryObjectScanner/Handler.cs
View File

@@ -18,7 +18,11 @@ namespace BinaryObjectScanner
/// <summary>
/// Cache for all IPathCheck types
/// </summary>
#if NET48
public static IEnumerable<IPathCheck> PathCheckClasses
#else
public static IEnumerable<IPathCheck?> PathCheckClasses
#endif
{
get
{
@@ -39,7 +43,7 @@ namespace BinaryObjectScanner
#if NET48
private static IEnumerable<IPathCheck> pathCheckClasses;
#else
private static IEnumerable<IPathCheck>? pathCheckClasses;
private static IEnumerable<IPathCheck?>? pathCheckClasses;
#endif
#endregion
@@ -67,7 +71,7 @@ namespace BinaryObjectScanner
// Iterate through all checks
Parallel.ForEach(PathCheckClasses, checkClass =>
{
var subProtections = checkClass.PerformCheck(path, files);
var subProtections = checkClass?.PerformCheck(path, files);
if (subProtections != null)
AppendToDictionary(protections, path, subProtections);
});
@@ -162,7 +166,7 @@ namespace BinaryObjectScanner
return null;
// Setup the output dictionary
var protections = new ConcurrentQueue<string>();
var protections = new ConcurrentQueue<string>();
// If we have a file path
if (File.Exists(path))
@@ -191,18 +195,33 @@ namespace BinaryObjectScanner
/// <summary>
/// Initialize all implementations of a type
/// </summary>
#if NET48
private static IEnumerable<T> InitCheckClasses<T>()
=> InitCheckClasses<T>(typeof(BinaryObjectScanner.Packer._DUMMY).Assembly)
.Concat(InitCheckClasses<T>(typeof(BinaryObjectScanner.Protection._DUMMY).Assembly));
#else
private static IEnumerable<T?> InitCheckClasses<T>()
#endif
{
return InitCheckClasses<T>(typeof(GameEngine._DUMMY).Assembly)
.Concat(InitCheckClasses<T>(typeof(Packer._DUMMY).Assembly))
.Concat(InitCheckClasses<T>(typeof(Protection._DUMMY).Assembly));
}
/// <summary>
/// Initialize all implementations of a type
/// </summary>
#if NET48
private static IEnumerable<T> InitCheckClasses<T>(Assembly assembly)
#else
private static IEnumerable<T?> InitCheckClasses<T>(Assembly assembly)
#endif
{
return assembly.GetTypes()?
.Where(t => t.IsClass && t.GetInterface(typeof(T).Name) != null)?
#if NET48
.Select(t => (T)Activator.CreateInstance(t)) ?? Array.Empty<T>();
#else
.Select(t => (T?)Activator.CreateInstance(t)) ?? Array.Empty<T>();
#endif
}
#endregion