ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace .Where(pred).FirstOrDefault() with .FirstOrDefault(pred) 

In FirmwareDatabase.LookupFirmwareRecord and MDS_Format.LoadMDSToDisc, first
convert LINQ DSL to method chain
This commit is contained in:
YoshiRulz 2019-03-25 02:21:37 +10:00
parent 4f5beb09a8
commit 90623d36e2
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
9 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -1287,9 +1287,7 @@ namespace BizHawk.Client.EmuHawk
if (column.Name.StartsWith("Key "))
{
keysMenus
.Where(m => m.DropDownItems.Count < maxRows)
.FirstOrDefault()
keysMenus.FirstOrDefault(m => m.DropDownItems.Count < maxRows)
.DropDownItems
.Add(menuItem);
}

10
BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
View File

@ -82,13 +82,9 @@ namespace BizHawk.Client.EmuHawk
var schemaType = Assembly
.GetExecutingAssembly()
.GetTypes()
.Where(t => typeof(IVirtualPadSchema)
.IsAssignableFrom(t) && t.GetCustomAttributes(false)
.OfType<SchemaAttribute>()
.Any())
.FirstOrDefault(t => t.GetCustomAttributes(false)
.OfType<SchemaAttribute>()
.First().SystemId == Emulator.SystemId);
.FirstOrDefault(t => typeof(IVirtualPadSchema).IsAssignableFrom(t)
&& t.GetCustomAttributes(false).OfType<SchemaAttribute>().Any()
&& t.GetCustomAttributes(false).OfType<SchemaAttribute>().First().SystemId == Emulator.SystemId);
if (schemaType != null)
{

12
BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
View File

@ -387,15 +387,7 @@ namespace BizHawk.Emulation.Common
public string ConfigKey => $"{SystemId}+{FirmwareId}";
}
public static FirmwareRecord LookupFirmwareRecord(string sysId, string firmwareId)
{
var found =
from fr in FirmwareRecords
where fr.FirmwareId == firmwareId
&& fr.SystemId == sysId
select fr;
return found.FirstOrDefault();
}
public static FirmwareRecord LookupFirmwareRecord(string sysId, string firmwareId) =>
FirmwareRecords.FirstOrDefault(fr => fr.FirmwareId == firmwareId && fr.SystemId == sysId);
} // static class FirmwareDatabase
}

10
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -397,7 +397,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
var mtc = maxTransferCap;
// get the current track
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track == null || track.NumberOfSectors <= 0)
{
@ -704,7 +704,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
}
// get the current track
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track == null || track.NumberOfSectors <= 0)
{
@ -1017,7 +1017,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
}
// get the current track
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track == null || track.NumberOfSectors <= 0)
{
@ -1209,7 +1209,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
break;
}
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track != null && track.NumberOfSectors > 0 && track.TrackNumber != 0xff)
{
@ -2543,7 +2543,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
cmdByte = cByte;
// lookup the command
var cmd = CommandList.Where(a => a.CommandCode == cmdByte).FirstOrDefault();
var cmd = CommandList.FirstOrDefault(a => a.CommandCode == cmdByte);
if (cmd == null)
{

10
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -397,7 +397,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
}
// get the current track
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track == null || track.NumberOfSectors <= 0)
{
@ -704,7 +704,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
}
// get the current track
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track == null || track.NumberOfSectors <= 0)
{
@ -1017,7 +1017,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
}
// get the current track
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track == null || track.NumberOfSectors <= 0)
{
@ -1209,7 +1209,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
break;
}
var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault();
var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID);
if (track != null && track.NumberOfSectors > 0 && track.TrackNumber != 0xff)
{
@ -2550,7 +2550,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
cmdByte = cByte;
// lookup the command
var cmd = CommandList.Where(a => a.CommandCode == cmdByte).FirstOrDefault();
var cmd = CommandList.FirstOrDefault(a => a.CommandCode == cmdByte);
if (cmd == null)
{

5
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
View File

@ -327,10 +327,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
/// <param name="type"></param>
/// <returns></returns>
protected IJoystick LocateUniqueJoystick(JoystickType type)
{
return JoystickCollection.Where(a => a.JoyType == type).FirstOrDefault();
}
protected IJoystick LocateUniqueJoystick(JoystickType type) => JoystickCollection.FirstOrDefault(a => a.JoyType == type);
/// <summary>
/// Signs whether input read has been requested

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
View File

@ -64,7 +64,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
}
// now process the blocks
var infoBlock = blocks.Where(a => a.RecordType == RecordHeaderType.INFO).FirstOrDefault();
var infoBlock = blocks.FirstOrDefault(a => a.RecordType == RecordHeaderType.INFO);
var IMGEblocks = blocks.Where(a => a.RecordType == RecordHeaderType.IMGE).ToList();
var DATAblocks = blocks.Where(a => a.RecordType == RecordHeaderType.DATA).ToList();
@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
var trk = DiskTracks[t];
var blockCount = img.IMGEblockCount;
var dataBlock = DATAblocks.Where(a => a.DATAdataKey == img.IMGEdataKey).FirstOrDefault();
var dataBlock = DATAblocks.FirstOrDefault(a => a.DATAdataKey == img.IMGEdataKey);
trk.SideNumber = (byte)img.IMGEside;
trk.TrackNumber = (byte)img.IMGEtrack;

6
BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs
View File

@ -728,7 +728,7 @@ namespace BizHawk.Emulation.DiscSystem
{
int relMSF = -1;
var track = mdsf.TOCEntries.Where(t => t.Point == i).FirstOrDefault();
var track = mdsf.TOCEntries.FirstOrDefault(t => t.Point == i);
if (track == null)
break;
@ -743,9 +743,7 @@ namespace BizHawk.Emulation.DiscSystem
// get the blob(s) for this track
// its probably a safe assumption that there will be only one blob per track,
// but i'm still not 100% sure on this
var tr = (from a in mdsf.TOCEntries
where a.Point == i
select a).FirstOrDefault();
var tr = mdsf.TOCEntries.FirstOrDefault(a => a.Point == i);
if (tr == null)
throw new MDSParseException("BLOB Error!");

2
BizHawk.Emulation.DiscSystem/DiscIdentifier.cs
View File

@ -186,7 +186,7 @@ namespace BizHawk.Emulation.DiscSystem
if (appId == "PSP GAME")
return DiscType.SonyPSP;
// in case the appId is not set correctly...
if (iso.Root.Children.Where(a => a.Key == "PSP_GAME").FirstOrDefault().Value as ISODirectoryNode != null)
if (iso.Root.Children.FirstOrDefault(a => a.Key == "PSP_GAME").Value as ISODirectoryNode != null)
return DiscType.SonyPSP;
if (sysId == "SEGA SEGASATURN")