Be consistent with model

This commit is contained in:
Matt Nadareski
2025-08-19 20:25:56 -04:00
parent 29a7158488
commit b70c510734
39 changed files with 124 additions and 114 deletions

View File

@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var mkb = Deserializers.AACS.DeserializeStream(data);
if (mkb == null)
var model = Deserializers.AACS.DeserializeStream(data);
if (model == null)
return null;
return new AACSMediaKeyBlock(mkb, data);
return new AACSMediaKeyBlock(model, data);
}
catch
{

View File

@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var svm = Deserializers.BDPlus.DeserializeStream(data);
if (svm == null)
var model = Deserializers.BDPlus.DeserializeStream(data);
if (model == null)
return null;
return new BDPlusSVM(svm, data);
return new BDPlusSVM(model, data);
}
catch
{

View File

@@ -72,11 +72,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var archive = Deserializers.BFPK.DeserializeStream(data);
if (archive == null)
var model = Deserializers.BFPK.DeserializeStream(data);
if (model == null)
return null;
return new BFPK(archive, data);
return new BFPK(model, data);
}
catch
{

View File

@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.BSP.DeserializeStream(data);
if (file == null)
var model = Deserializers.BSP.DeserializeStream(data);
if (model == null)
return null;
return new BSP(file, data);
return new BSP(model, data);
}
catch
{

View File

@@ -118,11 +118,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var binary = Deserializers.CFB.DeserializeStream(data);
if (binary == null)
var model = Deserializers.CFB.DeserializeStream(data);
if (model == null)
return null;
return new CFB(binary, data);
return new CFB(model, data);
}
catch
{

View File

@@ -107,11 +107,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var header = Deserializers.CHD.DeserializeStream(data);
if (header == null)
var model = Deserializers.CHD.DeserializeStream(data);
if (model == null)
return null;
return new CHD(header, data);
return new CHD(model, data);
}
catch
{

View File

@@ -62,11 +62,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var cia = Deserializers.CIA.DeserializeStream(data);
if (cia == null)
var model = Deserializers.CIA.DeserializeStream(data);
if (model == null)
return null;
return new CIA(cia, data);
return new CIA(model, data);
}
catch
{

View File

@@ -213,11 +213,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.GCF.DeserializeStream(data);
if (file == null)
var model = Deserializers.GCF.DeserializeStream(data);
if (model == null)
return null;
return new GCF(file, data);
return new GCF(model, data);
}
catch
{

View File

@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.IRD.DeserializeStream(data);
if (file == null)
var model = Deserializers.IRD.DeserializeStream(data);
if (model == null)
return null;
return new IRD(file, data);
return new IRD(model, data);
}
catch
{

View File

@@ -158,11 +158,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var archive = Deserializers.InstallShieldArchiveV3.DeserializeStream(data);
if (archive == null)
var model = Deserializers.InstallShieldArchiveV3.DeserializeStream(data);
if (model == null)
return null;
return new InstallShieldArchiveV3(archive, data);
return new InstallShieldArchiveV3(model, data);
}
catch
{

View File

@@ -150,11 +150,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var cabinet = Deserializers.InstallShieldCabinet.DeserializeStream(data);
if (cabinet == null)
var model = Deserializers.InstallShieldCabinet.DeserializeStream(data);
if (model == null)
return null;
return new InstallShieldCabinet(cabinet, data);
return new InstallShieldCabinet(model, data);
}
catch
{

View File

@@ -81,11 +81,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.LZKWAJ.DeserializeStream(data);
if (file == null)
var model = Deserializers.LZKWAJ.DeserializeStream(data);
if (model == null)
return null;
return new LZKWAJ(file, data);
return new LZKWAJ(model, data);
}
catch
{

View File

@@ -65,11 +65,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.LZQBasic.DeserializeStream(data);
if (file == null)
var model = Deserializers.LZQBasic.DeserializeStream(data);
if (model == null)
return null;
return new LZQBasic(file, data);
return new LZQBasic(model, data);
}
catch
{

View File

@@ -72,11 +72,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.LZSZDD.DeserializeStream(data);
if (file == null)
var model = Deserializers.LZSZDD.DeserializeStream(data);
if (model == null)
return null;
return new LZSZDD(file, data);
return new LZSZDD(model, data);
}
catch
{

View File

@@ -80,11 +80,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var executable = Deserializers.LinearExecutable.DeserializeStream(data);
if (executable == null)
var model = Deserializers.LinearExecutable.DeserializeStream(data);
if (model == null)
return null;
return new LinearExecutable(executable, data);
return new LinearExecutable(model, data);
}
catch
{

View File

@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var executable = Deserializers.MSDOS.DeserializeStream(data);
if (executable == null)
var model = Deserializers.MSDOS.DeserializeStream(data);
if (model == null)
return null;
return new MSDOS(executable, data);
return new MSDOS(model, data);
}
catch
{

View File

@@ -103,11 +103,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var cabinet = Deserializers.MicrosoftCabinet.DeserializeStream(data);
if (cabinet == null)
var model = Deserializers.MicrosoftCabinet.DeserializeStream(data);
if (model == null)
return null;
return new MicrosoftCabinet(cabinet, data);
return new MicrosoftCabinet(model, data);
}
catch
{

View File

@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var archive = Deserializers.MoPaQ.DeserializeStream(data);
if (archive == null)
var model = Deserializers.MoPaQ.DeserializeStream(data);
if (model == null)
return null;
return new MoPaQ(archive, data);
return new MoPaQ(model, data);
}
catch
{

View File

@@ -256,11 +256,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var cart = Deserializers.N3DS.DeserializeStream(data);
if (cart == null)
var model = Deserializers.N3DS.DeserializeStream(data);
if (model == null)
return null;
return new N3DS(cart, data);
return new N3DS(model, data);
}
catch
{

View File

@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.NCF.DeserializeStream(data);
if (file == null)
var model = Deserializers.NCF.DeserializeStream(data);
if (model == null)
return null;
return new NCF(file, data);
return new NCF(model, data);
}
catch
{

View File

@@ -368,11 +368,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var executable = Deserializers.NewExecutable.DeserializeStream(data);
if (executable == null)
var model = Deserializers.NewExecutable.DeserializeStream(data);
if (model == null)
return null;
return new NewExecutable(executable, data);
return new NewExecutable(model, data);
}
catch
{

View File

@@ -84,11 +84,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var cart = Deserializers.Nitro.DeserializeStream(data);
if (cart == null)
var model = Deserializers.Nitro.DeserializeStream(data);
if (model == null)
return null;
return new Nitro(cart, data);
return new Nitro(model, data);
}
catch
{

View File

@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.PAK.DeserializeStream(data);
if (file == null)
var model = Deserializers.PAK.DeserializeStream(data);
if (model == null)
return null;
return new PAK(file, data);
return new PAK(model, data);
}
catch
{

View File

@@ -76,11 +76,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var archive = Deserializers.PFF.DeserializeStream(data);
if (archive == null)
var model = Deserializers.PFF.DeserializeStream(data);
if (model == null)
return null;
return new PFF(archive, data);
return new PFF(model, data);
}
catch
{

View File

@@ -70,11 +70,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var di = Deserializers.PIC.DeserializeStream(data);
if (di == null)
var model = Deserializers.PIC.DeserializeStream(data);
if (model == null)
return null;
return new PIC(di, data);
return new PIC(model, data);
}
catch
{

View File

@@ -62,11 +62,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var archive = Deserializers.PKZIP.DeserializeStream(data);
if (archive == null)
var model = Deserializers.PKZIP.DeserializeStream(data);
if (model == null)
return null;
return new PKZIP(archive, data);
return new PKZIP(model, data);
}
catch
{

View File

@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var audioFile = Deserializers.PlayJAudio.DeserializeStream(data);
if (audioFile == null)
var model = Deserializers.PlayJAudio.DeserializeStream(data);
if (model == null)
return null;
return new PlayJAudioFile(audioFile, data);
return new PlayJAudioFile(model, data);
}
catch
{

View File

@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var playlist = Deserializers.PlayJPlaylist.DeserializeStream(data);
if (playlist == null)
var model = Deserializers.PlayJPlaylist.DeserializeStream(data);
if (model == null)
return null;
return new PlayJPlaylist(playlist, data);
return new PlayJPlaylist(model, data);
}
catch
{

View File

@@ -832,11 +832,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var executable = Deserializers.PortableExecutable.DeserializeStream(data);
if (executable == null)
var model = Deserializers.PortableExecutable.DeserializeStream(data);
if (model == null)
return null;
return new PortableExecutable(executable, data);
return new PortableExecutable(model, data);
}
catch
{

View File

@@ -80,11 +80,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var archive = Deserializers.Quantum.DeserializeStream(data);
if (archive == null)
var model = Deserializers.Quantum.DeserializeStream(data);
if (model == null)
return null;
return new Quantum(archive, data);
return new Quantum(model, data);
}
catch
{

View File

@@ -109,11 +109,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.SGA.DeserializeStream(data);
if (file == null)
var model = Deserializers.SGA.DeserializeStream(data);
if (model == null)
return null;
return new SGA(file, data);
return new SGA(model, data);
}
catch
{

View File

@@ -62,11 +62,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.SecuROMDFA.DeserializeStream(data);
if (file == null)
var model = Deserializers.SecuROMDFA.DeserializeStream(data);
if (model == null)
return null;
return new SecuROMDFA(file, data);
return new SecuROMDFA(model, data);
}
catch
{

View File

@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.VBSP.DeserializeStream(data);
if (file == null)
var model = Deserializers.VBSP.DeserializeStream(data);
if (model == null)
return null;
return new VBSP(file, data);
return new VBSP(model, data);
}
catch
{

View File

@@ -136,11 +136,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.VPK.DeserializeStream(data);
if (file == null)
var model = Deserializers.VPK.DeserializeStream(data);
if (model == null)
return null;
return new VPK(file, data);
return new VPK(model, data);
}
catch
{

View File

@@ -70,11 +70,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.WAD3.DeserializeStream(data);
if (file == null)
var model = Deserializers.WAD3.DeserializeStream(data);
if (model == null)
return null;
return new WAD3(file, data);
return new WAD3(model, data);
}
catch
{

View File

@@ -234,6 +234,16 @@ namespace SabreTools.Serialization.Wrappers
/// </summary>
WAD,
/// <summary>
/// Wise Installer Overlay Header
/// </summary>
WiseOverlayHeader,
/// <summary>
/// Wise Installer Script File
/// </summary>
WiseScript,
/// <summary>
/// xz archive
/// </summary>

View File

@@ -89,12 +89,12 @@ namespace SabreTools.Serialization.Wrappers
try
{
var xmid = Deserializers.XMID.DeserializeString(data);
if (xmid == null)
var model = Deserializers.XMID.DeserializeString(data);
if (model == null)
return null;
var ms = new MemoryStream(Encoding.ASCII.GetBytes(data));
return new XMID(xmid, ms);
return new XMID(model, ms);
}
catch
{

View File

@@ -73,11 +73,11 @@ namespace SabreTools.Serialization.Wrappers
try
{
var file = Deserializers.XZP.DeserializeStream(data);
if (file == null)
var model = Deserializers.XZP.DeserializeStream(data);
if (model == null)
return null;
return new XZP(file, data);
return new XZP(model, data);
}
catch
{

View File

@@ -104,12 +104,12 @@ namespace SabreTools.Serialization.Wrappers
try
{
var xemid = Deserializers.XeMID.DeserializeString(data);
if (xemid == null)
var model = Deserializers.XeMID.DeserializeString(data);
if (model == null)
return null;
var ms = new MemoryStream(Encoding.ASCII.GetBytes(data));
return new XeMID(xemid, ms);
return new XeMID(model, ms);
}
catch
{