incr ver

remove unofficial linux instructions

Documentation/Advanced.md

@@ -8,7 +8,6 @@
 # Advanced: Table of Contents
 
 - [Files and folders](#files-and-folders)
-- [Linux and Mac (unofficial)](#linux-and-mac)
 - [Settings](#settings)
 - [Custom File Naming](#custom-file-naming)
 - [Command Line Interface](#command-line-interface)
@@ -25,10 +24,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 * The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
 
-### Linux and Mac
-
-Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
-
 ### Settings
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.

Documentation/GettingStarted.md

@@ -22,7 +22,12 @@
 
 ### Installation
 
-To install Libation, extract the zip file to a folder, for example `C:\Libation`, and then run Libation.exe from that folder to begin the configuration process and configure your account(s).
+* Windows
+
+Extract the zip file to a folder and then run `Libation.exe` from inside of that folder.
+
+* [Ubuntu Linux (beta)](InstallOnLinux.md)
+* [MacOS (beta)](InstallOnMac.md)
 
 ### Create Accounts
 

Documentation/InstallOnLinux.md

@@ -1,4 +1,11 @@
-# Run Libation on Ubuntu
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Run Libation on Ubuntu (Beta)
 This walkthrough should get you up and running with Libation on your Ubuntu machine.
 
 Some limitations of the linux release are:

Documentation/InstallOnMac.md

@@ -0,0 +1,24 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Run Libation on MacOS (Beta)
+This walkthrough should get you up and running with Libation on your Mac.
+
+## Install Libation
+
+- Download latest MacOS zip to downloads folder
+- Extract and rename folder to Libation
+- in terminal type cd and then drag your folder of libation to terminal so it looks like `cd/users/YourName/Downloads/Libation`
+- Type following commands
+
+```console
+chmod +x ./Libation
+sudo spctl --add --label "Libation" ./Libation
+./Libation
+```
+
+Report bugs to https://github.com/rmcrackan/Libation/issues

README.md

@@ -14,7 +14,6 @@
 - [Getting started](Documentation/GettingStarted.md)
     - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
     - [Installation](Documentation/GettingStarted.md#installation)
-    - [Installation on Ubuntu](Source/LibationAvalonia/README.md)
     - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
     - [Import your library](Documentation/GettingStarted.md#import-your-library)
     - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)
@@ -28,7 +27,6 @@
     - [Filters](Documentation/SearchingAndFiltering.md#filters)
 - [Advanced](Documentation/Advanced.md)
     - [Files and folders](Documentation/Advanced.md#files-and-folders)
-    - [Linux and Mac (unofficial)](Documentation/Advanced.md#linux-and-mac)
     - [Settings](Documentation/Advanced.md#settings)
     - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
@@ -55,7 +53,7 @@
 
 ### The bad
 
-* Windows only
+* Only fully supported in Windows. (Mac and Linux are in beta)
 * Large file size
 * Made by a programmer, not a designer so the goals are function rather than beauty. And it shows
 

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
+	  <PackageReference Include="AAXClean.Codecs" Version="0.2.14" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>8.4.3.1</Version>
+    <Version>8.4.6.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="2.0.0" />
+    <PackageReference Include="Octokit" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.6.3.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.4.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/DataLayer.csproj

@@ -10,14 +10,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
+    <PackageReference Include="Dinah.Core" Version="5.1.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/FileLiberator/DownloadPdf.cs

@@ -24,7 +24,7 @@ namespace FileLiberator
 		{
 			OnBegin(libraryBook);
 
-			try
+            try
 			{
 				var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
 				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
@@ -32,13 +32,22 @@ namespace FileLiberator
 
 				libraryBook.Book.UpdatePdfStatus(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
 
-				return result;
-			}
+                return result;
+            }
+			catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, "Error downloading PDF");
+
+                var result = new StatusHandler();
+                result.AddError($"Error downloading PDF. See log for details. Error summary: {ex.Message}");
+
+                return result;
+            }
 			finally
 			{
 				OnCompleted(libraryBook);
-			}
-		}
+            }
+        }
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{

Source/FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
+    <PackageReference Include="Dinah.Core" Version="5.1.1.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -63,11 +63,11 @@
 		<TrimmableAssembly Include="Avalonia.Themes.Default" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="0.10.17" />
-		<PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+		<PackageReference Include="Avalonia" Version="0.10.18" />
+		<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
 		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
 	</ItemGroup>
 	<ItemGroup>

Source/LibationAvalonia/Assets/LibationStyles.xaml

@@ -9,4 +9,8 @@
 		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
 		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
 	</Styles.Resources>
+	<Style Selector="TextBox[IsReadOnly=true]">
+		<Setter Property="Background" Value="LightGray" />
+		<Setter Property="CaretBrush" Value="#00000000" />
+	</Style>
 </Styles>

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml

@@ -66,7 +66,7 @@
 				<DataGridTextColumn
 					Width="2*"
 					Binding="{Binding AccountId, Mode=TwoWay}"
-					Header="Autible&#xa;email/login"/>
+					Header="Audible&#xa;email/login"/>
 
 				<DataGridTemplateColumn Width="Auto" Header="Locale">
 					<DataGridTemplateColumn.CellTemplate>

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -124,11 +124,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+    <PackageReference Include="Avalonia" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
 	  <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
 
@@ -145,7 +145,7 @@
   </ItemGroup>
 
 
-	<Target Name="SpicNSpan"  AfterTargets="Clean">
+	<Target Name="SpicNSpan" AfterTargets="Clean">
 		<!-- Remove obj folder -->
 		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
 		<!-- Remove bin folder -->

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -7,6 +7,7 @@ using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using DataLayer;
 using Dinah.Core;
+using Dinah.Core.ErrorHandling;
 using FileLiberator;
 using LibationFileManager;
 using ReactiveUI;
@@ -289,25 +290,36 @@ namespace LibationAvalonia.ViewModels
 			Logger.Info($"{((Processable)sender).Name} Step, Completed: {libraryBook.Book}");
 			UnlinkProcessable((Processable)sender);
 
-			if (Processes.Count > 0)
-			{
-				NextProcessable();
-				LinkProcessable(CurrentProcessable);
-				var result = await CurrentProcessable.ProcessSingleAsync(libraryBook, validate: true);
+            if (Processes.Count == 0)
+            {
+                Completed?.Invoke(this, EventArgs.Empty);
+				return;
+            }
 
-				if (result.HasErrors)
-				{
-					foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
-						Logger.Error(errorMessage);
+            NextProcessable();
+            LinkProcessable(CurrentProcessable);
 
-					Completed?.Invoke(this, EventArgs.Empty);
-				}
-			}
-			else
+			StatusHandler result;
+            try
 			{
-				Completed?.Invoke(this, EventArgs.Empty);
-			}
-		}
+				result = await CurrentProcessable.ProcessSingleAsync(libraryBook, validate: true);
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, $"{nameof(Processable_Completed)} error");
+
+                result = new StatusHandler();
+                result.AddError($"{nameof(Processable_Completed)} error. See log for details. Error summary: {ex.Message}");
+            }
+
+            if (result.HasErrors)
+            {
+                foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
+                    Logger.Error(errorMessage);
+
+                Completed?.Invoke(this, EventArgs.Empty);
+            }
+        }
 
 		#endregion
 

Source/LibationFileManager/InteropFactory.cs

@@ -80,53 +80,71 @@ namespace LibationFileManager
             return appName;
         }
 
-       /*
-        * Use this method to locate dependencies when they are not in Libation's program files directory.
-        * 
-        private static List<ProcessModule> LoadModuleList(string exeName)
-        {
-            var proc = new Process
-            {
-                StartInfo = new()
-                {
-                    FileName = exeName,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true,
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden,
-                    UseShellExecute = false
-                }
-            };
+        /*
+         * Use this method to locate dependencies when they are not in Libation's program files directory.
+         * 
+         private static List<ProcessModule> LoadModuleList(string exeName)
+         {
+             var proc = new Process
+             {
+                 StartInfo = new()
+                 {
+                     FileName = exeName,
+                     RedirectStandardInput = true,
+                     RedirectStandardOutput = true,
+                     CreateNoWindow = true,
+                     WindowStyle = ProcessWindowStyle.Hidden,
+                     UseShellExecute = false
+                 }
+             };
 
-            var waitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
+             var waitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
 
-            proc.OutputDataReceived += (_, _) => waitHandle.Set();
-            proc.Start();
-            proc.BeginOutputReadLine();
+             proc.OutputDataReceived += (_, _) => waitHandle.Set();
+             proc.Start();
+             proc.BeginOutputReadLine();
 
-            //Let the win process know we're ready to receive its standard output
-            proc.StandardInput.WriteLine();
+             //Let the win process know we're ready to receive its standard output
+             proc.StandardInput.WriteLine();
 
-            if (!waitHandle.WaitOne(2000))
-                throw new Exception("Failed to start program");
+             if (!waitHandle.WaitOne(2000))
+                 throw new Exception("Failed to start program");
 
-            //The win process has finished loading and is now waiting inside Main().
-            //Copy it process module list.
-            var modules = proc.Modules.Cast<ProcessModule>().ToList();
+             //The win process has finished loading and is now waiting inside Main().
+             //Copy it process module list.
+             var modules = proc.Modules.Cast<ProcessModule>().ToList();
 
-            //Let the win process know we're done reading its module list
-            proc.StandardInput.WriteLine();
+             //Let the win process know we're done reading its module list
+             proc.StandardInput.WriteLine();
 
-            return modules;
-        }
-        */
+             return modules;
+         }
+         */
 
+        private static Dictionary<string, Assembly> lowEffortCache { get; } = new();
         private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
         {
             // e.g. "System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
             var asmName = args.Name.Split(',')[0] + ".dll";
+            var here = Path.GetDirectoryName(Environment.ProcessPath);
 
+            var key = $"{asmName}|{here}";
 
+            if (lowEffortCache.TryGetValue(key, out var value))
+                return value;
+
+            var assembly = CurrentDomain_AssemblyResolve_internal(asmName: asmName, here: here);
+            lowEffortCache[key] = assembly;
+
+            //Let the runtime handle any dll not found exceptions.
+            if (assembly is null)
+                Serilog.Log.Logger.Error($"Unable to load module {args.Name}");
+
+            return assembly;
+        }
+
+        private static Assembly CurrentDomain_AssemblyResolve_internal(string asmName, string here)
+        {
             /*
              * Commented code used to locate assemblies from the *ConfigApp.exe's module list.
              * Use this method to locate dependencies when they are not in Libation's program files directory.
@@ -135,20 +153,15 @@ namespace LibationFileManager
             var modulePath = ModuleList.SingleOrDefault(m => m.ModuleName.EqualsInsensitive(asmName))?.FileName;
  #else
             */
-            var here = Path.GetDirectoryName(Environment.ProcessPath);
 
             // find the requested assembly in the program files directory
             var modulePath =
                 Directory.EnumerateFiles(here, asmName, SearchOption.TopDirectoryOnly)
                 .SingleOrDefault();
 
-            //#endif
+//#endif
             if (modulePath is null)
-            {
-                //Let the runtime handle any dll not found exceptions.
-                Serilog.Log.Logger.Error($"Unable to load module {args.Name}");
                 return null;
-            }
 
             return Assembly.LoadFrom(modulePath);
         }

Source/LibationFileManager/LibationFileManager.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.3.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationWinForms/Dialogs/AccountsDialog.Designer.cs

@@ -28,134 +28,134 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.cancelBtn = new System.Windows.Forms.Button();
-			this.saveBtn = new System.Windows.Forms.Button();
-			this.dataGridView1 = new System.Windows.Forms.DataGridView();
-			this.DeleteAccount = new System.Windows.Forms.DataGridViewButtonColumn();
-			this.ExportAccount = new System.Windows.Forms.DataGridViewButtonColumn();
-			this.LibraryScan = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.AccountId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Locale = new System.Windows.Forms.DataGridViewComboBoxColumn();
-			this.AccountName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.importBtn = new System.Windows.Forms.Button();
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// cancelBtn
-			// 
-			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 479);
-			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.cancelBtn.Name = "cancelBtn";
-			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
-			this.cancelBtn.TabIndex = 2;
-			this.cancelBtn.Text = "Cancel";
-			this.cancelBtn.UseVisualStyleBackColor = true;
-			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
-			// 
-			// saveBtn
-			// 
-			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(714, 479);
-			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.saveBtn.Name = "saveBtn";
-			this.saveBtn.Size = new System.Drawing.Size(88, 27);
-			this.saveBtn.TabIndex = 1;
-			this.saveBtn.Text = "pub ";
-			this.saveBtn.UseVisualStyleBackColor = true;
-			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
-			// 
-			// dataGridView1
-			// 
-			this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.cancelBtn = new System.Windows.Forms.Button();
+            this.saveBtn = new System.Windows.Forms.Button();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.DeleteAccount = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.ExportAccount = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.LibraryScan = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.AccountId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Locale = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.AccountName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.importBtn = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // cancelBtn
+            // 
+            this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelBtn.Location = new System.Drawing.Point(832, 479);
+            this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.cancelBtn.Name = "cancelBtn";
+            this.cancelBtn.Size = new System.Drawing.Size(88, 27);
+            this.cancelBtn.TabIndex = 2;
+            this.cancelBtn.Text = "Cancel";
+            this.cancelBtn.UseVisualStyleBackColor = true;
+            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+            // 
+            // saveBtn
+            // 
+            this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.saveBtn.Location = new System.Drawing.Point(714, 479);
+            this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.saveBtn.Name = "saveBtn";
+            this.saveBtn.Size = new System.Drawing.Size(88, 27);
+            this.saveBtn.TabIndex = 1;
+            this.saveBtn.Text = "Save";
+            this.saveBtn.UseVisualStyleBackColor = true;
+            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-			this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.DeleteAccount,
             this.ExportAccount,
             this.LibraryScan,
             this.AccountId,
             this.Locale,
             this.AccountName});
