Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc

Browse Source
This commit is contained in:
JustArchi
2020-11-28 20:45:47 +01:00
parent 2aaffaa208
commit eebd7d6f45
1 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ArchiSteamFarm/WebBrowser.cs
View File

@@ -118,8 +118,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
BinaryResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
await using StreamResponse? response = await UrlGetToStream(request, headers, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
@@ -217,7 +215,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -230,8 +228,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
HtmlDocumentResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
await using StreamResponse? response = await UrlGetToStream(request, headers, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
@@ -269,14 +265,10 @@ namespace ArchiSteamFarm {
}
try {
result = await HtmlDocumentResponse.Create(response).ConfigureAwait(false);
return await HtmlDocumentResponse.Create(response).ConfigureAwait(false);
} catch (Exception e) {
ArchiLogger.LogGenericWarningException(e);
continue;
}
return result;
}
if (maxTries > 1) {
@@ -284,7 +276,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -297,8 +289,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
ObjectResponse<T>? result = null;
for (byte i = 0; i < maxTries; i++) {
await using StreamResponse? response = await UrlGetToStream(request, headers, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
@@ -364,7 +354,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -377,8 +367,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
StreamResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
HttpResponseMessage? response = await InternalGet(request, headers, referer, requestOptions, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
@@ -415,7 +403,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -428,8 +416,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
StringResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
using HttpResponseMessage? response = await InternalGet(request, headers, referer, requestOptions).ConfigureAwait(false);
@@ -466,7 +452,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -479,8 +465,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
XmlDocumentResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
await using StreamResponse? response = await UrlGetToStream(request, headers, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
@@ -535,7 +519,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -640,8 +624,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
HtmlDocumentResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
await using StreamResponse? response = await UrlPostToStream(request, headers, data, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
@@ -679,14 +661,10 @@ namespace ArchiSteamFarm {
}
try {
result = await HtmlDocumentResponse.Create(response).ConfigureAwait(false);
return await HtmlDocumentResponse.Create(response).ConfigureAwait(false);
} catch (Exception e) {
ArchiLogger.LogGenericWarningException(e);
continue;
}
return result;
}
if (maxTries > 1) {
@@ -694,7 +672,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -707,9 +685,7 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
ObjectResponse<TResult>? result = null;
for (byte i = 0; (i < maxTries) && (result == null); i++) {
for (byte i = 0; i < maxTries; i++) {
await using StreamResponse? response = await UrlPostToStream(request, headers, data, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
if (response == null) {
@@ -773,7 +749,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
[PublicAPI]
@@ -786,8 +762,6 @@ namespace ArchiSteamFarm {
throw new ArgumentOutOfRangeException(nameof(maxTries));
}
StreamResponse? result = null;
for (byte i = 0; i < maxTries; i++) {
HttpResponseMessage? response = await InternalPost(request, headers, data, referer, requestOptions, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
@@ -824,7 +798,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericDebug(string.Format(CultureInfo.CurrentCulture, Strings.ErrorFailingRequest, request));
}
return result;
return null;
}
internal static void Init() {