incr ver

Improved Login experience, error messages, and published size.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,10 +10,10 @@ PLEASE FILL OUT THE FOLLOWING. Bug reports with limited information or lacking a
 
 ___
 
-**Describe the bug**  
+## Describe the bug  
 A clear and concise description of what the bug is.
 
-**To Reproduce**  
+## To Reproduce  
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -21,14 +21,23 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**  
+## Expected behavior  
 A clear and concise description of what you expected to happen.
 
-**Screenshots**  
+## Screenshots  
 If applicable, add screenshots to help explain your problem.
 
-**Platform**  
+## Platform  
 [e.g. Windows 10, Windows 11, Mac, Linux (State distribution)]
 
-**Log Files**  
-Attach your Libation log file here. Logs are typically in your `[user]\Libation` folder. (For example, on windows: `C:\my_username\Libation`) Also within Libation, on the first tab in Settings you can click the button 'Open log folder'. If your user folder contains the file "LibationCrash.log", attach that also.
+## Log Files
+Attach your Libation log file here. If your user folder contains the file "LibationCrash.log", attach that also.
+
+**Default Log File Locations**
+|Platform|Folder|
+|-|-|
+|Windows|`%userprofile%\Libation`|
+|macOS|`~/Library/Application Support/Libation`|
+|Linux|`~/.local/share/Libation`|
+
+Alternative, you may open the log file folder from within Libation. Open Libation's settings, and on the first tab in Settings you can click the button 'Open log folder'. 

.github/workflows/build-linux.yml

@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -124,7 +124,7 @@ jobs:
           echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
 
       - name: Publish bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.bundle.outputs.artifact }}
           path: ./Source/bin/Publish/bundle/${{ steps.bundle.outputs.artifact }}

.github/workflows/build-windows.yml

@@ -44,7 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -110,7 +110,7 @@ jobs:
           Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"
 
       - name: Publish artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.zip.outputs.artifact }}.zip
           path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.zip

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           path: artifacts
           pattern: "*(Classic-)Libation.*"

Documentation/Advanced.md

@@ -68,6 +68,10 @@ liberate all books and pdfs
 liberate pdfs only
   libationcli liberate --pdf
   libationcli liberate -p
+
+Copy the local sqlite database to postgres
+  libationcli copydb --connectionString "my postgres connection string"
+  libationcli copydb -c "my postgres connection string"
   
 export library to file
   libationcli export --path "C:\foo\bar\my.json" --json

Documentation/AudioFileFormats.md

@@ -58,6 +58,11 @@ This is a proprietary codec created by the [Fraunhofer Institute for Integrated
 
 xHE-AAC boasts significantly higher quality audio at low bitrates. Though it has existed since at least 2016, playback support is still quite limited. FFmpeg has recently added partial decoder support for the USAC profiles, but it is insufficient to decode the xHE-AAC audio files acquired from Audible (due to FFmpeg's lack of support for MPEG Surround for Mono to Stereo Upmixing; ISO 23003-3:2012 §7.11)
 
+Note that the xHE-AAC files authored by Audible have some USAC conformance errors including:
+- Number of samples per frame not matching the UsacConfig coreCoderFrameLength value.
+- Disagreement between stts and UsacFrame usacIndependencyFlag value.
+- Stts indicating a frame is an immediate play-out frame, but USAC AudioPreRoll is absent.
+
 ## Dolby Atmos
 Atmos is a surround sound technology that expands on existing surround sound systems by adding height channels as well as free-moving sound objects. Audible delivers Dolby Atmos in two formats: E-AC-3 and AC-4.
 

Documentation/NamingTemplates.md

@@ -81,17 +81,39 @@ Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) w
 |\<if podcast-\>...\<-if podcast\>|Only include if part of a podcast|Conditional|
 |\<if bookseries-\>...\<-if bookseries\>|Only include if part of a book series|Conditional|
 |\<if podcastparent-\>...\<-if podcastparent\>**†**|Only include if item is a podcast series parent|Conditional|
+|\<has PROPERTY-\>...\<-has\>|Only include if the PROPERTY has a value (i.e. not null or empty)|Conditional|
 
 **†** Only affects the podcast series folder naming if "Save all podcast episodes to the series parent folder" option is checked.
 
-For example, <if podcast-\>\<series\>\<-if podcast\> will evaluate to the podcast's series name if the file is a podcast. For audiobooks that are not podcasts, that tag will be blank.
+For example, `<if podcast-><series><-if podcast>` will evaluate to the podcast's series name if the file is a podcast. For audiobooks that are not podcasts, that tag will be blank.
 
-You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a '!' symbol before the opening tag name.
+You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a `!` symbol before the opening tag name. 
+
+|Inverted Tag|Description|Type|
+|-|-|-|
+|\<!if series-\>...\<-if series\>|Only include if *not* part of a book series or podcast|Conditional|
+|\<!if podcast-\>...\<-if podcast\>|Only include if *not* part of a podcast|Conditional|
+|\<!if bookseries-\>...\<-if bookseries\>|Only include if *not* part of a book series|Conditional|
+|\<!if podcastparent-\>...\<-if podcastparent\>**†**|Only include if item is *not* a podcast series parent|Conditional|
+|\<!has PROPERTY-\>...\<-has\>|Only include if the PROPERTY *does not* have a value (i.e. is null or empty)|Conditional|
+
+**†** Only affects the podcast series folder naming if "Save all podcast episodes to the series parent folder" option is checked.
 
 As an example, this folder template will place all Liberated podcasts into a "Podcasts" folder and all liberated books (not podcasts) into a "Books" folder.
 
-\<if podcast-\>Podcasts<-if podcast\>\<!if podcast-\>Books\<-if podcast\>\\\<title\>
+`<if podcast->Podcasts<-if podcast><!if podcast->Books<-if podcast>\<title>`
 
+This example will add a number if the `<series#\>` tag has a value:
+
+`<has series#><series#><-has>`
+
+This example will put non-series books in a "Standalones" folder:
+
+`<!if series->Standalones/<-if series>`
+
+And this example will customize the title based on whether the book has a subtitle:
+
+`<audible title><has audible subtitle->-<audible subtitle><-has>`
 
 # Tag Formatters
 **Text**, **Name List**, **Number**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.

Scripts/Bundle_Debian.sh

@@ -113,6 +113,7 @@ Essential: no
 Priority: optional
 Maintainer: github.com/rmcrackan
 Description: liberate your audiobooks
+Recommends: libgtk-3-0, libwebkit2gtk-4.1-0
 " >> $FOLDER_DEBIAN/control
 
 echo "Changing permissions for pre- and post-install files..."

Scripts/Bundle_Redhat.sh

@@ -62,7 +62,7 @@ License:        GPLv3+
 URL:            https://github.com/rmcrackan/Libation
 Source0:        https://github.com/rmcrackan/Libation   
 
-Requires:       bash
+Requires:       bash gtk3 webkit2gtk4.1
 
 
 %define __os_install_post %{nil}

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,13 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>12.5.2.1</Version>
+    <Version>12.7.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <!-- Do not remove unused Serilog.Sinks -->
     <!-- Only File sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>

Source/ApplicationServices/ApplicationServices.csproj

@@ -6,12 +6,14 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.1.0" />
-    <PackageReference Include="NPOI" Version="2.7.4" />
+	<PackageReference Include="ClosedXML" Version="0.105.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
     <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
+    <ProjectReference Include="..\DataLayer.Postgres\DataLayer.Postgres.csproj" />
+    <ProjectReference Include="..\DataLayer.Sqlite\DataLayer.Sqlite.csproj" />
   </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/ApplicationServices/DbContexts.cs

@@ -1,21 +1,28 @@
-using System;
-using System.Collections.Generic;
-using DataLayer;
+using DataLayer;
 using LibationFileManager;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 
 namespace ApplicationServices
 {
-	public static class DbContexts
-	{
-		/// <summary>Use for fully functional context, incl. SaveChanges(). For query-only, use the other method</summary>
-		public static LibationContext GetContext()
-			=> LibationContext.Create(SqliteStorage.ConnectionString);
+    public static class DbContexts
+    {
+        /// <summary>Use for fully functional context, incl. SaveChanges(). For query-only, use the other method</summary>
+        public static LibationContext GetContext()
+            => InstanceQueue<LibationContext>.WaitToCreateInstance(() =>
+            {
+                var context = !string.IsNullOrEmpty(Configuration.Instance.PostgresqlConnectionString)
+                    ? LibationContextFactory.CreatePostgres(Configuration.Instance.PostgresqlConnectionString)
+                    : LibationContextFactory.CreateSqlite(SqliteStorage.ConnectionString);
+                context.Database.Migrate();
+                return context;
+            });
 
-		/// <summary>Use for full library querying. No lazy loading</summary>
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking(bool includeParents = false)
-		{
-			using var context = GetContext();
-			return context.GetLibrary_Flat_NoTracking(includeParents);
-		}
-	}
+        /// <summary>Use for full library querying. No lazy loading</summary>
+        public static List<LibraryBook> GetLibrary_Flat_NoTracking(bool includeParents = false)
+        {
+            using var context = GetContext();
+            return context.GetLibrary_Flat_NoTracking(includeParents);
+        }
+    }
 }

Source/ApplicationServices/LibraryExporter.cs

@@ -1,11 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using ClosedXML.Excel;
 using CsvHelper;
 using CsvHelper.Configuration.Attributes;
 using DataLayer;
 using Newtonsoft.Json;
-using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 
 namespace ApplicationServices
 {
@@ -208,19 +209,11 @@ namespace ApplicationServices
 		{
 			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 
-			var workbook = new XSSFWorkbook();
-			var sheet = workbook.CreateSheet("Library");
+			using var workbook = new XLWorkbook();
+			var sheet = workbook.AddWorksheet("Library");
 
-			var detailSubtotalFont = workbook.CreateFont();
-			detailSubtotalFont.IsBold = true;
-
-			var detailSubtotalCellStyle = workbook.CreateCellStyle();
-			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
 
 			// headers
-			var rowIndex = 0;
-			var row = sheet.CreateRow(rowIndex);
-
 			var columns = new[] {
 				nameof(ExportDto.Account),
 				nameof(ExportDto.DateAdded),
@@ -261,81 +254,71 @@ namespace ApplicationServices
                 nameof(ExportDto.ChannelCount),
                 nameof(ExportDto.BitRate)
             };
-			var col = 0;
+
+			int rowIndex = 1, col = 1;
+			var headerRow = sheet.Row(rowIndex++);
 			foreach (var c in columns)
 			{
-				var cell = row.CreateCell(col++);
-				var name = ExportDto.GetName(c);
-				cell.SetCellValue(name);
-				cell.CellStyle = detailSubtotalCellStyle;
+				var headerCell = headerRow.Cell(col++);
+				headerCell.Value = ExportDto.GetName(c);
+				headerCell.Style.Font.Bold = true;
 			}
 
-			var dateFormat = workbook.CreateDataFormat();
-			var dateStyle = workbook.CreateCellStyle();
-			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
-
-			rowIndex++;
+			var dateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " HH:mm:ss";
 
 			// Add data rows
 			foreach (var dto in dtos)
 			{
-				col = 0;
-				row = sheet.CreateRow(rowIndex++);
+				col = 1;
+				var row = sheet.Row(rowIndex++);
 
-				row.CreateCell(col++).SetCellValue(dto.Account);
-				row.CreateCell(col++).SetCellValue(dto.DateAdded).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.AudibleProductId);
-				row.CreateCell(col++).SetCellValue(dto.Locale);
-				row.CreateCell(col++).SetCellValue(dto.Title);
-				row.CreateCell(col++).SetCellValue(dto.Subtitle);
-				row.CreateCell(col++).SetCellValue(dto.AuthorNames);
-				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
-				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
-				row.CreateCell(col++).SetCellValue(dto.Description);
-				row.CreateCell(col++).SetCellValue(dto.Publisher);
-				row.CreateCell(col++).SetCellValue(dto.HasPdf);
-				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
-				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingStory);
-				row.CreateCell(col++).SetCellValue(dto.PictureId);
-				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
-				row.CreateCell(col++).SetCellValue(dto.DatePublished).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingStory);
-				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
-				row.CreateCell(col++).SetCellValue(dto.BookStatus);
-				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
-				row.CreateCell(col++).SetCellValue(dto.ContentType);
-				row.CreateCell(col++).SetCellValue(dto.Language);
-				row.CreateCell(col++).SetCellValue(dto.LastDownloaded).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.LastDownloadedVersion);
-				row.CreateCell(col++).SetCellValue(dto.IsFinished);
-				row.CreateCell(col++).SetCellValue(dto.IsSpatial);
-				row.CreateCell(col++).SetCellValue(dto.LastDownloadedFileVersion);
-				row.CreateCell(col++).SetCellValue(dto.CodecString);
-				row.CreateCell(col++).SetCellValue(dto.SampleRate);
-				row.CreateCell(col++).SetCellValue(dto.ChannelCount);
-				row.CreateCell(col++).SetCellValue(dto.BitRate);
+				row.Cell(col++).Value = dto.Account;
+				row.Cell(col++).SetDate(dto.DateAdded, dateFormat);
+				row.Cell(col++).Value = dto.AudibleProductId;
+				row.Cell(col++).Value = dto.Locale;
+				row.Cell(col++).Value = dto.Title;
+				row.Cell(col++).Value = dto.Subtitle;
+				row.Cell(col++).Value = dto.AuthorNames;
+				row.Cell(col++).Value = dto.NarratorNames;
+				row.Cell(col++).Value = dto.LengthInMinutes;
+				row.Cell(col++).Value = dto.Description;
+				row.Cell(col++).Value = dto.Publisher;
+				row.Cell(col++).Value = dto.HasPdf;
+				row.Cell(col++).Value = dto.SeriesNames;
+				row.Cell(col++).Value = dto.SeriesOrder;
+				row.Cell(col++).Value = dto.CommunityRatingOverall;
+				row.Cell(col++).Value = dto.CommunityRatingPerformance;
+				row.Cell(col++).Value = dto.CommunityRatingStory;
+				row.Cell(col++).Value = dto.PictureId;
+				row.Cell(col++).Value = dto.IsAbridged;
+				row.Cell(col++).SetDate(dto.DatePublished, dateFormat);
+				row.Cell(col++).Value = dto.CategoriesNames;
+				row.Cell(col++).Value = dto.MyRatingOverall;
+				row.Cell(col++).Value = dto.MyRatingPerformance;
+				row.Cell(col++).Value = dto.MyRatingStory;
+				row.Cell(col++).Value = dto.MyLibationTags;
+				row.Cell(col++).Value = dto.BookStatus;
+				row.Cell(col++).Value = dto.PdfStatus;
+				row.Cell(col++).Value = dto.ContentType;
+				row.Cell(col++).Value = dto.Language;
+				row.Cell(col++).SetDate(dto.LastDownloaded, dateFormat);
+				row.Cell(col++).Value = dto.LastDownloadedVersion;
+				row.Cell(col++).Value = dto.IsFinished;
+				row.Cell(col++).Value = dto.IsSpatial;
+				row.Cell(col++).Value = dto.LastDownloadedFileVersion;
+				row.Cell(col++).Value = dto.CodecString;
+				row.Cell(col++).Value = dto.SampleRate;
+				row.Cell(col++).Value = dto.ChannelCount;
+				row.Cell(col++).Value = dto.BitRate;
 			}
 
