spt/installer
spt/installer
0
0
Fork 0
mirror of https://github.com/sp-tarkov/installer.git synced 2025-02-12 14:50:45 -05:00
Code

Merge pull request #27 from waffle-lord/master

Browse Source 
Add metadata retries
This commit is contained in:
waffle-lord 2025-01-03 17:05:15 -05:00 committed by GitHub
commit dc0a201010
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 117 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
SPTInstaller/CustomControls/Dialogs/WhyCacheThoughDialog.axaml.cs
View File

@ -59,39 +59,8 @@ public partial class WhyCacheThoughDialog : UserControl
public void ClearCachedMetaData()
{
var cachedMetadata =
new DirectoryInfo(DownloadCacheHelper.CachePath).GetFiles("*.json", SearchOption.TopDirectoryOnly);
var message = "no cached metadata to remove";
if (cachedMetadata.Length == 0)
{
AdditionalInfo = message;
AdditionalInfoColor = "dodgerblue";
Log.Information(message);
return;
}
var allDeleted = true;
foreach (var file in cachedMetadata)
{
try
{
file.Delete();
file.Refresh();
if (file.Exists)
{
allDeleted = false;
}
}
catch (Exception ex)
{
Log.Error(ex, $"Failed to delete cached metadata file: {file.Name}");
}
}
message = allDeleted ? "cached metadata removed" : "some files could not be removed. Check logs";
var allDeleted = DownloadCacheHelper.ClearMetadataCache();
var message = allDeleted ? "cached metadata removed" : "some files could not be removed. Check logs";
AdditionalInfo = message;
AdditionalInfoColor = allDeleted ? "green" : "red";
Log.Information(message);

20
SPTInstaller/Helpers/DownloadCacheHelper.cs
View File

@ -43,6 +43,26 @@ public static class DownloadCacheHelper
return DirectorySizeHelper.SizeSuffix(cacheSize);
}
public static bool ClearMetadataCache()
{
var metaData = new DirectoryInfo(CachePath).GetFiles("*.json", SearchOption.TopDirectoryOnly);
var allDeleted = true;
foreach (var file in metaData)
{
file.Delete();
file.Refresh();
if (file.Exists)
{
allDeleted = false;
}
}
return allDeleted;
}
/// <summary>
/// Check if a file in the cache already exists
/// </summary>

92
SPTInstaller/Installer Tasks/ReleaseCheckTask.cs
View File

@ -24,40 +24,70 @@ public class ReleaseCheckTask : InstallerTaskBase
SetStatus("Checking SPT Releases", "", null, ProgressStyle.Indeterminate);
var progress = new Progress<double>((d) => { SetStatus(null, null, (int)Math.Floor(d)); });
var SPTReleaseInfoFile =
await DownloadCacheHelper.GetOrDownloadFileAsync("release.json", DownloadCacheHelper.ReleaseMirrorUrl,
progress, DownloadCacheHelper.SuggestedTtl);
if (SPTReleaseInfoFile == null)
ReleaseInfo? sptReleaseInfo = null;
PatchInfo? patchMirrorInfo = null;
int retries = 1;
while (retries >= 0)
{
return Result.FromError("Failed to download release metadata, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button");
retries--;
try
{
var sptReleaseInfoFile =
await DownloadCacheHelper.GetOrDownloadFileAsync("release.json", DownloadCacheHelper.ReleaseMirrorUrl,
progress, DownloadCacheHelper.SuggestedTtl);
if (sptReleaseInfoFile == null)
{
return Result.FromError("Failed to download release metadata, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button");
}
SetStatus("Checking for Patches", "", null, ProgressStyle.Indeterminate);
var sptPatchMirrorsFile =
await DownloadCacheHelper.GetOrDownloadFileAsync("mirrors.json", DownloadCacheHelper.PatchMirrorUrl,
progress, DownloadCacheHelper.SuggestedTtl);
if (sptPatchMirrorsFile == null)
{
return Result.FromError("Failed to download patch mirror data, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button");
}
sptReleaseInfo =
JsonConvert.DeserializeObject<ReleaseInfo>(File.ReadAllText(sptReleaseInfoFile.FullName));
patchMirrorInfo =
JsonConvert.DeserializeObject<PatchInfo>(File.ReadAllText(sptPatchMirrorsFile.FullName));
break;
}
catch (Exception ex)
{
if (retries >= 0)
{
SetStatus("Clearing cache and retrying ...", "", null, ProgressStyle.Indeterminate);
await Task.Delay(1000);
DownloadCacheHelper.ClearMetadataCache();
continue;
}
return Result.FromError(
$"An error occurred while deserializing SPT or patch data.\n\nMost likely we are uploading a new patch.\nPlease wait and try again in an hour\n\nERROR: {ex.Message}");
}
}
var SPTReleaseInfo =
JsonConvert.DeserializeObject<ReleaseInfo>(File.ReadAllText(SPTReleaseInfoFile.FullName));
SetStatus("Checking for Patches", "", null, ProgressStyle.Indeterminate);
var SPTPatchMirrorsFile =
await DownloadCacheHelper.GetOrDownloadFileAsync("mirrors.json", DownloadCacheHelper.PatchMirrorUrl,
progress, DownloadCacheHelper.SuggestedTtl);
if (SPTPatchMirrorsFile == null)
if (sptReleaseInfo == null || patchMirrorInfo == null)
{
return Result.FromError("Failed to download patch mirror data, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button");
return Result.FromError(
"Release or mirror info was null. If you are seeing this report it. This should never be hit");
}
var patchMirrorInfo =
JsonConvert.DeserializeObject<PatchInfo>(File.ReadAllText(SPTPatchMirrorsFile.FullName));
if (SPTReleaseInfo == null || patchMirrorInfo == null)
{
return Result.FromError("An error occurred while deserializing SPT or patch data, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button");
}
_data.ReleaseInfo = SPTReleaseInfo;
_data.ReleaseInfo = sptReleaseInfo;
_data.PatchInfo = patchMirrorInfo;
int intSPTVersion = int.Parse(SPTReleaseInfo.ClientVersion);
int intSPTVersion = int.Parse(sptReleaseInfo.ClientVersion);
int intGameVersion = int.Parse(_data.OriginalGameVersion);
// note: it's possible the game version could be lower than the SPT version and still need a patch if the major version numbers change
@ -99,10 +129,10 @@ public class ReleaseCheckTask : InstallerTaskBase
if (sptClientIsOutdated)
{
return Result.FromError(
"Could not find a downgrade patcher for the version of EFT you have installed." +
"\nThis can happen due to one of the following reasons:" +
"\n* Live EFT just updated. The SPT team will create a new patcher within 24 hours, hold tight!" +
"\n* Live EFT just updated. You have not installed it on your computer using your Battlestate Games launcher");
"Live EFT has recently updated. The SPT team needs to make a new patcher." +
"\n* It's usually made within 24 hours." +
"\n* The patcher is only for turning your EFT files into an older version for SPT to use." +
"\n* This does not mean SPT is being updated to a newer version.");
}
if (liveClientIsOutdated)
@ -113,7 +143,7 @@ public class ReleaseCheckTask : InstallerTaskBase
_data.PatchNeeded = patchNeedCheck;
string status =
$"Current Release: {SPTReleaseInfo.ClientVersion} - {(_data.PatchNeeded ? "Patch Available" : "No Patch Needed")}";
$"Current Release: {sptReleaseInfo.ClientVersion} - {(_data.PatchNeeded ? "Patch Available" : "No Patch Needed")}";
SetStatus(null, status);

