Skip to content

Commit 3381f5b

Browse files
committed
More debug logging, make null consistent
1 parent b1ec3d2 commit 3381f5b

7 files changed

Lines changed: 104 additions & 32 deletions

File tree

RedumpTool/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class Program
1010
public static void Main(string[] args)
1111
{
1212
// Show help if nothing is input
13-
if (args is null || args.Length == 0)
13+
if (args.Length == 0)
1414
{
1515
Console.WriteLine("At least one argument is required");
1616
ShowHelp();

SabreTools.RedumpLib/Downloader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private async Task<List<int>> ProcessUser()
180180
private async Task<List<int>> ProcessWIP()
181181
{
182182
if (OnlyNew)
183-
return await WIP.DownloadLastSubmitted(_client, OutDir);
183+
return await WIP.DownloadLastSubmitted(_client, OutDir) ?? [];
184184
else
185185
return await WIP.DownloadWIPRange(_client, OutDir, MinimumId, MaximumId);
186186
}

SabreTools.RedumpLib/Web/Discs.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public static async Task<List<int>> DownloadLastModified(RedumpClient rc, string
2626
while (true)
2727
{
2828
var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.LastModifiedUrl, pageNumber++), outDir, !force);
29+
if (pageIds is null)
30+
return [];
31+
2932
ids.AddRange(pageIds);
3033
if (pageIds.Count == 0)
3134
break;

SabreTools.RedumpLib/Web/RedumpClient.cs

Lines changed: 89 additions & 29 deletions
Large diffs are not rendered by default.

SabreTools.RedumpLib/Web/Search.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ public static async Task<List<int>> DownloadSearchResults(RedumpClient rc, strin
9494
while (true)
9595
{
9696
var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.QuickSearchUrl, query, pageNumber++), outDir, false);
97+
if (pageIds is null)
98+
return [];
99+
97100
ids.AddRange(pageIds);
98101
if (pageIds.Count == 0)
99102
break;

SabreTools.RedumpLib/Web/User.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public static async Task<List<int>> DownloadUser(RedumpClient rc, string? userna
3232
while (true)
3333
{
3434
var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsUrl, username, pageNumber++), outDir, false);
35+
if (pageIds is null)
36+
return [];
37+
3538
ids.AddRange(pageIds);
3639
if (pageIds.Count == 0)
3740
break;
@@ -62,6 +65,9 @@ public static async Task<List<int>> DownloadUserLastModified(RedumpClient rc, st
6265
while (true)
6366
{
6467
var pageIds = await rc.CheckSingleSitePage(string.Format(Constants.UserDumpsLastModifiedUrl, username, pageNumber++), outDir, true);
68+
if (pageIds is null)
69+
return [];
70+
6571
ids.AddRange(pageIds);
6672
if (pageIds.Count == 0)
6773
break;

SabreTools.RedumpLib/Web/WIP.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class WIP
1616
/// <param name="rc">RedumpClient for connectivity</param>
1717
/// <param name="outDir">Output directory to save data to</param>
1818
/// <returns>All disc IDs in last submitted range, empty on error</returns>
19-
public static async Task<List<int>> DownloadLastSubmitted(RedumpClient rc, string? outDir)
19+
public static async Task<List<int>?> DownloadLastSubmitted(RedumpClient rc, string? outDir)
2020
{
2121
return await rc.CheckSingleWIPPage(Constants.WipDumpsUrl, outDir, false);
2222
}

0 commit comments

Comments
 (0)