Bump version

Remove unncessary Linq usage
Add .NET 9 to target frameworks
2026-02-08 13:54:31 +00:00 · 2024-11-13 01:30:42 -05:00 · 2024-11-13 01:29:36 -05:00 · 2024-11-13 00:59:20 -05:00 · 2024-10-18 12:30:30 -04:00 · 2024-10-18 12:26:36 -04:00
18 changed files with 311 additions and 447 deletions
--- a/.github/workflows/build_nupkg.yml
+++ b/.github/workflows/build_nupkg.yml
@@ -16,10 +16,16 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v4
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
        
    - name: Restore dependencies
      run: dotnet restore
+
+    - name: Build library
+      run: dotnet build
+
+    - name: Run tests
+      run: dotnet test
      
    - name: Pack
      run: dotnet pack
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -11,7 +11,10 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v4
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
      
    - name: Build
-      run: dotnet build
+      run: dotnet build
+
+    - name: Run tests
+      run: dotnet test
--- a/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
+++ b/SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj
@@ -1,47 +1,47 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-      <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-      <CheckEolTargetFramework>false</CheckEolTargetFramework>
-      <LangVersion>latest</LangVersion>
-      <Nullable>enable</Nullable>
-      <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    </PropertyGroup>
-  
+
    <ItemGroup>
-      <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
+        <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
    </ItemGroup>

    <ItemGroup>
-      <None Remove="TestData\*" />
+        <None Remove="TestData\*" />
    </ItemGroup>
-  
+
    <ItemGroup>
-      <Content Include="TestData\*">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </Content>
+        <Content Include="TestData\*">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
    </ItemGroup>
-  
+
    <ItemGroup>
-      <PackageReference Include="Microsoft.CodeCoverage" Version="17.11.1" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-      <PackageReference Include="xunit" Version="2.9.2" />
-      <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-      <PackageReference Include="xunit.analyzers" Version="1.16.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">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="xunit" Version="2.9.2" />
+        <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">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
    </ItemGroup>
-  
-  </Project>
+
+</Project>
  
