DrakiaXYZ/SPT-AKI-Installer
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix mirror downloads maybe' (#8) from waffle.lord/SPT-AKI-Installer:master into master

Browse Source 
Reviewed-on: CWX/SPT-AKI-Installer#8
This commit is contained in:
IsWaffle 2022-07-12 01:20:50 +00:00
commit 0285fe5a87
7 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Aki.Core/InternalData.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using SPT_AKI_Installer.Aki.Core.Model;
using System.Collections.Generic;
using System.IO;
namespace SPT_AKI_Installer.Aki.Core
@ -43,7 +44,7 @@ namespace SPT_AKI_Installer.Aki.Core
/// <summary>
/// The release download mirrors for the patcher
/// </summary>
public List<string> PatcherReleaseMirrors { get; set; } = null;
public List<DownloadMirror> PatcherReleaseMirrors { get; set; } = null;
/// <summary>
/// Whether or not a patch is needed to downgrade the client files

8
Aki.Core/Model/DownloadMirror.cs Normal file
View File

@ -0,0 +1,8 @@
namespace SPT_AKI_Installer.Aki.Core.Model
{
public class DownloadMirror
{
public string Link { get; set; }
public string Hash { get; set; }
}
}

2
Aki.Core/SPTInstaller.cs
View File

@ -55,7 +55,7 @@ namespace SPT_AKI_Installer.Aki.Core
#endif
await LiveTableTaskRunner.RunAsync(tasks);
CloseApp("SPT is Ready to play");
CloseApp("");
}
private static IHost ConfigureHost()

21
Aki.Core/Tasks/DownloadTask.cs
View File

