Add discs support next to quicksearch

Author: mnadareski

RedumpTool/Features/QueryFeature.cs

@@ -29,6 +29,9 @@ internal sealed class QueryFeature : BaseFeature
         private const string _queryName = "query";
         internal readonly StringInput QueryInput = new(_queryName, ["-q", "--query"], "Redump-compatible query to run");
 
+        private const string _quickSearchName = "quicksearch";
+        internal readonly FlagInput QuickSearchInput = new(_quickSearchName, ["-s", "--quick"], "Indicate a query is for the 'quicksearch' path, not 'discs'");
+
         #endregion
 
         public QueryFeature()
@@ -45,6 +48,7 @@ public QueryFeature()
 
             // Specific
             Add(QueryInput);
+            Add(QuickSearchInput);
             Add(ListInput);
             Add(NoSlashInput);
         }
@@ -57,6 +61,7 @@ public override bool Execute()
             string? outputDirectory = OutputInput.Value;
             string? queryString = QueryInput.Value;
             int? attemptCount = AttemptCountInput.Value;
+            bool quick = QuickSearchInput.Value;
 
             // Output directory validation
             if (!onlyList && !ValidateAndCreateOutputDirectory(outputDirectory))
@@ -80,10 +85,20 @@ public override bool Execute()
 
             // Start the processing
             Task<List<int>> processingTask;
-            if (onlyList)
-                processingTask = _client.ListSearchResults(queryString, NoSlashInput.Value);
+            if (quick)
+            {
+                if (onlyList)
+                    processingTask = _client.ListSearchResults(queryString, NoSlashInput.Value);
+                else
+                    processingTask = _client.DownloadSearchResults(queryString, outputDirectory, NoSlashInput.Value);
+            }
             else
-                processingTask = _client.DownloadSearchResults(queryString, outputDirectory, NoSlashInput.Value);
+            {
+                if (onlyList)
+                    processingTask = _client.ListDiscsResults(queryString, NoSlashInput.Value);
+                else
+                    processingTask = _client.DownloadDiscsResults(queryString, outputDirectory, NoSlashInput.Value);
+            }
 
             // Retrieve the result
             processingTask.Wait();

RedumpTool/Program.cs

@@ -94,6 +94,7 @@ private static void ShowHelp()
             Console.WriteLine();
             Console.WriteLine("query - Download pages and related files from a Redump-compatible query");
             Console.WriteLine("    -q, --query - Redump-compatible query to run");
+            Console.WriteLine("    -s, --quick - Indicate a query is for the 'quicksearch' path, not 'discs'");
             Console.WriteLine("    -l, --list - Only list the page IDs for that query");
             Console.WriteLine("    -ns, --noslash - Don't replace forward slashes with '-'");
             Console.WriteLine();

SabreTools.RedumpLib/Data/Constants.cs

@@ -180,6 +180,11 @@ public static class Constants
         /// </summary>
         public const string DiscPageUrl = @"http://redump.org/disc/{0}/";
 
+        /// <summary>
+        /// Redump discs path URL template
+        /// </summary>
+        public const string DiscsUrl = @"http://redump.org/discs/{0}";
+
         /// <summary>
         /// Redump last modified search URL template
         /// </summary>

SabreTools.RedumpLib/Web/Discs.cs

@@ -10,6 +10,101 @@ namespace SabreTools.RedumpLib.Web
     /// </summary>
     public static class Discs
     {
+        /// <summary>
+        /// List the disc IDs associated with a given discs query
+        /// </summary>
+        /// <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, empty on error</returns>
+        public static async Task<List<int>> ListDiscsResults(this RedumpClient rc, string? query, bool noSlash)
+        {
+            // If the query is invalid
+            if (string.IsNullOrEmpty(query))
+                return [];
+
+            List<int> ids = [];
+
+            // Strip quotes
+            query = query!.Trim('"', '\'');
+
+            // Special characters become dashes
+            query = query.Replace(' ', '-');
+            query = query.Replace('\\', '-');
+            if (!noSlash)
+                query = query.Replace('/', '-');
+
+            // Lowercase is defined per language
+            query = query.ToLowerInvariant();
+
+            // Keep getting quicksearch pages until there are none left
+            try
+            {
+                int pageNumber = 1;
+                while (true)
+                {
+                    var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.DiscsUrl, query, pageNumber++));
+                    if (pageIds is null)
+                        return [];
+
+                    ids.AddRange(pageIds);
+                    if (pageIds.Count <= 1)
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"An exception occurred while trying to log in: {ex}");
+                return [];
+            }
+
+            return ids;
+        }
+
+        /// <summary>
+        /// Download the disc pages associated with a given discs query
+        /// </summary>
+        /// <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>
+        /// <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>> DownloadDiscsResults(this RedumpClient rc, string? query, string? outDir, bool noSlash)
+        {
+            List<int> ids = [];
+
+            // If the query is invalid
+            if (string.IsNullOrEmpty(query))
+                return ids;
+
+            // Strip quotes
+            query = query!.Trim('"', '\'');
+
+            // Special characters become dashes
+            query = query.Replace(' ', '-');
+            query = query.Replace('\\', '-');
+            if (!noSlash)
+                query = query.Replace('/', '-');
+
+            // Lowercase is defined per language
+            query = query.ToLowerInvariant();
+
+            // Keep getting quicksearch pages until there are none left
+            int pageNumber = 1;
+            while (true)
+            {
+                var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.DiscsUrl, query, pageNumber++), outDir, false);
+                if (pageIds is null)
+                    return [];
+
+                ids.AddRange(pageIds);
+                if (pageIds.Count == 0)
+                    break;
+            }
+
+            return ids;
+        }
+
         /// <summary>
         /// Download the last modified disc pages, until first failure
         /// </summary>