--- a/SabreTools.RedumpLib/Attributes/AttributeHelper.cs
+++ b/SabreTools.RedumpLib/Attributes/AttributeHelper.cs
@@ -1,7 +1,4 @@
 using System;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif

 namespace SabreTools.RedumpLib.Attributes
 {
@@ -34,19 +31,7 @@ namespace SabreTools.RedumpLib.Attributes
                return null;

            // Get the enum value info from the array, if possible
-#if NET20 || NET35
-            System.Reflection.MemberInfo? enumValueMemberInfo = null;
-            foreach (var m in memberInfos)
-            {
-                if (m.DeclaringType != enumType)
-                    continue;
-
-                enumValueMemberInfo = m;
-                break;
-            }
-#else
-            var enumValueMemberInfo = memberInfos.FirstOrDefault(m => m.DeclaringType == enumType);
-#endif
+            var enumValueMemberInfo = Array.Find(memberInfos, m => m.DeclaringType == enumType);
            if (enumValueMemberInfo == null)
                return null;

--- a/SabreTools.RedumpLib/Builder.cs
+++ b/SabreTools.RedumpLib/Builder.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 #if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using System.Net;
+#endif
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -272,12 +271,11 @@ namespace SabreTools.RedumpLib
                {
                    info.CommonDiscInfo!.Title = title.Substring(0, firstParenLocation);
                    var submatches = Constants.DiscNumberLetterRegex.Matches(title);
-#if NET20 || NET35
-                    foreach (Match submatch in submatches)
-#else
-                    foreach (Match submatch in submatches.Cast<Match>())
-#endif
+                    foreach (Match? submatch in submatches)
                    {
+                        if (submatch == null)
+                            continue;
+
                        var submatchValue = submatch.Groups[1].Value;

                        // Disc number or letter
@@ -285,11 +283,7 @@ namespace SabreTools.RedumpLib
                            info.CommonDiscInfo.DiscNumberLetter = submatchValue.Remove(0, "Disc ".Length);

                        // Issue number
-#if NET20 || NET35
-                        else if (long.TryParse(submatchValue, out _))
-#else
-                        else if (submatchValue.All(c => char.IsNumber(c)))
-#endif
+                        else if (ulong.TryParse(submatchValue, out _))
                            info.CommonDiscInfo.Title += $" ({submatchValue})";

                        // Disc title
@@ -308,15 +302,13 @@ namespace SabreTools.RedumpLib
            match = Constants.ForeignTitleRegex.Match(discData);
            if (match.Success)
                info.CommonDiscInfo!.ForeignTitleNonLatin = WebUtility.HtmlDecode(match.Groups[1].Value);
-            else
-                info.CommonDiscInfo!.ForeignTitleNonLatin = null;

            // Category
            match = Constants.CategoryRegex.Match(discData);
            if (match.Success)
-                info.CommonDiscInfo.Category = Extensions.ToDiscCategory(match.Groups[1].Value);
+                info.CommonDiscInfo!.Category = Extensions.ToDiscCategory(match.Groups[1].Value);
            else
-                info.CommonDiscInfo.Category = DiscCategory.Games;
+                info.CommonDiscInfo!.Category = DiscCategory.Games;

            // Region
            if (info.CommonDiscInfo.Region == null)
@@ -331,12 +323,11 @@ namespace SabreTools.RedumpLib
            if (matches.Count > 0)
            {
                var tempLanguages = new List<Language?>();
-#if NET20 || NET35
-                foreach (Match submatch in matches)
-#else
-                foreach (Match submatch in matches.Cast<Match>())
-#endif
+                foreach (Match? submatch in matches)
                {
+                    if (submatch == null)
+                        continue;
+
                    var language = Extensions.ToLanguage(submatch.Groups[1].Value);
                    if (language != null)
                        tempLanguages.Add(language);
@@ -382,12 +373,11 @@ namespace SabreTools.RedumpLib
                        tempDumpers.Add(dumper);
                }

-#if NET20 || NET35
-                foreach (Match submatch in matches)
-#else
-                foreach (Match submatch in matches.Cast<Match>())
-#endif
+                foreach (Match? submatch in matches)
                {
+                    if (submatch == null)
+                        continue;
+
                    string? dumper = WebUtility.HtmlDecode(submatch.Groups[1].Value);
                    if (dumper != null)
                        tempDumpers.Add(dumper);
--- a/SabreTools.RedumpLib/Data/Extensions.cs
+++ b/SabreTools.RedumpLib/Data/Extensions.cs
@@ -793,7 +793,8 @@ namespace SabreTools.RedumpLib.Data
        /// </summary>
        /// <param name="category"></param>
        /// <returns></returns>
-        public static string? LongName(this DiscCategory? category) => AttributeHelper<DiscCategory?>.GetAttribute(category)?.LongName;
+        public static string? LongName(this DiscCategory? category)
+            => AttributeHelper<DiscCategory?>.GetAttribute(category)?.LongName;

        /// <summary>
        /// Get the Category enum value for a given string
@@ -830,7 +831,8 @@ namespace SabreTools.RedumpLib.Data
        /// </summary>
        /// <param name="discType"></param>
        /// <returns></returns>
-        public static string? LongName(this DiscType? discType) => AttributeHelper<DiscType?>.GetAttribute(discType)?.LongName;
+        public static string? LongName(this DiscType? discType)
+            => AttributeHelper<DiscType?>.GetAttribute(discType)?.LongName;

        /// <summary>
        /// Get the DiscType enum value for a given string
@@ -896,7 +898,8 @@ namespace SabreTools.RedumpLib.Data
        /// </summary>
        /// <param name="language"></param>
        /// <returns></returns>
-        public static string? LongName(this Language? language) => AttributeHelper<Language?>.GetAttribute(language)?.LongName;
+        public static string? LongName(this Language? language)
+            => AttributeHelper<Language?>.GetAttribute(language)?.LongName;

        /// <summary>
        /// Get the Redump shortnames for each known language
@@ -925,17 +928,7 @@ namespace SabreTools.RedumpLib.Data
        /// <returns>Language represented by the string, if possible</returns>
        public static Language? ToLanguage(string lang)
        {
-#if NET20 || NET35
-            var languages = new List<Language?>();
-            foreach (Language l in Enum.GetValues(typeof(Language)))
-            {
-                languages.Add(new Nullable<Language>(l));
-            }
-#else
-            var languages = Enum.GetValues(typeof(Language))
-                .Cast<Language?>()
-                .ToList();
-#endif
+            var languages = (Language?[])Enum.GetValues(typeof(Language));

            // Check ISO 639-1 codes
 #if NET20 || NET35
@@ -948,8 +941,7 @@ namespace SabreTools.RedumpLib.Data
                languageMapping[l.TwoLetterCode() ?? string.Empty] = l;
            }
 #else
-            Dictionary<string, Language?> languageMapping = languages
-                .Where(l => l.TwoLetterCode() != null)
+            Dictionary<string, Language?> languageMapping = Array.FindAll(languages, l => l.TwoLetterCode() != null)
                .ToDictionary(l => l.TwoLetterCode() ?? string.Empty, l => l);
 #endif

@@ -967,8 +959,7 @@ namespace SabreTools.RedumpLib.Data
                languageMapping[l.ThreeLetterCode() ?? string.Empty] = l;
            }
 #else
-            languageMapping = languages
-                .Where(l => l.ThreeLetterCode() != null)
+            languageMapping = Array.FindAll(languages, l => l.ThreeLetterCode() != null)
                .ToDictionary(l => l.ThreeLetterCode() ?? string.Empty, l => l);
 #endif

@@ -986,8 +977,7 @@ namespace SabreTools.RedumpLib.Data
                languageMapping[l.ThreeLetterCodeAlt() ?? string.Empty] = l;
            }
 #else
-            languageMapping = languages
-                .Where(l => l.ThreeLetterCodeAlt() != null)
+            languageMapping = Array.FindAll(languages, l => l.ThreeLetterCodeAlt() != null)
                .ToDictionary(l => l.ThreeLetterCodeAlt() ?? string.Empty, l => l);
 #endif

@@ -1002,21 +992,24 @@ namespace SabreTools.RedumpLib.Data
        /// </summary>
        /// <param name="language"></param>
        /// <returns></returns>
-        public static string? ThreeLetterCode(this Language? language) => (AttributeHelper<Language?>.GetAttribute(language) as LanguageAttribute)?.ThreeLetterCode;
+        public static string? ThreeLetterCode(this Language? language)
+            => (AttributeHelper<Language?>.GetAttribute(language) as LanguageAttribute)?.ThreeLetterCode;

        /// <summary>
        /// Get the ISO 639-2 alternate code for each known language
        /// </summary>
        /// <param name="language"></param>
        /// <returns></returns>
-        public static string? ThreeLetterCodeAlt(this Language? language) => (AttributeHelper<Language?>.GetAttribute(language) as LanguageAttribute)?.ThreeLetterCodeAlt;
+        public static string? ThreeLetterCodeAlt(this Language? language)
+            => (AttributeHelper<Language?>.GetAttribute(language) as LanguageAttribute)?.ThreeLetterCodeAlt;

        /// <summary>
        /// Get the ISO 639-1 code for each known language
        /// </summary>
        /// <param name="language"></param>
        /// <returns></returns>
-        public static string? TwoLetterCode(this Language? language) => (AttributeHelper<Language?>.GetAttribute(language) as LanguageAttribute)?.TwoLetterCode;
+        public static string? TwoLetterCode(this Language? language)
+            => (AttributeHelper<Language?>.GetAttribute(language) as LanguageAttribute)?.TwoLetterCode;

        #endregion

@@ -1114,17 +1107,7 @@ namespace SabreTools.RedumpLib.Data
        public static Region? ToRegion(string region)
        {
            region = region.ToLowerInvariant();
-#if NET20 || NET35
-            var regions = new List<Region?>();
-            foreach (Region r in Enum.GetValues(typeof(Region)))
-            {
-                regions.Add(new Nullable<Region>(r));
-            }
-#else
-            var regions = Enum.GetValues(typeof(Region))
-                .Cast<Region?>()
-                .ToList();
-#endif
+            var regions = (Region?[])Enum.GetValues(typeof(Region));

            // Check ISO 3166-1 alpha-2 codes
 #if NET20 || NET35
@@ -1137,8 +1120,7 @@ namespace SabreTools.RedumpLib.Data
                regionMapping[r.ShortName()?.ToLowerInvariant() ?? string.Empty] = r;
            }
 #else
-            Dictionary<string, Region?> regionMapping = regions
-                .Where(r => r.ShortName() != null)
+            Dictionary<string, Region?> regionMapping = Array.FindAll(regions, r => r.ShortName() != null)
                .ToDictionary(r => r.ShortName()?.ToLowerInvariant() ?? string.Empty, r => r);
 #endif

@@ -1449,31 +1431,10 @@ namespace SabreTools.RedumpLib.Data
        /// </summary>
        public static List<string> ListSystems()
        {
-            var systems = new List<string>();
-
-#if NET20 || NET35
-            var knownSystems = new List<RedumpSystem?>();
-            foreach (RedumpSystem s in Enum.GetValues(typeof(RedumpSystem)))
-            {
-                var ns = new Nullable<RedumpSystem>(s);
-                if (ns != null && !ns.IsMarker() && ns.GetCategory() != SystemCategory.NONE)
-                    knownSystems.Add(ns);
-            }
-
-            knownSystems.Sort((x, y) => (x.LongName() ?? string.Empty).CompareTo(y.LongName() ?? string.Empty));
-#else
-            var knownSystems = Enum.GetValues(typeof(RedumpSystem))
-                .OfType<RedumpSystem?>()
-                .Where(s => s != null && !s.IsMarker() && s.GetCategory() != SystemCategory.NONE)
-                .OrderBy(s => s.LongName() ?? string.Empty);
-#endif
-
-            foreach (var val in knownSystems)
-            {
-                systems.Add($"{val.ShortName()} - {val.LongName()}");
-            }
-
-            return systems;
+            var systems = (RedumpSystem?[])Enum.GetValues(typeof(RedumpSystem));
+            var knownSystems = Array.FindAll(systems, s => s != null && !s.IsMarker() && s.GetCategory() != SystemCategory.NONE);
+            Array.Sort(knownSystems, (x, y) => (x.LongName() ?? string.Empty).CompareTo(y.LongName() ?? string.Empty));
+            return [.. Array.ConvertAll(knownSystems, val => $"{val.ShortName()} - {val.LongName()}")];
        }

        /// <summary>
--- a/SabreTools.RedumpLib/Downloader.cs
+++ b/SabreTools.RedumpLib/Downloader.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;

@@ -51,6 +52,11 @@ namespace SabreTools.RedumpLib
        /// </summary>
        public bool OnlyList { get; set; }

+        /// <summary>
+        /// Don't replace forward slashes with `-` in queries
+        /// </summary>
+        public bool NoSlash { get; set; }
+
        /// <summary>
        /// Force continuing downloads until user cancels or pages run out
        /// </summary>
@@ -97,49 +103,85 @@ namespace SabreTools.RedumpLib
        /// <summary>
        /// Run the downloads that should go
        /// </summary>
-        /// <returns>True if there was a valid download type, false otherwise</returns>
-        public async Task<bool> Download()
+        /// <returns>List of IDs that were processed on success, empty on error</returns>
+        /// <remarks>Packs will never return anything other than empty</remarks>
+        public async Task<List<int>> Download()
        {
            // Login to Redump, if possible
            if (!_client.LoggedIn)
                await _client.Login(Username ?? string.Empty, Password ?? string.Empty);

+            // Create output list
+            List<int> processedIds = [];
+
            switch (Feature)
            {
-                case Feature.Site:
-                    if (OnlyNew)
-                        await Discs.DownloadLastModified(_client, OutDir, Force);
-                    else
-                        await Discs.DownloadSiteRange(_client, OutDir, MinimumId, MaximumId);
-                    break;
-                case Feature.WIP:
-                    if (OnlyNew)
-                        await WIP.DownloadLastSubmitted(_client, OutDir);
-                    else
-                        await WIP.DownloadWIPRange(_client, OutDir, MinimumId, MaximumId);
-                    break;
                case Feature.Packs:
                    await Packs.DownloadPacks(_client, OutDir, UseSubfolders);
                    break;
-                case Feature.User:
-                    if (OnlyList)
-                        await User.ListUser(_client, Username);
-                    else if (OnlyNew)
-                        await User.DownloadUserLastModified(_client, Username, OutDir);
-                    else
-                        await User.DownloadUser(_client, Username, OutDir);
-                    break;
                case Feature.Quicksearch:
-                    if (OnlyList)
-                        await Search.ListSearchResults(_client, QueryString);
-                    else
-                        await Search.DownloadSearchResults(_client, QueryString, OutDir);
+                    processedIds = await ProcessQuicksearch();
+                    break;
+                case Feature.Site:
+                    processedIds = await ProcessSite();
+                    break;
+                case Feature.User:
+                    processedIds = await ProcessUser();
+                    break;
+                case Feature.WIP:
+                    processedIds = await ProcessWIP();
                    break;
                default:
-                    return false;
+                    return [];
            }

-            return true;
+            return processedIds;
+        }
+
+        /// <summary>
+        /// Process the Quicksearch feature
+        /// </summary>
+        private async Task<List<int>> ProcessQuicksearch()
+        {
+            if (OnlyList)
+                return await Search.ListSearchResults(_client, QueryString, NoSlash);
+            else
+                return await Search.DownloadSearchResults(_client, QueryString, OutDir, NoSlash);
+        }
+
+        /// <summary>
+        /// Process the Site feature
+        /// </summary>
+        private async Task<List<int>> ProcessSite()
+        {
+            if (OnlyNew)
+                return await Discs.DownloadLastModified(_client, OutDir, Force);
+            else
+                return await Discs.DownloadSiteRange(_client, OutDir, MinimumId, MaximumId);
+        }
+
+        /// <summary>
+        /// Process the User feature
+        /// </summary>
+        private async Task<List<int>> ProcessUser()
+        {
+            if (OnlyList)
+                return await User.ListUser(_client, Username);
+            else if (OnlyNew)
+                return await User.DownloadUserLastModified(_client, Username, OutDir);
+            else
+                return await User.DownloadUser(_client, Username, OutDir);
+        }
+
+        /// <summary>
+        /// Process the WIP feature
+        /// </summary>
+        private async Task<List<int>> ProcessWIP()
+        {
+            if (OnlyNew)
+                return await WIP.DownloadLastSubmitted(_client, OutDir);
+            else
+                return await WIP.DownloadWIPRange(_client, OutDir, MinimumId, MaximumId);
        }
    }
 }
--- a/SabreTools.RedumpLib/Formatter.cs
+++ b/SabreTools.RedumpLib/Formatter.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using System.Text.RegularExpressions;
 using SabreTools.RedumpLib.Data;

@@ -60,28 +57,10 @@ namespace SabreTools.RedumpLib
                AddIfExists(output, Template.FullyMatchingIDField, info.FullyMatchedID?.ToString(), 1);
                AddIfExists(output, Template.PartiallyMatchingIDsField, info.PartiallyMatchedIDs, 1);
                AddIfExists(output, Template.RegionField, info.CommonDiscInfo?.Region.LongName() ?? "SPACE! (CHANGE THIS)", 1);
-#if NET20 || NET35
-                var languages = info.CommonDiscInfo?.Languages ?? [null];
-                var languageStrings = new List<string>();
-                foreach (var l in languages)
-                {
-                    languageStrings.Add(l.LongName() ?? "SILENCE! (CHANGE THIS)");
-                }
-
-                AddIfExists(output, Template.LanguagesField, languageStrings.ToArray(), 1);
-
-                var langaugeSelections = info.CommonDiscInfo?.LanguageSelection ?? [];
-                var languageSelectionStrings = new List<string?>();
-                foreach (var l in langaugeSelections)
-                {
-                    languageSelectionStrings.Add(l.LongName());
-                }
-
-                AddIfExists(output, Template.PlaystationLanguageSelectionViaField, languageSelectionStrings.ToArray(), 1);
-#else
-                AddIfExists(output, Template.LanguagesField, (info.CommonDiscInfo?.Languages ?? [null]).Select(l => l.LongName() ?? "SILENCE! (CHANGE THIS)").ToArray(), 1);
-                AddIfExists(output, Template.PlaystationLanguageSelectionViaField, (info.CommonDiscInfo?.LanguageSelection ?? []).Select(l => l.LongName()).ToArray(), 1);
-#endif
+                AddIfExists(output, Template.LanguagesField,
+                    Array.ConvertAll(info.CommonDiscInfo?.Languages ?? [null], l => l.LongName() ?? "SILENCE! (CHANGE THIS)"), 1);
+                AddIfExists(output, Template.PlaystationLanguageSelectionViaField,
+                    Array.ConvertAll(info.CommonDiscInfo?.LanguageSelection ?? [], l => l.LongName()), 1);
                AddIfExists(output, Template.DiscSerialField, info.CommonDiscInfo?.Serial, 1);

                // All ringcode information goes in an indented area
@@ -307,32 +286,13 @@ namespace SabreTools.RedumpLib
                    info.CommonDiscInfo.Comments = string.Empty;

                // Add all special fields before any comments
-#if NET20 || NET35
-                var orderedCommentTags = OrderCommentTags(info.CommonDiscInfo.CommentsSpecialFields);
-                var commentTagStrings = new List<string>();
-                foreach (var kvp in orderedCommentTags)
-                {
-                    if (string.IsNullOrEmpty(kvp.Value))
-                        continue;
-
-                    string? formatted = FormatSiteTag(kvp);
-                    if (formatted == null)
-                        continue;
-
-                    commentTagStrings.Add(formatted);
-                }
-
-                info.CommonDiscInfo.Comments = string.Join("\n", commentTagStrings.ToArray())
-                    + "\n" + info.CommonDiscInfo.Comments;
-#else
                info.CommonDiscInfo.Comments = string.Join(
                    "\n", OrderCommentTags(info.CommonDiscInfo.CommentsSpecialFields)
-                        .Where(kvp => !string.IsNullOrEmpty(kvp.Value))
-                        .Select(FormatSiteTag)
-                        .Where(s => !string.IsNullOrEmpty(s))
+                        .FindAll(kvp => !string.IsNullOrEmpty(kvp.Value))
+                        .ConvertAll(FormatSiteTag)
+                        .FindAll(s => !string.IsNullOrEmpty(s))
                        .ToArray()
                ) + "\n" + info.CommonDiscInfo.Comments;
-#endif

                // Normalize newlines
                info.CommonDiscInfo.Comments = info.CommonDiscInfo.Comments.Replace("\r\n", "\n");
@@ -352,32 +312,13 @@ namespace SabreTools.RedumpLib
                    info.CommonDiscInfo.Contents = string.Empty;

                // Add all special fields before any contents
-#if NET20 || NET35
-                var orderedContentTags = OrderContentTags(info.CommonDiscInfo.ContentsSpecialFields);
-                var contentTagStrings = new List<string>();
-                foreach (var kvp in orderedContentTags)
-                {
-                    if (string.IsNullOrEmpty(kvp.Value))
-                        continue;
-
-                    string? formatted = FormatSiteTag(kvp);
-                    if (formatted == null)
-                        continue;
-
-                    contentTagStrings.Add(formatted);
-                }
-
-                info.CommonDiscInfo.Contents = string.Join("\n", contentTagStrings.ToArray())
-                    + "\n" + info.CommonDiscInfo.Contents;
-#else
                info.CommonDiscInfo.Contents = string.Join(
                    "\n", OrderContentTags(info.CommonDiscInfo.ContentsSpecialFields)
-                        .Where(kvp => !string.IsNullOrEmpty(kvp.Value))
-                        .Select(FormatSiteTag)
-                        .Where(s => !string.IsNullOrEmpty(s))
+                        .FindAll(kvp => !string.IsNullOrEmpty(kvp.Value))
+                        .ConvertAll(FormatSiteTag)
+                        .FindAll(s => !string.IsNullOrEmpty(s))
                        .ToArray()
                ) + "\n" + info.CommonDiscInfo.Contents;
-#endif

                // Normalize newlines
                info.CommonDiscInfo.Contents = info.CommonDiscInfo.Contents.Replace("\r\n", "\n");
@@ -425,11 +366,7 @@ namespace SabreTools.RedumpLib

            // If the value contains a newline
            value = value.Replace("\r\n", "\n");
-#if NET20 || NET35
            if (value.Contains("\n"))
-#else
-            if (value.Contains('\n'))
-#endif
            {
                output.Add(prefix + key + ":"); output.Add("");
                string[] values = value.Split('\n');
@@ -495,17 +432,7 @@ namespace SabreTools.RedumpLib
            if (value == null || value.Count == 0)
                return;

-#if NET20 || NET35
-            var valueStrings = new List<string>();
-            foreach (int o in value)
-            {
-                valueStrings.Add(o.ToString());
-            }
-
-            AddIfExists(output, key, string.Join(", ", valueStrings.ToArray()), indent);
-#else
-            AddIfExists(output, key, string.Join(", ", value.Select(o => o.ToString()).ToArray()), indent);
-#endif
+            AddIfExists(output, key, string.Join(", ", [.. value.ConvertAll(o => o.ToString())]), indent);
        }

        /// <summary>
--- a/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
+++ b/SabreTools.RedumpLib/SabreTools.RedumpLib.csproj
@@ -1,41 +1,54 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.4.2</Version>
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>1.5.0</Version>

-    <!-- Package Properties -->
-    <Authors>Matt Nadareski</Authors>
-    <Description>Code to interact with redump.org</Description>
-    <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>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>web client redump</PackageTags>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Code to interact with redump.org</Description>
+        <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>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>web client redump</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>

-  <ItemGroup>
-    <None Include="../README.md" Pack="true" PackagePath="" />
-  </ItemGroup>
+    <!-- Support All Frameworks -->
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
+        <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    </PropertyGroup>

-  <!-- Support for old .NET versions -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
-    <PackageReference Include="Net30.LinqBridge" Version="1.3.0" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
-    <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="../README.md" Pack="true" PackagePath="" />
+    </ItemGroup>

-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.10" />
-  </ItemGroup>
+    <!-- Support for old .NET versions -->
+    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
+        <PackageReference Include="Net30.LinqBridge" Version="1.3.0" />
+    </ItemGroup>
+    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
+        <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
+    </ItemGroup>

-</Project>
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="SabreTools.Models" Version="1.5.0" />
+    </ItemGroup>
+
+</Project>
--- a/SabreTools.RedumpLib/Validator.cs
+++ b/SabreTools.RedumpLib/Validator.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
--- a/SabreTools.RedumpLib/Web/Discs.cs
+++ b/SabreTools.RedumpLib/Web/Discs.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;

@@ -15,17 +16,22 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="outDir">Output directory to save data to</param>
        /// <param name="force">Force continuation of download</param>
-        public static async Task<bool> DownloadLastModified(RedumpClient rc, string? outDir, bool force)
+        /// <returns>All disc IDs in last modified range, empty on error</returns>
+        public static async Task<List<int>> DownloadLastModified(RedumpClient rc, string? outDir, bool force)
        {
+            List<int> ids = [];
+
            // Keep getting last modified pages until there are none left
            int pageNumber = 1;
            while (true)
            {
-                if (!await rc.CheckSingleSitePage(string.Format(Constants.LastModifiedUrl, pageNumber++), outDir, !force))
+                var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.LastModifiedUrl, pageNumber++), outDir, !force);
+                ids.AddRange(pageIds);
+                if (pageIds.Count == 0)
                    break;
            }