-			this.dataGridView1.Location = new System.Drawing.Point(14, 14);
-			this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.dataGridView1.MultiSelect = false;
-			this.dataGridView1.Name = "dataGridView1";
-			this.dataGridView1.Size = new System.Drawing.Size(905, 458);
-			this.dataGridView1.TabIndex = 0;
-			this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellContentClick);
-			this.dataGridView1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridView1_DefaultValuesNeeded);
-			// 
-			// DeleteAccount
-			// 
-			this.DeleteAccount.HeaderText = "Delete";
-			this.DeleteAccount.Name = "DeleteAccount";
-			this.DeleteAccount.ReadOnly = true;
-			this.DeleteAccount.Text = "x";
-			this.DeleteAccount.Width = 46;
-			// 
-			// ExportAccount
-			// 
-			this.ExportAccount.HeaderText = "Export";
-			this.ExportAccount.Name = "ExportAccount";
-			this.ExportAccount.Text = "Export to audible-cli";
-			this.ExportAccount.Width = 47;
-			// 
-			// LibraryScan
-			// 
-			this.LibraryScan.HeaderText = "Include in library scan?";
-			this.LibraryScan.Name = "LibraryScan";
-			this.LibraryScan.Width = 94;
-			// 
-			// AccountId
-			// 
-			this.AccountId.HeaderText = "Audible email/login";
-			this.AccountId.Name = "AccountId";
-			this.AccountId.Width = 125;
-			// 
-			// Locale
-			// 
-			this.Locale.HeaderText = "Locale";
-			this.Locale.Name = "Locale";
-			this.Locale.Width = 47;
-			// 
-			// AccountName
-			// 
-			this.AccountName.HeaderText = "Account nickname (optional)";
-			this.AccountName.Name = "AccountName";
-			this.AccountName.Width = 170;
-			// 
-			// importBtn
-			// 
-			this.importBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.importBtn.Location = new System.Drawing.Point(14, 480);
-			this.importBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.importBtn.Name = "importBtn";
-			this.importBtn.Size = new System.Drawing.Size(156, 27);
-			this.importBtn.TabIndex = 1;
-			this.importBtn.Text = "Import from audible-cli";
-			this.importBtn.UseVisualStyleBackColor = true;
-			this.importBtn.Click += new System.EventHandler(this.importBtn_Click);
-			// 
-			// AccountsDialog
-			// 
-			this.AcceptButton = this.saveBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(933, 519);
-			this.Controls.Add(this.dataGridView1);
-			this.Controls.Add(this.importBtn);
-			this.Controls.Add(this.saveBtn);
-			this.Controls.Add(this.cancelBtn);
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.Name = "AccountsDialog";
-			this.Text = "Audible Accounts";
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-			this.ResumeLayout(false);
+            this.dataGridView1.Location = new System.Drawing.Point(14, 14);
+            this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.dataGridView1.MultiSelect = false;
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.Size = new System.Drawing.Size(905, 458);
+            this.dataGridView1.TabIndex = 0;
+            this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellContentClick);
+            this.dataGridView1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridView1_DefaultValuesNeeded);
+            // 
+            // DeleteAccount
+            // 
+            this.DeleteAccount.HeaderText = "Delete";
+            this.DeleteAccount.Name = "DeleteAccount";
+            this.DeleteAccount.ReadOnly = true;
+            this.DeleteAccount.Text = "x";
+            this.DeleteAccount.Width = 46;
+            // 
+            // ExportAccount
+            // 
+            this.ExportAccount.HeaderText = "Export";
+            this.ExportAccount.Name = "ExportAccount";
+            this.ExportAccount.Text = "Export to audible-cli";
+            this.ExportAccount.Width = 47;
+            // 
+            // LibraryScan
+            // 
+            this.LibraryScan.HeaderText = "Include in library scan?";
+            this.LibraryScan.Name = "LibraryScan";
+            this.LibraryScan.Width = 94;
+            // 
+            // AccountId
+            // 
+            this.AccountId.HeaderText = "Audible email/login";
+            this.AccountId.Name = "AccountId";
+            this.AccountId.Width = 125;
+            // 
+            // Locale
+            // 
+            this.Locale.HeaderText = "Locale";
+            this.Locale.Name = "Locale";
+            this.Locale.Width = 47;
+            // 
+            // AccountName
+            // 
+            this.AccountName.HeaderText = "Account nickname (optional)";
+            this.AccountName.Name = "AccountName";
+            this.AccountName.Width = 170;
+            // 
+            // importBtn
+            // 
+            this.importBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.importBtn.Location = new System.Drawing.Point(14, 480);
+            this.importBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.importBtn.Name = "importBtn";
+            this.importBtn.Size = new System.Drawing.Size(156, 27);
+            this.importBtn.TabIndex = 1;
+            this.importBtn.Text = "Import from audible-cli";
+            this.importBtn.UseVisualStyleBackColor = true;
+            this.importBtn.Click += new System.EventHandler(this.importBtn_Click);
+            // 
+            // AccountsDialog
+            // 
+            this.AcceptButton = this.saveBtn;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelBtn;
+            this.ClientSize = new System.Drawing.Size(933, 519);
+            this.Controls.Add(this.dataGridView1);
+            this.Controls.Add(this.importBtn);
+            this.Controls.Add(this.saveBtn);
+            this.Controls.Add(this.cancelBtn);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Name = "AccountsDialog";
+            this.Text = "Audible Accounts";
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
 
 		}
 

