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

Fixed NullPropagation (#1809)

Browse Source 
* Fixed NullPropagation

* Changes to similar methods
This commit is contained in:
Kamushek
2020-05-27 15:42:12 +03:00
committed by GitHub
parent 90a9fbe6af
commit 800d10de96
1 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
ArchiSteamFarm/WebBrowser.cs
View File

@@ -116,11 +116,7 @@ namespace ArchiSteamFarm {
for (int i = 0; i < maxTries; i++) { for (int i = 0; i < maxTries; i++) {
await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false); await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
return null;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new HtmlDocumentResponse(response); result = new HtmlDocumentResponse(response);
} }
@@ -128,7 +124,7 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response.Content == null) { if (response?.Content == null) {
continue; continue;
} }
@@ -165,12 +161,7 @@ namespace ArchiSteamFarm {
for (byte i = 0; i < maxTries; i++) { for (byte i = 0; i < maxTries; i++) {
await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false); await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
// ReSharper disable once UseNullPropagationWhenPossible - false check if (response?.StatusCode.IsClientErrorCode() == true) {
if (response == null) {
continue;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new ObjectResponse<T>(response); result = new ObjectResponse<T>(response);
} }
@@ -178,7 +169,7 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response.Content == null) { if (response?.Content == null) {
continue; continue;
} }
@@ -221,12 +212,7 @@ namespace ArchiSteamFarm {
for (byte i = 0; i < maxTries; i++) { for (byte i = 0; i < maxTries; i++) {
await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false); await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
// ReSharper disable once UseNullPropagationWhenPossible - false check if (response?.StatusCode.IsClientErrorCode() == true) {
if (response == null) {
continue;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new XmlDocumentResponse(response); result = new XmlDocumentResponse(response);
} }
@@ -234,7 +220,7 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response.Content == null) { if (response?.Content == null) {
continue; continue;
} }
@@ -347,11 +333,7 @@ namespace ArchiSteamFarm {
for (int i = 0; i < maxTries; i++) { for (int i = 0; i < maxTries; i++) {
await using StreamResponse response = await UrlPostToStream(request, data, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false); await using StreamResponse response = await UrlPostToStream(request, data, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
return null;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new HtmlDocumentResponse(response); result = new HtmlDocumentResponse(response);
} }
@@ -359,7 +341,7 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response.Content == null) { if (response?.Content == null) {
continue; continue;
} }
@@ -396,11 +378,7 @@ namespace ArchiSteamFarm {
for (byte i = 0; i < maxTries; i++) { for (byte i = 0; i < maxTries; i++) {
await using StreamResponse response = await UrlPostToStream(request, data, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false); await using StreamResponse response = await UrlPostToStream(request, data, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
return null;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new ObjectResponse<T>(response); result = new ObjectResponse<T>(response);
} }
@@ -408,7 +386,7 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response.Content == null) { if (response?.Content == null) {
continue; continue;
} }
@@ -481,11 +459,7 @@ namespace ArchiSteamFarm {
await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false); await using StreamResponse response = await UrlGetToStream(request, referer, requestOptions | ERequestOptions.ReturnClientErrors, 1).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
continue;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new BinaryResponse(response); result = new BinaryResponse(response);
} }
@@ -493,6 +467,10 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response?.Content == null) {
continue;
}
ArchiLogger.LogGenericDebug("0%..."); ArchiLogger.LogGenericDebug("0%...");
#if !NETFRAMEWORK #if !NETFRAMEWORK
@@ -559,11 +537,7 @@ namespace ArchiSteamFarm {
for (byte i = 0; i < maxTries; i++) { for (byte i = 0; i < maxTries; i++) {
using HttpResponseMessage response = await InternalGet(request, referer).ConfigureAwait(false); using HttpResponseMessage response = await InternalGet(request, referer).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
continue;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new StringResponse(response); result = new StringResponse(response);
} }
@@ -571,6 +545,10 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response?.Content == null) {
continue;
}
return new StringResponse(response, await response.Content.ReadAsStringAsync().ConfigureAwait(false)); return new StringResponse(response, await response.Content.ReadAsStringAsync().ConfigureAwait(false));
} }
@@ -730,11 +708,7 @@ namespace ArchiSteamFarm {
for (byte i = 0; i < maxTries; i++) { for (byte i = 0; i < maxTries; i++) {
HttpResponseMessage response = await InternalGet(request, referer, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false); HttpResponseMessage response = await InternalGet(request, referer, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
continue;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new StreamResponse(response); result = new StreamResponse(response);
} }
@@ -742,6 +716,10 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response?.Content == null) {
continue;
}
return new StreamResponse(response, await response.Content.ReadAsStreamAsync().ConfigureAwait(false)); return new StreamResponse(response, await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
} }
@@ -766,11 +744,7 @@ namespace ArchiSteamFarm {
for (byte i = 0; i < maxTries; i++) { for (byte i = 0; i < maxTries; i++) {
HttpResponseMessage response = await InternalPost(request, data, referer, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false); HttpResponseMessage response = await InternalPost(request, data, referer, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
if (response == null) { if (response?.StatusCode.IsClientErrorCode() == true) {
continue;
}
if (response.StatusCode.IsClientErrorCode()) {
if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) { if (requestOptions.HasFlag(ERequestOptions.ReturnClientErrors)) {
result = new StreamResponse(response); result = new StreamResponse(response);
} }
@@ -778,6 +752,10 @@ namespace ArchiSteamFarm {
break; break;
} }
if (response?.Content == null) {
continue;
}
return new StreamResponse(response, await response.Content.ReadAsStreamAsync().ConfigureAwait(false)); return new StreamResponse(response, await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
} }