-            return true;
+            return ids;
        }

        /// <summary>
@@ -35,21 +41,25 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="outDir">Output directory to save data to</param>
        /// <param name="minId">Starting ID for the range</param>
        /// <param name="maxId">Ending ID for the range (inclusive)</param>
-        public static async Task<bool> DownloadSiteRange(RedumpClient rc, string? outDir, int minId = 0, int maxId = 0)
+        /// <returns>All disc IDs in last modified range, empty on error</returns>
+        public static async Task<List<int>> DownloadSiteRange(RedumpClient rc, string? outDir, int minId = 0, int maxId = 0)
        {
+            List<int> ids = [];
+
            if (!rc.LoggedIn)
            {
                Console.WriteLine("Site download functionality is only available to Redump members");
-                return false;
+                return ids;
            }

            for (int id = minId; id <= maxId; id++)
            {
+                ids.Add(id);
                if (await rc.DownloadSingleSiteID(id, outDir, true))
                    DelayHelper.DelayRandom(); // Intentional sleep here so we don't flood the server
            }

-            return true;
+            return ids;
        }
    }
 }
--- a/SabreTools.RedumpLib/Web/Packs.cs
+++ b/SabreTools.RedumpLib/Web/Packs.cs
@@ -1,10 +1,4 @@
 using System;
