incr ver

Fix MessageBox launch error on macOS

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -26,7 +26,17 @@ namespace AaxDecrypter
 		protected string OutputDirectory { get; }
 		public IDownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => NfsPersister.NetworkFileStream;
-		protected virtual long InputFilePosition => InputFileStream.Position;
+		protected virtual long InputFilePosition
+		{
+			get
+			{
+				//Use try/catch instread of checking CanRead to avoid
+				//a race with the background download completing
+				//between the check and the Position call.
+				try { return InputFileStream.Position; }
+				catch { return InputFileStream.Length; }
+			}
+		}
 		private bool downloadFinished;
 
 		private NetworkFileStreamPersister? m_nfsPersister;

Source/AaxDecrypter/NetworkFileStream.cs

@@ -209,6 +209,12 @@ namespace AaxDecrypter
 					}
 				}
 			}
+			catch (Exception ex)
+			{
+				//Don't throw from DownloadTask.
+				//This task gets awaited in Dispose() and we don't want to have an unhandled exception there.
+				Serilog.Log.Error(ex, "An error was encountered during the download process.");
+			}
 			finally
 			{
 				_writeFile.Dispose();

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
-    <Version>12.7.3.1</Version>
+    <Version>12.7.5.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -90,6 +90,7 @@ namespace AppScaffolding
 			{
 				config.LoadPersistentSettings(config.LibationFiles.SettingsFilePath);
 			}
+			DeleteOpenSqliteFiles(config);
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
 
 			//
@@ -102,6 +103,19 @@ namespace AppScaffolding
 			Migrations.migrate_to_v12_0_1(config);
 		}
 
+		/// <summary>
+		/// Delete shared memory and write-ahead log SQLite database files which may prevent access to the database.
+		/// </summary>
+		private static void DeleteOpenSqliteFiles(Configuration config)
+		{
+			var walFile = SqliteStorage.DatabasePath + "-wal";
+			var shmFile = SqliteStorage.DatabasePath + "-shm";
+			if (File.Exists(walFile))
+				FileManager.FileUtility.SaferDelete(walFile);
+			if (File.Exists(shmFile))
+				FileManager.FileUtility.SaferDelete(shmFile);
+		}
+
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
 		public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
 		{

Source/ApplicationServices/LibraryCommands.cs

@@ -586,7 +586,7 @@ namespace ApplicationServices
 
         // below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 
-        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int booksUnavailable, int pdfsDownloaded, int pdfsNotDownloaded, int pdfsUnavailable)
+        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int booksUnavailable, int pdfsDownloaded, int pdfsNotDownloaded, int pdfsUnavailable, IEnumerable<LibraryBook> LibraryBooks)
         {
             public int PendingBooks => booksNoProgress + booksDownloadedOnly;
             public bool HasPendingBooks => PendingBooks > 0;
@@ -655,7 +655,7 @@ namespace ApplicationServices
 
 			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = pdfResults.Count, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable });
 
-            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, booksUnavailable, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable);
+            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, booksUnavailable, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable, libraryBooks);
         }
     }
 }

Source/DataLayer.Sqlite/SqliteContextFactory.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Design;
 
-namespace DataLayer.Postgres
+namespace DataLayer.Sqlite
 {
     public class SqliteContextFactory : IDesignTimeDbContextFactory<LibationContext>
     {

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -73,8 +73,8 @@ namespace LibationAvalonia.Dialogs
 			}
 		}
 
