glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-06-23 03:24:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup code for HttpDownloadClient and error-log

Browse Source
This commit is contained in:
glax
2025-06-15 23:00:01 +02:00
parent aa67c11050
commit 1a8f70f501
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
API/MangaDownloadClients/HttpDownloadClient.cs
View File

@ -18,33 +18,28 @@ internal class HttpDownloadClient : DownloadClient
internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
{
if (clickButton is not null)
Log.Warn("Can not click button on static site.");
Log.Warn("Client can not click button");
HttpResponseMessage? response = null;
while (response is null)
{
HttpRequestMessage requestMessage = new(HttpMethod.Get, url);
if (referrer is not null)
requestMessage.Headers.Referrer = new Uri(referrer);
requestMessage.Headers.Referrer = new (referrer);
Log.Debug($"Requesting {url}");
try
{
response = Client.Send(requestMessage);
}
catch (Exception e)
catch (HttpRequestException e)
{
switch (e)
{
case TaskCanceledException:
return new RequestResult(HttpStatusCode.RequestTimeout, null, Stream.Null);
case HttpRequestException:
return new RequestResult(HttpStatusCode.BadRequest, null, Stream.Null);
}
Log.Error(e);
return new (HttpStatusCode.Unused, null, Stream.Null);
}
}
if (!response.IsSuccessStatusCode)
{
return new RequestResult(response.StatusCode, null, Stream.Null);
return new (response.StatusCode, null, Stream.Null);
}
Stream stream;
@ -55,7 +50,7 @@ internal class HttpDownloadClient : DownloadClient
catch (Exception e)
{
Log.Error(e);
return new RequestResult(HttpStatusCode.InternalServerError, null, Stream.Null);
return new (HttpStatusCode.Unused, null, Stream.Null);
}
HtmlDocument? document = null;
@ -71,10 +66,9 @@ internal class HttpDownloadClient : DownloadClient
// Request has been redirected to another page. For example, it redirects directly to the results when there is only 1 result
if (response.RequestMessage is not null && response.RequestMessage.RequestUri is not null)
{
return new RequestResult(response.StatusCode, document, stream, true,
response.RequestMessage.RequestUri.AbsoluteUri);
return new (response.StatusCode, document, stream, true, response.RequestMessage.RequestUri.AbsoluteUri);
}
return new RequestResult(response.StatusCode, document, stream);
return new (response.StatusCode, document, stream);
}
}