-#if NET20 || NET35
-using System.Collections.Generic;
-#endif
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;

@@ -23,92 +17,15 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="useSubfolders">True to use named subfolders to store downloads, false to store directly in the output directory</param>
        public static async Task<bool> DownloadPacks(RedumpClient rc, string? outDir, bool useSubfolders)
        {
-#if NET20 || NET35
-            var systems = new List<RedumpSystem?>();
-            foreach (RedumpSystem s in Enum.GetValues(typeof(RedumpSystem)))
-            {
-                systems.Add(new Nullable<RedumpSystem>(s));
-            }
-#elif NET40_OR_GREATER || NETCOREAPP3_1
-            var systems = Enum.GetValues(typeof(RedumpSystem))
-                .OfType<RedumpSystem>()
-                .Select(s => new Nullable<RedumpSystem>(s));
-#else
-            var systems = Enum.GetValues<RedumpSystem>().Select(s => new RedumpSystem?(s));
-#endif
+            var systems = (RedumpSystem?[])Enum.GetValues(typeof(RedumpSystem));

-#if NET20 || NET35
-            var filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasCues())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackCuesUrl, filtered.ToArray(), "CUEs", outDir, useSubfolders ? "cue" : null);
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasDat())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackDatfileUrl, filtered.ToArray(), "DATs", outDir, useSubfolders ? "dat" : null);
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasCues())
-                    filtered.Add(s);
-            }
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasDkeys())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackDkeysUrl, filtered.ToArray(), "Decrypted KEYS", outDir, useSubfolders ? "dkey" : null);
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasGdi())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackGdiUrl, filtered.ToArray(), "GDIs", outDir, useSubfolders ? "gdi" : null);
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasKeys())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackKeysUrl, filtered.ToArray(), "KEYS", outDir, useSubfolders ? "keys" : null);
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasLsd())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackLsdUrl, filtered.ToArray(), "LSD", outDir, useSubfolders ? "lsd" : null);
-
-            filtered = new List<RedumpSystem?>();
-            foreach (var s in systems)
-            {
-                if (s.HasSbi())
-                    filtered.Add(s);
-            }
-            await rc.DownloadPacks(Constants.PackSbiUrl, filtered.ToArray(), "SBIs", outDir, useSubfolders ? "sbi" : null);
-#else
-            await rc.DownloadPacks(Constants.PackCuesUrl, systems.Where(s => s.HasCues()).ToArray(), "CUEs", outDir, useSubfolders ? "cue" : null);
-            await rc.DownloadPacks(Constants.PackDatfileUrl, systems.Where(s => s.HasDat()).ToArray(), "DATs", outDir, useSubfolders ? "dat" : null);
-            await rc.DownloadPacks(Constants.PackDkeysUrl, systems.Where(s => s.HasDkeys()).ToArray(), "Decrypted KEYS", outDir, useSubfolders ? "dkey" : null);
-            await rc.DownloadPacks(Constants.PackGdiUrl, systems.Where(s => s.HasGdi()).ToArray(), "GDIs", outDir, useSubfolders ? "gdi" : null);
-            await rc.DownloadPacks(Constants.PackKeysUrl, systems.Where(s => s.HasKeys()).ToArray(), "KEYS", outDir, useSubfolders ? "keys" : null);
-            await rc.DownloadPacks(Constants.PackLsdUrl, systems.Where(s => s.HasLsd()).ToArray(), "LSD", outDir, useSubfolders ? "lsd" : null);
-            await rc.DownloadPacks(Constants.PackSbiUrl, systems.Where(s => s.HasSbi()).ToArray(), "SBIs", outDir, useSubfolders ? "sbi" : null);
-#endif
+            await rc.DownloadPacks(Constants.PackCuesUrl, Array.FindAll(systems, s => s.HasCues()), "CUEs", outDir, useSubfolders ? "cue" : null);
+            await rc.DownloadPacks(Constants.PackDatfileUrl, Array.FindAll(systems, s => s.HasDat()), "DATs", outDir, useSubfolders ? "dat" : null);
+            await rc.DownloadPacks(Constants.PackDkeysUrl, Array.FindAll(systems, s => s.HasDkeys()), "Decrypted KEYS", outDir, useSubfolders ? "dkey" : null);
+            await rc.DownloadPacks(Constants.PackGdiUrl, Array.FindAll(systems, s => s.HasGdi()), "GDIs", outDir, useSubfolders ? "gdi" : null);
+            await rc.DownloadPacks(Constants.PackKeysUrl, Array.FindAll(systems, s => s.HasKeys()), "KEYS", outDir, useSubfolders ? "keys" : null);
+            await rc.DownloadPacks(Constants.PackLsdUrl, Array.FindAll(systems, s => s.HasLsd()), "LSD", outDir, useSubfolders ? "lsd" : null);
+            await rc.DownloadPacks(Constants.PackSbiUrl, Array.FindAll(systems, s => s.HasSbi()), "SBIs", outDir, useSubfolders ? "sbi" : null);

            return true;
        }