Source/LibationWinForms/Form1.VisibleBooks.cs

@@ -80,7 +80,7 @@ namespace LibationWinForms
 
 			var confirmationResult = MessageBoxLib.ShowConfirmationDialog(
 				visibleLibraryBooks,
-				$"Are you sure you want to replace tags in {0}?",
+				"Are you sure you want to replace tags in {0}?",
 				"Replace tags?");
 
 			if (confirmationResult != DialogResult.Yes)

Source/LibationWinForms/LibationWinForms.csproj

@@ -43,8 +43,8 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.4" />
-		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.1.1" />
+		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.5" />
+		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/LibationWinForms/ProcessQueue/ProcessBook.cs

@@ -9,6 +9,7 @@ using System.Windows.Forms;
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
+using Dinah.Core.ErrorHandling;
 using Dinah.Core.WindowsDesktop.Drawing;
 using FileLiberator;
 using LibationFileManager;
@@ -279,36 +280,47 @@ namespace LibationWinForms.ProcessQueue
 			updateBookInfo();
 		}
 
-		private async void Processable_Completed(object sender, LibraryBook libraryBook)
-		{
-			Logger.Info($"{((Processable)sender).Name} Step, Completed: {libraryBook.Book}");
-			UnlinkProcessable((Processable)sender);
+        private async void Processable_Completed(object sender, LibraryBook libraryBook)
+        {
+            Logger.Info($"{((Processable)sender).Name} Step, Completed: {libraryBook.Book}");
+            UnlinkProcessable((Processable)sender);
 
-			if (Processes.Count > 0)
-			{
-				NextProcessable();
-				LinkProcessable(CurrentProcessable);
-				var result = await CurrentProcessable.ProcessSingleAsync(libraryBook, validate: true);
+            if (Processes.Count == 0)
+            {
+                Completed?.Invoke(this, EventArgs.Empty);
+                return;
+            }
 
-				if (result.HasErrors)
-				{
-					foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
-						Logger.Error(errorMessage);
+            NextProcessable();
+            LinkProcessable(CurrentProcessable);
 
-					Completed?.Invoke(this, EventArgs.Empty);
-				}
-			}
-			else
-			{
-				Completed?.Invoke(this, EventArgs.Empty);
-			}
-		}
+            StatusHandler result;
+            try
+            {
+                result = await CurrentProcessable.ProcessSingleAsync(libraryBook, validate: true);
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, $"{nameof(Processable_Completed)} error");
 
-		#endregion
+                result = new StatusHandler();
+                result.AddError($"{nameof(Processable_Completed)} error. See log for details. Error summary: {ex.Message}");
+            }
 
-		#region Failure Handler
+            if (result.HasErrors)
+            {
+                foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
+                    Logger.Error(errorMessage);
 
-		private ProcessBookResult showRetry(LibraryBook libraryBook)
+                Completed?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+
+        #region Failure Handler
+
+        private ProcessBookResult showRetry(LibraryBook libraryBook)
 		{
 			Logger.Error("ERROR. All books have not been processed. Most recent book: processing failed");
 

Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj

@@ -32,7 +32,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.1.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.2.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj

@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
+	  <PackageReference Include="Dinah.Core" Version="5.1.1.1" />
 	</ItemGroup>
 
 </Project>

Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />

Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.1.2">

Source/_Tests/FileManager.Tests/FileManager.Tests.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.1.2">

Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.1.2">

Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />