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

Use string interpolation wherever possible

Browse Source 
Majority of cases still need to go through string.Format() due to localization requirements
This commit is contained in:
Archi
2021-09-27 19:59:00 +02:00
parent de19010820
commit f2d3a2a894
29 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm/Web/GitHub.cs
View File

@@ -56,7 +56,7 @@ namespace ArchiSteamFarm.Web {
throw new ArgumentNullException(nameof(version));
}
Uri request = new(SharedInfo.GithubReleaseURL + "/tags/" + version);
Uri request = new($"{SharedInfo.GithubReleaseURL}/tags/{version}");
return await GetReleaseFromURL(request).ConfigureAwait(false);
}
@@ -70,7 +70,7 @@ namespace ArchiSteamFarm.Web {
throw new InvalidOperationException(nameof(ASF.WebBrowser));
}
Uri request = new(SharedInfo.ProjectURL + "/wiki/" + page + "/_history");
Uri request = new($"{SharedInfo.ProjectURL}/wiki/{page}/_history");
using HtmlDocumentResponse? response = await ASF.WebBrowser.UrlGetToHtmlDocument(request, requestOptions: WebBrowser.ERequestOptions.ReturnClientErrors).ConfigureAwait(false);
@@ -143,7 +143,7 @@ namespace ArchiSteamFarm.Web {
throw new InvalidOperationException(nameof(ASF.WebBrowser));
}
Uri request = new(SharedInfo.ProjectURL + "/wiki/" + page + (!string.IsNullOrEmpty(revision) ? "/" + revision : ""));
Uri request = new($"{SharedInfo.ProjectURL}/wiki/{page}{(!string.IsNullOrEmpty(revision) ? $"/{revision}" : "")}");
using HtmlDocumentResponse? response = await ASF.WebBrowser.UrlGetToHtmlDocument(request).ConfigureAwait(false);

10
ArchiSteamFarm/Web/WebBrowser.cs
View File

@@ -113,7 +113,7 @@ namespace ArchiSteamFarm.Web {
// Most web services expect that UserAgent is set, so we declare it globally
// If you by any chance came here with a very "clever" idea of hiding your ass by changing default ASF user-agent then here is a very good advice from me: don't, for your own safety - you've been warned
result.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(SharedInfo.PublicIdentifier, SharedInfo.Version.ToString()));
result.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("(" + SharedInfo.BuildInfo.Variant + "; " + OS.Version.Replace("(", "", StringComparison.Ordinal).Replace(")", "", StringComparison.Ordinal) + "; +" + SharedInfo.ProjectURL + ")"));
result.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue($"({SharedInfo.BuildInfo.Variant}; {OS.Version.Replace("(", "", StringComparison.Ordinal).Replace(")", "", StringComparison.Ordinal)}; +{SharedInfo.ProjectURL})"));
return result;
}
@@ -785,7 +785,7 @@ namespace ArchiSteamFarm.Web {
try {
requestMessage.Content = new FormUrlEncodedContent(nameValueCollection);
} catch (UriFormatException) {
requestMessage.Content = new StringContent(string.Join("&", nameValueCollection.Select(kv => WebUtility.UrlEncode(kv.Key) + "=" + WebUtility.UrlEncode(kv.Value))), null, "application/x-www-form-urlencoded");
requestMessage.Content = new StringContent(string.Join("&", nameValueCollection.Select(kv => $"{WebUtility.UrlEncode(kv.Key)}={WebUtility.UrlEncode(kv.Value)}")), null, "application/x-www-form-urlencoded");
}
break;
@@ -805,7 +805,7 @@ namespace ArchiSteamFarm.Web {
}
if (Debugging.IsUserDebugging) {
ArchiLogger.LogGenericDebug(httpMethod + " " + request);
ArchiLogger.LogGenericDebug($"{httpMethod} {request}");
}
try {
@@ -823,7 +823,7 @@ namespace ArchiSteamFarm.Web {
}
if (Debugging.IsUserDebugging) {
ArchiLogger.LogGenericDebug(response.StatusCode + " <- " + httpMethod + " " + request);
ArchiLogger.LogGenericDebug($"{response.StatusCode} <- {httpMethod} {request}");
}
if (response.IsSuccessStatusCode) {
@@ -883,7 +883,7 @@ namespace ArchiSteamFarm.Web {
}
if (!Debugging.IsUserDebugging) {
ArchiLogger.LogGenericDebug(response.StatusCode + " <- " + httpMethod + " " + request);
ArchiLogger.LogGenericDebug($"{response.StatusCode} <- {httpMethod} {request}");
}
if (response.StatusCode.IsClientErrorCode()) {