--- a/SabreTools.RedumpLib/Web/RedumpClient.cs
+++ b/SabreTools.RedumpLib/Web/RedumpClient.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using System.Net;
 #if NETCOREAPP
 using System.Net.Http;
@@ -219,11 +216,7 @@ namespace SabreTools.RedumpLib.Web

            // Otherwise, traverse each dump on the page
            var matches = Constants.DiscRegex.Matches(dumpsPage);
-#if NET20 || NET35
            foreach (Match? match in matches)
-#else
-            foreach (Match? match in matches.Cast<Match?>())
-#endif
            {
                if (match == null)
                    continue;
@@ -249,15 +242,17 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="url">Base URL to download using</param>
        /// <param name="outDir">Output directory to save data to</param>
        /// <param name="failOnSingle">True to return on first error, false otherwise</param>
-        /// <returns>True if the page could be downloaded, false otherwise</returns>
-        public async Task<bool> CheckSingleSitePage(string url, string? outDir, bool failOnSingle)
+        /// <returns>List of IDs that were found on success, empty on error</returns>
+        public async Task<List<int>> CheckSingleSitePage(string url, string? outDir, bool failOnSingle)
        {
+            List<int> ids = [];
+
            // Try to retrieve the data
            string? dumpsPage = await DownloadStringWithRetries(url);

            // If we have no dumps left
            if (dumpsPage == null || dumpsPage.Contains("No discs found."))
-                return false;
+                return ids;

            // If we have a single disc page already
            if (dumpsPage.Contains("<b>Download:</b>"))
@@ -265,21 +260,18 @@ namespace SabreTools.RedumpLib.Web
                var value = Regex.Match(dumpsPage, @"/disc/(\d+)/sfv/").Groups[1].Value;
                if (int.TryParse(value, out int id))
                {
+                    ids.Add(id);
                    bool downloaded = await DownloadSingleSiteID(id, outDir, false);
                    if (!downloaded && failOnSingle)
-                        return false;
+                        return ids;
                }

-                return false;
+                return ids;
            }

            // Otherwise, traverse each dump on the page
            var matches = Constants.DiscRegex.Matches(dumpsPage);
-#if NET20 || NET35
            foreach (Match? match in matches)
-#else
-            foreach (Match? match in matches.Cast<Match?>())
-#endif
            {
                if (match == null)
                    continue;
@@ -288,9 +280,10 @@ namespace SabreTools.RedumpLib.Web
                {
                    if (int.TryParse(match.Groups[1].Value, out int value))
                    {
+                        ids.Add(value);
                        bool downloaded = await DownloadSingleSiteID(value, outDir, false);
                        if (!downloaded && failOnSingle)
-                            return false;
+                            return ids;
                    }
                }
                catch (Exception ex)
@@ -300,7 +293,7 @@ namespace SabreTools.RedumpLib.Web
                }
            }