-			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
-			workbook.Write(fileData);
+			workbook.SaveAs(saveFilePath);
 		}
 
-		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, DateTime? nullableDate)
-			=> nullableDate.HasValue ? cell.SetCellValue(nullableDate.Value)
-			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
-
-		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, int? nullableInt)
-			=> nullableInt.HasValue ? cell.SetCellValue(nullableInt.Value)
-			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
-
-		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, float? nullableFloat)
-			=> nullableFloat.HasValue ? cell.SetCellValue(nullableFloat.Value)
-			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
+		private static void SetDate(this IXLCell cell, DateTime? value, string dateFormat)
+		{
+			cell.Value = value;
+			cell.Style.DateFormat.Format = dateFormat;
+		}
 	}
 }

Source/ApplicationServices/RecordExporter.cs

@@ -1,10 +1,11 @@
 using AudibleApi.Common;
+using ClosedXML.Excel;
 using CsvHelper;
 using DataLayer;
 using Newtonsoft.Json.Linq;
-using NPOI.XSSF.UserModel;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace ApplicationServices
@@ -16,19 +17,10 @@ namespace ApplicationServices
 			if (!records.Any())
 				return;
 
-			using var workbook = new XSSFWorkbook();
-			var sheet = workbook.CreateSheet("Records");
-
-			var detailSubtotalFont = workbook.CreateFont();
-			detailSubtotalFont.IsBold = true;
-
-			var detailSubtotalCellStyle = workbook.CreateCellStyle();
-			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
+			using var workbook = new XLWorkbook();
+			var worksheet = workbook.AddWorksheet("Records");
 
 			// headers
-			var rowIndex = 0;
-			var row = sheet.CreateRow(rowIndex);
-
 			var columns = new List<string>
 			{
 				nameof(Type.Name),
@@ -49,56 +41,52 @@ namespace ApplicationServices
 			if (records.OfType<Clip>().Any())
 				columns.Add(nameof(Clip.Title));
 
-			var col = 0;
+			int rowIndex = 1, col = 1;
+			var headerRow = worksheet.Row(rowIndex++);
 			foreach (var c in columns)
 			{
-				var cell = row.CreateCell(col++);
-				cell.SetCellValue(c);
-				cell.CellStyle = detailSubtotalCellStyle;
+				var headerCell = headerRow.Cell(col++);
+				headerCell.Value = c;
+				headerCell.Style.Font.Bold = true;
 			}
 
-			var dateFormat = workbook.CreateDataFormat();
-			var dateStyle = workbook.CreateCellStyle();
-			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
+			var dateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " HH:mm:ss";
 
 			// Add data rows
 			foreach (var record in records)
 			{
-				col = 0;
+				col = 1;
+				var row = worksheet.Row(rowIndex++);
 
-				row = sheet.CreateRow(++rowIndex);
-
-				row.CreateCell(col++).SetCellValue(record.GetType().Name);
-
-				var dateCreatedCell = row.CreateCell(col++);
-				dateCreatedCell.CellStyle = dateStyle;
-				dateCreatedCell.SetCellValue(record.Created.DateTime);
-
-				row.CreateCell(col++).SetCellValue(record.Start.TotalMilliseconds);
+				row.Cell(col++).Value = record.GetType().Name;
+				row.Cell(col++).SetDate(record.Created.DateTime, dateFormat);
+				row.Cell(col++).Value = record.Start.TotalMilliseconds;
 
 				if (record is IAnnotation annotation)
 				{
-					row.CreateCell(col++).SetCellValue(annotation.AnnotationId);
 
-					var lastModifiedCell = row.CreateCell(col++);
-					lastModifiedCell.CellStyle = dateStyle;
-					lastModifiedCell.SetCellValue(annotation.LastModified.DateTime);
+					row.Cell(col++).Value = annotation.AnnotationId;
+					row.Cell(col++).SetDate(annotation.LastModified.DateTime, dateFormat);
 
 					if (annotation is IRangeAnnotation rangeAnnotation)
 					{
-						row.CreateCell(col++).SetCellValue(rangeAnnotation.End.TotalMilliseconds);
-						row.CreateCell(col++).SetCellValue(rangeAnnotation.Text);
+						row.Cell(col++).Value = rangeAnnotation.End.TotalMilliseconds;
+						row.Cell(col++).Value = rangeAnnotation.Text;
 
 						if (rangeAnnotation is Clip clip)
-							row.CreateCell(col++).SetCellValue(clip.Title);
+							row.Cell(col++).Value = clip.Title;
 					}
 				}
 			}
 
-			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
-			workbook.Write(fileData);
+			workbook.SaveAs(saveFilePath);
 		}
 
+		private static void SetDate(this IXLCell cell, DateTime? value, string dateFormat)
+		{
+			cell.Value = value;
+			cell.Style.DateFormat.Format = dateFormat;
+		}
 		public static void ToJson(string saveFilePath, LibraryBook libraryBook, IEnumerable<IRecord> records)
 		{
 			if (!records.Any())

Source/AudibleUtilities/AccountsSettings.cs

@@ -6,6 +6,7 @@ using AudibleApi.Authorization;
 using Dinah.Core;
 using Newtonsoft.Json;
 
+#nullable enable
 namespace AudibleUtilities
 {
 	// 'AccountsSettings' is intentionally NOT IEnumerable<> so that properties can be added/extended
@@ -14,8 +15,8 @@ namespace AudibleUtilities
 	//   JSON :  Array (properties on the collection will not be serialized)
 	public class AccountsSettings : IUpdatable
 	{
-		public event EventHandler Updated;
-		private void update(object sender = null, EventArgs e = null)
+		public event EventHandler? Updated;
+		private void update(object? sender = null, EventArgs? e = null)
 		{
 			foreach (var account in Accounts)
 				validate(account);
@@ -48,9 +49,9 @@ namespace AudibleUtilities
 			}
 		}
 
-		private string _cdm;
+		private string? _cdm;
 		[JsonProperty]
-		public string Cdm
+		public string? Cdm
 		{
 			get => _cdm;
 			set
@@ -68,7 +69,7 @@ namespace AudibleUtilities
 		#endregion
 
 		#region de/serialize
-		public static AccountsSettings FromJson(string json)
+		public static AccountsSettings? FromJson(string json)
 			=> JsonConvert.DeserializeObject<AccountsSettings>(json, Identity.GetJsonSerializerSettings());
 
 		public string ToJson(Formatting formatting = Formatting.Indented)
@@ -107,7 +108,7 @@ namespace AudibleUtilities
 			account.Updated += update;
 		}
 
-		public Account GetAccount(string accountId, string locale)
+		public Account? GetAccount(string accountId, string? locale)
 		{
 			if (locale is null)
 				return null;

Source/AudibleUtilities/AudibleApiValidators.cs

@@ -28,10 +28,11 @@ namespace AudibleUtilities
 
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.ProductId)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with null or blank {nameof(Item.ProductId)}", nameof(items)));
-			if (items.Any(i => i.DateAdded < new DateTime(1980, 1, 1)))
-				exceptions.Add(new ArgumentException($"Collection contains item(s) with invalid {nameof(Item.DateAdded)}", nameof(items)));
+            //// unfortunately, an actual user has a title with a beginning-of-time 'purchase_date'
+            //if (items.Any(i => i.DateAdded < new DateTime(1980, 1, 1)))
+            //	exceptions.Add(new ArgumentException($"Collection contains item(s) with invalid {nameof(Item.DateAdded)}", nameof(items)));
 
-			return exceptions;
+            return exceptions;
 		}
 	}
 	public class BookValidator : IValidator
@@ -91,7 +92,7 @@ namespace AudibleUtilities
 			if (distinct.Any(s => s.SeriesId is null))
 				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesId)}", nameof(items)));
 
-			//// unfortunately, a user has a series with no name
+			//// unfortunately, an actual user has a series with no name
 			//if (distinct.Any(s => s.SeriesName is null))
 			//    exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
 

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.4.4.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.32.0" />
+    <PackageReference Include="AudibleApi" Version="9.5.0.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.33.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer.Postgres/DataLayer.Postgres.csproj

@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Migrations\" />
+	</ItemGroup>
+
+</Project>

Source/DataLayer.Postgres/Migrations/20251027224441_InitialPostgres.Designer.cs

