cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-22 12:37:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move duplicate concrete IAbstractHttpClientFactorys to Common.HttpClientFactory

Browse Source
This commit is contained in:
Dominion
2023-04-23 13:57:57 -04:00
parent 43e1fec1b0
commit 4ecdf8afe1
15 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/Tgstation.Server.Migrator/ConcreteHttpClientFactory.cs
-10
View File
@@ -1,10 +0,0 @@
using Tgstation.Server.Common;
using Tgstation.Server.Host.Utils;
namespace Tgstation.Server.Migrator
{
sealed class ConcreteHttpClientFactory : IAbstractHttpClientFactory
{
public IHttpClient CreateClient() => new HttpClient();
}
}
tools/Tgstation.Server.Migrator/Program.cs
+5 -5
View File
@@ -21,9 +21,9 @@ using Octokit;
using Tgstation.Server.Api;
using Tgstation.Server.Client;
using Tgstation.Server.Common;
using Tgstation.Server.Host.IO;
using Tgstation.Server.Host.Setup;
using Tgstation.Server.Migrator;
using FileMode = System.IO.FileMode;
@@ -264,6 +264,7 @@ try
new ProductInfoHeaderValue(
assemblyName.Name!,
assemblyName.Version!.Semver().ToString());
var httpClientFactory = new HttpClientFactory(productInfoHeaderValue);
if (!runtimeInstalled)
{
// RUNTIME DONWLOAD
@@ -279,9 +280,9 @@ try
Console.WriteLine($"Downloading {downloadUri} to {Path.GetFullPath(dotnetDownloadFilePath)}...");
using var httpClient = new HttpClient();
httpClient.DefaultRequestHeaders.UserAgent.Add(productInfoHeaderValue);
var webRequestTask = httpClient.GetAsync(downloadUri);
using var httpClient = httpClientFactory.CreateClient();
using var request = new HttpRequestMessage(HttpMethod.Get, downloadUri);
var webRequestTask = httpClient.SendAsync(request, default);
using var response = await webRequestTask;
response.EnsureSuccessStatusCode();
using (var responseStream = await response.Content.ReadAsStreamAsync())
@@ -382,7 +383,6 @@ try
// TGS5 DOWNLOAD AND UNZIP
Console.WriteLine("Downloading TGS5...");
var httpClientFactory = new ConcreteHttpClientFactory();
using (var loggerFactory = LoggerFactory.Create(builder => { }))
{
var fileDownloader = new FileDownloader(httpClientFactory, loggerFactory.CreateLogger<FileDownloader>());