-            return true;
+            return ids;
        }

        /// <summary>
@@ -321,11 +314,7 @@ namespace SabreTools.RedumpLib.Web

            // Otherwise, traverse each dump on the page
            var matches = Constants.NewDiscRegex.Matches(dumpsPage);
-#if NET20 || NET35
            foreach (Match? match in matches)
-#else
-            foreach (Match? match in matches.Cast<Match?>())
-#endif
            {
                if (match == null)
                    continue;
@@ -351,23 +340,21 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="wc">RedumpWebClient to access the packs</param>
        /// <param name="outDir">Output directory to save data to</param>
        /// <param name="failOnSingle">True to return on first error, false otherwise</param>
-        /// <returns>True if the page could be downloaded, false otherwise</returns>
-        public async Task<bool> CheckSingleWIPPage(string url, string? outDir, bool failOnSingle)
+        /// <returns>List of IDs that were found on success, empty on error</returns>
+        public async Task<List<int>> CheckSingleWIPPage(string url, string? outDir, bool failOnSingle)
        {
+            List<int> ids = [];
+
            // Try to retrieve the data
            string? dumpsPage = await DownloadStringWithRetries(url);

            // If we have no dumps left
            if (dumpsPage == null || dumpsPage.Contains("No discs found."))
-                return false;
+                return ids;

            // Otherwise, traverse each dump on the page
            var matches = Constants.NewDiscRegex.Matches(dumpsPage);
-#if NET20 || NET35
            foreach (Match? match in matches)
-#else
-            foreach (Match? match in matches.Cast<Match?>())
-#endif
            {
                if (match == null)
                    continue;
@@ -376,9 +363,10 @@ namespace SabreTools.RedumpLib.Web
                {
                    if (int.TryParse(match.Groups[2].Value, out int value))
                    {
+                        ids.Add(value);
                        bool downloaded = await DownloadSingleWIPID(value, outDir, false);
                        if (!downloaded && failOnSingle)
-                            return false;
+                            return ids;
                    }
                }
                catch (Exception ex)
@@ -388,7 +376,7 @@ namespace SabreTools.RedumpLib.Web
                }
            }

-            return true;
+            return ids;
        }

        #endregion
