SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-02-04 05:36:12 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Update packages

Browse Source
This commit is contained in:
Matt Nadareski
2024-12-16 15:00:44 -05:00
parent 3b631678f5
commit 2239b82a4b
5 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InfoPrint/InfoPrint.csproj
View File

@@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.IO" Version="1.6.1" />
<PackageReference Include="SabreTools.IO" Version="1.6.2" />
</ItemGroup>
</Project>

6
SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj
View File

@@ -27,10 +27,10 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="SabreTools.Hashing" Version="1.4.0" />
<PackageReference Include="SabreTools.Models" Version="1.5.7" />
<PackageReference Include="SabreTools.Hashing" Version="1.4.1" />
<PackageReference Include="SabreTools.Models" Version="1.5.8" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

8
SabreTools.Serialization/Deserializers/SFB.cs
View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using SabreTools.IO.Extensions;
using static SabreTools.Models.PlayStation3.Constants;
namespace SabreTools.Serialization.Deserializers
{
@@ -17,11 +17,7 @@ namespace SabreTools.Serialization.Deserializers
{
// Deserialize the SFB
var sfb = data.ReadType<Models.PlayStation3.SFB>();
if (sfb?.Magic == null)
return null;
string magic = Encoding.ASCII.GetString(sfb.Magic);
if (magic != ".SFB")
if (sfb?.Magic == SFBMagic)
return null;
return sfb;

24
SabreTools.Serialization/Deserializers/SFO.cs
View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using SabreTools.IO.Extensions;
using static SabreTools.Models.PlayStation3.Constants;
namespace SabreTools.Serialization.Deserializers
{
@@ -21,8 +21,8 @@ namespace SabreTools.Serialization.Deserializers
#region Header
// Try to parse the header
var header = ParseHeader(data);
if (header == null)
var header = data.ReadType<Models.PlayStation3.SFOHeader>();
if (header?.Magic != SFOMagic)
return null;
// Assign the header
@@ -60,24 +60,6 @@ namespace SabreTools.Serialization.Deserializers
}
}
/// <summary>
/// Parse a Stream into an SFO header
/// </summary>
/// <param name="data">Stream to parse</param>
/// <returns>Filled SFO header on success, null on error</returns>
public static Models.PlayStation3.SFOHeader? ParseHeader(Stream data)
{
var sfoHeader = data.ReadType<Models.PlayStation3.SFOHeader>();
if (sfoHeader == null)
return null;
string magic = Encoding.ASCII.GetString(sfoHeader!.Magic!);
if (magic != "\0PSF")
return null;
return sfoHeader;
}
/// <summary>
/// Parse a Stream into an SFO index table entry
/// </summary>

10
SabreTools.Serialization/SabreTools.Serialization.csproj
View File

@@ -30,11 +30,11 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.ASN1" Version="1.5.0" />
<PackageReference Include="SabreTools.Compression" Version="0.6.2" />
<PackageReference Include="SabreTools.Hashing" Version="1.4.0" />
<PackageReference Include="SabreTools.IO" Version="1.6.1" />
<PackageReference Include="SabreTools.Models" Version="1.5.7" />
<PackageReference Include="SabreTools.ASN1" Version="1.5.1" />
<PackageReference Include="SabreTools.Compression" Version="0.6.3" />
<PackageReference Include="SabreTools.Hashing" Version="1.4.1" />
<PackageReference Include="SabreTools.IO" Version="1.6.2" />
<PackageReference Include="SabreTools.Models" Version="1.5.8" />
</ItemGroup>
</Project>