AudibleApi. Better logging around getting pdf url

Update installer

Source/AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>7.6.2.1</Version>
+    <Version>7.7.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

Source/AppScaffolding/LibationScaffolding.cs

@@ -282,22 +282,20 @@ namespace AppScaffolding
 			});
 		}
 
-		public static (bool hasUpgrade, string zipUrl, string htmlUrl, string zipName) GetLatestRelease()
+		public static UpgradeProperties GetLatestRelease()
 		{
-			(bool, string, string, string) isFalse = (false, null, null, null);
-
 			// timed out
 			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
 			if (latest is null)
-				return isFalse;
+				return null;
 
 			var latestVersionString = latest.TagName.Trim('v');
 			if (!Version.TryParse(latestVersionString, out var latestRelease))
-				return isFalse;
+				return null;
 
 			// we're up to date
 			if (latestRelease <= BuildVersion)
-				return isFalse;
+				return null;
 
 			// we have an update
 			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
@@ -310,7 +308,7 @@ namespace AppScaffolding
 				zipUrl
 			});
 
-			return (true, zipUrl, latest.HtmlUrl, zip.Name);
+			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
 		private static Octokit.Release getLatestRelease(TimeSpan timeout)
 		{

Source/AppScaffolding/UpgradeProperties.cs

@@ -0,0 +1,6 @@
+using System;
+
+namespace AppScaffolding
+{
+    public record UpgradeProperties(string ZipUrl, string HtmlUrl, string ZipName, Version LatestRelease);
+}

Source/AudibleUtilities/AudibleUtilities.csproj

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

Source/DataLayer/DataLayer.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.0.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -29,7 +29,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <None Update="appsettings.json">
+    <None Update="migrate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Source/DataLayer/appsettings.json

@@ -1,6 +0,0 @@
-{
-  "ConnectionStrings": {
-    "// this connection string is ONLY used for DataLayer's Migrations. this appsettings.json file is NOT used at all by application; it is overwritten":  "",
-    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
-  }
-}

Source/DataLayer/migrate.json

@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
+  }
+}

Source/FileLiberator/DownloadFile.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : Streamable
-	{
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
-
-			OnStreamingBegin(proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				OnFileCreated("Upgrade", actualDownloadedFilePath);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				OnStreamingCompleted(proposedDownloadFilePath);
-			}
-		}
-	}
-}

Source/LibationCli/Options/_ProcessableOptionsBase.cs