--- a/SabreTools.RedumpLib/Web/Search.cs
+++ b/SabreTools.RedumpLib/Web/Search.cs
@@ -15,12 +15,13 @@ namespace SabreTools.RedumpLib.Web
        /// </summary>
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="query">Query string to attempt to search for</param>
-        /// <returns>All disc IDs for the given query, null on error</returns>
-        public static async Task<List<int>?> ListSearchResults(RedumpClient rc, string? query)
+        /// <param name="noSlash">Don't replace slashes with `-` in queries</param>
+        /// <returns>All disc IDs for the given query, empty on error</returns>
+        public static async Task<List<int>> ListSearchResults(RedumpClient rc, string? query, bool noSlash)
        {
            // If the query is invalid
            if (string.IsNullOrEmpty(query))
-                return null;
+                return [];

            List<int> ids = [];

@@ -29,8 +30,9 @@ namespace SabreTools.RedumpLib.Web

            // Special characters become dashes
            query = query.Replace(' ', '-');
-            query = query.Replace('/', '-');
-            query = query.Replace('\\', '/');
+            query = query.Replace('\\', '-');
+            if (!noSlash)
+                query = query.Replace('/', '-');

            // Lowercase is defined per language
            query = query.ToLowerInvariant();
@@ -50,7 +52,7 @@ namespace SabreTools.RedumpLib.Web
            catch (Exception ex)
            {
                Console.WriteLine($"An exception occurred while trying to log in: {ex}");
-                return null;
+                return [];
            }

            return ids;
@@ -62,19 +64,24 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="query">Query string to attempt to search for</param>
        /// <param name="outDir">Output directory to save data to</param>
-        public static async Task<bool> DownloadSearchResults(RedumpClient rc, string? query, string? outDir)
+        /// <param name="noSlash">Don't replace slashes with `-` in queries</param>
+        /// <returns>All disc IDs for the given query, empty on error</returns>
+        public static async Task<List<int>> DownloadSearchResults(RedumpClient rc, string? query, string? outDir, bool noSlash)
        {
+            List<int> ids = [];
+
            // If the query is invalid
            if (string.IsNullOrEmpty(query))
-                return false;
+                return ids;

            // Strip quotes
            query = query!.Trim('"', '\'');

            // Special characters become dashes
            query = query.Replace(' ', '-');
-            query = query.Replace('/', '-');
-            query = query.Replace('\\', '/');
+            query = query.Replace('\\', '-');
+            if (!noSlash)
+                query = query.Replace('/', '-');

            // Lowercase is defined per language
            query = query.ToLowerInvariant();
@@ -83,11 +90,13 @@ namespace SabreTools.RedumpLib.Web
            int pageNumber = 1;
            while (true)
            {
-                if (!await rc.CheckSingleSitePage(string.Format(Constants.QuickSearchUrl, query, pageNumber++), outDir, false))
+                var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.QuickSearchUrl, query, pageNumber++), outDir, false);
+                ids.AddRange(pageIds);
+                if (pageIds.Count == 0)
                    break;
            }

-            return true;
+            return ids;
        }
    }
 }
--- a/SabreTools.RedumpLib/Web/User.cs
+++ b/SabreTools.RedumpLib/Web/User.cs
@@ -16,23 +16,28 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="username">Username to check discs for</param>
        /// <param name="outDir">Output directory to save data to</param>
