Bump version

Add new non-tag site codes
Bump version
2026-02-12 13:45:49 +00:00 · 2025-05-23 12:39:49 -04:00 · 2025-05-23 12:35:16 -04:00 · 2025-05-01 10:54:09 -04:00 · 2025-05-01 10:53:21 -04:00 · 2025-05-01 10:51:26 -04:00
11 changed files with 94 additions and 74 deletions
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -25,13 +25,7 @@ jobs:
      run: dotnet test
      
    - name: Run publish script
-      run: ./publish-nix.sh
-
-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: 'Nuget Package'
-        path: "*.nupkg,*.snupkg"
+      run: ./publish-nix.sh -d

    - name: Upload to rolling
      uses: ncipollo/release-action@v1.14.0
--- a/RedumpTool/RedumpTool.csproj
+++ b/RedumpTool/RedumpTool.csproj
@@ -9,7 +9,7 @@
        <Nullable>enable</Nullable>
        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.3</Version>
+        <Version>1.6.7</Version>
    </PropertyGroup>

    <!-- Support All Frameworks -->
--- a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
+++ b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
@@ -696,20 +696,24 @@ namespace SabreTools.RedumpLib.Test.Data
            SiteCode.BBFCRegistrationNumber,
            SiteCode.CompatibleOS,
            SiteCode.DiscHologramID,
+            SiteCode.DiscTitleNonLatin,
            SiteCode.DMIHash,
            SiteCode.DNASDiscID,
+            SiteCode.EditionNonLatin,
            SiteCode.Filename,
            SiteCode.Genre,
            SiteCode.InternalName,
            SiteCode.InternalSerialName,
            SiteCode.ISBN,
            SiteCode.ISSN,
+            SiteCode.LogsLink,
            SiteCode.Multisession,
            SiteCode.PFIHash,
            SiteCode.PostgapType,
            SiteCode.PPN,
            SiteCode.Protection,
            SiteCode.RingNonZeroDataStart,
+            SiteCode.RingPerfectAudioOffset,
            SiteCode.Series,
            SiteCode.SSHash,
            SiteCode.SSVersion,
@@ -1023,7 +1027,6 @@ namespace SabreTools.RedumpLib.Test.Data
            RedumpSystem.NintendoWiiU,
            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
            RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
            RedumpSystem.SegaDreamcast,
            RedumpSystem.SegaMegaCDSegaCD,
            RedumpSystem.SegaSaturn,
@@ -1100,7 +1103,6 @@ namespace SabreTools.RedumpLib.Test.Data
            RedumpSystem.MicrosoftXboxOne,
            RedumpSystem.MicrosoftXboxSeriesXS,
            RedumpSystem.NintendoWiiU,
-            RedumpSystem.PhilipsCDiDigitalVideo,
            RedumpSystem.SonyPlayStation4,
            RedumpSystem.SonyPlayStation5,

@@ -1180,7 +1182,6 @@ namespace SabreTools.RedumpLib.Test.Data
            [RedumpSystem.NintendoWiiU] = SystemCategory.DiscBasedConsole,
            [RedumpSystem.Panasonic3DOInteractiveMultiplayer] = SystemCategory.DiscBasedConsole,
            [RedumpSystem.PhilipsCDi] = SystemCategory.DiscBasedConsole,
-            [RedumpSystem.PhilipsCDiDigitalVideo] = SystemCategory.DiscBasedConsole,
            [RedumpSystem.PioneerLaserActive] = SystemCategory.DiscBasedConsole,
            [RedumpSystem.SegaDreamcast] = SystemCategory.DiscBasedConsole,
            [RedumpSystem.SegaMegaCDSegaCD] = SystemCategory.DiscBasedConsole,
--- a/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
+++ b/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
@@ -24,20 +24,20 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
        <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.17.0" />
-        <PackageReference Include="xunit.assert" Version="2.9.2" />
-        <PackageReference Include="xunit.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.assert" Version="2.9.3" />
+        <PackageReference Include="xunit.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/SabreTools.RedumpLib/Builder.cs
+++ b/SabreTools.RedumpLib/Builder.cs
@@ -458,40 +458,8 @@ namespace SabreTools.RedumpLib
                            addToLast = siteCode.IsMultiLine();

                            // Skip certain site codes because of data issues