@@ -9,7 +9,6 @@ using FileLiberator;
 
 namespace LibationCli
 {
-	// streamlined, non-Forms copy of ProcessorAutomationController
 	public abstract class ProcessableOptionsBase : OptionsBase
 	{
 		protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook> completedAction = null)

Source/LibationCli/Setup.cs

@@ -34,15 +34,15 @@ namespace LibationCli
 
 		private static void checkForUpdate()
 		{
-			var (hasUpgrade, zipUrl, htmlUrl, zipName) = LibationScaffolding.GetLatestRelease();
-			if (!hasUpgrade)
+			var upgradeProperties = LibationScaffolding.GetLatestRelease();
+			if (upgradeProperties is null)
 				return;
 
 			var origColor = Console.ForegroundColor;
 			try
 			{
 				Console.ForegroundColor = ConsoleColor.Red;
-				Console.WriteLine($"UPDATE AVAILABLE @ {zipUrl}");
+				Console.WriteLine($"UPDATE AVAILABLE @ {upgradeProperties.ZipUrl}");
 			}
 			finally
 			{

Source/LibationFileManager/Configuration.cs

@@ -421,7 +421,7 @@ namespace LibationFileManager
                     return libationFilesPathCache;
 
                 // FIRST: must write here before SettingsFilePath in next step reads cache
-                libationFilesPathCache = getLiberationFilesSettingFromJson();
+                libationFilesPathCache = getLibationFilesSettingFromJson();
 
                 // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
                 persistentDictionary = new PersistentDictionary(SettingsFilePath);
@@ -443,7 +443,7 @@ namespace LibationFileManager
 
         private static string libationFilesPathCache;
 
-        private string getLiberationFilesSettingFromJson()
+        private string getLibationFilesSettingFromJson()
         {
             string startingContents = null;
             try
@@ -482,6 +482,14 @@ namespace LibationFileManager
         {
             libationFilesPathCache = null;
 
+            // ensure exists
+            if (!File.Exists(APPSETTINGS_JSON))
+            {
+                // getter creates new file, loads PersistentDictionary
+                var _ = LibationFiles;
+                System.Threading.Thread.Sleep(100);
+            }
+
             var startingContents = File.ReadAllText(APPSETTINGS_JSON);
             var jObj = JObject.Parse(startingContents);
 

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.1.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationWinForms/BookLiberation/DownloadForm.Designer.cs

@@ -1,109 +0,0 @@
-using DataLayer;
-using System;
-
-namespace LibationWinForms.BookLiberation
-{
-    partial class DownloadForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.filenameLbl = new System.Windows.Forms.Label();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.progressLbl = new System.Windows.Forms.Label();
-            this.lastUpdateLbl = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // filenameLbl
-            // 
-            this.filenameLbl.AutoSize = true;
-            this.filenameLbl.Location = new System.Drawing.Point(12, 9);
-            this.filenameLbl.Name = "filenameLbl";
-            this.filenameLbl.Size = new System.Drawing.Size(52, 13);
-            this.filenameLbl.TabIndex = 0;
-            this.filenameLbl.Text = "[filename]";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(15, 67);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(877, 23);
-            this.progressBar1.TabIndex = 4;
-            // 
-            // progressLbl
-            // 
-            this.progressLbl.Location = new System.Drawing.Point(12, 36);
-            this.progressLbl.Name = "progressLbl";
-            this.progressLbl.Size = new System.Drawing.Size(173, 13);
-            this.progressLbl.TabIndex = 5;
-            this.progressLbl.Text = "[2,999,999,999] of [2,999,999,999]";
-            this.progressLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // lastUpdateLbl
-            // 
-            this.lastUpdateLbl.AutoSize = true;
-            this.lastUpdateLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lastUpdateLbl.ForeColor = System.Drawing.Color.DarkRed;
-            this.lastUpdateLbl.Location = new System.Drawing.Point(361, 36);
-            this.lastUpdateLbl.Name = "lastUpdateLbl";
-            this.lastUpdateLbl.Size = new System.Drawing.Size(81, 13);
-            this.lastUpdateLbl.TabIndex = 6;
-            this.lastUpdateLbl.Text = "Last updated";
-            this.lastUpdateLbl.Visible = false;
-            // 
-            // DownloadForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(904, 102);
-            this.Controls.Add(this.lastUpdateLbl);
-            this.Controls.Add(this.progressLbl);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.filenameLbl);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "DownloadForm";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Downloading";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DownloadForm_FormClosing);
-            this.Load += new System.EventHandler(this.DownloadForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-
-		#endregion
-
-		private System.Windows.Forms.Label filenameLbl;
-        private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.Label progressLbl;
-        private System.Windows.Forms.Label lastUpdateLbl;
-    }
-}

Source/LibationWinForms/BookLiberation/DownloadForm.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using FileLiberator;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class DownloadForm : Form
-	{
-		protected Streamable Streamable { get; private set; }
-		protected LogMe LogMe { get; private set; }
-		private SynchronizeInvoker Invoker { get; init; }
-
-		public DownloadForm()
-		{
-			//SynchronizationContext.Current will be null until the process contains a Form.
-			//If this is the first form created, it will not exist until after execution
-			//reaches inside the constructor (after base class has been initialized).
-			Invoker = new SynchronizeInvoker();
-			InitializeComponent();
-
-			this.SetLibationIcon();
-			progressLbl.Text = "";
-			filenameLbl.Text = "";
-		}
-
-		public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null)
-		{
-			if (streamable is null) return;
-			streamable.StreamingBegin += Streamable_StreamingBegin;
-			streamable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
-			streamable.StreamingCompleted += (_, _) => this.UIThreadAsync(Close);
-			Streamable = streamable;
-			LogMe = logMe;
-		}
-
-
-		#region Streamable event handler overrides
-		public void Streamable_StreamingBegin(object sender, string beginString)
-		{
-			Invoker.UIThreadAsync(Show);
-			filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
-		}
-		public void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
-		{
-			// this won't happen with download file. it will happen with download string
-			if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
-				return;
-
-			progressLbl.UIThreadAsync(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
-
-			var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
-			var i = int.Parse(Math.Truncate(d).ToString());
-			progressBar1.UIThreadAsync(() => progressBar1.Value = i);
-
-			lastDownloadProgress = DateTime.Now;
-		}
-		#endregion
-
-		#region timer
-		private Timer timer { get; } = new Timer { Interval = 1000 };
-		private void DownloadForm_Load(object sender, EventArgs e)
-		{
-			timer.Tick += new EventHandler(timer_Tick);
-			timer.Start();
-		}
-		private DateTime lastDownloadProgress = DateTime.Now;
-		private void timer_Tick(object sender, EventArgs e)
-		{
-			// if no update in the last 30 seconds, display frozen label
-			lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
-			if (lastUpdateLbl.Visible)
-			{
-				var diff = DateTime.Now - lastDownloadProgress;
-				var min = (int)diff.TotalMinutes;
-				var minText = min > 0 ? $"{min}min " : "";
-
-				lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
-			}
-		}
-		private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();
-		#endregion
-	}
-}

Source/LibationWinForms/BookLiberation/DownloadForm.resx

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Source/LibationWinForms/Form1.ProcessQueue.cs

@@ -23,18 +23,7 @@ namespace LibationWinForms
 
 		private void ProductsGrid_LiberateClicked(object sender, LibraryBook e)
 		{
-			if (e.Book.Audio_Exists())
-			{
-				// liberated: open explorer to file
-				var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
-				if (!Go.To.File(filePath))
-				{
-					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
-					MessageBox.Show($"File not found" + suffix);
-				}
-				return;
-			}
-			else if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
+			if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
 			{
 				SetQueueCollapseState(false);
 				processBookQueue1.AddDownloadDecrypt(e);
@@ -44,7 +33,16 @@ namespace LibationWinForms
 				SetQueueCollapseState(false);
 				processBookQueue1.AddDownloadPdf(e);
 			}
-			
+			else if (e.Book.Audio_Exists())
+			{
+				// liberated: open explorer to file
+				var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
+				if (!Go.To.File(filePath))
+				{
+					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
+					MessageBox.Show($"File not found" + suffix);
+				}
+			}
 		}
 
 		private void SetQueueCollapseState(bool collapsed)

Source/LibationWinForms/LibationWinForms.csproj

@@ -28,6 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.7.0" />
     <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.2.1" />
   </ItemGroup>
 

Source/LibationWinForms/ProcessQueue/ILogForm.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibationWinForms.BookLiberation
+namespace LibationWinForms.ProcessQueue
 {
 	public interface ILogForm
 	{

Source/LibationWinForms/ProcessQueue/LogMe.cs

@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
-using FileLiberator;
 
-namespace LibationWinForms.BookLiberation
+namespace LibationWinForms.ProcessQueue
 {
 	// decouple serilog and form. include convenience factory method
 	public class LogMe
@@ -45,28 +44,4 @@ namespace LibationWinForms.BookLiberation
 		public void Error(string text) => LogErrorString?.Invoke(this, text);
 		public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
 	}
-
-	public static class ProcessorAutomationController
-	{
-		public static void DownloadFile(string url, string destination, bool showDownloadCompletedDialog = false)
-		{
-			Serilog.Log.Logger.Information($"Begin {nameof(DownloadFile)} for {url}");
-
-			void onDownloadFileStreamingCompleted(object sender, string savedFile)
-			{
-				Serilog.Log.Logger.Information($"Completed {nameof(DownloadFile)} for {url}. Saved to {savedFile}");
-
-				if (showDownloadCompletedDialog)
-					MessageBox.Show($"File downloaded to:{Environment.NewLine}{Environment.NewLine}{savedFile}");
-			}
-
-			var downloadFile = new DownloadFile();
-			var downloadForm = new DownloadForm();
-			downloadForm.RegisterFileLiberator(downloadFile);
-			downloadFile.StreamingCompleted += onDownloadFileStreamingCompleted;
-
-			async void runDownload() => await downloadFile.PerformDownloadFileAsync(url, destination);
-			new Task(runDownload).Start();
-		}
-	}
 }

Source/LibationWinForms/ProcessQueue/ProcessBook.cs

@@ -2,7 +2,6 @@
 using Dinah.Core;
 using FileLiberator;
 using LibationFileManager;
-using LibationWinForms.BookLiberation;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs

@@ -1,5 +1,4 @@
-using LibationWinForms.BookLiberation;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;

Source/LibationWinForms/Program.cs

@@ -3,14 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using AudibleApi.Authorization;
-using AudibleUtilities;
-using DataLayer;
 using Dinah.Core;
 using LibationFileManager;
 using LibationWinForms.Dialogs;
-using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json.Linq;
 using Serilog;
 
 namespace LibationWinForms
@@ -165,15 +160,12 @@ namespace LibationWinForms
 
 		private static void checkForUpdate()
 		{
-			string zipUrl;
-			string htmlUrl;
-			string zipName;
+			AppScaffolding.UpgradeProperties upgradeProperties;
+
 			try
 			{
-				bool hasUpgrade;
-				(hasUpgrade, zipUrl, htmlUrl, zipName) = AppScaffolding.LibationScaffolding.GetLatestRelease();
-
-				if (!hasUpgrade)
+                upgradeProperties = AppScaffolding.LibationScaffolding.GetLatestRelease();
+				if (upgradeProperties is null)
 					return;
 			}
 			catch (Exception ex)
@@ -182,29 +174,13 @@ namespace LibationWinForms
 				return;
 			}
 
-			if (zipUrl is null)
+			if (upgradeProperties.ZipUrl is null)
 			{
-				MessageBox.Show(htmlUrl, "New version available");
+				MessageBox.Show(upgradeProperties.HtmlUrl, "New version available");
 				return;
 			}
 
-			var result = MessageBox.Show($"New version available @ {htmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-			if (result != DialogResult.Yes)
-				return;
-
-			try
-			{
-				using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-				if (fileSelector.ShowDialog() != DialogResult.OK)
-					return;
-				var selectedPath = fileSelector.FileName;
-
-				BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxLib.ShowAdminAlert("Error downloading update", "Error downloading update", ex);
-			}
+			Updater.Run(upgradeProperties.LatestRelease, upgradeProperties.ZipUrl);
 		}
 	}
 }

Source/LibationWinForms/Updater.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Windows.Forms;
+using AutoUpdaterDotNET;
+
+namespace LibationWinForms
+{
+    public static class Updater
+	{
+		private const string REPO_URL = "https://github.com/rmcrackan/Libation/releases/latest";
+
+		public static void Run(Version latestVersionOnServer, string downloadZipUrl)
+			=> Run(latestVersionOnServer.ToString(), downloadZipUrl);
+		public static void Run(string latestVersionOnServer, string downloadZipUrl)
+		{
+			AutoUpdater.ParseUpdateInfoEvent +=
+				args => args.UpdateInfo = new()
+				{
+					CurrentVersion = latestVersionOnServer,
+					DownloadURL = downloadZipUrl,
+					ChangelogURL = REPO_URL
+				};
+			AutoUpdater.CheckForUpdateEvent += AutoUpdaterOnCheckForUpdateEvent;
+			AutoUpdater.Start(REPO_URL);
+		}
+
+		private static void AutoUpdaterOnCheckForUpdateEvent(UpdateInfoEventArgs args)
+		{
+			if (args is null || !args.IsUpdateAvailable)
+				return;
+
+			var dialogResult = MessageBox.Show(string.Format(
+				$"There is a new version avilable. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
+				"Update Available",
+				MessageBoxButtons.YesNo,
+				MessageBoxIcon.Information);
+			if (dialogResult != DialogResult.Yes)
+				return;
+
+			try
+			{
+				Serilog.Log.Logger.Information("Start upgrade. {@DebugInfo}", new { CurrentlyInstalled = args.InstalledVersion, TargetVersion = args.CurrentVersion });
+				AutoUpdater.DownloadUpdate(args);
+			}
+			catch (Exception ex)
+			{
+				MessageBoxLib.ShowAdminAlert("Error downloading update", "Error downloading update", ex);
+			}
+		}
+	}
+}

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

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

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

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

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

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

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

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

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

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