SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in cached package handling

Browse Source
This commit is contained in:
pizzaboxer 2024-09-07 23:11:39 +01:00
parent 99ff002121
commit 1bdf761d07
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Bloxstrap/Bootstrapper.cs
View File

@ -34,9 +34,9 @@ namespace Bloxstrap
private readonly CancellationTokenSource _cancelTokenSource = new(); private readonly CancellationTokenSource _cancelTokenSource = new();
private IAppData AppData; private readonly IAppData AppData;
private bool FreshInstall => String.IsNullOrEmpty(AppData.State.VersionGuid); private bool FreshInstall => !File.Exists(AppData.ExecutablePath) || String.IsNullOrEmpty(AppData.State.VersionGuid);
private string _launchCommandLine = App.LaunchSettings.RobloxLaunchArgs; private string _launchCommandLine = App.LaunchSettings.RobloxLaunchArgs;
private LaunchMode _launchMode = App.LaunchSettings.RobloxLaunchMode; private LaunchMode _launchMode = App.LaunchSettings.RobloxLaunchMode;
@ -559,10 +559,14 @@ namespace Bloxstrap
var lockFile = new FileInfo(AppData.LockFilePath); var lockFile = new FileInfo(AppData.LockFilePath);
lockFile.Create().Dispose(); lockFile.Create().Dispose();
var cachedPackageHashes = Directory.GetFiles(Paths.Downloads).Select(x => Path.GetFileName(x));
// package manifest states packed size and uncompressed size in exact bytes // package manifest states packed size and uncompressed size in exact bytes
int totalSizeRequired = 0;
// packed size only matters if we don't already have the package cached on disk // packed size only matters if we don't already have the package cached on disk
var cachedPackages = Directory.GetFiles(Paths.Downloads); totalSizeRequired += _versionPackageManifest.Where(x => !cachedPackageHashes.Contains(x.Signature)).Sum(x => x.PackedSize);
int totalSizeRequired = _versionPackageManifest.Where(x => !cachedPackages.Contains(x.Signature)).Sum(x => x.PackedSize) + _versionPackageManifest.Sum(x => x.Size); totalSizeRequired += _versionPackageManifest.Sum(x => x.Size);
if (Filesystem.GetFreeDiskSpace(Paths.Base) < totalSizeRequired) if (Filesystem.GetFreeDiskSpace(Paths.Base) < totalSizeRequired)
{ {
@ -682,19 +686,19 @@ namespace Bloxstrap
allPackageHashes.AddRange(App.State.Prop.Player.PackageHashes.Values); allPackageHashes.AddRange(App.State.Prop.Player.PackageHashes.Values);
allPackageHashes.AddRange(App.State.Prop.Studio.PackageHashes.Values); allPackageHashes.AddRange(App.State.Prop.Studio.PackageHashes.Values);
foreach (string filename in cachedPackages) foreach (string hash in cachedPackageHashes)
{ {
if (!allPackageHashes.Contains(filename)) if (!allPackageHashes.Contains(hash))
{ {
App.Logger.WriteLine(LOG_IDENT, $"Deleting unused package {filename}"); App.Logger.WriteLine(LOG_IDENT, $"Deleting unused package {hash}");
try try
{ {
File.Delete(filename); File.Delete(Path.Combine(Paths.Downloads, hash));
} }
catch (Exception ex) catch (Exception ex)
{ {
App.Logger.WriteLine(LOG_IDENT, $"Failed to delete {filename}!"); App.Logger.WriteLine(LOG_IDENT, $"Failed to delete {hash}!");
App.Logger.WriteException(LOG_IDENT, ex); App.Logger.WriteException(LOG_IDENT, ex);
} }
} }
@ -702,7 +706,7 @@ namespace Bloxstrap
App.Logger.WriteLine(LOG_IDENT, "Registering approximate program size..."); App.Logger.WriteLine(LOG_IDENT, "Registering approximate program size...");
int distributionSize = _versionPackageManifest.Sum(x => x.Size + x.PackedSize) / 1000; int distributionSize = _versionPackageManifest.Sum(x => x.Size + x.PackedSize) / 1024;
AppData.State.Size = distributionSize; AppData.State.Size = distributionSize;