-                            switch (siteCode)
-                            {
-                                // Multiple
-                                case SiteCode.InternalSerialName:
-                                case SiteCode.Multisession:
-                                case SiteCode.VolumeLabel:
-                                    continue;
-
-                                // Audio CD
-                                case SiteCode.RingNonZeroDataStart:
-                                case SiteCode.UniversalHash:
-                                    continue;
-
-                                // Microsoft Xbox and Xbox 360
-                                case SiteCode.DMIHash:
-                                case SiteCode.PFIHash:
-                                case SiteCode.SSHash:
-                                case SiteCode.SSVersion:
-                                case SiteCode.XMID:
-                                case SiteCode.XeMID:
-                                    continue;
-
-                                // Microsoft Xbox One and Series X/S
-                                case SiteCode.Filename:
-                                    continue;
-
-                                // Nintendo Gamecube
-                                case SiteCode.InternalName:
-                                    continue;
-
-                                // Protection
-                                case SiteCode.Protection:
-                                    continue;
-                            }
+                            if (ShouldSkipSiteCode(siteCode))
+                                continue;

                            // If we don't already have this site code, add it to the dictionary
                            if (!info.CommonDiscInfo.CommentsSpecialFields!.ContainsKey(siteCode.Value))
@@ -507,14 +475,14 @@ namespace SabreTools.RedumpLib
                        // If we didn't find a known tag, just add the line, just in case
                        if (!foundTag)
                        {
-                            if (addToLast && lastSiteCode != null)
+                            if (addToLast && lastSiteCode != null && !ShouldSkipSiteCode(lastSiteCode))
                            {
                                if (!string.IsNullOrEmpty(info.CommonDiscInfo.CommentsSpecialFields![lastSiteCode.Value]))
                                    info.CommonDiscInfo.CommentsSpecialFields[lastSiteCode.Value] += "\n";

                                info.CommonDiscInfo.CommentsSpecialFields[lastSiteCode.Value] += commentLine;
                            }
-                            else
+                            else if (!addToLast || lastSiteCode == null)
                            {
                                newComments += $"{commentLine}\n";
                            }
@@ -595,14 +563,14 @@ namespace SabreTools.RedumpLib
                        // If we didn't find a known tag, just add the line, just in case
                        if (!foundTag)
                        {
-                            if (addToLast && lastSiteCode != null)
+                            if (addToLast && lastSiteCode != null && !ShouldSkipSiteCode(lastSiteCode))
                            {
                                if (!string.IsNullOrEmpty(info.CommonDiscInfo.ContentsSpecialFields![lastSiteCode.Value]))
                                    info.CommonDiscInfo.ContentsSpecialFields[lastSiteCode.Value] += "\n";

                                info.CommonDiscInfo.ContentsSpecialFields[lastSiteCode.Value] += contentLine;
                            }
-                            else
+                            else if (!addToLast || lastSiteCode == null)
                            {
                                newContents += $"{contentLine}\n";
                            }
@@ -737,6 +705,44 @@ namespace SabreTools.RedumpLib
            return info;
        }

+        /// <summary>
+        /// Determine if a site code should be skipped on pulling
+        /// </summary>
+        private static bool ShouldSkipSiteCode(SiteCode? siteCode)
+        {
+            return siteCode switch
+            {
+                // Multiple
+                SiteCode.InternalSerialName
+                    or SiteCode.Multisession
+                    or SiteCode.VolumeLabel => true,
+
+                // Audio CD
+                SiteCode.RingNonZeroDataStart
+                    or SiteCode.RingPerfectAudioOffset
+                    or SiteCode.UniversalHash => true,
+
+                // Microsoft Xbox and Xbox 360
+                SiteCode.DMIHash
+                    or SiteCode.PFIHash
+                    or SiteCode.SSHash
+                    or SiteCode.SSVersion
+                    or SiteCode.XMID
+                    or SiteCode.XeMID => true,
+
+                // Microsoft Xbox One and Series X/S
+                SiteCode.Filename => true,
+
+                // Nintendo Gamecube
+                SiteCode.InternalName => true,
+
+                // Protection
+                SiteCode.Protection => true,
+
+                _ => false,
+            };
+        }
+
        #endregion

        #region Helpers
--- a/SabreTools.RedumpLib/Data/Enumerations.cs
+++ b/SabreTools.RedumpLib/Data/Enumerations.cs
@@ -2008,9 +2008,6 @@ namespace SabreTools.RedumpLib.Data
        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i", ShortName = "cdi", HasCues = true, HasDat = true)]
        PhilipsCDi,

-        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i Digital Video", ShortName = "cdi-video", IsBanned = true)]
-        PhilipsCDiDigitalVideo,
-
        [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Pioneer LaserActive")]
        PioneerLaserActive,

@@ -3553,6 +3550,10 @@ namespace SabreTools.RedumpLib.Data
        [HumanReadable(ShortName = "<b>Disc Hologram ID</b>:", LongName = "<b>Disc Hologram ID</b>:")]
        DiscHologramID,

+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Disc Title (non-Latin)</b>:", LongName = "<b>Disc Title (non-Latin)</b>:")]
+        DiscTitleNonLatin,
+
        // This doesn't have a site tag yet
        [HumanReadable(ShortName = "<b>DMI</b>:", LongName = "<b>DMI</b>:")]
        DMIHash,
@@ -3560,6 +3561,10 @@ namespace SabreTools.RedumpLib.Data
        [HumanReadable(ShortName = "[T:DNAS]", LongName = "<b>DNAS Disc ID</b>:")]
        DNASDiscID,

+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Edition (non-Latin)</b>:", LongName = "<b>Edition (non-Latin)</b>:")]
+        EditionNonLatin,
+
        // This doesn't have a site tag yet
        [HumanReadable(ShortName = "<b>Eidos ID</b>:", LongName = "<b>Eidos ID</b>:")]
        EidosID,
@@ -3615,6 +3620,10 @@ namespace SabreTools.RedumpLib.Data
        [HumanReadable(ShortName = "[T:KID]", LongName = "<b>Konami ID</b>:")]
        KonamiID,

+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Logs Link</b>:", LongName = "<b>Logs Link</b>:")]
+        LogsLink,
+
        [HumanReadable(ShortName = "[T:LAID]", LongName = "<b>Lucas Arts ID</b>:")]
        LucasArtsID,

@@ -3668,6 +3677,10 @@ namespace SabreTools.RedumpLib.Data
        [HumanReadable(ShortName = "<b>Ring non-zero data start</b>:", LongName = "<b>Ring non-zero data start</b>:")]
        RingNonZeroDataStart,

+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Ring Perfect Audio Offset</b>:", LongName = "<b>Ring Perfect Audio Offset</b>:")]
+        RingPerfectAudioOffset,
+
        [HumanReadable(ShortName = "[T:RD]", LongName = "<b>Rolling Demos</b>:")]
        RollingDemos,

--- a/SabreTools.RedumpLib/Data/Extensions.cs
+++ b/SabreTools.RedumpLib/Data/Extensions.cs
@@ -1247,20 +1247,24 @@ namespace SabreTools.RedumpLib.Data
                SiteCode.BBFCRegistrationNumber => true,
                SiteCode.CompatibleOS => true,
                SiteCode.DiscHologramID => true,
+                SiteCode.DiscTitleNonLatin => true,
                SiteCode.DMIHash => true,
                SiteCode.DNASDiscID => true,
+                SiteCode.EditionNonLatin => true,
                SiteCode.Filename => true,
                SiteCode.Genre => true,
                SiteCode.InternalName => true,
                SiteCode.InternalSerialName => true,
                SiteCode.ISBN => true,
                SiteCode.ISSN => true,
+                SiteCode.LogsLink => true,
                SiteCode.Multisession => true,
                SiteCode.PFIHash => true,
                SiteCode.PostgapType => true,
                SiteCode.PPN => true,
                SiteCode.Protection => true,
                SiteCode.RingNonZeroDataStart => true,
+                SiteCode.RingPerfectAudioOffset => true,
                SiteCode.Series => true,
                SiteCode.SSHash => true,
                SiteCode.SSVersion => true,
@@ -1420,7 +1424,6 @@ namespace SabreTools.RedumpLib.Data
                    or RedumpSystem.NintendoWiiU
                    or RedumpSystem.Panasonic3DOInteractiveMultiplayer
                    or RedumpSystem.PhilipsCDi
-                    or RedumpSystem.PhilipsCDiDigitalVideo
                    or RedumpSystem.PioneerLaserActive
                    or RedumpSystem.MarkerDiscBasedConsoleEnd => false,

--- a/SabreTools.RedumpLib/Formatter.cs
+++ b/SabreTools.RedumpLib/Formatter.cs
@@ -13,15 +13,21 @@ namespace SabreTools.RedumpLib
        /// </summary>
        internal static readonly SiteCode[] OrderedCommentCodes =
        [
+            // Submission Info
+            SiteCode.LogsLink,
+
            // Identifying Info
            SiteCode.AlternativeTitle,
            SiteCode.AlternativeForeignTitle,
+            SiteCode.DiscTitleNonLatin,
+            SiteCode.EditionNonLatin,
            SiteCode.InternalName,
            SiteCode.InternalSerialName,
            SiteCode.VolumeLabel,
            SiteCode.Multisession,
            SiteCode.UniversalHash,
            SiteCode.RingNonZeroDataStart,
+            SiteCode.RingPerfectAudioOffset,

            SiteCode.XMID,
            SiteCode.XeMID,
--- a/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
+++ b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
@@ -8,12 +8,12 @@
        <Nullable>enable</Nullable>
        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.3</Version>
+        <Version>1.6.7</Version>

        <!-- Package Properties -->
        <Authors>Matt Nadareski</Authors>
        <Description>Code to interact with redump.org</Description>
-        <Copyright>Copyright (c) Matt Nadareski 2020-2024</Copyright>
+        <Copyright>Copyright (c) Matt Nadareski 2020-2025</Copyright>
        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
        <PackageReadmeFile>README.md</PackageReadmeFile>
        <RepositoryUrl>https://github.com/SabreTools/SabreTools.RedumpLib</RepositoryUrl>
@@ -30,15 +30,9 @@
        <None Include="../README.md" Pack="true" PackagePath="" />
    </ItemGroup>

-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
-        <PackageReference Include="Net35.Actions" Version="1.1.0" />
-    </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
-        <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
-    </ItemGroup>
-
    <ItemGroup>
+        <PackageReference Include="MinAsyncBridge" Version="0.12.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
+        <PackageReference Include="Net35.Actions" Version="1.4.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
        <PackageReference Include="SabreTools.Models" Version="1.5.8" />
    </ItemGroup>
--- a/SabreTools.RedumpLib/Web/CookieWebClient.cs
+++ b/SabreTools.RedumpLib/Web/CookieWebClient.cs
@@ -32,7 +32,10 @@ namespace SabreTools.RedumpLib.Web
        {
            WebRequest request = base.GetWebRequest(address);
            if (request is HttpWebRequest webRequest)
+            {
+                webRequest.Timeout = 30 * 1000; // 30 seconds
                webRequest.CookieContainer = _container;
+            }

            return request;
        }
--- a/SabreTools.RedumpLib/Web/RedumpClient.cs
+++ b/SabreTools.RedumpLib/Web/RedumpClient.cs
@@ -52,7 +52,7 @@ namespace SabreTools.RedumpLib.Web
 #if NETFRAMEWORK
            _internalClient = new CookieWebClient();
 #else
-            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true });
+            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(30) };
 #endif
        }