-        public static async Task<bool> DownloadUser(RedumpClient rc, string? username, string? outDir)
+        /// <returns>All disc IDs for the given user, empty on error</returns>
+        public static async Task<List<int>> DownloadUser(RedumpClient rc, string? username, string? outDir)
        {
+            List<int> ids = [];
+
            if (!rc.LoggedIn || string.IsNullOrEmpty(username))
            {
                Console.WriteLine("User download functionality is only available to Redump members");
-                return false;
+                return ids;
            }

            // Keep getting user pages until there are none left
            int pageNumber = 1;
            while (true)
            {
-                if (!await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsUrl, username, pageNumber++), outDir, false))
+                var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsUrl, username, pageNumber++), outDir, false);
+                ids.AddRange(pageIds);
+                if (pageIds.Count == 0)
                    break;
            }

-            return true;
+            return ids;
        }

        /// <summary>
@@ -41,23 +46,28 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="username">Username to check discs for</param>
        /// <param name="outDir">Output directory to save data to</param>
-        public static async Task<bool> DownloadUserLastModified(RedumpClient rc, string? username, string? outDir)
+        /// <returns>All disc IDs for the given user, empty on error</returns>
+        public static async Task<List<int>> DownloadUserLastModified(RedumpClient rc, string? username, string? outDir)
        {
+            List<int> ids = [];
+
            if (!rc.LoggedIn || string.IsNullOrEmpty(username))
            {
                Console.WriteLine("User download functionality is only available to Redump members");
-                return false;
+                return ids;
            }

            // Keep getting last modified user pages until there are none left
            int pageNumber = 1;
            while (true)
            {
-                if (!await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsLastModifiedUrl, username, pageNumber++), outDir, true))
+                var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsLastModifiedUrl, username, pageNumber++), outDir, true);
+                ids.AddRange(pageIds);
+                if (pageIds.Count == 0)
                    break;
            }

-            return true;
+            return ids;
        }
    
        /// <summary>
@@ -65,8 +75,8 @@ namespace SabreTools.RedumpLib.Web
        /// </summary>
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="username">Username to check discs for</param>
-        /// <returns>All disc IDs for the given user, null on error</returns>
-        public static async Task<List<int>?> ListUser(RedumpClient rc, string? username)
+        /// <returns>All disc IDs for the given user, empty on error</returns>
+        public static async Task<List<int>> ListUser(RedumpClient rc, string? username)
        {
            List<int> ids = [];

@@ -82,7 +92,7 @@ namespace SabreTools.RedumpLib.Web
                int pageNumber = 1;
                while (true)
                {
-                    List<int> pageIds = await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsUrl, username, pageNumber++));
+                    var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsUrl, username, pageNumber++));
                    ids.AddRange(pageIds);
                    if (pageIds.Count <= 1)
                        break;
@@ -91,7 +101,7 @@ namespace SabreTools.RedumpLib.Web
            catch (Exception ex)
            {
                Console.WriteLine($"An exception occurred while trying to log in: {ex}");
-                return null;
+                return [];
            }

            return ids;
--- a/SabreTools.RedumpLib/Web/WIP.cs
+++ b/SabreTools.RedumpLib/Web/WIP.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;

@@ -14,7 +15,8 @@ namespace SabreTools.RedumpLib.Web
        /// </summary>
        /// <param name="rc">RedumpClient for connectivity</param>
        /// <param name="outDir">Output directory to save data to</param>
-        public static async Task<bool> DownloadLastSubmitted(RedumpClient rc, string? outDir)
+        /// <returns>All disc IDs in last submitted range, empty on error</returns>
+        public static async Task<List<int>> DownloadLastSubmitted(RedumpClient rc, string? outDir)
        {
            return await rc.CheckSingleWIPPage(Constants.WipDumpsUrl, outDir, false);
        }
@@ -26,21 +28,25 @@ namespace SabreTools.RedumpLib.Web
        /// <param name="outDir">Output directory to save data to</param>
        /// <param name="minId">Starting ID for the range</param>
        /// <param name="maxId">Ending ID for the range (inclusive)</param>
-        public static async Task<bool> DownloadWIPRange(RedumpClient rc, string? outDir, int minId = 0, int maxId = 0)
+        /// <returns>All disc IDs in last submitted range, empty on error</returns>
+        public static async Task<List<int>> DownloadWIPRange(RedumpClient rc, string? outDir, int minId = 0, int maxId = 0)
        {
+            List<int> ids = [];
+
            if (!rc.LoggedIn || !rc.IsStaff)
            {
                Console.WriteLine("WIP download functionality is only available to Redump moderators");
-                return false;
+                return ids;
            }

            for (int id = minId; id <= maxId; id++)
            {
+                ids.Add(id);
                if (await rc.DownloadSingleWIPID(id, outDir, true))
                    DelayHelper.DelayRandom(); // Intentional sleep here so we don't flood the server
            }

-            return true;
+            return ids;
        }
    }
 }
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -1,7 +1,7 @@
 #! /bin/bash

 # This batch file assumes the following:
-# - .NET 8.0 (or newer) SDK is installed and in PATH
+# - .NET 9.0 (or newer) SDK is installed and in PATH
 #
 # If any of these are not satisfied, the operation may fail
 # in an unpredictable way and result in an incomplete output.
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -1,5 +1,5 @@
 # This batch file assumes the following:
-# - .NET 8.0 (or newer) SDK is installed and in PATH
+# - .NET 9.0 (or newer) SDK is installed and in PATH
 #
 # If any of these are not satisfied, the operation may fail
 # in an unpredictable way and result in an incomplete output.
Author	SHA1	Message	Date
Matt Nadareski	240eb74ead	Bump version	2024-11-13 01:30:42 -05:00
Matt Nadareski	a64b109d2c	Remove unncessary Linq usage	2024-11-13 01:29:36 -05:00
Matt Nadareski	3e0f9b5410	Add .NET 9 to target frameworks	2024-11-13 00:59:20 -05:00
Matt Nadareski	668be418ac	Bump version	2024-10-18 12:30:30 -04:00
Matt Nadareski	7d184a634e	Always return ID list, if possible	2024-10-18 12:26:36 -04:00
Matt Nadareski	67aed0899d	Don't null foreign title if missing	2024-10-18 11:58:29 -04:00
Matt Nadareski	9fbaf1a187	Bump version	2024-10-04 01:42:58 -04:00
Matt Nadareski	fe8686a2bb	Allow forward slashes in queries sometimes	2024-10-04 01:41:05 -04:00