Bump version

* Fill PS3 Disc Key from redump

* Deny NULL rather than only allow hex keys

* Update Builder.cs

Co-authored-by: Matt Nadareski <mnadareski@outlook.com>

---------

Co-authored-by: Matt Nadareski <mnadareski@outlook.com>

.github/workflows/build_nupkg.yml

@@ -0,0 +1,43 @@
+name: Nuget Pack
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Pack
+      run: dotnet pack
+
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'Nuget Package'
+        path: 'bin/Release/*.nupkg'
+
+    - name: Upload to rolling
+      uses: ncipollo/release-action@v1.14.0
+      with:
+        allowUpdates: True
+        artifacts: 'bin/Release/*.nupkg'
+        body: 'Last built commit: ${{ github.sha }}'
+        name: 'Rolling Release'
+        prerelease: True
+        replacesArtifacts: True
+        tag: "rolling"
+        updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -0,0 +1,17 @@
+name: Build PR
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+      
+    - name: Build
+      run: dotnet build

Builder.cs

@@ -386,6 +386,15 @@ namespace SabreTools.RedumpLib
                 info.DumpersAndStatus.Dumpers = [.. tempDumpers];
             }
 
+            // PS3 DiscKey
+            if (string.IsNullOrEmpty(info.Extras!.DiscKey))
+            {
+                // Validate key is not NULL
+                match = Constants.PS3DiscKey.Match(discData);
+                if (match.Success && match.Groups[1].Value != "<span class=\"null\">NULL</span>")
+                    info.Extras.DiscKey = match.Groups[1].Value;
+            }
+
             // TODO: Unify handling of fields that can include site codes (Comments/Contents)
 
             // Comments
@@ -721,7 +730,7 @@ namespace SabreTools.RedumpLib
             }
         }
 
-#endregion
+        #endregion
 
         #region Helpers
 

Data/Constants.cs

@@ -102,6 +102,11 @@ namespace SabreTools.RedumpLib.Data
         /// </summary>
         public static Regex PartialMatchRegex = new(@"<td class=""static"">partial match ids: (.*?)</td>");
 
+        /// <summary>
+        /// Regex matching the disc key on a PS3 disc page
+        /// </summary>
+        public static Regex PS3DiscKey = new(@"<th>Disc Key</th><th>Disc ID</th><th>Permanent Information & Control \(PIC\)</th></tr><tr><td>(.*?)</td><td>");
+
         /// <summary>
         /// Regex matching the PVD field on a disc page
         /// </summary>

Data/Extensions.cs

@@ -239,6 +239,7 @@ namespace SabreTools.RedumpLib.Data
 
                 // https://en.wikipedia.org/wiki/Game_Wave_Family_Entertainment_System
                 case RedumpSystem.ZAPiTGamesGameWaveFamilyEntertainmentSystem:
+                    types.Add(MediaType.CDROM); // Firmware discs only(?)
                     types.Add(MediaType.DVD);
                     break;
 

Data/SubmissionInfo.cs

@@ -530,6 +530,10 @@ namespace SabreTools.RedumpLib.Data
     /// </summary>
     public class DumpingInfoSection : ICloneable
     {
+        // Name not defined by Redump -- Only used with MPF
+        [JsonProperty(PropertyName = "d_frontend_version", Required = Required.AllowNull)]
+        public string? FrontendVersion { get; set; }
+
         // Name not defined by Redump
         [JsonProperty(PropertyName = "d_dumping_program", Required = Required.AllowNull)]
         public string? DumpingProgram { get; set; }
@@ -554,16 +558,22 @@ namespace SabreTools.RedumpLib.Data
         [JsonProperty(PropertyName = "d_reported_disc_type", Required = Required.AllowNull)]
         public string? ReportedDiscType { get; set; }
 
+        // Name not defined by Redump -- Only used with Redumper
+        [JsonProperty(PropertyName = "d_errors_c2", NullValueHandling = NullValueHandling.Ignore)]
+        public string? C2ErrorsCount { get; set; }
+
         public object Clone()
         {
             return new DumpingInfoSection
             {
+                FrontendVersion = this.FrontendVersion,
                 DumpingProgram = this.DumpingProgram,
                 DumpingDate = this.DumpingDate,
                 Manufacturer = this.Manufacturer,
                 Model = this.Model,
                 Firmware = this.Firmware,
                 ReportedDiscType = this.ReportedDiscType,
+                C2ErrorsCount = this.C2ErrorsCount,
             };
         }
     }

SabreTools.RedumpLib.csproj

@@ -7,12 +7,12 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.3.0</Version>
+    <Version>1.3.5</Version>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
     <Description>Code to interact with redump.org</Description>
-    <Copyright>Copyright (c) Matt Nadareski 2020-2023</Copyright>
+    <Copyright>Copyright (c) Matt Nadareski 2020-2024</Copyright>
     <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/SabreTools/SabreTools.RedumpLib</RepositoryUrl>
@@ -26,16 +26,12 @@
   </ItemGroup>
 
   <!-- Support for old .NET versions -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
-    <PackageReference Include="LinqBridge" Version="1.3.0" />
-  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))">
     <PackageReference Include="MinValueTupleBridge" Version="0.2.1" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
-    <PackageReference Include="MinAsyncBridge" Version="0.12.2" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
+    <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
+    <PackageReference Include="MinThreadingBridge" Version="0.11.4" />
     <PackageReference Include="Net30.LinqBridge" Version="1.3.0" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith(`net4`))">

Validator.cs

@@ -142,9 +142,9 @@ namespace SabreTools.RedumpLib
         /// <param name="sha1">SHA-1 hash to check against</param>
         /// <returns>True if the track was found, false otherwise; List of found values, if possible</returns>
 #if NETFRAMEWORK
-        public async static Task<(bool, List<int>?, string?)> ValidateSingleTrack(RedumpWebClient wc, SubmissionInfo info, string sha1)
+        public async static Task<(bool, List<int>?, string?)> ValidateSingleTrack(RedumpWebClient wc, SubmissionInfo info, string? sha1)
 #else
-        public async static Task<(bool, List<int>?, string?)> ValidateSingleTrack(RedumpHttpClient wc, SubmissionInfo info, string sha1)
+        public async static Task<(bool, List<int>?, string?)> ValidateSingleTrack(RedumpHttpClient wc, SubmissionInfo info, string? sha1)
 #endif
         {
             // Get all matching IDs for the track
@@ -190,10 +190,10 @@ namespace SabreTools.RedumpLib
                 return (false, null, "Universal hash was missing");
 
             // Format the universal hash for finding within the comments
-            universalHash = $"{universalHash.Substring(0, universalHash.Length - 1)}/comments/only";
+            string universalHashQuery = $"{universalHash.Substring(0, universalHash.Length - 1)}/comments/only";
 
             // Get all matching IDs for the hash
-            var newIds = await ListSearchResults(wc, universalHash, filterForwardSlashes: false);
+            var newIds = await ListSearchResults(wc, universalHashQuery, filterForwardSlashes: false);
 
             // If we got null back, there was an error
             if (newIds == null)