Skip to content

Commit ac0a19e

Browse files
committed
Partially convert quicksearch
1 parent ec1ce57 commit ac0a19e

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

SabreTools.RedumpLib/Web/RedumpClient.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -601,28 +601,24 @@ public RedumpClient()
601601
/// <summary>
602602
/// Process a Redump quicksearch page as a list of possible IDs or disc page
603603
/// </summary>
604-
/// <param name="query">Quicksearch query string to use</param>
604+
/// <param name="query">Raw quicksearch query string to use directly</param>
605605
/// <param name="pageNumber">Page number to use</param>
606-
/// <param name="convertForwardSlashes">Replace forward slashes with `-` in queries</param>
607606
/// <returns>List of IDs from the page, empty on none, null on error</returns>
608-
public async Task<List<int>?> CheckSingleQuicksearchPage(string query, int pageNumber, bool convertForwardSlashes)
607+
public async Task<List<int>?> CheckSingleQuicksearchPage(string query, int pageNumber)
609608
{
610-
query = NormalizeQuery(query, convertForwardSlashes);
611609
string url = UrlBuilder.BuildDiscsUrl(quicksearch: query, page: pageNumber);
612610
return await CheckSingleSitePage(url);
613611
}
614612

615613
/// <summary>
616614
/// Process a Redump quicksearch page as a list of possible IDs or disc page
617615
/// </summary>
618-
/// <param name="query">Quicksearch query string to use</param>
616+
/// <param name="query">Raw quicksearch query string to use directly</param>
619617
/// <param name="pageNumber">Page number to use</param>
620618
/// <param name="outDir">Output directory to save data to</param>
621-
/// <param name="convertForwardSlashes">Replace forward slashes with `-` in queries</param>
622619
/// <returns>List of IDs from the page, empty on none, null on error</returns>
623-
public async Task<List<int>?> CheckSingleQuicksearchPage(string query, int pageNumber, string? outDir, bool convertForwardSlashes)
620+
public async Task<List<int>?> CheckSingleQuicksearchPage(string query, int pageNumber, string? outDir)
624621
{
625-
query = NormalizeQuery(query, convertForwardSlashes);
626622
string url = UrlBuilder.BuildDiscsUrl(quicksearch: query, page: pageNumber);
627623
return await CheckSingleSitePage(url, outDir);
628624
}

SabreTools.RedumpLib/Web/Search.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ public static async Task<List<int>> ListSearchResults(this RedumpClient client,
3636
if (limit > 0 && pageNumber >= limit)
3737
break;
3838

39-
var pageIds = await client.CheckSingleQuicksearchPage(query!, pageNumber++, convertForwardSlashes);
39+
// Convert forward slashes implies a strict query
40+
var pageIds = convertForwardSlashes
41+
? await client.CheckSingleDiscsPage(quicksearch: query, page: pageNumber++)
42+
: await client.CheckSingleQuicksearchPage(query!, pageNumber++);
4043
if (pageIds is null)
4144
return [];
4245

@@ -83,7 +86,10 @@ public static async Task<List<int>> DownloadSearchResults(this RedumpClient clie
8386
if (limit > 0 && pageNumber >= limit)
8487
break;
8588

86-
var pageIds = await client.CheckSingleQuicksearchPage(query!, pageNumber++, outDir, convertForwardSlashes);
89+
// Convert forward slashes implies a strict query
90+
var pageIds = convertForwardSlashes
91+
? await client.CheckSingleDiscsPage(outDir, quicksearch: query, page: pageNumber++)
92+
: await client.CheckSingleQuicksearchPage(query!, pageNumber++, outDir);
8793
if (pageIds is null)
8894
return [];
8995

0 commit comments

Comments
 (0)