diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index da21e53..bc6e36d 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -58,6 +58,7 @@ namespace Bloxstrap private double _taskbarProgressIncrement; private double _taskbarProgressMaximum; private long _totalDownloadedBytes = 0; + private bool _packageExtractionSuccess = true; private bool _mustUpgrade => String.IsNullOrEmpty(AppData.State.VersionGuid) || !File.Exists(AppData.ExecutablePath); private bool _noConnection = false; @@ -78,7 +79,15 @@ namespace Bloxstrap // https://github.com/icsharpcode/SharpZipLib/blob/master/src/ICSharpCode.SharpZipLib/Zip/FastZip.cs/#L669-L680 // exceptions don't get thrown if we define events without actually binding to the failure events. probably a bug. ¯\_(ツ)_/¯ - _fastZipEvents.FileFailure += (_, e) => throw e.Exception; + _fastZipEvents.FileFailure += (_, e) => + { + // only give a pass to font files (no idea whats wrong with them) + if (!e.Name.EndsWith(".ttf")) + throw e.Exception; + + App.Logger.WriteLine("FastZipEvents::OnFileFailure", $"Failed to extract {e.Name}"); + _packageExtractionSuccess = false; + }; _fastZipEvents.DirectoryFailure += (_, e) => throw e.Exception; _fastZipEvents.ProcessFile += (_, e) => e.ContinueRunning = !_cancelTokenSource.IsCancellationRequested; @@ -223,6 +232,8 @@ namespace Bloxstrap } } + bool allModificationsApplied = true; + if (!_noConnection) { if (AppData.State.VersionGuid != _latestVersionGuid || _mustUpgrade) @@ -233,7 +244,7 @@ namespace Bloxstrap // we require deployment details for applying modifications for a worst case scenario, // where we'd need to restore files from a package that isn't present on disk and needs to be redownloaded - await ApplyModifications(); + allModificationsApplied = await ApplyModifications(); } // check registry entries for every launch, just in case the stock bootstrapper changes it back @@ -247,7 +258,15 @@ namespace Bloxstrap await mutex.ReleaseAsync(); if (!App.LaunchSettings.NoLaunchFlag.Active && !_cancelTokenSource.IsCancellationRequested) + { + // show some balloon tips + if (!_packageExtractionSuccess) + Frontend.ShowBalloonTip(Strings.Bootstrapper_ExtractionFailed_Title, Strings.Bootstrapper_ExtractionFailed_Message, ToolTipIcon.Warning); + else if (!allModificationsApplied) + Frontend.ShowBalloonTip(Strings.Bootstrapper_ModificationsFailed_Title, Strings.Bootstrapper_ModificationsFailed_Message, ToolTipIcon.Warning); + StartRoblox(); + } await mutex.ReleaseAsync(); @@ -921,10 +940,12 @@ namespace Bloxstrap _isInstalling = false; } - private async Task ApplyModifications() + private async Task ApplyModifications() { const string LOG_IDENT = "Bootstrapper::ApplyModifications"; + bool success = true; + SetStatus(Strings.Bootstrapper_Status_ApplyingModifications); // handle file mods @@ -1000,7 +1021,7 @@ namespace Bloxstrap foreach (string file in Directory.GetFiles(Paths.Modifications, "*.*", SearchOption.AllDirectories)) { if (_cancelTokenSource.IsCancellationRequested) - return; + return true; // get relative directory path string relativeFile = file.Substring(Paths.Modifications.Length + 1); @@ -1032,10 +1053,18 @@ namespace Bloxstrap Directory.CreateDirectory(Path.GetDirectoryName(fileVersionFolder)!); Filesystem.AssertReadOnly(fileVersionFolder); - File.Copy(fileModFolder, fileVersionFolder, true); - Filesystem.AssertReadOnly(fileVersionFolder); - - App.Logger.WriteLine(LOG_IDENT, $"{relativeFile} has been copied to the version folder"); + try + { + File.Copy(fileModFolder, fileVersionFolder, true); + Filesystem.AssertReadOnly(fileVersionFolder); + App.Logger.WriteLine(LOG_IDENT, $"{relativeFile} has been copied to the version folder"); + } + catch (Exception ex) + { + App.Logger.WriteLine(LOG_IDENT, $"Failed to apply modification ({relativeFile})"); + App.Logger.WriteException(LOG_IDENT, ex); + success = false; + } } // the manifest is primarily here to keep track of what files have been @@ -1082,7 +1111,7 @@ namespace Bloxstrap if (package is not null) { if (_cancelTokenSource.IsCancellationRequested) - return; + return true; await DownloadPackage(package); ExtractPackage(package, entry.Value); @@ -1093,6 +1122,11 @@ namespace Bloxstrap App.State.Save(); App.Logger.WriteLine(LOG_IDENT, $"Finished checking file mods"); + + if (!success) + App.Logger.WriteLine(LOG_IDENT, "Failed to apply all modifications"); + + return success; } private async Task DownloadPackage(Package package) diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index d1277a1..e80603d 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -178,6 +178,24 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Some content may be missing. Force a Roblox reinstallation in settings to fix this.. + /// + public static string Bootstrapper_ExtractionFailed_Message { + get { + return ResourceManager.GetString("Bootstrapper.ExtractionFailed.Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to extract all files. + /// + public static string Bootstrapper_ExtractionFailed_Title { + get { + return ResourceManager.GetString("Bootstrapper.ExtractionFailed.Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bloxstrap tried to upgrade Roblox but can't because Roblox's files are still in use. /// @@ -207,6 +225,24 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Not all modifications will be present in the current launch.. + /// + public static string Bootstrapper_ModificationsFailed_Message { + get { + return ResourceManager.GetString("Bootstrapper.ModificationsFailed.Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to apply all modifications. + /// + public static string Bootstrapper_ModificationsFailed_Title { + get { + return ResourceManager.GetString("Bootstrapper.ModificationsFailed.Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bloxstrap does not have enough disk space to download and install Roblox. Please free up some disk space and try again.. /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index 4f3dadb..9048916 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -1270,4 +1270,16 @@ Please close any applications that may be using Roblox's files, and relaunch. Roblox no longer supports Windows 7 or 8.1. To continue playing Roblox, please upgrade to Windows 10 or newer. + + Failed to extract all files + + + Some content may be missing. Force a Roblox reinstallation in settings to fix this. + + + Failed to apply all modifications + + + Not all modifications will be present in the current launch. + \ No newline at end of file diff --git a/Bloxstrap/UI/Frontend.cs b/Bloxstrap/UI/Frontend.cs index cb069fc..d195906 100644 --- a/Bloxstrap/UI/Frontend.cs +++ b/Bloxstrap/UI/Frontend.cs @@ -83,5 +83,17 @@ namespace Bloxstrap.UI return messagebox.Result; })); } + + public static void ShowBalloonTip(string title, string message, System.Windows.Forms.ToolTipIcon icon = System.Windows.Forms.ToolTipIcon.None, int timeout = 5) + { + var notifyIcon = new System.Windows.Forms.NotifyIcon + { + Icon = Properties.Resources.IconBloxstrap, + Text = App.ProjectName, + Visible = true + }; + + notifyIcon.ShowBalloonTip(timeout, title, message, icon); + } } }