Skip to content

Commit 758d7a8

Browse files
committed
Add explicit error logs on download failure
1 parent 24d2c7b commit 758d7a8

1 file changed

Lines changed: 27 additions & 4 deletions

File tree

SabreTools.RedumpLib/Web/RedumpClient.cs

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ public RedumpClient()
235235
Thread.Sleep(100);
236236
}
237237

238+
Console.Error.WriteLine($"Could not download \"{uri}\" after {AttemptCount} attempts");
238239
return null;
239240
}
240241

@@ -286,6 +287,7 @@ public RedumpClient()
286287
Thread.Sleep(100);
287288
}
288289

290+
Console.Error.WriteLine($"Could not download \"{uri}\" after {AttemptCount} attempts");
289291
return null;
290292
}
291293

@@ -319,6 +321,7 @@ public RedumpClient()
319321
Thread.Sleep(100);
320322
}
321323

324+
Console.Error.WriteLine($"Could not download \"{uri}\" after {AttemptCount} attempts");
322325
return null;
323326
}
324327

@@ -638,7 +641,12 @@ public async Task<bool> DownloadSinglePack(string url, RedumpSystem? system, str
638641
string discPageUri = string.Format(Constants.DiscPageUrl, +id);
639642
string? discPage = await DownloadString(discPageUri);
640643

641-
if (discPage is null || discPage.Contains($"Disc with ID \"{id}\" doesn't exist"))
644+
if (discPage is null)
645+
{
646+
Console.Error.WriteLine($"An error occurred retrieving ID {paddedId}!");
647+
return null;
648+
}
649+
else if (discPage.Contains($"Disc with ID \"{id}\" doesn't exist"))
642650
{
643651
Console.Error.WriteLine($"ID {paddedId} could not be found!");
644652
return null;
@@ -676,7 +684,12 @@ public async Task<bool> DownloadSingleSiteID(int id, string? outDir, bool rename
676684
string discPageUri = string.Format(Constants.DiscPageUrl, +id);
677685
string? discPage = await DownloadString(discPageUri);
678686

679-
if (discPage is null || discPage.Contains($"Disc with ID \"{id}\" doesn't exist"))
687+
if (discPage is null)
688+
{
689+
Console.Error.WriteLine($"An error occurred retrieving ID {paddedId}!");
690+
return false;
691+
}
692+
else if (discPage.Contains($"Disc with ID \"{id}\" doesn't exist"))
680693
{
681694
try
682695
{
@@ -800,7 +813,12 @@ public async Task<bool> DownloadSingleSiteID(int id, string? outDir, bool rename
800813
string discPageUri = string.Format(Constants.WipDiscPageUrl, +id);
801814
string? discPage = await DownloadString(discPageUri);
802815

803-
if (discPage is null || discPage.Contains($"WIP disc with ID \"{id}\" doesn't exist"))
816+
if (discPage is null)
817+
{
818+
Console.Error.WriteLine($"An error occurred retrieving ID {paddedId}!");
819+
return null;
820+
}
821+
else if (discPage.Contains($"WIP disc with ID \"{id}\" doesn't exist"))
804822
{
805823
Console.Error.WriteLine($"ID {paddedId} could not be found!");
806824
return null;
@@ -838,7 +856,12 @@ public async Task<bool> DownloadSingleWIPID(int id, string? outDir, bool rename)
838856
string discPageUri = string.Format(Constants.WipDiscPageUrl, +id);
839857
string? discPage = await DownloadString(discPageUri);
840858

841-
if (discPage is null || discPage.Contains($"WIP disc with ID \"{id}\" doesn't exist"))
859+
if (discPage is null)
860+
{
861+
Console.Error.WriteLine($"An error occurred retrieving ID {paddedId}!");
862+
return false;
863+
}
864+
else if (discPage.Contains($"WIP disc with ID \"{id}\" doesn't exist"))
842865
{
843866
try
844867
{

0 commit comments

Comments
 (0)