-		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> SaveAndClose();
+		public async void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> await SaveAndCloseAsync();
 		public class liberatedComboBoxItem
 		{
 			public LiberatedStatus Status { get; set; }

Source/LibationAvalonia/MessageBox.cs

@@ -11,10 +11,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Avalonia.Platform;
 
+#nullable enable
 namespace LibationAvalonia
 {
-
 	public class MessageBox
 	{
 		public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
@@ -27,15 +28,15 @@ namespace LibationAvalonia
 			=> ShowCoreAsync(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 		public static Task<DialogResult> Show(string text)
 			=> ShowCoreAsync(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+		public static Task<DialogResult> Show(Window? owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 			=> ShowCoreAsync(owner, text, caption, buttons, icon, defaultButton, saveAndRestorePosition);
-		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+		public static Task<DialogResult> Show(Window? owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
 			=> ShowCoreAsync(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons)
+		public static Task<DialogResult> Show(Window? owner, string text, string caption, MessageBoxButtons buttons)
 			=> ShowCoreAsync(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-		public static Task<DialogResult> Show(Window owner, string text, string caption)
+		public static Task<DialogResult> Show(Window? owner, string text, string caption)
 			=> ShowCoreAsync(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-		public static Task<DialogResult> Show(Window owner, string text)
+		public static Task<DialogResult> Show(Window? owner, string text)
 			=> ShowCoreAsync(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
 		public static async Task VerboseLoggingWarning_ShowIfTrue()
@@ -58,7 +59,7 @@ namespace LibationAvalonia
 		/// <summary>
 		/// Note: the format field should use {0} and NOT use the `$` string interpolation. Formatting is done inside this method.
 		/// </summary>
-		public static async Task<DialogResult> ShowConfirmationDialog(Window owner, IEnumerable<LibraryBook> libraryBooks, string format, string title, MessageBoxDefaultButton defaultButton = MessageBoxDefaultButton.Button1)
+		public static async Task<DialogResult> ShowConfirmationDialog(Window? owner, IEnumerable<LibraryBook> libraryBooks, string format, string title, MessageBoxDefaultButton defaultButton = MessageBoxDefaultButton.Button1)
 		{
 			if (libraryBooks is null || !libraryBooks.Any())
 				return DialogResult.Cancel;
@@ -88,7 +89,7 @@ namespace LibationAvalonia
 		/// <param name="text">The text to display in the message box.</param>
 		/// <param name="caption">The text to display in the title bar of the message box.</param>
 		/// <param name="exception">Exception to log.</param>
-		public static async Task ShowAdminAlert(Window owner, string text, string caption, Exception exception)
+		public static async Task ShowAdminAlert(Window? owner, string text, string caption, Exception exception)
 		{
 			// for development and debugging, show me what broke!
 			if (System.Diagnostics.Debugger.IsAttached)
@@ -106,7 +107,7 @@ namespace LibationAvalonia
 			await DisplayWindow(form, owner);
 		}
 
-		private static async Task<DialogResult> ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+		private static async Task<DialogResult> ShowCoreAsync(Window? owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 		=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			owner = owner?.IsLoaded is true ? owner : null;
@@ -114,10 +115,8 @@ namespace LibationAvalonia
 			return await DisplayWindow(dialog, owner);
 		});
 
-		private static MessageBoxWindow CreateMessageBox(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+		private static MessageBoxWindow CreateMessageBox(Window? owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 		{
-			owner ??= (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).MainWindow;
-
 			var dialog = new MessageBoxWindow(saveAndRestorePosition);
 
 			var vm = new MessageBoxViewModel(message, caption, buttons, icon, defaultButton);
@@ -125,18 +124,12 @@ namespace LibationAvalonia
 			dialog.ControlToFocusOnShow = dialog.FindControl<Control>(defaultButton.ToString());
 			dialog.CanResize = false;
 			dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-			var tbx = dialog.FindControl<TextBlock>("messageTextBlock");
+			var tbx = dialog.messageTextBlock;
 
 			tbx.MinWidth = vm.TextBlockMinWidth;
 			tbx.Text = message;
 
-			var thisScreen = owner.Screens?.ScreenFromVisual(owner);
-
-			var maxSize
-				= thisScreen is null ? owner.ClientSize
-				: new Size(0.20 * thisScreen.Bounds.Width, 0.9 * thisScreen.Bounds.Height - 55);
-
-			var desiredMax = new Size(maxSize.Width, maxSize.Height);
+			var desiredMax = GetMaxMessageBoxSizeFromOwner(owner);
 
 			tbx.Measure(desiredMax);
 
@@ -152,13 +145,34 @@ namespace LibationAvalonia
 			dialog.Width = dialog.MinWidth;
 			return dialog;
 		}
-		private static async Task<DialogResult> DisplayWindow(DialogWindow toDisplay, Window owner)
+
+		private static Size GetMaxMessageBoxSizeFromOwner(TopLevel? owner)
+		{
+			if (owner is null && App.Current is IClassicDesktopStyleApplicationLifetime lt)
+			{
+				//The Windows enumeration will only contain active (non-disposed) windows.
+				//If none are available, the last disposed window may still be in MainWindow
+				//Just be careful what you use it for. It will still have Screens, but
+				//ScreenFromTopLevel can't be used on macOS.
+				owner = lt.Windows.FirstOrDefault() ?? lt.MainWindow;
+			}
+			if (owner?.Screens is Screens screens)
+			{
+				var mainScreen = owner?.PlatformImpl is null ? screens.Primary : screens.ScreenFromTopLevel(owner);
+				if (mainScreen is not null)
+					return new Size(0.20 * mainScreen.Bounds.Width, 0.9 * mainScreen.Bounds.Height - 55);
+			}
+
+			return owner?.ClientSize ?? new Size(800, 600);
+		}
+
+		private static async Task<DialogResult> DisplayWindow(DialogWindow toDisplay, Window? owner)
 		{
 			if (owner is null)
 			{
-				if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+				if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 				{
-					if (desktop.MainWindow.IsLoaded)
+					if (desktop.MainWindow?.IsLoaded is true)
 						return await toDisplay.ShowDialog<DialogResult>(desktop.MainWindow);
 					else
 					{
@@ -185,7 +199,6 @@ namespace LibationAvalonia
 					window.Close();
 					return result;
 				}
-
 			}
 			else
 			{

Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs

@@ -1,5 +1,4 @@
 using ApplicationServices;
-using Avalonia.Threading;
 using DataLayer;
 using LibationFileManager;
 using ReactiveUI;
@@ -11,7 +10,7 @@ namespace LibationAvalonia.ViewModels
 {
 	partial class MainVM
 	{
-		private Task<LibraryCommands.LibraryStats>? updateCountsTask;
+		private System.ComponentModel.BackgroundWorker updateCountsBw = new();
 
 		/// <summary> The "Begin Book and PDF Backup" menu item header text </summary>
 		public string BookBackupsToolStripText { get; private set; } = "Begin Book and PDF Backups: 0";
@@ -46,20 +45,40 @@ namespace LibationAvalonia.ViewModels
 			//Pass null to the setup count to get the whole library.
 			LibraryCommands.BookUserDefinedItemCommitted += async (_, _)
 				=> await SetBackupCountsAsync(null);
+
+			updateCountsBw.DoWork += UpdateCountsBw_DoWork;
+			updateCountsBw.RunWorkerCompleted += UpdateCountsBw_Completed; ;
 		}
 
+
+		private bool runBackupCountsAgain;
+
 		public async Task SetBackupCountsAsync(IEnumerable<LibraryBook>? libraryBooks)
 		{
-			if (updateCountsTask?.IsCompleted ?? true)
-			{
-				updateCountsTask = Task.Run(() => LibraryCommands.GetCounts(libraryBooks));
-				var stats = await updateCountsTask;
-				await Dispatcher.UIThread.InvokeAsync(() => LibraryStats = stats);
+			runBackupCountsAgain = true;
 
-				if (Configuration.Instance.AutoDownloadEpisodes
-					&& stats.PendingBooks + stats.pdfsNotDownloaded > 0)
-					await Dispatcher.UIThread.InvokeAsync(BackupAllBooks);
+			if (!updateCountsBw.IsBusy)
+				updateCountsBw.RunWorkerAsync(libraryBooks);
+		}
+
+		private void UpdateCountsBw_DoWork(object? sender, System.ComponentModel.DoWorkEventArgs e)
+		{
+			while (runBackupCountsAgain)
+			{
+				runBackupCountsAgain = false;
+				e.Result = LibraryCommands.GetCounts(e.Argument as IEnumerable<LibraryBook>);
 			}
 		}
+
+		private void UpdateCountsBw_Completed(object? sender, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			if (e.Result is  not LibraryCommands.LibraryStats stats)
+				return;
+			LibraryStats = stats;
+
+			if (Configuration.Instance.AutoDownloadEpisodes
+				&& stats.PendingBooks + stats.pdfsNotDownloaded > 0)
+				BackupAllBooks(stats.LibraryBooks);
+		}
 	}
 }

Source/LibationAvalonia/ViewModels/MainVM.Liberate.cs

@@ -7,6 +7,7 @@ using DataLayer;
 using LibationUiBase.Forms;
 using LibationUiBase;
 using System.Collections.Generic;
+using Avalonia.Threading;
 
 #nullable enable
 namespace LibationAvalonia.ViewModels
@@ -15,14 +16,24 @@ namespace LibationAvalonia.ViewModels
 	{
 		public void Configure_Liberate() { }
 
+		/// <summary> This gets called by the "Begin Book and PDF Backups" menu item. </summary>
 		public async Task BackupAllBooks()
+		{
+			var books = await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking());
+			BackupAllBooks(books);
+		}
+
+		private void BackupAllBooks(IEnumerable<LibraryBook> books)
 		{
 			try
 			{
-				var unliberated = await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking().UnLiberated().ToArray());
+				var unliberated = books.UnLiberated().ToArray();
 
-				if (ProcessQueue.QueueDownloadDecrypt(unliberated))
-					setQueueCollapseState(false);
+				Dispatcher.UIThread.Invoke(() =>
+				{
+					if (ProcessQueue.QueueDownloadDecrypt(unliberated))
+						setQueueCollapseState(false);
+				});
 			}
 			catch (Exception ex)
 			{
@@ -30,9 +41,11 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
+		/// <summary> This gets called by the "Begin PDF Only Backups" menu item. </summary>
 		public async Task BackupAllPdfs()
 		{
-			if (ProcessQueue.QueueDownloadPdf(await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking())))
+			var books = await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking());
+			if (ProcessQueue.QueueDownloadPdf(books))
 				setQueueCollapseState(false);
 		}
 

Source/LibationFileManager/SqliteStorage.cs

@@ -5,7 +5,7 @@ namespace LibationFileManager
 	public static class SqliteStorage
 	{
 		// not customizable. don't move to config
-		private static string databasePath => Path.Combine(Configuration.Instance.LibationFiles.Location, "LibationContext.db");
-		public static string ConnectionString => $"Data Source={databasePath};Foreign Keys=False;Pooling=False;";
+		public static string DatabasePath => Path.Combine(Configuration.Instance.LibationFiles.Location, "LibationContext.db");
+		public static string ConnectionString => $"Data Source={DatabasePath};Foreign Keys=False;Pooling=False;";
 	}
 }

Source/LibationWinForms/Form1.Liberate.cs

@@ -1,6 +1,7 @@
-using DataLayer;
-using LibationUiBase;
+using ApplicationServices;
+using DataLayer;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -13,12 +14,21 @@ namespace LibationWinForms
 
 		//GetLibrary_Flat_NoTracking() may take a long time on a hugh library. so run in new thread 
 		private async void beginBookBackupsToolStripMenuItem_Click(object _ = null, EventArgs __ = null)
+		{
+			var library = await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking());
+			BackupAllBooks(library);
+		}
+
+		private void BackupAllBooks(IEnumerable<LibraryBook> books)
 		{
 			try
 			{
-				var unliberated = await Task.Run(() => ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking().UnLiberated().ToArray());
-				if (processBookQueue1.ViewModel.QueueDownloadDecrypt(unliberated))
-					SetQueueCollapseState(false);
+				var unliberated = books.UnLiberated().ToArray();
+				Invoke(() =>
+				{
+					if (processBookQueue1.ViewModel.QueueDownloadDecrypt(unliberated))
+						SetQueueCollapseState(false);
+				});
 			}
 			catch (Exception ex)
 			{

Source/LibationWinForms/Form1._NonUI.cs

@@ -28,13 +28,11 @@ namespace LibationWinForms
             // winforms only. this should NOT be allowed in cli
             updateCountsBw.RunWorkerCompleted += (object sender, System.ComponentModel.RunWorkerCompletedEventArgs e) =>
             {
-                if (!Configuration.Instance.AutoDownloadEpisodes)
+                if (!Configuration.Instance.AutoDownloadEpisodes || e.Result is not LibraryCommands.LibraryStats libraryStats)
                     return;
 
-                var libraryStats = e.Result as LibraryCommands.LibraryStats;
-
                 if ((libraryStats.PendingBooks + libraryStats.pdfsNotDownloaded) > 0)
-                    Invoke(() => beginBookBackupsToolStripMenuItem_Click(null, System.EventArgs.Empty));
+					BackupAllBooks(libraryStats.LibraryBooks);
             };
 		}