diff --git a/Source/AudibleUtilities/AudibleApiStorage.cs b/Source/AudibleUtilities/AudibleApiStorage.cs index ff96b812..2fb43e8b 100644 --- a/Source/AudibleUtilities/AudibleApiStorage.cs +++ b/Source/AudibleUtilities/AudibleApiStorage.cs @@ -5,19 +5,58 @@ using Newtonsoft.Json; namespace AudibleUtilities { + public class AccountSettingsLoadErrorEventArgs : ErrorEventArgs + { + /// + /// Create a new, empty file if true, otherwise throw + /// + public bool Handled { get; set; } + /// + /// The file path of the AccountsSettings.json file + /// + public string SettingsFilePath { get; } + + public AccountSettingsLoadErrorEventArgs(string path, Exception exception) + : base(exception) + { + SettingsFilePath = path; + } + } + public static class AudibleApiStorage { public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json"); + public static event EventHandler LoadError; + public static void EnsureAccountsSettingsFileExists() { // saves. BEWARE: this will overwrite an existing file if (!File.Exists(AccountsSettingsFile)) - _ = new AccountsSettingsPersister(new AccountsSettings(), AccountsSettingsFile); + { + //Save the JSON file manually so that AccountsSettingsPersister.Saving and AccountsSettingsPersister.Saved + //are not fired. There's no need to fire those events on an empty AccountsSettings file. + var accountSerializerSettings = AudibleApi.Authorization.Identity.GetJsonSerializerSettings(); + File.WriteAllText(AccountsSettingsFile, JsonConvert.SerializeObject(new AccountsSettings(), Formatting.Indented, accountSerializerSettings)); + } } /// If you use this, be a good citizen and DISPOSE of it - public static AccountsSettingsPersister GetAccountsSettingsPersister() => new AccountsSettingsPersister(AccountsSettingsFile); + public static AccountsSettingsPersister GetAccountsSettingsPersister() + { + try + { + return new AccountsSettingsPersister(AccountsSettingsFile); + } + catch (Exception ex) + { + var args = new AccountSettingsLoadErrorEventArgs(AccountsSettingsFile, ex); + LoadError?.Invoke(null, args); + if (args.Handled) + return GetAccountsSettingsPersister(); + throw; + } + } public static string GetIdentityTokensJsonPath(this Account account) => GetIdentityTokensJsonPath(account.AccountId, account.Locale?.Name); diff --git a/Source/FileManager/FileUtility.cs b/Source/FileManager/FileUtility.cs index e6d9074c..137b817f 100644 --- a/Source/FileManager/FileUtility.cs +++ b/Source/FileManager/FileUtility.cs @@ -157,7 +157,7 @@ namespace FileManager /// File extension override to use for /// If false and exists, append " (n)" to filename and try again. /// The actual destination filename - public static string SaferMoveToValidPath( + public static LongPath SaferMoveToValidPath( LongPath source, LongPath destination, ReplacementCharacters replacements, diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.axaml.cs index a70755dc..61eb14f2 100644 --- a/Source/LibationAvalonia/Views/MainWindow.axaml.cs +++ b/Source/LibationAvalonia/Views/MainWindow.axaml.cs @@ -1,6 +1,9 @@ +using AudibleUtilities; using Avalonia.Input; using Avalonia.ReactiveUI; +using Avalonia.Threading; using DataLayer; +using FileManager; using LibationAvalonia.ViewModels; using LibationFileManager; using LibationUiBase.GridView; @@ -18,6 +21,7 @@ namespace LibationAvalonia.Views { DataContext = new MainVM(this); + AudibleApiStorage.LoadError += AudibleApiStorage_LoadError; InitializeComponent(); Configure_Upgrade(); @@ -34,6 +38,62 @@ namespace LibationAvalonia.Views } } + private void AudibleApiStorage_LoadError(object sender, AccountSettingsLoadErrorEventArgs e) + { + try + { + //Backup AccountSettings.json and create a new, empty file. + var backupFile = + FileUtility.SaferMoveToValidPath( + e.SettingsFilePath, + e.SettingsFilePath, + ReplacementCharacters.Barebones, + "bak"); + AudibleApiStorage.EnsureAccountsSettingsFileExists(); + e.Handled = true; + + showAccountSettingsRecoveredMessage(backupFile); + } + catch + { + showAccountSettingsUnrecoveredMessage(); + } + + async void showAccountSettingsRecoveredMessage(LongPath backupFile) + => await MessageBox.Show(this, $""" + Libation could not load your account settings, so it had created a new, empty account settings file. + + You will need to re-add you Audible account(s) before scanning or downloading. + + The old account settings file has been archived at '{backupFile.PathWithoutPrefix}' + + {e.GetException().ToString()} + """, + "Error Loading Account Settings", + MessageBoxButtons.OK, + MessageBoxIcon.Warning); + + void showAccountSettingsUnrecoveredMessage() + { + var messageBoxWindow = MessageBox.Show(this, $""" + Libation could not load your account settings. The file may be corrupted, but Libation is unable to delete it. + + Please move or delete the account settings file '{e.SettingsFilePath}' + + {e.GetException().ToString()} + """, + "Error Loading Account Settings", + MessageBoxButtons.OK); + + //Force the message box to show synchronously because we're not handling the exception + //and libation will crash after the event handler returns + var frame = new DispatcherFrame(); + _ = messageBoxWindow.ContinueWith(static (_, s) => ((DispatcherFrame)s).Continue = false, frame); + Dispatcher.UIThread.PushFrame(frame); + messageBoxWindow.GetAwaiter().GetResult(); + } + } + private async void MainWindow_Opened(object sender, EventArgs e) { if (Configuration.Instance.FirstLaunch) diff --git a/Source/LibationWinForms/Form1._NonUI.cs b/Source/LibationWinForms/Form1._NonUI.cs index 21ddc9f3..3c91142d 100644 --- a/Source/LibationWinForms/Form1._NonUI.cs +++ b/Source/LibationWinForms/Form1._NonUI.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Windows.Forms; using ApplicationServices; +using AudibleUtilities; using Dinah.Core.WindowsDesktop.Drawing; +using FileManager; using LibationFileManager; using LibationUiBase; @@ -13,9 +11,11 @@ namespace LibationWinForms public partial class Form1 { private void Configure_NonUI() - { - // init default/placeholder cover art - var format = System.Drawing.Imaging.ImageFormat.Jpeg; + { + AudibleApiStorage.LoadError += AudibleApiStorage_LoadError; + + // init default/placeholder cover art + var format = System.Drawing.Imaging.ImageFormat.Jpeg; PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format)); PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format)); PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format)); @@ -35,6 +35,55 @@ namespace LibationWinForms if ((libraryStats.booksNoProgress + libraryStats.pdfsNotDownloaded) > 0) beginBookBackupsToolStripMenuItem_Click(); }; - } - } + } + + private void AudibleApiStorage_LoadError(object sender, AccountSettingsLoadErrorEventArgs e) + { + try + { + //Backup AccountSettings.json and create a new, empty file. + var backupFile = + FileUtility.SaferMoveToValidPath( + e.SettingsFilePath, + e.SettingsFilePath, + ReplacementCharacters.Barebones, + "bak"); + + AudibleApiStorage.EnsureAccountsSettingsFileExists(); + e.Handled = true; + + showAccountSettingsRecoveredMessage(backupFile); + } + catch + { + showAccountSettingsUnrecoveredMessage(); + } + + void showAccountSettingsRecoveredMessage(LongPath backupFile) + => MessageBox.Show(this, $""" + Libation could not load your account settings, so it had created a new, empty account settings file. + + You will need to re-add you Audible account(s) before scanning or downloading. + + The old account settings file has been archived at '{backupFile.PathWithoutPrefix}' + + {e.GetException().ToString()} + """, + "Error Loading Account Settings", + MessageBoxButtons.OK, + MessageBoxIcon.Warning); + + void showAccountSettingsUnrecoveredMessage() + => MessageBox.Show(this, $""" + Libation could not load your account settings. The file may be corrupted, but Libation is unable to delete it. + + Please move or delete the account settings file '{e.SettingsFilePath}' + + {e.GetException().ToString()} + """, + "Error Loading Account Settings", + MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } }