Bump version

SabreTools.RedumpLib/Builder.cs

@@ -308,15 +308,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)

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;
 
@@ -102,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, NoSlash);
-                    else
-                        await Search.DownloadSearchResults(_client, QueryString, OutDir, NoSlash);
+                    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);
         }
     }
 }

SabreTools.RedumpLib/SabreTools.RedumpLib.csproj

@@ -7,7 +7,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.4.3</Version>
+    <Version>1.4.4</Version>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>

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;
         }
     }
 }

SabreTools.RedumpLib/Web/RedumpClient.cs

@@ -249,15 +249,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,12 +267,13 @@ 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
@@ -288,9 +291,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 +304,7 @@ namespace SabreTools.RedumpLib.Web
                 }
             }
 
-            return true;
+            return ids;
         }
 
         /// <summary>
@@ -351,15 +355,17 @@ 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);
@@ -376,9 +382,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 +395,7 @@ namespace SabreTools.RedumpLib.Web
                 }
             }
 
-            return true;
+            return ids;
         }
 
         #endregion

SabreTools.RedumpLib/Web/Search.cs

@@ -16,12 +16,12 @@ namespace SabreTools.RedumpLib.Web
         /// <param name="rc">RedumpClient for connectivity</param>
         /// <param name="query">Query string to attempt to search for</param>
         /// <param name="noSlash">Don't replace slashes with `-` in queries</param>
-        /// <returns>All disc IDs for the given query, null on error</returns>
-        public static async Task<List<int>?> ListSearchResults(RedumpClient rc, string? query, bool noSlash)
+        /// <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 = [];
 
@@ -52,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;
@@ -65,11 +65,14 @@ namespace SabreTools.RedumpLib.Web
         /// <param name="query">Query string to attempt to search for</param>
         /// <param name="outDir">Output directory to save data to</param>
         /// <param name="noSlash">Don't replace slashes with `-` in queries</param>
-        public static async Task<bool> DownloadSearchResults(RedumpClient rc, string? query, string? outDir, bool noSlash)
+        /// <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('"', '\'');
@@ -87,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;
         }
     }
 }

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;

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;
         }
     }
 }