claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce implicit null checks

Browse Source
This commit is contained in:
Matt Nadareski
2023-08-10 11:35:32 -04:00
parent 5213490689
commit c59bd4d857
35 changed files with 1406 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SabreTools.Serialization/ArchiveDotOrg.Deserializer.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Linq;
using SabreTools.Models.ArchiveDotOrg;
@@ -22,7 +23,12 @@ namespace SabreTools.Serialization
var machines = item.Read<Models.Internal.Machine[]>(Models.Internal.MetadataFile.MachineKey);
if (machines != null && machines.Any())
files.File = machines.SelectMany(ConvertFromInternalModel).ToArray();
{
files.File = machines
.Where(m => m != null)
.SelectMany(ConvertFromInternalModel)
.ToArray();
}
return files;
}
@@ -30,23 +36,22 @@ namespace SabreTools.Serialization
/// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.ArchiveDotOrg.File"/>
/// </summary>
private static File[]? ConvertFromInternalModel(Models.Internal.Machine? item)
private static File[] ConvertFromInternalModel(Models.Internal.Machine item)
{
if (item == null)
return null;
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
return roms?.Select(ConvertFromInternalModel)?.ToArray();
if (roms == null)
return Array.Empty<File>();
return roms
.Where(r => r != null)
.Select(ConvertFromInternalModel).ToArray();
}
/// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.ArchiveDotOrg.File"/>
/// </summary>
private static File? ConvertFromInternalModel(Models.Internal.Rom? item)
private static File ConvertFromInternalModel(Models.Internal.Rom item)
{
if (item == null)
return null;
var file = new File
{
Name = item.ReadString(Models.Internal.Rom.NameKey),