Author	SHA1	Message	Date
Matt Nadareski	0021c7653c	Bump version	2025-05-23 12:39:49 -04:00
Matt Nadareski	091a32b223	Add new non-tag site codes	2025-05-23 12:35:16 -04:00
Matt Nadareski	f29a50c3b0	Bump version	2025-05-01 10:54:09 -04:00
Matt Nadareski	edf6e12371	Update Nuget packages	2025-05-01 10:53:21 -04:00
Matt Nadareski	146b2780c5	Fix skipped multiline site codes	2025-05-01 10:51:26 -04:00
Matt Nadareski	60ce7cbfa0	Bump version	2025-04-30 20:51:59 -04:00
Deterous	39fe46a162	Remove obsolete PhilipsCDiDigitalVideo system (#10 ) * Remove obsolete PhilipsCDiDigitalVideo system * Delete obsolete system	2025-04-17 08:04:02 -04:00
Matt Nadareski	a8674a21e4	Add 30 second timeout to web operations	2025-04-13 21:20:00 -04:00
Matt Nadareski	65f2d53a3f	Fix how conditions are used for references	2025-02-25 21:16:16 -05:00
Matt Nadareski	0bc869543a	Bump version	2024-12-31 21:10:46 -05:00
Matt Nadareski	aa7d513d2c	Add Ring Perfect Audio Offset pseudo-tag	2024-12-31 21:09:11 -05:00
Matt Nadareski	3d35129529	Update copyright	2024-12-30 21:27:26 -05:00
Matt Nadareski	ec563938ba	Remove unnecessary action step	2024-12-30 21:26:16 -05:00