@ -33,9 +33,9 @@ namespace SPT_AKI_Installer.Aki.Core.Tasks
return downloadResult;
}
var blah = JsonConvert.DeserializeObject<List<string>>(File.ReadAllText(mirrorListInfo.FullName));
var blah = JsonConvert.DeserializeObject<List<DownloadMirror>>(File.ReadAllText(mirrorListInfo.FullName));
if (blah is List<string> mirrors)
if (blah is List<DownloadMirror> mirrors)
{
_data.PatcherReleaseMirrors = mirrors;
@ -47,12 +47,12 @@ namespace SPT_AKI_Installer.Aki.Core.Tasks
private async Task<GenericResult> DownloadPatcherFromMirrors(IProgress<double> progress)
{
foreach (string mirror in _data.PatcherReleaseMirrors)
foreach (var mirror in _data.PatcherReleaseMirrors)
{
SetStatus($"Downloading Patcher: {mirror}", false);
SetStatus($"Downloading Patcher: {mirror.Link}", false);
// mega is a little weird since they use encryption, but thankfully there is a great library for their api :)
if (mirror.StartsWith("https://mega"))
if (mirror.Link.StartsWith("https://mega"))
{
var megaClient = new MegaApiClient();
await megaClient.LoginAnonymousAsync();
@ -62,12 +62,19 @@ namespace SPT_AKI_Installer.Aki.Core.Tasks
try
{
using var megaDownloadStream = await megaClient.DownloadAsync(new Uri(mirror), progress);
using var megaDownloadStream = await megaClient.DownloadAsync(new Uri(mirror.Link), progress);
using var patcherFileStream = _data.PatcherZipInfo.Open(FileMode.Create);
{
await megaDownloadStream.CopyToAsync(patcherFileStream);
}
patcherFileStream.Close();
if(!DownloadHelper.FileHashCheck(_data.PatcherZipInfo, mirror.Hash))
{
return GenericResult.FromError("Hash mismatch");
}
return GenericResult.FromSuccess();
}
catch (Exception)
@ -77,7 +84,7 @@ namespace SPT_AKI_Installer.Aki.Core.Tasks
}
}
var result = await DownloadHelper.DownloadFile(_data.PatcherZipInfo, mirror, progress);
var result = await DownloadHelper.DownloadFile(_data.PatcherZipInfo, mirror.Link, progress, mirror.Hash);
if (result.Succeeded)
{

24
Aki.Helper/DownloadHelper.cs
View File

@ -2,7 +2,9 @@
using SPT_AKI_Installer.Aki.Core.Model;
using System;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Security.Cryptography;
using System.Threading.Tasks;
namespace SPT_AKI_Installer.Aki.Helper
@ -11,7 +13,22 @@ namespace SPT_AKI_Installer.Aki.Helper
{
private static HttpClient _httpClient = new HttpClient() { Timeout = TimeSpan.FromHours(1) };
public static async Task<GenericResult> DownloadFile(FileInfo outputFile, string targetLink, IProgress<double> progress)
public static bool FileHashCheck(FileInfo file, string expectedHash)
{
using (MD5 md5Service = MD5.Create())
using (var sourceStream = file.OpenRead())
{
byte[] sourceHash = md5Service.ComputeHash(sourceStream);
byte[] expectedHashBytes = Convert.FromBase64String(expectedHash);
bool matched = Enumerable.SequenceEqual(sourceHash, expectedHashBytes);
return matched;
}
}
public static async Task<GenericResult> DownloadFile(FileInfo outputFile, string targetLink, IProgress<double> progress, string expectedHash = null)
{
try
{
@ -30,6 +47,11 @@ namespace SPT_AKI_Installer.Aki.Helper
return GenericResult.FromError($"Failed to download {outputFile.Name}");
}
if (expectedHash != null && !FileHashCheck(outputFile, expectedHash))
{
return GenericResult.FromError("Hash mismatch");
}
return GenericResult.FromSuccess();
}
catch (Exception ex)

2
Aki.Helper/HttpClientProgressExtensions.cs
View File

@ -12,6 +12,8 @@ namespace HttpClientProgress
{
using (var response = await client.GetAsync(requestUrl, HttpCompletionOption.ResponseHeadersRead))
{
var blah = await response.Content.ReadAsStringAsync();
var contentLength = response.Content.Headers.ContentLength;
using (var download = await response.Content.ReadAsStreamAsync())
{

2
Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2022-07-09T17:06:26.5751622Z;True|2022-07-09T12:56:17.1018408-04:00;True|2022-07-09T12:38:17.0878078-04:00;True|2022-07-09T12:18:23.6469737-04:00;True|2022-06-21T14:47:38.7532473-04:00;True|2022-06-08T13:26:47.7977621-04:00;True|2022-06-06T10:07:18.8067168-04:00;True|2022-06-05T17:55:20.5192697-04:00;True|2022-05-30T08:11:30.6942032-04:00;True|2022-05-30T08:08:08.4269393-04:00;True|2022-05-16T20:06:33.6758525-04:00;True|2022-05-13T20:56:09.8410037-04:00;True|2022-05-13T19:54:24.0683990-04:00;True|2022-05-13T19:53:04.7105427-04:00;True|2022-05-13T19:51:00.6280767-04:00;True|2022-05-13T19:49:19.4630888-04:00;True|2022-05-13T19:47:59.2166156-04:00;</History>
<History>True|2022-07-12T01:15:15.4480498Z;True|2022-07-11T21:11:55.8484217-04:00;True|2022-07-09T13:06:26.5751622-04:00;True|2022-07-09T12:56:17.1018408-04:00;True|2022-07-09T12:38:17.0878078-04:00;True|2022-07-09T12:18:23.6469737-04:00;True|2022-06-21T14:47:38.7532473-04:00;True|2022-06-08T13:26:47.7977621-04:00;True|2022-06-06T10:07:18.8067168-04:00;True|2022-06-05T17:55:20.5192697-04:00;True|2022-05-30T08:11:30.6942032-04:00;True|2022-05-30T08:08:08.4269393-04:00;True|2022-05-16T20:06:33.6758525-04:00;True|2022-05-13T20:56:09.8410037-04:00;True|2022-05-13T19:54:24.0683990-04:00;True|2022-05-13T19:53:04.7105427-04:00;True|2022-05-13T19:51:00.6280767-04:00;True|2022-05-13T19:49:19.4630888-04:00;True|2022-05-13T19:47:59.2166156-04:00;</History>
</PropertyGroup>
</Project>