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

Convert FirmwareRecord to a readonly struct

This commit is contained in:
YoshiRulz 2021-02-08 13:10:33 +10:00
parent 2e52827bc1
commit a41fc1f1ce
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.Client.Common
var resolved = Resolve(
pathEntries,
userSpecifications,
FirmwareDatabase.FirmwareRecords.FirstOrDefault(fr => fr.ID == id));
FirmwareDatabase.FirmwareRecords.First(fr => fr.ID == id));
if (resolved == null)
{
return null;

4
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -179,7 +179,7 @@ namespace BizHawk.Client.EmuHawk
};
lvi.SubItems.Add(fr.ID.System);
lvi.SubItems.Add(fr.ID.Firmware);
lvi.SubItems.Add(fr.Descr);
lvi.SubItems.Add(fr.Description);
lvi.SubItems.Add(""); // resolved with
lvi.SubItems.Add(""); // location
lvi.SubItems.Add(""); // size
@ -531,7 +531,7 @@ namespace BizHawk.Client.EmuHawk
{
lblFirmware =
{
Text = $"{fr.ID.System} : {fr.ID.Firmware} ({fr.Descr})"
Text = $"{fr.ID.System} : {fr.ID.Firmware} ({fr.Description})"
}
};

6
src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
View File

@ -40,11 +40,7 @@ namespace BizHawk.Emulation.Common
=> options.Add(new(new(systemId, id), ff.Hash, ff.Size, ff.IsBad ? FirmwareOptionStatus.Bad : status));
void Firmware(string systemId, string id, string desc)
=> records.Add(new FirmwareRecord
{
ID = new(systemId, id),
Descr = desc
});
=> records.Add(new(new(systemId, id), desc));
void FirmwareAndOption(string hash, long size, string systemId, string id, string name, string desc)
{

14
src/BizHawk.Emulation.Common/Database/FirmwareRecord.cs
View File

@ -1,9 +1,17 @@
#nullable enable
namespace BizHawk.Emulation.Common
{
public sealed class FirmwareRecord
public readonly struct FirmwareRecord
{
public string Descr { get; set; }
public readonly string Description;
public FirmwareID ID { get; set; }
public readonly FirmwareID ID;
public FirmwareRecord(FirmwareID id, string desc)
{
Description = desc;
ID = id;
}
}
}