4
SPTInstaller/SPTInstaller.csproj
View File

@ -10,8 +10,8 @@
<PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.94</AssemblyVersion>
<FileVersion>2.94</FileVersion>
<AssemblyVersion>2.96</AssemblyVersion>
<FileVersion>2.96</FileVersion>
<Company>SPT</Company>
</PropertyGroup>

39
SPTInstaller/ViewModels/PreChecksViewModel.cs
View File

@ -245,28 +245,43 @@ public class PreChecksViewModel : ViewModelBase
var progress = new Progress<double>((d) => { });
var SPTReleaseInfoFile =
await DownloadCacheHelper.GetOrDownloadFileAsync("release.json", DownloadCacheHelper.ReleaseMirrorUrl,
progress, DownloadCacheHelper.SuggestedTtl);
ReleaseInfo? sptReleaseInfo = null;
var retries = 1;
if (SPTReleaseInfoFile == null)
while (retries >= 0)
{
InstallButtonText = "Could not get SPT release metadata";
InstallButtonCheckState = StatusSpinner.SpinnerState.Error;
return;
retries--;
try
{
var sptReleaseInfoFile =
await DownloadCacheHelper.GetOrDownloadFileAsync("release.json", DownloadCacheHelper.ReleaseMirrorUrl,
progress, DownloadCacheHelper.SuggestedTtl);
if (sptReleaseInfoFile == null)
{
InstallButtonText = "Could not get SPT release metadata";
InstallButtonCheckState = StatusSpinner.SpinnerState.Error;
return;
}
sptReleaseInfo =
JsonConvert.DeserializeObject<ReleaseInfo>(File.ReadAllText(sptReleaseInfoFile.FullName));
}
catch (Exception)
{
DownloadCacheHelper.ClearMetadataCache();
}
}
var SPTReleaseInfo =
JsonConvert.DeserializeObject<ReleaseInfo>(File.ReadAllText(SPTReleaseInfoFile.FullName));
if (SPTReleaseInfo == null)
if (sptReleaseInfo == null)
{
InstallButtonText = "Could not parse latest SPT release";
InstallButtonCheckState = StatusSpinner.SpinnerState.Error;
return;
}
InstallButtonText = $"Start Install: SPT v{SPTReleaseInfo.SPTVersion}";
InstallButtonText = $"Start Install: SPT v{sptReleaseInfo.SPTVersion}";
InstallButtonCheckState = StatusSpinner.SpinnerState.OK;
AllowDetailsButton = true;