@@ -0,0 +1,494 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DataLayer.Postgres.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20251027224441_InitialPostgres")]
+    partial class InitialPostgres
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.Property<int>("_categoriesCategoryId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("_categoryLaddersCategoryLadderId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("_categoriesCategoryId", "_categoryLaddersCategoryLadderId");
+
+                    b.HasIndex("_categoryLaddersCategoryLadderId");
+
+                    b.ToTable("CategoryCategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BookId"));
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsSpatial")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("text");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subtitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CategoryLadderId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("BookId", "CategoryLadderId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("CategoryLadderId");
+
+                    b.ToTable("BookCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("integer");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("smallint");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.ToTable("Categories");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Property<int>("CategoryLadderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryLadderId"));
+
+                    b.HasKey("CategoryLadderId");
+
+                    b.ToTable("CategoryLadders");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ContributorId"));
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("IncludedUntil")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SeriesId"));
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("text");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.HasOne("DataLayer.Category", null)
+                        .WithMany()
+                        .HasForeignKey("_categoriesCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", null)
+                        .WithMany()
+                        .HasForeignKey("_categoryLaddersCategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("integer");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("real");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("SupplementId"));
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("integer");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("text");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("integer");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("integer");
+
+                            b1.Property<bool>("IsFinished")
+                                .HasColumnType("boolean");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("timestamp without time zone");
+
+                            b1.Property<string>("LastDownloadedFileVersion")
+                                .HasColumnType("text");
+
+                            b1.Property<long?>("LastDownloadedFormat")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("text");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("integer");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("text");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("integer");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("CategoriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", "CategoryLadder")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("CategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("CategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("CategoriesLink");
+
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer.Postgres/Migrations/20251027224441_InitialPostgres.cs

@@ -0,0 +1,372 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DataLayer.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialPostgres : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Books",
+                columns: table => new
+                {
+                    BookId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    AudibleProductId = table.Column<string>(type: "text", nullable: true),
+                    Title = table.Column<string>(type: "text", nullable: true),
+                    Subtitle = table.Column<string>(type: "text", nullable: true),
+                    Description = table.Column<string>(type: "text", nullable: true),
+                    LengthInMinutes = table.Column<int>(type: "integer", nullable: false),
+                    ContentType = table.Column<int>(type: "integer", nullable: false),
+                    Locale = table.Column<string>(type: "text", nullable: true),
+                    PictureId = table.Column<string>(type: "text", nullable: true),
+                    PictureLarge = table.Column<string>(type: "text", nullable: true),
+                    IsAbridged = table.Column<bool>(type: "boolean", nullable: false),
+                    IsSpatial = table.Column<bool>(type: "boolean", nullable: false),
+                    DatePublished = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    Language = table.Column<string>(type: "text", nullable: true),
+                    Rating_OverallRating = table.Column<float>(type: "real", nullable: true),
+                    Rating_PerformanceRating = table.Column<float>(type: "real", nullable: true),
+                    Rating_StoryRating = table.Column<float>(type: "real", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Books", x => x.BookId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Categories",
+                columns: table => new
+                {
+                    CategoryId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    AudibleCategoryId = table.Column<string>(type: "text", nullable: true),
+                    Name = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Categories", x => x.CategoryId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CategoryLadders",
+                columns: table => new
+                {
+                    CategoryLadderId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CategoryLadders", x => x.CategoryLadderId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Contributors",
+                columns: table => new
+                {
+                    ContributorId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    Name = table.Column<string>(type: "text", nullable: true),
+                    AudibleContributorId = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Contributors", x => x.ContributorId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Series",
+                columns: table => new
+                {
+                    SeriesId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    AudibleSeriesId = table.Column<string>(type: "text", nullable: true),
+                    Name = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Series", x => x.SeriesId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "LibraryBooks",
+                columns: table => new
+                {
+                    BookId = table.Column<int>(type: "integer", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    Account = table.Column<string>(type: "text", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "boolean", nullable: false),
+                    AbsentFromLastScan = table.Column<bool>(type: "boolean", nullable: false),
+                    IncludedUntil = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LibraryBooks", x => x.BookId);
+                    table.ForeignKey(
+                        name: "FK_LibraryBooks_Books_BookId",
+                        column: x => x.BookId,
+                        principalTable: "Books",
+                        principalColumn: "BookId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Supplement",
+                columns: table => new
+                {
+                    SupplementId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    BookId = table.Column<int>(type: "integer", nullable: false),
+                    Url = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Supplement", x => x.SupplementId);
+                    table.ForeignKey(
+                        name: "FK_Supplement_Books_BookId",
+                        column: x => x.BookId,
+                        principalTable: "Books",
+                        principalColumn: "BookId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "UserDefinedItem",
+                columns: table => new
+                {
+                    BookId = table.Column<int>(type: "integer", nullable: false),
+                    LastDownloaded = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    LastDownloadedVersion = table.Column<string>(type: "text", nullable: true),
+                    LastDownloadedFormat = table.Column<long>(type: "bigint", nullable: true),
+                    LastDownloadedFileVersion = table.Column<string>(type: "text", nullable: true),
+                    Tags = table.Column<string>(type: "text", nullable: true),
+                    Rating_OverallRating = table.Column<float>(type: "real", nullable: true),
+                    Rating_PerformanceRating = table.Column<float>(type: "real", nullable: true),
+                    Rating_StoryRating = table.Column<float>(type: "real", nullable: true),
+                    BookStatus = table.Column<int>(type: "integer", nullable: false),
+                    PdfStatus = table.Column<int>(type: "integer", nullable: true),
+                    IsFinished = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UserDefinedItem", x => x.BookId);
+                    table.ForeignKey(
+                        name: "FK_UserDefinedItem_Books_BookId",
+                        column: x => x.BookId,
+                        principalTable: "Books",
+                        principalColumn: "BookId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "BookCategory",
+                columns: table => new
+                {
+                    BookId = table.Column<int>(type: "integer", nullable: false),
+                    CategoryLadderId = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BookCategory", x => new { x.BookId, x.CategoryLadderId });
+                    table.ForeignKey(
+                        name: "FK_BookCategory_Books_BookId",
+                        column: x => x.BookId,
+                        principalTable: "Books",
+                        principalColumn: "BookId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_BookCategory_CategoryLadders_CategoryLadderId",
+                        column: x => x.CategoryLadderId,
+                        principalTable: "CategoryLadders",
+                        principalColumn: "CategoryLadderId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CategoryCategoryLadder",
+                columns: table => new
+                {
+                    _categoriesCategoryId = table.Column<int>(type: "integer", nullable: false),
+                    _categoryLaddersCategoryLadderId = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CategoryCategoryLadder", x => new { x._categoriesCategoryId, x._categoryLaddersCategoryLadderId });
+                    table.ForeignKey(
+                        name: "FK_CategoryCategoryLadder_Categories__categoriesCategoryId",
+                        column: x => x._categoriesCategoryId,
+                        principalTable: "Categories",
+                        principalColumn: "CategoryId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_CategoryCategoryLadder_CategoryLadders__categoryLaddersCate~",
+                        column: x => x._categoryLaddersCategoryLadderId,
+                        principalTable: "CategoryLadders",
+                        principalColumn: "CategoryLadderId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "BookContributor",
+                columns: table => new
+                {
+                    BookId = table.Column<int>(type: "integer", nullable: false),
+                    ContributorId = table.Column<int>(type: "integer", nullable: false),
+                    Role = table.Column<int>(type: "integer", nullable: false),
+                    Order = table.Column<byte>(type: "smallint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BookContributor", x => new { x.BookId, x.ContributorId, x.Role });
+                    table.ForeignKey(
+                        name: "FK_BookContributor_Books_BookId",
+                        column: x => x.BookId,
+                        principalTable: "Books",
+                        principalColumn: "BookId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_BookContributor_Contributors_ContributorId",
+                        column: x => x.ContributorId,
+                        principalTable: "Contributors",
+                        principalColumn: "ContributorId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "SeriesBook",
+                columns: table => new
+                {
+                    SeriesId = table.Column<int>(type: "integer", nullable: false),
+                    BookId = table.Column<int>(type: "integer", nullable: false),
+                    Order = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SeriesBook", x => new { x.SeriesId, x.BookId });
+                    table.ForeignKey(
+                        name: "FK_SeriesBook_Books_BookId",
+                        column: x => x.BookId,
+                        principalTable: "Books",
+                        principalColumn: "BookId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_SeriesBook_Series_SeriesId",
+                        column: x => x.SeriesId,
+                        principalTable: "Series",
+                        principalColumn: "SeriesId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.InsertData(
+                table: "Contributors",
+                columns: new[] { "ContributorId", "AudibleContributorId", "Name" },
+                values: new object[] { -1, null, "" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BookCategory_BookId",
+                table: "BookCategory",
+                column: "BookId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BookCategory_CategoryLadderId",
+                table: "BookCategory",
+                column: "CategoryLadderId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BookContributor_BookId",
+                table: "BookContributor",
+                column: "BookId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BookContributor_ContributorId",
+                table: "BookContributor",
+                column: "ContributorId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Books_AudibleProductId",
+                table: "Books",
+                column: "AudibleProductId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Categories_AudibleCategoryId",
+                table: "Categories",
+                column: "AudibleCategoryId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CategoryCategoryLadder__categoryLaddersCategoryLadderId",
+                table: "CategoryCategoryLadder",
+                column: "_categoryLaddersCategoryLadderId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Contributors_Name",
+                table: "Contributors",
+                column: "Name");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Series_AudibleSeriesId",
+                table: "Series",
+                column: "AudibleSeriesId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SeriesBook_BookId",
+                table: "SeriesBook",
+                column: "BookId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SeriesBook_SeriesId",
+                table: "SeriesBook",
+                column: "SeriesId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Supplement_BookId",
+                table: "Supplement",
+                column: "BookId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "BookCategory");
+
+            migrationBuilder.DropTable(
+                name: "BookContributor");
+
+            migrationBuilder.DropTable(
+                name: "CategoryCategoryLadder");
+
+            migrationBuilder.DropTable(
+                name: "LibraryBooks");
+
+            migrationBuilder.DropTable(
+                name: "SeriesBook");
+
+            migrationBuilder.DropTable(
+                name: "Supplement");
+
+            migrationBuilder.DropTable(
+                name: "UserDefinedItem");
+
+            migrationBuilder.DropTable(
+                name: "Contributors");
+
+            migrationBuilder.DropTable(
+                name: "Categories");
+
+            migrationBuilder.DropTable(
+                name: "CategoryLadders");
+
+            migrationBuilder.DropTable(
+                name: "Series");
+
+            migrationBuilder.DropTable(
+                name: "Books");
+        }
+    }
+}

Source/DataLayer.Postgres/Migrations/LibationContextModelSnapshot.cs

@@ -0,0 +1,491 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DataLayer.Postgres.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    partial class LibationContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.Property<int>("_categoriesCategoryId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("_categoryLaddersCategoryLadderId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("_categoriesCategoryId", "_categoryLaddersCategoryLadderId");
+
+                    b.HasIndex("_categoryLaddersCategoryLadderId");
+
+                    b.ToTable("CategoryCategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BookId"));
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsSpatial")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("text");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subtitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CategoryLadderId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("BookId", "CategoryLadderId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("CategoryLadderId");
+
+                    b.ToTable("BookCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("integer");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("smallint");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.ToTable("Categories");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Property<int>("CategoryLadderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryLadderId"));
+
+                    b.HasKey("CategoryLadderId");
+
+                    b.ToTable("CategoryLadders");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ContributorId"));
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("IncludedUntil")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SeriesId"));
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("text");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.HasOne("DataLayer.Category", null)
+                        .WithMany()
+                        .HasForeignKey("_categoriesCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", null)
+                        .WithMany()
+                        .HasForeignKey("_categoryLaddersCategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("integer");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("real");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("SupplementId"));
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("integer");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("text");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("integer");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("integer");
+
+                            b1.Property<bool>("IsFinished")
+                                .HasColumnType("boolean");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("timestamp without time zone");
+
+                            b1.Property<string>("LastDownloadedFileVersion")
+                                .HasColumnType("text");
+
+                            b1.Property<long?>("LastDownloadedFormat")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("text");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("integer");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("text");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("integer");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("CategoriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", "CategoryLadder")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("CategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("CategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("CategoriesLink");
+
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer.Postgres/PostgresContextFactory.cs

@@ -0,0 +1,12 @@
+using Microsoft.EntityFrameworkCore.Design;
+
+namespace DataLayer.Postgres
+{
+    public class PostgresContextFactory : IDesignTimeDbContextFactory<LibationContext>
+    {
+        public LibationContext CreateDbContext(string[] args)
+        {
+            return LibationContextFactory.CreatePostgres(string.Empty);
+        }
+    }
+}

Source/DataLayer.Sqlite/DataLayer.Sqlite.csproj

@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
+	</ItemGroup>
+
+</Project>

Source/DataLayer.Sqlite/Migrations/20251020175053_AddIncludedUntil.Designer.cs

@@ -0,0 +1,477 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20251020175053_AddIncludedUntil")]
+    partial class AddIncludedUntil
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.8");
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.Property<int>("_categoriesCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("_categoryLaddersCategoryLadderId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("_categoriesCategoryId", "_categoryLaddersCategoryLadderId");
+
+                    b.HasIndex("_categoryLaddersCategoryLadderId");
+
+                    b.ToTable("CategoryCategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSpatial")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Subtitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CategoryLadderId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "CategoryLadderId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("CategoryLadderId");
+
+                    b.ToTable("BookCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.ToTable("Categories");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Property<int>("CategoryLadderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryLadderId");
+
+                    b.ToTable("CategoryLadders");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("IncludedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.HasOne("DataLayer.Category", null)
+                        .WithMany()
+                        .HasForeignKey("_categoriesCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", null)
+                        .WithMany()
+                        .HasForeignKey("_categoryLaddersCategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsFinished")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<string>("LastDownloadedFileVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<long?>("LastDownloadedFormat")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("CategoriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", "CategoryLadder")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("CategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("CategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("CategoriesLink");
+
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer.Sqlite/Migrations/20251020175053_AddIncludedUntil.cs

@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddIncludedUntil : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "IncludedUntil",
+                table: "LibraryBooks",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IncludedUntil",
+                table: "LibraryBooks");
+        }
+    }
+}

Source/DataLayer.Sqlite/Migrations/LibationContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.7");
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.8");
 
             modelBuilder.Entity("CategoryCategoryLadder", b =>
                 {
@@ -194,6 +194,9 @@ namespace DataLayer.Migrations
                     b.Property<DateTime>("DateAdded")
                         .HasColumnType("TEXT");
 
+                    b.Property<DateTime?>("IncludedUntil")
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
 

Source/DataLayer.Sqlite/SqliteContextFactory.cs

@@ -0,0 +1,12 @@
+using Microsoft.EntityFrameworkCore.Design;
+
+namespace DataLayer.Postgres
+{
+    public class SqliteContextFactory : IDesignTimeDbContextFactory<LibationContext>
+    {
+        public LibationContext CreateDbContext(string[] args)
+        {
+            return LibationContextFactory.CreateSqlite(string.Empty);
+        }
+    }
+}

Source/DataLayer/DataLayer.csproj

@@ -10,18 +10,25 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.2.1" />
+    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="migrate.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<DebugType>embedded</DebugType>
@@ -30,11 +37,5 @@
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
-  
-  <ItemGroup>
-    <None Update="migrate.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 
 </Project>

Source/DataLayer/EfClasses/Book.cs

@@ -73,7 +73,8 @@ namespace DataLayer
             ContentType contentType,
             IEnumerable<Contributor> authors,
             IEnumerable<Contributor> narrators,
-            string localeName)
+            string localeName
+            )
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));

Source/DataLayer/EfClasses/Contributor.cs

@@ -45,5 +45,7 @@ namespace DataLayer
 		public override string ToString() => Name;
 		public void SetAudibleContributorId(string audibleContributorId)
 			=> AudibleContributorId = audibleContributorId;
-	}
+
+        public bool IsEmpty => ContributorId == -1;
+    }
 }

Source/DataLayer/EfClasses/LibraryBook.cs

@@ -13,7 +13,8 @@ namespace DataLayer
 
         public bool IsDeleted { get; set; }
         public bool AbsentFromLastScan { get; set; }
-
+        
+        public DateTime? IncludedUntil { get; private set; }
         private LibraryBook() { }
         public LibraryBook(Book book, DateTime dateAdded, string account)
         {
@@ -26,7 +27,7 @@ namespace DataLayer
         }
 
         public void SetAccount(string account) => Account = account;
-
-		public override string ToString() => $"{DateAdded:d} {Book}";
-	}
-}
+        public void SetIncludedUntil(DateTime? includedUntil) => IncludedUntil = includedUntil;
+        public override string ToString() => $"{DateAdded:d} {Book}";
+    }
+}

Source/DataLayer/InstanceQueue.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+#nullable enable
+namespace DataLayer;
+
+/// <summary> Notifies clients that the object is being disposed. </summary>
+public interface INotifyDisposed : IDisposable
+{
+	/// <summary> Event raised when the object is disposed. </summary>
+	event EventHandler? ObjectDisposed;	
+}
+
+/// <summary> Creates a single instance of <typeparamref name="TDisposable"/> at a time, blocking subsequent creations until the previous creations are disposed. </summary>
+public static class InstanceQueue<TDisposable> where TDisposable : INotifyDisposed
+{
+	/// <summary> Synchronization object for access to <see cref="LastInLine"/>"/> </summary>
+	private static Lock Locker { get; } = new();
+	/// <summary> Ticket holder for the last instance creator in line. </summary>
+	private static Ticket? LastInLine { get; set; }
+
+	/// <summary> Waits for all previously created instances of <typeparamref name="TDisposable"/> to be disposed, then creates and returns a new instance of <typeparamref name="TDisposable"/> using the provided <paramref name="creator"/> factory. </summary>
+	public static TDisposable WaitToCreateInstance(Func<TDisposable> creator)
+	{
+		Ticket ticket;
+		lock (Locker)
+		{
+			ticket = LastInLine = new Ticket(creator, LastInLine);
+		}
+
+		return ticket.Fulfill();
+	}
+
+	/// <summary> A queue ticket for an instance creator. </summary>
+	/// <param name="creator">Factory to create a new instance of <typeparamref name="TDisposable"/></param>
+	/// <param name="inFront">The ticket immediately in preceding this new ticket. This new ticket must wait for <paramref name="inFront"/> to signal its instance has been disposed before creating a new instance of <typeparamref name="TDisposable"/></param>
+	private class Ticket(Func<TDisposable> creator, Ticket? inFront) : IDisposable
+	{
+		/// <summary> Factory to create a new instance of <typeparamref name="TDisposable"/> </summary>
+		private Func<TDisposable> Creator { get; } = creator;
+		/// <summary> Ticket immediately in front of this one. This instance must wait for <see cref="InFront"/> to signal its instance has been disposed before creating a new instance of <typeparamref name="TDisposable"/></summary>
+		private Ticket? InFront { get; } = inFront;
+		/// <summary> Wait handle to signal when this ticket's created instance is disposed </summary>
+		private EventWaitHandle WaitHandle { get; } = new(false, EventResetMode.ManualReset);
+		/// <summary> This ticket's created instance of <typeparamref name="TDisposable"/> </summary>
+		private TDisposable? CreatedInstance { get; set; }
+
+		/// <summary> Disposes of this ticket and every ticket queued in front of it. </summary>
+		public void Dispose()
+		{
+			WaitHandle.Dispose();
+			InFront?.Dispose();
+		}
+
+		/// <summary>
+		/// Waits for the <see cref="InFront"/> ticket's instance to be disposed, then creates and returns a new instance of <typeparamref name="TDisposable"/> using the <see cref="Creator"/> factory.
+		/// </summary>
+		public TDisposable Fulfill()
+		{
+#if DEBUG
+			var sw = Stopwatch.StartNew();
+#endif
+			//Wait for the previous ticket's instance to be disposed, then dispose of the previous ticket.
+			InFront?.WaitHandle.WaitOne(Timeout.Infinite);
+			InFront?.Dispose();
+#if DEBUG
+			sw.Stop();
+			Debug.WriteLine($"Waited {sw.ElapsedMilliseconds}ms to create instance of {typeof(TDisposable).Name}");
+#endif
+			CreatedInstance = Creator();
+			CreatedInstance.ObjectDisposed += CreatedInstance_ObjectDisposed;
+			return CreatedInstance;
+		}
+
+		private void CreatedInstance_ObjectDisposed(object? sender, EventArgs e)
+		{
+			Debug.WriteLine($"{typeof(TDisposable).Name} Disposed");
+			if (CreatedInstance is not null)
+			{
+				CreatedInstance.ObjectDisposed -= CreatedInstance_ObjectDisposed;
+				CreatedInstance = default;
+			}
+
+			lock (Locker)
+			{
+				if (this == LastInLine)
+				{
+					//There are no ticket holders waiting after this one.
+					//This ticket is fulfilled and will never be waited on.
+					LastInLine = null;
+					Dispose();
+				}
+				else
+				{
+					//Signal the that this ticket has been fulfilled so that
+					//the next ticket in line may proceed.
+					WaitHandle.Set();
+				}
+			}
+		}
+	}
+}

Source/DataLayer/LibationContext.cs

@@ -1,9 +1,11 @@
 using DataLayer.Configurations;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.Threading.Tasks;
 
 namespace DataLayer
 {
-    public class LibationContext : DbContext
+    public class LibationContext : DbContext, INotifyDisposed
     {
         // IMPORTANT: USING DbSet<>
         // ========================
@@ -25,15 +27,20 @@ namespace DataLayer
         public DbSet<Category> Categories { get; private set; }
         public DbSet<CategoryLadder> CategoryLadders { get; private set; }
 
-        public static LibationContext Create(string connectionString)
+        public event EventHandler ObjectDisposed;
+        public override void Dispose()
         {
-            var factory = new LibationContextFactory();
-            var context = factory.Create(connectionString);
-            return context;
+            base.Dispose();
+            ObjectDisposed?.Invoke(this, EventArgs.Empty);
+        }
+        public override async ValueTask DisposeAsync()
+        {
+            await base.DisposeAsync();
+            ObjectDisposed?.Invoke(this, EventArgs.Empty);
         }
 
         // see DesignTimeDbContextFactoryBase for info about ctors and connection strings/OnConfiguring()
-        internal LibationContext(DbContextOptions options) : base(options) { }
+        public LibationContext(DbContextOptions options) : base(options) { }
 
         // typically only called once per execution; NOT once per instantiation
         protected override void OnModelCreating(ModelBuilder modelBuilder)

Source/DataLayer/LibationContextFactory.cs

@@ -1,14 +1,41 @@
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
+using System;
 
 namespace DataLayer
 {
-    public class LibationContextFactory : DesignTimeDbContextFactoryBase<LibationContext>
+    public class LibationContextFactory
     {
-        protected override LibationContext CreateNewInstance(DbContextOptions<LibationContext> options) => new LibationContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString)
-            => optionsBuilder.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning))
-            .UseSqlite(connectionString, ob => ob.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));
+        public static void ConfigureOptions(NpgsqlDbContextOptionsBuilder options)
+        {
+            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+            options.MigrationsAssembly("DataLayer.Postgres");
+            options.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+        }
+
+        public static LibationContext CreatePostgres(string connectionString)
+        {
+            var options = new DbContextOptionsBuilder<LibationContext>();
+
+            options.UseNpgsql(connectionString, ConfigureOptions);
+
+            return new LibationContext(options.Options);
+        }
+
+        public static LibationContext CreateSqlite(string connectionString)
+        {
+            var options = new DbContextOptionsBuilder<LibationContext>();
+
+            options
+                .ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning))
+                .UseSqlite(connectionString, options =>
+                {
+                    options.MigrationsAssembly("DataLayer.Sqlite");
+                    options.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                });
+
+            return new LibationContext(options.Options);
+        }
     }
 }

Source/DataLayer/MockLibraryBook.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+#nullable enable
+namespace DataLayer;
+public class MockLibraryBook : LibraryBook
+{
+	protected MockLibraryBook(Book book, DateTime dateAdded, string account, DateTime? includedUntil)
+		: base(book, dateAdded, account)
+	{
+		SetIncludedUntil(includedUntil);
+	}
+
+	public MockLibraryBook AddSeries(string seriesName, int order)
+	{
+		var series = new Series(new AudibleSeriesId(CalculateAsin(seriesName)), seriesName);
+		Book.UpsertSeries(series, order.ToString());
+		return this;
+	}
+
+	public MockLibraryBook AddCategoryLadder(params string[] ladder)
+	{
+		var newLadder = new CategoryLadder(ladder.Select(c => new Category(new AudibleCategoryId(CalculateAsin(c)), c)).ToList());
+		Book.SetCategoryLadders(Book.Categories.Select(c => c.CategoryLadder).Append(newLadder));
+		return this;
+	}
+
+	public MockLibraryBook AddNarrator(string name)
+	{
+		var newNarrator = new Contributor(name, CalculateAsin(name));
+		Book.ReplaceNarrators(Book.Narrators.Append(newNarrator));
+		return this;
+	}
+
+	public MockLibraryBook AddAuthor(string name)
+	{
+		var newAuthor = new Contributor(name, CalculateAsin(name));
+		Book.ReplaceAuthors(Book.Authors.Append(newAuthor));
+		return this;
+	}
+
+	public MockLibraryBook WithBookStatus(LiberatedStatus liberatedStatus)
+	{
+		//Set the backing field directly to preserve LiberatedStatus.PartialDownload
+		typeof(UserDefinedItem)
+			.GetField("_bookStatus", BindingFlags.NonPublic | BindingFlags.Instance)
+			?.SetValue(Book.UserDefinedItem, liberatedStatus);
+		return this;
+	}
+
+	public MockLibraryBook WithPdfStatus(LiberatedStatus liberatedStatus)
+	{
+		Book.UserDefinedItem.PdfStatus = liberatedStatus;
+		return this;
+	}
+
+	public MockLibraryBook WithLastDownloaded(Version? lastVersion = null, AudioFormat? format = null, string audioVersion = "1")
+	{
+		lastVersion ??= new Version(10, 0, 0, 0);
+		format ??= AudioFormat.Default;
+		Book.UserDefinedItem.SetLastDownloaded(lastVersion, format, audioVersion);
+		return this;
+	}
+
+	public MockLibraryBook WithMyRating(float overallRating = 4, float performanceRating = 4.5f, float storyRating = 5)
+	{
+		Book.UserDefinedItem.UpdateRating(overallRating, performanceRating, storyRating);
+		return this;
+	}
+
+	public static MockLibraryBook CreateBook(
+		string account = "someone@email.co",
+		bool absetFromLastScan = false,
+		DateTime? dateAdded = null,
+		DateTime? datePublished = null,
+		DateTime? includedUntil = null,
+		string title = "Mock Book Title",
+		string subtitle = "Mock Book Subtitle",
+		string description = "This is a mock book description.",
+		int lengthInMinutes = 1400,
+		ContentType contentType = ContentType.Product,
+		string firstAuthor = "Author One",
+		string firstNarrator = "Narrator One",
+		string localeName = "us",
+		bool isAbridged = false,
+		bool isSpatial = false,
+		string language = "English")
+	{
+		var book = new Book(
+			new AudibleProductId(CalculateAsin(title + subtitle)),
+			title,
+			subtitle,
+			description,
+			lengthInMinutes,
+			contentType,
+			[new Contributor(firstAuthor, CalculateAsin(firstAuthor))],
+			[new Contributor(firstNarrator, CalculateAsin(firstNarrator))],
+			localeName);
+
+		book.UpdateBookDetails(isAbridged, isSpatial, datePublished ?? DateTime.Now, language);
+
+		return new MockLibraryBook(
+			book,
+			dateAdded ?? DateTime.Now,
+			account,
+			includedUntil)
+		{
+			AbsentFromLastScan = absetFromLastScan
+		};
+	}
+
+	private static string CalculateAsin(string name) 
+		=> Convert.ToHexString(System.Security.Cryptography.MD5.HashData(Encoding.UTF8.GetBytes(name))).Substring(0, 10);
+}

Source/DtoImporterService/BookImporter.cs

@@ -111,7 +111,8 @@ namespace DtoImporterService
 					contentType,
 					authors,
 					narrators,
-					importItem.LocaleName)
+					importItem.LocaleName
+					)
 					).Entity;
 				Cache.Add(book.AudibleProductId, book);
 			}

Source/DtoImporterService/LibraryBookImporter.cs

@@ -8,121 +8,136 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class LibraryBookImporter : ItemsImporterBase
-	{
-		protected override IValidator Validator => new LibraryValidator();
+    public class LibraryBookImporter : ItemsImporterBase
+    {
+  	  protected override IValidator Validator => new LibraryValidator();
 
-		private BookImporter bookImporter { get; }
+  	  private BookImporter bookImporter { get; }
 
-		public LibraryBookImporter(LibationContext context) : base(context)
-		{
-			bookImporter = new BookImporter(DbContext);
-		}
+  	  public LibraryBookImporter(LibationContext context) : base(context)
+  	  {
+  		  bookImporter = new BookImporter(DbContext);
+  	  }
 
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			bookImporter.Import(importItems);
+  	  protected override int DoImport(IEnumerable<ImportItem> importItems)
+  	  {
+  		  bookImporter.Import(importItems);
 
-			var qtyNew = upsertLibraryBooks(importItems);
-			return qtyNew;
-		}
+  		  var qtyNew = upsertLibraryBooks(importItems);
+  		  return qtyNew;
+  	  }
 
-		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
-		{
-			// technically, we should be able to have duplicate books from separate accounts.
-			// this would violate the current pk and would be difficult to deal with elsewhere:
-			// - what to show in the grid
-			// - which to consider liberated
-			//
-			// sqlite cannot alter pk. the work around is an extensive headache
-			// - update: now possible in .net5/efcore5
-			//
-			// currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
-			//
-			// CURRENT SOLUTION: don't re-insert
+  	  private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
+  	  {
+  		  // technically, we should be able to have duplicate books from separate accounts.
+  		  // this would violate the current pk and would be difficult to deal with elsewhere:
+  		  // - what to show in the grid
+  		  // - which to consider liberated
+  		  //
+  		  // sqlite cannot alter pk. the work around is an extensive headache
+  		  // - update: now possible in .net5/efcore5
+  		  //
+  		  // currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
+  		  //
+  		  // CURRENT SOLUTION: don't re-insert
 
 
-			//When Books are upserted during the BookImporter run, they are linked to their LibraryBook in the DbContext
-			//instance. If a LibraryBook has a null book here, that means it's Book was not imported during by BookImporter.
-			//There should never be duplicates, but this is defensive.
-			var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionarySafe(l => l.Book.AudibleProductId);
+  		  //When Books are upserted during the BookImporter run, they are linked to their LibraryBook in the DbContext
+  		  //instance. If a LibraryBook has a null book here, that means it's Book was not imported during by BookImporter.
+  		  //There should never be duplicates, but this is defensive.
+  		  var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionarySafe(l => l.Book.AudibleProductId);
 
-			//If importItems are contains duplicates by asin, keep the Item that's "available"
-			var uniqueImportItems = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
+  		  //If importItems are contains duplicates by asin, keep the Item that's "available"
+  		  var uniqueImportItems = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
 
-			int qtyNew = 0;
+  		  int qtyNew = 0;			
 
-			foreach (var item in uniqueImportItems.Values)
-			{
-				if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
-				{
-					if (existing.Account != item.AccountId)
-					{
-						//Book is absent from the existing LibraryBook's account. Use the alternate account.
-						existing.SetAccount(item.AccountId);
-					}
+  		  foreach (var item in uniqueImportItems.Values)
+  		  {
+  			  if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
+  			  {
+  				  if (existing.Account != item.AccountId)
+  				  {
+  					  //Book is absent from the existing LibraryBook's account. Use the alternate account.
+  					  existing.SetAccount(item.AccountId);
+  				  }
 
-					existing.AbsentFromLastScan = isUnavailable(item);
-				}
-				else
-				{
-					var libraryBook = new LibraryBook(
-						bookImporter.Cache[item.DtoItem.ProductId],
-						item.DtoItem.DateAdded,
-						item.AccountId)
-						{
-							AbsentFromLastScan = isUnavailable(item)
-						};
+  				  existing.AbsentFromLastScan = isUnavailable(item);
+  			  }
+  			  else
+  			  {
+  				  existing = new LibraryBook(
+  					  bookImporter.Cache[item.DtoItem.ProductId],
+  					  item.DtoItem.DateAdded,
+  					  item.AccountId)
+  					  {
+  						  AbsentFromLastScan = isUnavailable(item)
+  					  };
 
-					try
-					{
-						DbContext.LibraryBooks.Add(libraryBook);
-						qtyNew++;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { libraryBook.Book, libraryBook.Account });
-					}
-				}
-			}
+  				  try
+  				  {
+  					  DbContext.LibraryBooks.Add(existing);
+  					  qtyNew++;
+  				  }
+  				  catch (Exception ex)
+  				  {
+  					  Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { existing.Book, existing.Account });
+  				  }
+  			  }
+  			  
+  			  existing.SetIncludedUntil(GetExpirationDate(item));
+  		  }
 
-			var scannedAccounts = importItems.Select(i => i.AccountId).Distinct().ToList();
+  		  var scannedAccounts = importItems.Select(i => i.AccountId).Distinct().ToList();
 
-			//If an existing Book wasn't found in the import, the owning LibraryBook's Book will be null.
-			//Only change AbsentFromLastScan for LibraryBooks of accounts that were scanned.
-			foreach (var nullBook in DbContext.LibraryBooks.AsEnumerable().Where(lb => lb.Book is null && lb.Account.In(scannedAccounts)))
-				nullBook.AbsentFromLastScan = true;
+  		  //If an existing Book wasn't found in the import, the owning LibraryBook's Book will be null.
+  		  //Only change AbsentFromLastScan for LibraryBooks of accounts that were scanned.
+  		  foreach (var nullBook in DbContext.LibraryBooks.AsEnumerable().Where(lb => lb.Book is null && lb.Account.In(scannedAccounts)))
+  			  nullBook.AbsentFromLastScan = true;
 
-			return qtyNew;
-		}		
+  		  return qtyNew;
+  	  }		
 
-		private static Dictionary<TKey, TSource> ToDictionarySafe<TKey, TSource>(IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TSource, TSource> tieBreaker)
-		{
-			var dictionary = new Dictionary<TKey, TSource>();
+  	  private static Dictionary<TKey, TSource> ToDictionarySafe<TKey, TSource>(IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TSource, TSource> tieBreaker)
+  	  {
+  		  var dictionary = new Dictionary<TKey, TSource>();
 
-			foreach (TSource newItem in source)
-			{
-				TKey key = keySelector(newItem);
+  		  foreach (TSource newItem in source)
+  		  {
+  			  TKey key = keySelector(newItem);
 
-				dictionary[key]
-					= dictionary.TryGetValue(key, out TSource existingItem)
-					? tieBreaker(existingItem, newItem)
-					: newItem;
-			}
-			return dictionary;
-		}
+  			  dictionary[key]
+  				  = dictionary.TryGetValue(key, out TSource existingItem)
+  				  ? tieBreaker(existingItem, newItem)
+  				  : newItem;
+  		  }
+  		  return dictionary;
+  	  }
 
-		private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
-			=> isUnavailable(item1) && !isUnavailable(item2) ? item2 : item1;
+  	  private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
+  		  => isUnavailable(item1) && !isUnavailable(item2) ? item2 : item1;
 
-		private static bool isUnavailable(ImportItem item)
-			=> isFutureRelease(item) || isPlusTitleUnavailable(item);
+  	  private static bool isUnavailable(ImportItem item)
+  		  => isFutureRelease(item) || isPlusTitleUnavailable(item);
 
         private static bool isFutureRelease(ImportItem item)
-			=> item.DtoItem.IssueDate is DateTimeOffset dt && dt > DateTimeOffset.UtcNow;
+  		  => item.DtoItem.IssueDate is DateTimeOffset dt && dt > DateTimeOffset.UtcNow;
 
-		private static bool isPlusTitleUnavailable(ImportItem item)
-			=> item.DtoItem.ContentType is null
-			|| (item.DtoItem.IsAyce is true && item.DtoItem.Plans?.Any(p => p.IsAyce) is not true);
-	}
-}
+  	  private static bool isPlusTitleUnavailable(ImportItem item)
+  		  => item.DtoItem.ContentType is null
+  		  || (item.DtoItem.IsAyce is true && item.DtoItem.Plans?.Any(p => p.IsAyce) is not true);
+
+  	  /// <summary>
+  	  /// Determines when your audible plus or free book will expire from your library  
+  	  /// plan.IsAyce from underlying AudibleApi project determines the plans to look at, first plan found is used.
+  	  /// In some cases current date is later than end date so exclude.
+  	  /// </summary>
+  	  /// <returns>The DateTime that this title will become unavailable, otherwise null</returns>
+  	  private static DateTime? GetExpirationDate(ImportItem item)
+  		  => item.DtoItem.Plans
+  		  ?.Where(p => p.IsAyce)
+  		  .Select(p => p.EndDate)
+  		  .FirstOrDefault(end => end.HasValue && end.Value.Year is not (2099 or 9999) && end.Value.LocalDateTime >= DateTime.Now) 
+  		  ?.DateTime;
+    }
+}

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -3,6 +3,7 @@ using AudibleApi;
 using AudibleApi.Common;
 using AudibleUtilities.Widevine;
 using DataLayer;
+using Dinah.Core;
 using LibationFileManager;
 using NAudio.Lame;
 using System;
@@ -24,14 +25,29 @@ public partial class DownloadOptions
 	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
 	{
 		var license = await ChooseContent(api, libraryBook, config, token);
+		Serilog.Log.Logger.Debug("Content License {@License}", new
+		{
+			license.DrmType,
+			license.ContentMetadata.ContentReference.Codec,
+			license.ContentMetadata.ContentReference.Marketplace,
+			license.ContentMetadata.ContentReference.ContentSizeInBytes,
+			license.ContentMetadata.ContentReference.Version,
+			license.ContentMetadata.ContentReference.FileVersion
+		});
+
 		token.ThrowIfCancellationRequested();
 
 		//Some audiobooks will have incorrect chapters in the metadata returned from the license request,
 		//but the metadata returned by the content metadata endpoint will be correct. Call the content
-		//metadata endpoint and use its chapters. Only replace the license request chapters if the total
-		//lengths match (defensive against different audio formats having slightly different lengths).
-		var metadata = await api.GetContentMetadataAsync(libraryBook.Book.AudibleProductId);
-		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
+		//metadata endpoint and use its chapters. Only replace the license request chapters if the content
+		//references match (defensive against different audio formats having slightly different lengths).
+		var metadata = await api.GetContentMetadataAsync(
+		   libraryBook.Book.AudibleProductId,
+		   license.DrmType,
+		   license.ContentMetadata.ContentReference.Acr,
+		   license.ContentMetadata.ContentReference.FileVersion);
+
+		if (metadata is not null && metadata.ContentReference == license.ContentMetadata.ContentReference)
 			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
 
 		token.ThrowIfCancellationRequested();
@@ -41,7 +57,7 @@ public partial class DownloadOptions
 	private class LicenseInfo
 	{
 		public DrmType DrmType { get; }
-		public ContentMetadata ContentMetadata { get; set; }
+		public ContentMetadata ContentMetadata { get; }
 		public KeyData[]? DecryptionKeys { get; }
 		public LicenseInfo(ContentLicense license, IEnumerable<KeyData>? keys = null)
 		{
@@ -56,10 +72,28 @@ public partial class DownloadOptions
 
 	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
 	{
+		Serilog.Log.Logger.Debug("Download Settings {@Settings}", new
+		{
+			config.FileDownloadQuality,
+			config.UseWidevine,
+			config.Request_xHE_AAC,
+			config.RequestSpatial,
+			config.SpatialAudioCodec
+		});
+
 		var dlQuality = config.FileDownloadQuality == Configuration.DownloadQuality.Normal ? DownloadQuality.Normal : DownloadQuality.High;
 
-		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
+		bool canUseWidevine = api.SupportsWidevine();
+		if (!config.UseWidevine || !canUseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
 		{
+			if (config.UseWidevine)
+			{
+				if (canUseWidevine)
+					Serilog.Log.Logger.Information("Unable to get a Widevine CDM. Falling back to ADRM.");
+				else
+					Serilog.Log.Logger.Information("Account {@account} is not registered as an android device, so content will not be downloaded with Widevine DRM. Remove and re-add the account in Libation to fix.", libraryBook.Account.ToMask());
+			}
+
 			token.ThrowIfCancellationRequested();
 			var license = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
 			return new LicenseInfo(license);
@@ -254,8 +288,11 @@ public partial class DownloadOptions
 
 	*/
 
-	public static List<Chapter> flattenChapters(IList<Chapter> chapters, string? titleConcat = ": ")
+	public static List<Chapter> flattenChapters(IList<Chapter>? chapters, string? titleConcat = ": ")
 	{
+		if (chapters is null)
+			return [];
+
 		List<Chapter> chaps = new();
 
 		foreach (var c in chapters)

Source/FileLiberator/UtilityExtensions.cs

@@ -7,6 +7,7 @@ using DataLayer;
 using Dinah.Core;
 using LibationFileManager;
 using LibationFileManager.Templates;
+using System.Security.Authentication;
 
 #nullable enable
 namespace FileLiberator
@@ -25,14 +26,22 @@ namespace FileLiberator
 
 		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
 		{
-			Account account;
-			using (var accounts = AudibleApiStorage.GetAccountsSettingsPersister())
-				account = accounts.AccountsSettings.GetAccount(libraryBook.Account, libraryBook.Book.Locale);
+			using var accounts = AudibleApiStorage.GetAccountsSettingsPersister();
+			var account = accounts.AccountsSettings.GetAccount(libraryBook.Account, libraryBook.Book.Locale)
+				?? throw new InvalidCredentialException($"No account found for '{libraryBook.Account}' and locale '{libraryBook.Book.Locale}'");
 
 			var apiExtended = await ApiExtended.CreateAsync(account);
 			return apiExtended.Api;
 		}
 
+		public static bool SupportsWidevine(this AudibleApi.Api api)
+		{
+			//TODO: Expose Api's identity maintainer directly instead of using reflection.
+			var identityProperty = api.GetType().GetProperty("_identityMaintainer", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+			return identityProperty?.GetValue(api) is AudibleApi.Authorization.IIdentityMaintainer identityMaintainer
+				&& identityMaintainer.DeviceType == AudibleApi.Resources.DeviceType;
+		}
+
 		public static LibraryBookDto ToDto(this LibraryBook libraryBook)
 		{
 			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();

Source/FileManager/BackgroundFileSystem.cs

@@ -3,15 +3,16 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 #nullable enable
 namespace FileManager
 {
-    /// <summary>
-    /// Tracks actual locations of files.
-    /// </summary>
-    public class BackgroundFileSystem
+	/// <summary>
+	/// Tracks actual locations of files.
+	/// </summary>
+	public class BackgroundFileSystem : IDisposable
     {
         public LongPath RootDirectory { get; private set; }
         public string SearchPattern { get; private set; }
@@ -21,7 +22,7 @@ namespace FileManager
         private BlockingCollection<FileSystemEventArgs>? directoryChangesEvents { get; set; }
         private Task? backgroundScanner { get; set; }
 
-        private object fsCacheLocker { get; } = new();
+        private Lock fsCacheLocker { get; } = new();
         private List<LongPath> fsCache { get; } = new();
 
         public BackgroundFileSystem(LongPath rootDirectory, string searchPattern, SearchOption searchOptions)
@@ -100,7 +101,6 @@ namespace FileManager
 
         private void FileSystemWatcher_Error(object sender, ErrorEventArgs e)
         {
-            Stop();
             Init();
         }
 
@@ -181,8 +181,12 @@ namespace FileManager
                 fsCache.Add(newFile);
         }
 
-        #endregion
+		#endregion
 
-        ~BackgroundFileSystem() => Stop();
-    }
+		public void Dispose()
+		{
+			Stop();
+			GC.SuppressFinalize(this);
+		}
+	}
 }

Source/FileManager/FileManager.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.2.1" />
-    <PackageReference Include="Polly" Version="8.6.2" />
+    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
+    <PackageReference Include="Polly" Version="8.6.4" />
   </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/FileManager/IPersistentDictionary.cs

@@ -0,0 +1,40 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Linq;
+
+#nullable enable
+namespace FileManager;
+
+public interface IPersistentDictionary
+{
+	bool Exists(string propertyName);
+	string? GetString(string propertyName, string? defaultValue = null);
+	T? GetNonString<T>(string propertyName, T? defaultValue = default);
+	object? GetObject(string propertyName);
+	void SetString(string propertyName, string? newValue);
+	void SetNonString(string propertyName, object? newValue);
+	bool RemoveProperty(string propertyName);
+	bool SetWithJsonPath(string jsonPath, string propertyName, string? newValue, bool suppressLogging = false);
+	string? GetStringFromJsonPath(string jsonPath);
+
+	string? GetStringFromJsonPath(string jsonPath, string propertyName)
+		=> GetStringFromJsonPath($"{jsonPath}.{propertyName}");
+
+	static T? UpCast<T>(object obj)
+	{
+		if (obj.GetType().IsAssignableTo(typeof(T))) return (T)obj;
+		if (obj is JObject jObject) return jObject.ToObject<T>();
+		if (obj is JValue jValue)
+		{
+			if (typeof(T).IsAssignableTo(typeof(Enum)))
+			{
+				return
+					Enum.TryParse(typeof(T), jValue.Value<string>(), out var enumVal)
+					? (T)enumVal
+					: Enum.GetValues(typeof(T)).Cast<T>().First();
+			}
+			return jValue.Value<T>();
+		}
+		throw new InvalidCastException($"{obj.GetType()} is not convertible to {typeof(T)}");
+	}
+}

Source/FileManager/NamingTemplate/ConditionalTagCollection[TClass].cs

@@ -22,6 +22,8 @@ internal interface IClosingPropertyTag : IPropertyTag
 	bool StartsWithClosing(string templateString, [NotNullWhen(true)] out string? exactName, [NotNullWhen(true)] out IClosingPropertyTag? propertyTag);
 }
 
+public delegate bool Conditional<T>(ITemplateTag templateTag, T value, string condition);
+
 public class ConditionalTagCollection<TClass> : TagCollection
 {
 	public ConditionalTagCollection(bool caseSensative = true) :base(typeof(TClass), caseSensative) { }
@@ -32,21 +34,49 @@ public class ConditionalTagCollection<TClass> : TagCollection
 	/// <param name="propertyGetter">A Func to get the condition's <see cref="bool"/> value from <see cref="TClass"/></param>
 	public void Add(ITemplateTag templateTag, Func<TClass, bool> propertyGetter)
 	{
-		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
-
+		var target = propertyGetter.Target is null ? null : Expression.Constant(propertyGetter.Target);
+		var expr = Expression.Call(target, propertyGetter.Method, Parameter);
 		AddPropertyTag(new ConditionalTag(templateTag, Options, expr));
 	}
+
+	/// <summary>
+	/// Register a conditional tag.
+	/// </summary>
+	/// <param name="conditional">A <see cref="Conditional{TClass}"/> to get the condition's <see cref="bool"/> value</param>
+	public void Add(ITemplateTag templateTag, Conditional<TClass> conditional)
+	{
+		AddPropertyTag(new ConditionalTag(templateTag, Options, Parameter, conditional));
+	}
 	
 	private class ConditionalTag : TagBase, IClosingPropertyTag
 	{
 		public override Regex NameMatcher { get; }
 		public Regex NameCloseMatcher { get; }
 
+		private Func<string?, Expression> CreateConditionExpression { get; }
+
 		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, Expression conditionExpression)
 			: base(templateTag, conditionExpression)
 		{
-			NameMatcher = new Regex($"^<(!)?{templateTag.TagName}->", options);
+			NameMatcher = new Regex(@$"^<(!)?{templateTag.TagName}->", options);
 			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
+			CreateConditionExpression = _ => conditionExpression;
+		}
+
+		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, ParameterExpression parameter, Conditional<TClass> conditional)
+			: base(templateTag, Expression.Constant(false))
+		{
+			NameMatcher = new Regex(@$"^<(!)?{templateTag.TagName}(?:\s+?(.*?)\s*?)?->", options);
+			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
+
+			var target = conditional.Target is null ? null : Expression.Constant(conditional.Target);
+			CreateConditionExpression = condition
+				=> Expression.Call(
+					conditional.Target is null ? null : Expression.Constant(conditional.Target),
+					conditional.Method,
+					Expression.Constant(templateTag),
+					parameter,
+					Expression.Constant(condition));
 		}
 
 		public bool StartsWithClosing(string templateString, [NotNullWhen(true)] out string? exactName, [NotNullWhen(true)] out IClosingPropertyTag? propertyTag)
@@ -64,6 +94,13 @@ public class ConditionalTagCollection<TClass> : TagCollection
 			return false;
 		}
 
-		protected override Expression GetTagExpression(string exactName, string formatter) => formatter == "!" ? Expression.Not(ValueExpression) : ValueExpression;
+		protected override Expression GetTagExpression(string exactName, string[] extraData)
+		{
+			if (extraData.Length is not (1 or 2) || extraData[0] is not ("!" or "") || extraData.Length == 2 && string.IsNullOrWhiteSpace(extraData[1]))
+				return Expression.Constant(false);
+
+			var getBool = extraData.Length == 2 ? CreateConditionExpression(extraData[1]) : CreateConditionExpression(null);
+			return extraData[0] == "!" ? Expression.Not(getBool) : getBool;
+		}
 	}
 }

Source/FileManager/NamingTemplate/NamingTemplate.cs

@@ -30,7 +30,7 @@ public class NamingTemplate
 	/// Invoke the <see cref="NamingTemplate"/>
 	/// </summary>
 	/// <param name="propertyClasses">Instances of the TClass used in <see cref="PropertyTagCollection{TClass}"/> and <see cref="ConditionalTagCollection{TClass}"/></param>
-	public TemplatePart Evaluate(params object[] propertyClasses)
+	public TemplatePart Evaluate(params object?[] propertyClasses)
 	{
 		if (templateToString is null)
 			throw new InvalidOperationException();
@@ -38,8 +38,8 @@ public class NamingTemplate
 		// Match propertyClasses to the arguments required by templateToString.DynamicInvoke(). 
 		// First parameter is "this", so ignore it.
 		var delegateArgTypes = templateToString.Method.GetParameters().Skip(1);
-
-		object[] args = delegateArgTypes.Join(propertyClasses, o => o.ParameterType, i => i.GetType(), (_, i) => i).ToArray();
+		
+		object?[] args = delegateArgTypes.Join(propertyClasses, o => o.ParameterType, i => i?.GetType(), (_, i) => i).ToArray();
 		
 		if (args.Length != delegateArgTypes.Count())
 			throw new ArgumentException($"This instance of {nameof(NamingTemplate)} requires the following arguments: {string.Join(", ", delegateArgTypes.Select(t => t.Name).Distinct())}");

Source/FileManager/NamingTemplate/PropertyTagCollection[TClass].cs

@@ -1,6 +1,7 @@
 using Dinah.Core;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
@@ -109,6 +110,25 @@ public class PropertyTagCollection<TClass> : TagCollection
 		catch { return null; }
 	}
 
+	/// <summary>
+	/// Try to get the default (unformatted) value of a property tag.
+	/// </summary>
+	/// <param name="tagName">Name of the tag value to get</param>
+	/// <param name="object">The property class from which the tag's value is read</param>
+	/// <param name="value"><paramref name="tagName"/>'s string value if it is in this collection, otherwise null</param>
+	/// <returns>True if the <paramref name="tagName"/> is in this collection, otherwise false</returns>
+	public bool TryGetValue(string tagName, TClass @object, [NotNullWhen(true)] out string? value)
+	{
+		value = null;
+
+		if (!StartsWith($"<{tagName}>", out var exactName, out var propertyTag, out var valueExpression))
+			return false;
+
+		var func = Expression.Lambda<Func<TClass, string>>(valueExpression, Parameter).Compile();
+		value = func(@object);
+		return true;
+	}
+
 	private class PropertyTag<TPropertyValue> : TagBase
 	{
 		public override Regex NameMatcher { get; }
@@ -138,8 +158,13 @@ public class PropertyTagCollection<TClass> : TagCollection
 						expVal);
 		}
 
-		protected override Expression GetTagExpression(string exactName, string formatString)
+		protected override Expression GetTagExpression(string exactName, string[] extraData)
 		{
+			if (extraData.Length is not (0 or 1))
+				return Expression.Constant(exactName);
+
+			string formatString = extraData.Length == 1 ? extraData[0] : "";
+
 			Expression toStringExpression
 				= !ReturnType.IsValueType
 				? Expression.Condition(

Source/FileManager/NamingTemplate/TagBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
 
@@ -42,8 +43,8 @@ internal abstract class TagBase : IPropertyTag
 
 	/// <summary>Create an <see cref="Expression"/> that returns the property's value.</summary>
 	/// <param name="exactName">The exact string that was matched to <see cref="ITemplateTag"/></param>
-	/// <param name="formatter">The optional format string in the match inside the square brackets</param>
-	protected abstract Expression GetTagExpression(string exactName, string formatter);
+	/// <param name="extraData">Optional extra data parsed from the tag, such as a format string in the match the square brackets, logical negation, and conditional options</param>
+	protected abstract Expression GetTagExpression(string exactName, string[] extraData);
 
 	public bool StartsWith(string templateString, [NotNullWhen(true)] out string? exactName, [NotNullWhen(true)] out Expression? propertyValue)
 	{
@@ -51,7 +52,7 @@ internal abstract class TagBase : IPropertyTag
 		if (match.Success)
 		{
 			exactName = match.Value;
-			propertyValue = GetTagExpression(exactName, match.Groups.Count == 2 ? match.Groups[1].Value.Trim() : "");
+			propertyValue = GetTagExpression(exactName, match.Groups.Values.Skip(1).Select(v => v.Value.Trim()).ToArray());
 			return true;
 		}
 

Source/FileManager/NamingTemplate/TagCollection.cs

@@ -18,7 +18,7 @@ public abstract class TagCollection : IEnumerable<ITemplateTag>
 	/// <summary>The <see cref="ParameterExpression"/> of the <see cref="TagCollection"/>'s TClass type.</summary>
 	internal ParameterExpression Parameter { get; }
 	protected RegexOptions Options { get; } = RegexOptions.Compiled;
-	private List<IPropertyTag> PropertyTags { get; } = new();
+	internal List<IPropertyTag> PropertyTags { get; } = new();
 
 	protected TagCollection(Type classType, bool caseSensative = true)
 	{

Source/FileManager/PersistentDictionary.cs

@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 #nullable enable
 namespace FileManager
 {
-    public class PersistentDictionary
+    public class PersistentDictionary : IPersistentDictionary
     {
         public string Filepath { get; }
         public bool IsReadOnly { get; }
@@ -60,21 +59,8 @@ namespace FileManager
                 objectCache[propertyName] = defaultValue;
                 return defaultValue;
             }
-            if (obj.GetType().IsAssignableTo(typeof(T))) return (T)obj;
-            if (obj is JObject jObject) return jObject.ToObject<T>();
-            if (obj is JValue jValue)
-            {
-                if (typeof(T).IsAssignableTo(typeof(Enum)))
-                {
-                    return
-                        Enum.TryParse(typeof(T), jValue.Value<string>(), out var enumVal)
-                        ? (T)enumVal
-                        : Enum.GetValues(typeof(T)).Cast<T>().First();
-                }
-                return jValue.Value<T>();
-            }
-            throw new InvalidCastException($"{obj.GetType()} is not convertible to {typeof(T)}");
-        }
+            return IPersistentDictionary.UpCast<T>(obj);
+		}
 
         public object? GetObject(string propertyName)
         {
@@ -89,7 +75,6 @@ namespace FileManager
             return objectCache[propertyName];
         }
 
-        public string? GetStringFromJsonPath(string jsonPath, string propertyName) => GetStringFromJsonPath($"{jsonPath}.{propertyName}");
         public string? GetStringFromJsonPath(string jsonPath)
         {
             if (!stringCache.ContainsKey(jsonPath))

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -70,13 +70,11 @@
 		<TrimmableAssembly Include="Avalonia.Themes.Default" />
 	</ItemGroup>
 	<ItemGroup>
-
-		<PackageReference Include="Avalonia" Version="11.3.3" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.3.3" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.3" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.3" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.3" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" />
+		<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/HangoverAvalonia/Program.cs

@@ -1,5 +1,5 @@
 using Avalonia;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using System;
 
 namespace HangoverAvalonia

Source/Libation.sln

@@ -5,6 +5,7 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
 	ProjectSection(SolutionItems) = preProject
+		add-migrations.ps1 = add-migrations.ps1
 		REFERENCE.txt = REFERENCE.txt
 		Upgrading dotnet version.txt = Upgrading dotnet version.txt
 		_ARCHITECTURE NOTES.txt = _ARCHITECTURE NOTES.txt
@@ -104,6 +105,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation CLI", "Libation CL
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssertionHelper", "_Tests\AssertionHelper\AssertionHelper.csproj", "{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataLayer.Postgres", "DataLayer.Postgres\DataLayer.Postgres.csproj", "{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataLayer.Sqlite", "DataLayer.Sqlite\DataLayer.Sqlite.csproj", "{1E689E85-279E-39D4-7D97-3E993FB6D95B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -226,6 +231,14 @@ Global
 		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -265,6 +278,8 @@ Global
 		{53758A35-1C7E-4702-9B96-433ABA457B37} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{47E27674-595D-4F7A-8CFB-127E768E1D1E} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
+		{1E689E85-279E-39D4-7D97-3E993FB6D95B} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationAvalonia/App.axaml.cs

@@ -1,261 +1,261 @@
 using ApplicationServices;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
+using Avalonia.Threading;
+using Dinah.Core;
 using LibationAvalonia.Dialogs;
+using LibationAvalonia.Themes;
 using LibationAvalonia.Views;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Threading;
-using Dinah.Core;
-using LibationAvalonia.Themes;
-using Avalonia.Data.Core.Plugins;
 using System.Linq;
-using LibationUiBase.Forms;
-using Avalonia.Controls;
+using System.Threading.Tasks;
 
 #nullable enable
-namespace LibationAvalonia
+namespace LibationAvalonia;
+
+public class App : Application
 {
-	public class App : Application
+	public static Task<List<DataLayer.LibraryBook>>? LibraryTask { get; set; }
+	public static ChardonnayTheme? DefaultThemeColors { get; private set; }
+	public static MainWindow? MainWindow { get; private set; }
+	public static Uri AssetUriBase { get; } = new("avares://Libation/Assets/");
+	public static new Application Current => Application.Current ?? throw new InvalidOperationException("The Avalonia app hasn't started yet.");
+
+	public static Stream OpenAsset(string assetRelativePath)
+		=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
+
+	public override void Initialize() => AvaloniaXamlLoader.Load(this);
+
+	public override void OnFrameworkInitializationCompleted()
 	{
-		public static Task<List<DataLayer.LibraryBook>>? LibraryTask { get; set; }
-		public static ChardonnayTheme? DefaultThemeColors { get; private set; }
-		public static MainWindow? MainWindow { get; private set; }
-		public static Uri AssetUriBase { get; } = new("avares://Libation/Assets/");
-		public static new Application Current => Application.Current ?? throw new InvalidOperationException("The Avalonia app hasn't started yet.");
+		DefaultThemeColors = ChardonnayTheme.GetLiveTheme();
 
-		public static Stream OpenAsset(string assetRelativePath)
-			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
-
-		public override void Initialize()
+		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 		{
-			AvaloniaXamlLoader.Load(this);
-		}
+			// Chardonnay uses the OnLastWindowClose shutdown mode. As long as the application lifetime
+			// has one active window, the application will stay alive. Setup windows must be daisy chained,
+			// each closing windows opens the next window before closing itself to prevent the app from exiting.
 
-		public override void OnFrameworkInitializationCompleted()
-		{
-			DefaultThemeColors = ChardonnayTheme.GetLiveTheme();
+			MessageBoxBase.ShowAsyncImpl = (owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition) =>
+				MessageBox.Show(owner as Window, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
 
-			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
+			// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
+			DisableAvaloniaDataAnnotationValidation();
+
+			Configuration config = Configuration.Instance;
+
+			if (!config.LibationSettingsAreValid)
 			{
-				MessageBoxBase.ShowAsyncImpl = (owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition) =>
-					MessageBox.Show(owner as Window, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
+				string defaultLibationFilesDir = Configuration.DefaultLibationFilesDirectory;
 
-				// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-				// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-				DisableAvaloniaDataAnnotationValidation();
+				// check for existing settings in default location
+				string defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
+				if (Configuration.SettingsFileIsValid(defaultSettingsFile))
+					Configuration.SetLibationFiles(defaultLibationFilesDir);
 
-				var config = Configuration.Instance;
-
-				if (!config.LibationSettingsAreValid)
+				if (config.LibationSettingsAreValid)
 				{
-					var defaultLibationFilesDir = Configuration.DefaultLibationFilesDirectory;
-
-					// check for existing settings in default location
-					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
-					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-						Configuration.SetLibationFiles(defaultLibationFilesDir);
-
-					if (config.LibationSettingsAreValid)
-					{
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-						ShowMainWindow(desktop);
-					}
-					else
-					{
-						var setupDialog = new SetupDialog { Config = config };
-						setupDialog.Closing += Setup_Closing;
-						desktop.MainWindow = setupDialog;
-					}
+					LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+					ShowMainWindow(desktop);
 				}
 				else
-					ShowMainWindow(desktop);
-			}
-
-			base.OnFrameworkInitializationCompleted();
-		}
-		private void DisableAvaloniaDataAnnotationValidation()
-		{
-			// Get an array of plugins to remove
-			var dataValidationPluginsToRemove =
-				BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-			// remove each entry found
-			foreach (var plugin in dataValidationPluginsToRemove)
-			{
-				BindingPlugins.DataValidators.Remove(plugin);
-			}
-		}
-
-		private async void Setup_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
-		{
-			if (sender is not SetupDialog setupDialog || ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
-				return;
-
-			try
-			{
-				// all returns should be preceded by either:
-				// - if config.LibationSettingsAreValid
-				// - error message, Exit()				
-				if (setupDialog.IsNewUser)
 				{
-					Configuration.SetLibationFiles(Configuration.DefaultLibationFilesDirectory);
-					setupDialog.Config.Books = Configuration.DefaultBooksDirectory;
-
-					if (setupDialog.Config.LibationSettingsAreValid)
-					{
-						string? theme = setupDialog.SelectedTheme.Content as string;
-
-						setupDialog.Config.SetString(theme, nameof(ThemeVariant));
-
-						await RunMigrationsAsync(setupDialog.Config);
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-						ShowMainWindow(desktop);
-					}
-					else
-					{
-						e.Cancel = true;
-						await CancelInstallation(setupDialog);
-					}
+					SetupDialog setupDialog = new() { Config = config };
+					setupDialog.Closing += (_, e) => SetupClosing(setupDialog, desktop, e);
+					desktop.MainWindow = setupDialog;
 				}
-				else if (setupDialog.IsReturningUser)
+			}
+			else
+			{
+				ShowMainWindow(desktop);
+			}
+		}
+
+		base.OnFrameworkInitializationCompleted();
+	}
+
+	private void DisableAvaloniaDataAnnotationValidation()
+	{
+		// Get an array of plugins to remove
+		DataAnnotationsValidationPlugin[] dataValidationPluginsToRemove =
+			BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
+
+		// remove each entry found
+		foreach (DataAnnotationsValidationPlugin? plugin in dataValidationPluginsToRemove)
+		{
+			BindingPlugins.DataValidators.Remove(plugin);
+		}
+	}
+
+	private async void SetupClosing(SetupDialog setupDialog, IClassicDesktopStyleApplicationLifetime desktop, System.ComponentModel.CancelEventArgs e)
+	{
+		try
+		{
+			if (setupDialog.IsNewUser)
+			{
+				Configuration.SetLibationFiles(Configuration.DefaultLibationFilesDirectory);
+				setupDialog.Config.Books = Configuration.DefaultBooksDirectory;
+
+				if (setupDialog.Config.LibationSettingsAreValid)
 				{
-					ShowLibationFilesDialog(desktop, setupDialog.Config, OnLibationFilesCompleted);
+					string? theme = setupDialog.SelectedTheme.Content as string;
+					setupDialog.Config.SetString(theme, nameof(ThemeVariant));
+
+					await RunMigrationsAsync(setupDialog.Config);
+					LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+					AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+					ShowMainWindow(desktop);
 				}
 				else
 				{
 					e.Cancel = true;
 					await CancelInstallation(setupDialog);
-					return;
 				}
-
 			}
-			catch (Exception ex)
+			else if (setupDialog.IsReturningUser)
 			{
-				var title = "Fatal error, pre-logging";
-				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
-				try
-				{
-					await MessageBox.ShowAdminAlert(setupDialog, body, title, ex);
-				}
-				catch
-				{
-					await MessageBox.Show(setupDialog, $"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-				return;
-			}
-		}
-
-		private async Task RunMigrationsAsync(Configuration config)
-		{
-			// most migrations go in here
-			AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
-
-			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
-
-			// logging is init'd here
-			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(AppScaffolding.Variety.Chardonnay, config);
-		}
-
-		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
-		{
-			var libationFilesDialog = new LibationFilesDialog();
-			desktop.MainWindow = libationFilesDialog;
-			libationFilesDialog.Show();
-
-			void WindowClosing(object? sender, System.ComponentModel.CancelEventArgs e)
-			{
-				libationFilesDialog.Closing -= WindowClosing;
-				e.Cancel = true;
-				OnClose?.Invoke(desktop, libationFilesDialog, config);
-			}
-			libationFilesDialog.Closing += WindowClosing;
-		}
-
-		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
-		{
-			Configuration.SetLibationFiles(libationFilesDialog.SelectedDirectory);
-			if (config.LibationSettingsAreValid)
-			{
-				await RunMigrationsAsync(config);
-
-				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-				ShowMainWindow(desktop);
+				ShowLibationFilesDialog(desktop, setupDialog.Config);
 			}
 			else
 			{
-				// path did not result in valid settings
-				var continueResult = await MessageBox.Show(
-					libationFilesDialog,
-					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
-					"New install?",
-					MessageBoxButtons.YesNo,
-					MessageBoxIcon.Question);
+				e.Cancel = true;
+				await CancelInstallation(setupDialog);
+			}
+		}
+		catch (Exception ex)
+		{
+			string title = "Fatal error, pre-logging";
+			string body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
 
-				if (continueResult == DialogResult.Yes)
+			MessageBoxAlertAdminDialog alert = new(body, title, ex);
+			desktop.MainWindow = alert;
+			alert.Show();
+		}
+	}
+
+	private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config)
+	{
+		LibationFilesDialog libationFilesDialog = new();
+		desktop.MainWindow = libationFilesDialog;
+		libationFilesDialog.Show();
+
+		async void WindowClosing(object? sender, System.ComponentModel.CancelEventArgs e)
+		{
+			libationFilesDialog.Closing -= WindowClosing;
+			e.Cancel = true;
+			if (libationFilesDialog.DialogResult == DialogResult.OK)
+				OnLibationFilesCompleted(desktop, libationFilesDialog, config);
+			else
+				await CancelInstallation(libationFilesDialog);
+		}
+		libationFilesDialog.Closing += WindowClosing;
+	}
+
+	private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
+	{
+		Configuration.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+		if (config.LibationSettingsAreValid)
+		{
+			await RunMigrationsAsync(config);
+
+			LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+			AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+			ShowMainWindow(desktop);
+		}
+		else
+		{
+			// path did not result in valid settings
+			DialogResult continueResult = await MessageBox.Show(
+				libationFilesDialog,
+				$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
+				"New install?",
+				MessageBoxButtons.YesNo,
+				MessageBoxIcon.Question);
+
+			if (continueResult == DialogResult.Yes)
+			{
+				config.Books = Path.Combine(libationFilesDialog.SelectedDirectory, nameof(Configuration.Books));
+
+				if (config.LibationSettingsAreValid)
 				{
-					config.Books = Configuration.DefaultBooksDirectory;
-
-					if (config.LibationSettingsAreValid)
-					{
-						await RunMigrationsAsync(config);
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-						ShowMainWindow(desktop);
-					}
-					else
-						await CancelInstallation(libationFilesDialog);
+					await RunMigrationsAsync(config);
+					LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+					AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+					ShowMainWindow(desktop);
 				}
 				else
+				{
 					await CancelInstallation(libationFilesDialog);
+				}
 			}
-
-			libationFilesDialog.Close();
-		}
-
-		static async Task CancelInstallation(Window window)
-		{
-			await MessageBox.Show(window, "Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-			Environment.Exit(0);
-		}
-
-		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
-		{
-			Configuration.Instance.PropertyChanged += ThemeVariant_PropertyChanged;
-			OpenAndApplyTheme(Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)));
-
-			var mainWindow = new MainWindow();
-			desktop.MainWindow = MainWindow = mainWindow;
-			mainWindow.Loaded += MainWindow_Loaded;
-			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
-			mainWindow.Show();
-		}
-
-		[PropertyChangeFilter(nameof(ThemeVariant))]
-		private static void ThemeVariant_PropertyChanged(object sender, PropertyChangedEventArgsEx e)
-			=> OpenAndApplyTheme(e.NewValue as string);
-
-		private static void OpenAndApplyTheme(string? themeVariant)
-		{
-			using var themePersister = ChardonnayThemePersister.Create();
-			themePersister?.Target.ApplyTheme(themeVariant);
-		}
-
-		private static async void MainWindow_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			if (LibraryTask is not null && MainWindow is not null)
+			else
 			{
-				var library = await LibraryTask;
-				await Dispatcher.UIThread.InvokeAsync(() => MainWindow.OnLibraryLoadedAsync(library));
+				await CancelInstallation(libationFilesDialog);
 			}
 		}
+
+		libationFilesDialog.Close();
+	}
+
+	private static async Task CancelInstallation(Window window)
+	{
+		await MessageBox.Show(window, "Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+		Environment.Exit(-1);
+	}
+
+	private async Task RunMigrationsAsync(Configuration config)
+	{
+		// most migrations go in here
+		AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
+
+		await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+		// logging is init'd here
+		AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(AppScaffolding.Variety.Chardonnay, config);
+	}
+
+	private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
+	{
+		Configuration.Instance.PropertyChanged += ThemeVariant_PropertyChanged;
+		Current.ActualThemeVariantChanged += OnActualThemeVariantChanged;
+		OnActualThemeVariantChanged(Current, EventArgs.Empty);
+
+		MainWindow mainWindow = new();
+		desktop.MainWindow = MainWindow = mainWindow;
+		mainWindow.Loaded += MainWindow_Loaded;
+		mainWindow.RestoreSizeAndLocation(Configuration.Instance);
+		mainWindow.Show();
+	}
+
+	[PropertyChangeFilter(nameof(ThemeVariant))]
+	private static void ThemeVariant_PropertyChanged(object sender, PropertyChangedEventArgsEx e)
+		=> OpenAndApplyTheme(e.NewValue as string);
+
+	private static void OnActualThemeVariantChanged(object? sender, EventArgs e)
+		=> OpenAndApplyTheme(Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)));
+
+	private static void OpenAndApplyTheme(string? themeVariant)
+	{
+		using ChardonnayThemePersister? themePersister = ChardonnayThemePersister.Create();
+		themePersister?.Target.ApplyTheme(themeVariant);
+	}
+
+	private static async void MainWindow_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+	{
+		if (LibraryTask is not null && MainWindow is not null)
+		{
+			List<DataLayer.LibraryBook> library = await LibraryTask;
+			await Dispatcher.UIThread.InvokeAsync(() => MainWindow.OnLibraryLoadedAsync(library));
+		}
 	}
 }

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -23,11 +23,6 @@ namespace LibationAvalonia
 			? dialogWindow.ShowDialog<DialogResult>(window)
 			: Task.FromResult(DialogResult.None);
 
-		public static Task<DialogResult> ShowDialogAsync(this Dialogs.Login.WebLoginDialog dialogWindow, Window? owner = null)
-			=> ((owner ?? App.MainWindow) is Window window)
-			? dialogWindow.ShowDialog<DialogResult>(window)
-			: Task.FromResult(DialogResult.None);
-
 		public static Window? GetParentWindow(this Control control) => control.GetVisualRoot() as Window;
 
 

Source/LibationAvalonia/Controls/NativeWebView.cs

@@ -1,176 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Platform;
-using Avalonia;
-using LibationFileManager;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Controls;
-
-#nullable enable
-public class NativeWebView : NativeControlHost, IWebView
-{
-	private IWebViewAdapter? _webViewAdapter;
-	private Uri? _delayedSource;
-	private TaskCompletionSource _webViewReadyCompletion = new();
-
-	public event EventHandler<WebViewNavigationEventArgs>? NavigationCompleted;
-
-	public event EventHandler<WebViewNavigationEventArgs>? NavigationStarted;
-	public event EventHandler? DOMContentLoaded;
-
-	public bool CanGoBack => _webViewAdapter?.CanGoBack ?? false;
-
-	public bool CanGoForward => _webViewAdapter?.CanGoForward ?? false;
-
-	public Uri? Source
-	{
-		get => _webViewAdapter?.Source ?? throw new InvalidOperationException("Control was not initialized");
-		set
-		{
-			if (_webViewAdapter is null)
-			{
-				_delayedSource = value;
-				return;
-			}
-			_webViewAdapter.Source = value;
-		}
-	}
-
-
-	public bool GoBack()
-	{
-		return _webViewAdapter?.GoBack() ?? throw new InvalidOperationException("Control was not initialized");
-	}
-
-	public bool GoForward()
-	{
-		return _webViewAdapter?.GoForward() ?? throw new InvalidOperationException("Control was not initialized");
-	}
-
-	public Task<string?> InvokeScriptAsync(string scriptName)
-	{
-		return _webViewAdapter is null
-			? throw new InvalidOperationException("Control was not initialized")
-			: _webViewAdapter.InvokeScriptAsync(scriptName);
-	}
-
-	public void Navigate(Uri url)
-	{
-		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.Navigate(url);
-	}
-
-	public Task NavigateToString(string text)
-	{
-		return (_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.NavigateToString(text);
-	}
-
-	public void Refresh()
-	{
-		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.Refresh();
-	}
-
-	public void Stop()
-	{
-		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.Stop();
-	}
-
-	public Task WaitForNativeHost()
-	{
-		return _webViewReadyCompletion.Task;
-	}
-
-	private class PlatformHandle : IPlatformHandle
-	{
-		public nint Handle { get; init; }
-
-		public string? HandleDescriptor { get; init; }
-	}
-
-	protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
-	{
-		_webViewAdapter = InteropFactory.Create().CreateWebViewAdapter();
-
-		if (_webViewAdapter is null)
-			return base.CreateNativeControlCore(parent);
-		else
-		{
-			SubscribeOnEvents();
-			var handle = new PlatformHandle
-			{
-				Handle = _webViewAdapter.PlatformHandle.Handle,
-				HandleDescriptor = _webViewAdapter.PlatformHandle.HandleDescriptor
-			};
-
-			if (_delayedSource is not null)
-			{
-				_webViewAdapter.Source = _delayedSource;
-			}
-
-			_webViewReadyCompletion.TrySetResult();
-
-			return handle;
-		}
-	}
-
-	private void SubscribeOnEvents()
-	{
-		if (_webViewAdapter is not null)
-		{
-			_webViewAdapter.NavigationStarted += WebViewAdapterOnNavigationStarted;
-			_webViewAdapter.NavigationCompleted += WebViewAdapterOnNavigationCompleted;
-			_webViewAdapter.DOMContentLoaded += _webViewAdapter_DOMContentLoaded;
-		}
-	}
-
-	private void _webViewAdapter_DOMContentLoaded(object? sender, EventArgs e)
-	{
-		DOMContentLoaded?.Invoke(this, e);
-	}
-
-	private void WebViewAdapterOnNavigationStarted(object? sender, WebViewNavigationEventArgs e)
-	{
-		NavigationStarted?.Invoke(this, e);
-	}
-
-	private void WebViewAdapterOnNavigationCompleted(object? sender, WebViewNavigationEventArgs e)
-	{
-		NavigationCompleted?.Invoke(this, e);
-	}
-
-	protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-	{
-		base.OnPropertyChanged(change);
-		if (change.Property == BoundsProperty && change.NewValue is Rect rect)
-		{
-			var scaling = (float)(VisualRoot?.RenderScaling ?? 1.0f);
-			_webViewAdapter?.HandleResize((int)(rect.Width * scaling), (int)(rect.Height * scaling), scaling);
-		}
-	}
-
-	protected override void OnKeyDown(KeyEventArgs e)
-	{
-		if (_webViewAdapter != null)
-		{
-			e.Handled = _webViewAdapter.HandleKeyDown((uint)e.Key, (uint)e.KeyModifiers);
-		}
-
-		base.OnKeyDown(e);
-	}
-
-	protected override void DestroyNativeControlCore(IPlatformHandle control)
-	{
-		if (_webViewAdapter is not null)
-		{
-			_webViewReadyCompletion = new TaskCompletionSource();
-			_webViewAdapter.NavigationStarted -= WebViewAdapterOnNavigationStarted;
-			_webViewAdapter.NavigationCompleted -= WebViewAdapterOnNavigationCompleted;
-			(_webViewAdapter as IDisposable)?.Dispose();
-		}
-	}
-}

Source/LibationAvalonia/Controls/Settings/Audio.axaml.cs

@@ -19,8 +19,7 @@ namespace LibationAvalonia.Controls.Settings
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new AudioSettingsVM(Configuration.Instance);
+				DataContext = new AudioSettingsVM(Configuration.CreateMockInstance());
 			}
 		}
 
@@ -39,7 +38,7 @@ namespace LibationAvalonia.Controls.Settings
 			{
 				using var accounts = AudibleApiStorage.GetAccountsSettingsPersister();
 
-				if (!accounts.AccountsSettings.Accounts.Any(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
+				if (!accounts.AccountsSettings.Accounts.All(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
 				{
 					if (VisualRoot is Window parent)
 					{

Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml.cs

@@ -16,8 +16,7 @@ namespace LibationAvalonia.Controls.Settings
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new DownloadDecryptSettingsVM(Configuration.Instance);
+				DataContext = new DownloadDecryptSettingsVM(Configuration.CreateMockInstance());
 			}
 		}
 

Source/LibationAvalonia/Controls/Settings/Import.axaml.cs

@@ -12,8 +12,7 @@ namespace LibationAvalonia.Controls.Settings
 
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new ImportSettingsVM(Configuration.Instance);
+				DataContext = new ImportSettingsVM(Configuration.CreateMockInstance());
 			}
 		}
 	}

Source/LibationAvalonia/Controls/Settings/Important.axaml.cs

@@ -18,8 +18,7 @@ namespace LibationAvalonia.Controls.Settings
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new ImportantSettingsVM(Configuration.Instance);
+				DataContext = new ImportantSettingsVM(Configuration.CreateMockInstance());
 			}
 
 			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;

Source/LibationAvalonia/Controls/ThemePreviewControl.axaml.cs

@@ -2,10 +2,8 @@ using Avalonia.Controls;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 using LibationAvalonia.ViewModels;
-using LibationFileManager;
 using LibationUiBase.ProcessQueue;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -31,9 +29,7 @@ public partial class ThemePreviewControl : UserControl
 
 		if (Design.IsDesignMode)
 		{
-			using var ms1 = new MemoryStream();
-			App.OpenAsset("img-coverart-prod-unavailable_80x80.jpg").CopyTo(ms1);
-			PictureStorage.SetDefaultImage(PictureSize._80x80, ms1.ToArray());
+			MainVM.Configure_NonUI();
 		}
 
 		QueuedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Queued };
@@ -55,32 +51,12 @@ public partial class ThemePreviewControl : UserControl
 
 	private IEnumerable<LibraryBook> CreateMockBooks()
 	{
-		var author = new Contributor("Some Author", "asin_contributor");
-		var narrator = new Contributor("Some Narrator", "asin_narrator");
-
-		var book1 = new Book(new AudibleProductId("asin_book1"), "Some Book 1", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
-		var book2 = new Book(new AudibleProductId("asin_book2"), "Some Book 2", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
-		var book3 = new Book(new AudibleProductId("asin_book3"), "Some Book 3", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
-		var book4 = new Book(new AudibleProductId("asin_book4"), "Some Book 4", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
-		var seriesParent = new Book(new AudibleProductId("asin_series"), "Some Series", "", "Demo Series Entry", 0, ContentType.Parent, [author], [narrator], "us");
-		var episode = new Book(new AudibleProductId("asin_episode"), "Some Episode", "Episode 1", "Demo Episode Entry", 56, ContentType.Episode, [author], [narrator], "us");
-
-		var series = new Series(new AudibleSeriesId(seriesParent.AudibleProductId), seriesParent.Title);
-
-		seriesParent.UpsertSeries(series, "");
-		episode.UpsertSeries(series, "1");
-
-		book1.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-		book4.UserDefinedItem.BookStatus = LiberatedStatus.Error;
-		//Set the backing field directly to preserve LiberatedStatus.PartialDownload
-		typeof(UserDefinedItem).GetField("_bookStatus", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(book2.UserDefinedItem, LiberatedStatus.PartialDownload);
-
-		yield return new LibraryBook(book1, System.DateTime.Now.AddDays(4), "someone@email.co");
-		yield return new LibraryBook(book2, System.DateTime.Now.AddDays(3), "someone@email.co");
-		yield return new LibraryBook(book3, System.DateTime.Now.AddDays(2), "someone@email.co") { AbsentFromLastScan = true };
-		yield return new LibraryBook(book4, System.DateTime.Now.AddDays(1), "someone@email.co");
-		yield return new LibraryBook(seriesParent, System.DateTime.Now, "someone@email.co");
-		yield return new LibraryBook(episode, System.DateTime.Now, "someone@email.co");
+		yield return MockLibraryBook.CreateBook(title: "Some Book 1", subtitle: "The Theming", dateAdded: System.DateTime.Now.AddDays(4)).WithBookStatus(LiberatedStatus.Liberated);
+		yield return MockLibraryBook.CreateBook(title: "Some Book 2", dateAdded: System.DateTime.Now.AddDays(3)).WithBookStatus(LiberatedStatus.PartialDownload);
+		yield return MockLibraryBook.CreateBook(title: "Some Book 3", dateAdded: System.DateTime.Now.AddDays(2), absetFromLastScan: true).WithPdfStatus(LiberatedStatus.NotLiberated);
+		yield return MockLibraryBook.CreateBook(title: "Some Book 4", dateAdded: System.DateTime.Now.AddDays(1)).WithBookStatus(LiberatedStatus.Error);
+		yield return MockLibraryBook.CreateBook(title: "Some Series", subtitle: "", contentType: ContentType.Parent).AddSeries("Some Series", 0);
+		yield return MockLibraryBook.CreateBook(title: "Some Episode", subtitle: "Episode 1", contentType: ContentType.Episode).AddSeries("Some Series", 1);
 	}
 
 	private class MockProcessable : FileLiberator.Processable

Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs

@@ -16,9 +16,6 @@ namespace LibationAvalonia.Dialogs
 		private readonly AboutVM _viewModel;
 		public AboutDialog() : base(saveAndRestorePosition:false)
 		{
-			if (Design.IsDesignMode)
-				_ = Configuration.Instance.LibationFiles;
-
 			InitializeComponent();
 
 			DataContext = _viewModel = new AboutVM();

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -37,8 +37,17 @@ namespace LibationAvalonia.Dialogs
 
 			if (Design.IsDesignMode)
 			{
-				using var context = DbContexts.GetContext();
-				LibraryBook = context.GetLibraryBook_Flat_NoTracking("B017V4IM1G");
+				MainVM.Configure_NonUI();
+				LibraryBook
+					= MockLibraryBook
+					.CreateBook()
+					.AddAuthor("Author 2")
+					.AddNarrator("Narrator 2")
+					.AddSeries("Series Name", 1)
+					.AddCategoryLadder("Parent", "Child Category")
+					.AddCategoryLadder("Parent", "Child Category 2")
+					.WithBookStatus(LiberatedStatus.NotLiberated)
+					.WithPdfStatus(LiberatedStatus.Liberated);
 			}
 		}
 		public BookDetailsDialog(LibraryBook libraryBook) : this()

Source/LibationAvalonia/Dialogs/DialogWindow.cs

@@ -16,6 +16,7 @@ namespace LibationAvalonia.Dialogs
 		public bool SaveAndRestorePosition { get; set; }
 		public Control ControlToFocusOnShow { get; set; }
 		protected override Type StyleKeyOverride => typeof(DialogWindow);
+		public DialogResult DialogResult { get; private set; } = DialogResult.None;
 
 		public DialogWindow(bool saveAndRestorePosition = true)
 		{
@@ -27,7 +28,15 @@ namespace LibationAvalonia.Dialogs
 			Closing += DialogWindow_Closing;
 
 			if (Design.IsDesignMode)
-				RequestedThemeVariant = ThemeVariant.Dark;
+			{
+				var themeVariant = Configuration.CreateMockInstance().GetString(propertyName: nameof(ThemeVariant));
+				RequestedThemeVariant = themeVariant switch
+				{
+					nameof(ThemeVariant.Dark) => ThemeVariant.Dark,
+					nameof(ThemeVariant.Light) => ThemeVariant.Light,
+					_ => ThemeVariant.Default,
+				};
+			}
 		}
 
 		private void DialogWindow_Loaded(object sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -66,6 +75,12 @@ namespace LibationAvalonia.Dialogs
 			ControlToFocusOnShow?.Focus();
 		}
 
+		public void Close(DialogResult dialogResult)
+		{
+			DialogResult = dialogResult;
+			base.Close(dialogResult);
+		}
+
 		protected virtual void SaveAndClose() => Close(DialogResult.OK);
 		protected virtual async Task SaveAndCloseAsync() => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(SaveAndClose);
 		protected virtual void CancelAndClose() => Close(DialogResult.Cancel);