Can log to zip files with new ZipFile sink

Serilog log to zip file

.github/workflows/build-windows.yml

@@ -69,7 +69,7 @@ jobs:
               LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
-              -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+              -p:PublishProfile=LoadByOS/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LibationCli/LibationCli.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,10 +2,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>10.0.4.1</Version>
+    <Version>10.2.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="5.0.2" />
+    <PackageReference Include="Octokit" Version="5.0.4" />
+    <PackageReference Include="Serilog.Sinks.ZipFile" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -118,8 +118,15 @@ namespace AppScaffolding
 
 		private static void ensureSerilogConfig(Configuration config)
 		{
-			if (config.GetObject("Serilog") is not null)
+			if (config.GetObject("Serilog") is JObject serilog)
+			{
+				if (serilog["WriteTo"] is JArray sinks && sinks.FirstOrDefault(s => s["Name"].Value<string>() is "File") is JToken fileSink)
+				{
+					fileSink["Name"] = "ZipFile";
+					config.SetNonString(serilog.DeepClone(), "Serilog");
+				}
 				return;
+			}
 
 			var serilogObj = new JObject
 			{
@@ -129,7 +136,7 @@ namespace AppScaffolding
 						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
-							{ "Name", "File" },
+							{ "Name", "ZipFile" },
 							{ "Args",
 								new JObject
 								{

Source/AudibleUtilities/AudibleUtilities.csproj

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

Source/FileManager/BackgroundFileSystem.cs

@@ -147,7 +147,8 @@ namespace FileManager
         private void AddPath(LongPath path)
         {
             path = path.LongPathName;
-            if (!File.Exists(path) && !Directory.Exists(path))
+            //Temporary files created when updating the db will disappear before their attributes can be read.
+            if (Path.GetFileName(path).Contains("LibationContext.db") || !File.Exists(path) && !Directory.Exists(path))
                 return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
                 AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));

Source/LibationAvalonia/Controls/NativeWebView.cs

@@ -0,0 +1,176 @@
+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/Important.axaml

@@ -53,7 +53,7 @@
 				Padding="20,0"
 				VerticalAlignment="Stretch"
 				Content="Open Log Folder"
-				Click="OpenLogFolderButton_Click" />
+				Command="{CompiledBinding OpenLogFolderButton}" />
 
 		</StackPanel>
 

Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml

@@ -6,6 +6,7 @@
 		MinWidth="240" MinHeight="140"
 		MaxWidth="240" MaxHeight="140"
 		Width="240" Height="140"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
         Title="Approval Alert Detected"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml.cs

@@ -4,7 +4,7 @@ namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class ApprovalNeededDialog : DialogWindow
 	{
-		public ApprovalNeededDialog()
+		public ApprovalNeededDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 		}

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -1,5 +1,7 @@
 using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Threading;
+using LibationFileManager;
 using System;
 using System.Threading.Tasks;
 
@@ -23,6 +25,20 @@ namespace LibationAvalonia.Dialogs.Login
 
 		public async Task<ChoiceOut> StartAsync(ChoiceIn choiceIn)
 		{
+			if (Configuration.IsWindows && Environment.OSVersion.Version.Major >= 10)
+			{
+				try
+				{
+					var weblogin = new WebLoginDialog(_account.AccountId, choiceIn.LoginUrl);
+					if (await weblogin.ShowDialog<DialogResult>(App.MainWindow) is DialogResult.OK)
+						return ChoiceOut.External(weblogin.ResponseUrl);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, $"Failed to run {nameof(WebLoginDialog)}");
+				}
+			}
+
 			var dialog = new LoginChoiceEagerDialog(_account);
 
 			if (await dialog.ShowDialogAsync() is not DialogResult.OK ||

Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml

@@ -6,6 +6,7 @@
 		MinWidth="220" MinHeight="250"
 		MaxWidth="220" MaxHeight="250"
 		Width="220" Height="250"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
         Title="CAPTCHA"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml.cs

@@ -13,7 +13,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string Answer => _viewModel.Answer;
 
 		private readonly CaptchaDialogViewModel _viewModel;
-		public CaptchaDialog()
+		public CaptchaDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 			passwordBox = this.FindControl<TextBox>(nameof(passwordBox));

Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml

@@ -5,6 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="120"
 		MinWidth="300" MinHeight="120"
 		Width="300" Height="120"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.LoginCallbackDialog"
         Title="Audible Login" 
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml.cs

@@ -11,7 +11,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public Account Account { get; }
 		public string Password { get; set; }
 
-		public LoginCallbackDialog()
+		public LoginCallbackDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 

Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml

@@ -2,9 +2,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="350" d:DesignHeight="200"
-		MinWidth="350" MinHeight="200"
-		Width="350" Height="200"
+        mc:Ignorable="d" d:DesignWidth="360" d:DesignHeight="200"
+		MinWidth="370" MinHeight="200"
+		Width="370" Height="200"
 		WindowStartupLocation="CenterOwner"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
@@ -35,7 +35,7 @@
 			Grid.Row="2"
 			Grid.Column="0"
 			Margin="0,5,0,5"
-			ColumnDefinitions="Auto,*">
+			ColumnDefinitions="Auto,*,Auto">
 			
 			<TextBlock
 				Grid.Column="0"
@@ -46,6 +46,12 @@
 				Grid.Column="1"
 				PasswordChar="*"
 				Text="{Binding Password, Mode=TwoWay}" />
+			<Button
+				Margin="5,0"
+				Grid.Column="2"
+				VerticalAlignment="Stretch"
+				Content="Submit"
+				Command="{Binding SaveAndCloseAsync}" />
 		</Grid>
 
 		<StackPanel
@@ -54,7 +60,7 @@
 
 			<controls:LinkLabel
 				Tapped="ExternalLoginLink_Tapped"
-				Text="Or click here to log in with your browser." />
+				Text="Trouble logging in? Click here to log in with your browser." />
 			
 			<TextBlock
 				TextWrapping="Wrap"

Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs

@@ -12,7 +12,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string Password { get; set; }
 		public LoginMethod LoginMethod { get; private set; }
 
-		public LoginChoiceEagerDialog()
+		public LoginChoiceEagerDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 

Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs

@@ -14,7 +14,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string ExternalLoginUrl { get; }
 		public string ResponseUrl { get; set; }
 
-		public LoginExternalDialog()
+		public LoginExternalDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml

@@ -6,6 +6,7 @@
 		MinWidth="400" MinHeight="200"
 		MaxWidth="400" MaxHeight="400"
 		Width="400" Height="200"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.MfaDialog"
         Title="Two-Step Verification"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs

@@ -14,7 +14,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string SelectedValue { get; private set; }
 		private RbValues Values { get; } = new();
 
-		public MfaDialog()
+		public MfaDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 

Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml

@@ -0,0 +1,13 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        x:Class="LibationAvalonia.Dialogs.Login.WebLoginDialog"
+		Width="500" Height="800"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico"
+        Title="Audible Login">
+	<controls:NativeWebView Name="webView" />
+</Window>

Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml.cs

@@ -0,0 +1,54 @@
+using Avalonia.Controls;
+using Dinah.Core;
+using System;
+
+namespace LibationAvalonia.Dialogs.Login
+{
+	public partial class WebLoginDialog : Window
+	{
+		public string ResponseUrl { get; private set; }
+		private readonly string accountID;
+
+		public WebLoginDialog()
+		{
+			InitializeComponent();
+			webView.NavigationStarted += WebView_NavigationStarted;
+			webView.DOMContentLoaded += WebView_NavigationCompleted;
+		}
+
+		public WebLoginDialog(string accountID, string loginUrl) : this()
+		{
+			this.accountID = ArgumentValidator.EnsureNotNullOrWhiteSpace(accountID, nameof(accountID));
+			webView.Source = new Uri(ArgumentValidator.EnsureNotNullOrWhiteSpace(loginUrl, nameof(loginUrl)));
+		}
+		
+		private void WebView_NavigationStarted(object sender, LibationFileManager.WebViewNavigationEventArgs e)
+		{
+			if (e.Request?.AbsolutePath.Contains("/ap/maplanding") is true)
+			{
+				ResponseUrl = e.Request.ToString();
+				Close(DialogResult.OK);
+			}
+		}
+
+		private async void WebView_NavigationCompleted(object sender, EventArgs e)
+		{
+			await webView.InvokeScriptAsync(getScript(accountID));
+		}
+
+		private static string getScript(string accountID) => $$"""
+			(function() {
+				var inputs = document.getElementsByTagName('input');
+				for (index = 0; index < inputs.length; ++index) {
+					if (inputs[index].name.includes('email')) {
+						inputs[index].value = '{{accountID}}';
+					}
+					if (inputs[index].name.includes('password')) {
+						inputs[index].focus();
+					}
+				}
+			})()
+			""";
+		
+	}
+}

Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml

@@ -6,6 +6,7 @@
 		MinWidth="200" MinHeight="200"
 		MaxWidth="200" MaxHeight="200"
 		Width="200" Height="200"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login._2faCodeDialog"
         Title="2FA Code"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml.cs

@@ -9,7 +9,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string Prompt { get; } = "For added security, please enter the One Time Password (OTP) generated by your Authenticator App";
 
 
-		public _2faCodeDialog()
+		public _2faCodeDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 			_2FABox = this.FindControl<TextBox>(nameof(_2FABox));

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -1,14 +1,6 @@
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Dinah.Core;
-using FileManager;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
-using LibationUiBase;
-using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs
@@ -47,10 +39,5 @@ namespace LibationAvalonia.Dialogs
 
 		public async void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await SaveAndCloseAsync();
-
-		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
-		}
 	}
 }

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -3,7 +3,8 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationIcon>Assets/libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
@@ -16,6 +17,7 @@
 
 	<PropertyGroup>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/LibationAvalonia/Program.cs

@@ -14,6 +14,7 @@ namespace LibationAvalonia
 {
 	static class Program
 	{
+		[STAThread]
 		static void Main(string[] args)
 		{
 

Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -23,7 +23,7 @@ namespace LibationAvalonia.ViewModels
 		/// <summary>Backing list of all grid entries</summary>
 		private readonly AvaloniaList<IGridEntry> SOURCE = new();
 		/// <summary>Grid entries included in the filter set. If null, all grid entries are shown</summary>
-		private List<IGridEntry> FilteredInGridEntries;
+		private HashSet<IGridEntry> FilteredInGridEntries;
 		public string FilterString { get; private set; }
 		public DataGridCollectionView GridEntries { get; private set; }
 
@@ -117,8 +117,8 @@ namespace LibationAvalonia.ViewModels
 			}
 
 			//Create the filtered-in list before adding entries to avoid a refresh
-			FilteredInGridEntries = QueryResults(geList.Union(geList.OfType<ISeriesEntry>().SelectMany(s => s.Children)), FilterString);
-			SOURCE.AddRange(geList.OrderByDescending(e => e.DateAdded));
+			FilteredInGridEntries = geList.Union(geList.OfType<ISeriesEntry>().SelectMany(s => s.Children)).FilterEntries(FilterString);
+			SOURCE.AddRange(geList.OrderDescending(new RowComparer(null)));
 
 			//Add all children beneath their parent
 			foreach (var series in SOURCE.OfType<ISeriesEntry>().ToList())
@@ -301,7 +301,7 @@ namespace LibationAvalonia.ViewModels
 			if (SOURCE.Count == 0)
 				return;
 
-			FilteredInGridEntries = QueryResults(SOURCE, searchString);
+			FilteredInGridEntries = SOURCE.FilterEntries(searchString);
 
 			await refreshGrid();
 		}
@@ -318,25 +318,11 @@ namespace LibationAvalonia.ViewModels
 			return FilteredInGridEntries.Contains(item);
 		}
 
-		private static List<IGridEntry> QueryResults(IEnumerable<IGridEntry> entries, string searchString)
-		{
-			if (string.IsNullOrEmpty(searchString)) return null;
-
-			var searchResultSet = SearchEngineCommands.Search(searchString);
-
-			var booksFilteredIn = entries.BookEntries().Join(searchResultSet.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => (IGridEntry)lbe);
-
-			//Find all series containing children that match the search criteria
-			var seriesFilteredIn = entries.SeriesEntries().Where(s => s.Children.Join(searchResultSet.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => lbe).Any());
-
-			return booksFilteredIn.Concat(seriesFilteredIn).ToList();
-		}
-
 		private async void SearchEngineCommands_SearchEngineUpdated(object sender, EventArgs e)
 		{
-			var filterResults = QueryResults(SOURCE, FilterString);
+			var filterResults = SOURCE.FilterEntries(FilterString);
 
-			if (filterResults is not null && FilteredInGridEntries.Intersect(filterResults).Count() != FilteredInGridEntries.Count)
+			if (FilteredInGridEntries.SearchSetsDiffer(filterResults))
 			{
 				FilteredInGridEntries = filterResults;
 				await refreshGrid();

Source/LibationAvalonia/ViewModels/RowComparer.cs

@@ -1,98 +1,28 @@
 using Avalonia.Controls;
 using LibationUiBase.GridView;
-using System.Collections;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
 
 namespace LibationAvalonia.ViewModels
 {
-	/// <summary>
-	/// This compare class ensures that all top-level grid entries (standalone books or series parents)
-	/// are sorted by PropertyName while all episodes remain immediately beneath their parents and remain
-	/// sorted by series index, ascending. Stable sorting is achieved by comparing the GridEntry.ListIndex
-	/// properties when 2 items compare equal.
-	/// </summary>
-	internal class RowComparer : IComparer, IComparer<IGridEntry>, IComparer<object>
+	internal class RowComparer : RowComparerBase
 	{
 		private static readonly PropertyInfo HeaderCellPi = typeof(DataGridColumn).GetProperty("HeaderCell", BindingFlags.NonPublic | BindingFlags.Instance);
 		private static readonly PropertyInfo CurrentSortingStatePi = typeof(DataGridColumnHeader).GetProperty("CurrentSortingState", BindingFlags.NonPublic | BindingFlags.Instance);
 
-		public DataGridColumn Column { get; init; }
-		public string PropertyName { get; private set; }
+		private DataGridColumn Column { get; init; }
+		public override string PropertyName { get; set; }
 
 		public RowComparer(DataGridColumn column)
 		{
 			Column = column;
-			PropertyName = Column.SortMemberPath;
-		}
-
-		public int Compare(object x, object y)
-		{
-			if (x is null && y is not null) return -1;
-			if (x is not null && y is null) return 1;
-			if (x is null && y is null) return 0;
-
-			var geA = (IGridEntry)x;
-			var geB = (IGridEntry)y;
-
-			var sortDirection = GetSortOrder();
-
-			ISeriesEntry parentA = null;
-			ISeriesEntry parentB = null;
-
-			if (geA is ILibraryBookEntry lbA && lbA.Parent is ISeriesEntry seA)
-				parentA = seA;
-			if (geB is ILibraryBookEntry lbB && lbB.Parent is ISeriesEntry seB)
-				parentB = seB;
-
-			//both a and b are top-level grid entries
-			if (parentA is null && parentB is null)
-				return InternalCompare(geA, geB);
-
-			//a is top-level, b is a child
-			if (parentA is null && parentB is not null)
-			{
-				// b is a child of a, parent is always first
-				if (parentB == geA)
-					return sortDirection is ListSortDirection.Ascending ? -1 : 1;
-				else
-					return InternalCompare(geA, parentB);
-			}
-
-			//a is a child, b is a top-level
-			if (parentA is not null && parentB is null)
-			{
-				// a is a child of b, parent is always first
-				if (parentA == geB)
-					return sortDirection is ListSortDirection.Ascending ? 1 : -1;
-				else
-					return InternalCompare(parentA, geB);
-			}
-
-			//both are children of the same series
-			if (parentA == parentB)
-				return InternalCompare(geA, geB);
-
-			//a and b are children of different series.
-			return InternalCompare(parentA, parentB);
+			PropertyName = Column?.SortMemberPath ?? nameof(IGridEntry.DateAdded);
 		}
 
 		//Avalonia doesn't expose the column's CurrentSortingState, so we must get it through reflection
-		private ListSortDirection? GetSortOrder()
-			=> CurrentSortingStatePi.GetValue(HeaderCellPi.GetValue(Column)) as ListSortDirection?;
-
-		private int InternalCompare(IGridEntry x, IGridEntry y)
-		{
-			var val1 = x.GetMemberValue(PropertyName);
-			var val2 = y.GetMemberValue(PropertyName);
-
-			return x.GetMemberComparer(val1.GetType()).Compare(val1, val2); ;
-		}
-
-		public int Compare(IGridEntry x, IGridEntry y)
-		{
-			return Compare((object)x, y);
-		}
+		protected override ListSortDirection GetSortOrder()
+			=> Column is null ? ListSortDirection.Descending
+			: CurrentSortingStatePi.GetValue(HeaderCellPi.GetValue(Column)) is ListSortDirection lsd ? lsd
+			: ListSortDirection.Descending;
 	}
 }

Source/LibationAvalonia/ViewModels/Settings/ImportantSettingsVM.cs

@@ -1,4 +1,5 @@
-using FileManager;
+using Dinah.Core;
+using FileManager;
 using LibationFileManager;
 using ReactiveUI;
 using System;
@@ -38,6 +39,8 @@ namespace LibationAvalonia.ViewModels.Settings
 			Configuration.Instance.SetString(ThemeVariant, nameof(ThemeVariant));
 		}
 
+		public void OpenLogFolderButton() => Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+
 		public List<Configuration.KnownDirectories> KnownDirectories { get; } = new()
 		{
 			Configuration.KnownDirectories.UserProfile,

Source/LibationAvalonia/Views/MainWindow.axaml

@@ -74,203 +74,169 @@
 		</NativeMenu>
 	</NativeMenu.Menu>
 
-	<Border BorderBrush="{DynamicResource DataGridGridLinesBrush}" BorderThickness="2" Padding="10,0,10,10">
-		<Grid RowDefinitions="Auto,Auto,*,Auto">
-			<Grid Grid.Row="0" ColumnDefinitions="1*,Auto">
-
-				<!-- Menu Strip -->
-				<Menu Grid.Column="0" VerticalAlignment="Top" IsVisible="{CompiledBinding MenuBarVisible}">
-					<!-- Decrease height of menu strop -->
+	<Grid RowDefinitions="Auto,Auto,*,Auto">
+		<Border Grid.Row="0"  BorderBrush="{DynamicResource SystemBaseLowColor}" BorderThickness="0,1">
+			<Grid ColumnDefinitions="*,Auto">
+			<!-- Menu Strip -->
+			<Menu VerticalAlignment="Top" IsVisible="{CompiledBinding MenuBarVisible}">
 					
-					<Menu.Styles>
-						<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-							<Setter Property="Height" Value="25"/>
-						</Style>
-					</Menu.Styles>
-
-					<!-- Import Menu -->
-					
-					<MenuItem Name="importToolStripMenuItem" Header="_Import">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-						<MenuItem IsVisible="{CompiledBinding AnyAccounts}" Command="{CompiledBinding ToggleAutoScan}" Header="A_uto Scan Library">
-							<MenuItem.Icon>
-								<CheckBox BorderThickness="0" IsChecked="{CompiledBinding AutoScanChecked, Mode=TwoWay}" IsHitTestVisible="False" />
-							</MenuItem.Icon>
-						</MenuItem>
-						<MenuItem IsVisible="{CompiledBinding !AnyAccounts}" Command="{CompiledBinding AddAccountsAsync}" Header="No accounts yet. A_dd Account..." />
-						
-						<!-- Scan Library -->
-						<MenuItem IsVisible="{CompiledBinding OneAccount}" IsEnabled="{CompiledBinding !ActivelyScanning}" Name="scanLibraryToolStripMenuItem" Command="{CompiledBinding ScanAccountAsync}" Header="Scan _Library" />
-						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding !ActivelyScanning}" Name="scanLibraryOfAllAccountsToolStripMenuItem" Command="{CompiledBinding ScanAllAccountsAsync}" Header="Scan Library of _All Accounts" />
-						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding !ActivelyScanning}" Command="{CompiledBinding ScanSomeAccountsAsync}" Header="Scan Library of _Some Accounts" />
-						
-						<Separator IsVisible="{CompiledBinding AnyAccounts}" />
-						
-						<!-- Remove Books -->
-						<MenuItem IsVisible="{CompiledBinding OneAccount}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksAsync}" Header="_Remove Library Books" />
-						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksAllAsync}" Header="_Remove Books from All Accounts" />
-						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksSomeAsync}" Header="_Remove Books from Some Accounts" />
-						
-						<Separator />
-						<MenuItem Command="{CompiledBinding LocateAudiobooksAsync}" Header="L_ocate Audiobooks..." />
-
-					</MenuItem>
-					
-					<!-- Liberate Menu -->
-
-					<MenuItem Header="_Liberate">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-						<MenuItem Command="{CompiledBinding BackupAllBooks}" Header="{CompiledBinding BookBackupsToolStripText}" />
-						<MenuItem Command="{CompiledBinding BackupAllPdfs}" Header="{CompiledBinding PdfBackupsToolStripText}" />
-						<MenuItem Command="{CompiledBinding ConvertAllToMp3Async}" Header="Convert all _M4b to Mp3 [Long-running]..." />
-						<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
-					</MenuItem>
-
-					<!-- Export Menu -->
-
-					<MenuItem Header="E_xport">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-						<MenuItem IsEnabled="{CompiledBinding LibraryStats.HasBookResults}" Command="{CompiledBinding ExportLibraryAsync}" Header="E_xport Library" InputGesture="ctrl+S" />
-					</MenuItem>
-
-					<!-- Quick Filters Menu -->
-
-					<MenuItem Name="quickFiltersToolStripMenuItem" Header="Quick _Filters" ItemsSource="{CompiledBinding QuickFilterMenuItems}">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-					</MenuItem>
-
-					<!-- Visible Books Menu -->
-
-					<MenuItem Header="{CompiledBinding VisibleCountMenuItemText}" >
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-						<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText_2}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
-						<MenuItem Command="{CompiledBinding ReplaceTagsAsync}" Header="Replace _Tags..." />
-						<MenuItem Command="{CompiledBinding SetBookDownloadedAsync}" Header="Set book '_Downloaded' status manually..." />
-						<MenuItem Command="{CompiledBinding SetPdfDownloadedAsync}" Header="Set _PDF 'Downloaded' status manually..." />
-						<MenuItem Command="{CompiledBinding SetDownloadedAutoAsync}" Header="Set '_Downloaded' status automatically..." />
-						<MenuItem Command="{CompiledBinding RemoveVisibleAsync}" Header="_Remove from library..." />
-					</MenuItem>
-
-					<!-- Settings Menu -->
-
-					<MenuItem Header="_Settings" Name="settingsToolStripMenuItem">
-						<!-- Remove height style property for menu item -->
-						<MenuItem.Styles>
-							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-								<Setter Property="Height" Value="NaN"/>
-							</Style>
-						</MenuItem.Styles>
-						<MenuItem Name="accountsToolStripMenuItem" Command="{CompiledBinding ShowAccountsAsync}" Header="_Accounts..." InputGesture="ctrl+shift+A"/>
-						<MenuItem Name="basicSettingsToolStripMenuItem" Command="{CompiledBinding ShowSettingsAsync}" Header="_Settings..." InputGesture="ctrl+P" />
-						<Separator />
-						<MenuItem Command="{CompiledBinding ShowTrashBinAsync}" Header="Trash Bin" />
-						<MenuItem Command="{CompiledBinding LaunchHangover}" Header="Launch _Hangover" />
-						<Separator />
-						<MenuItem Command="{CompiledBinding StartWalkthroughAsync}" Header="Take a Guided _Tour of Libation" />
-						<MenuItem Command="{CompiledBinding ShowAboutAsync}" Header="A_bout..." />
-					</MenuItem>
-				</Menu>
-				<StackPanel IsVisible="{CompiledBinding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-					<Path VerticalAlignment="Center" Fill="{StaticResource IconFill}" Data="{StaticResource ImportIcon}" />
-					<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{CompiledBinding ScanningText}"/>
-				</StackPanel>
-			</Grid>
-
-			<!-- Buttons and Search Box -->
-			<Grid Grid.Row="1" Margin="0,10,0,10" Height="30" ColumnDefinitions="Auto,*,Auto">
-
-				<Grid.Styles>
-					<Style Selector="TextBox">
-						<Setter Property="MinHeight" Value="10" />
+				<!-- Decrease height of menu strop -->					
+				<Menu.Styles>
+					<Style Selector="Menu /template/ ItemsPresenter#PART_ItemsPresenter">
+						<Setter Property="Height" Value="25"/>
 					</Style>
-					<Style Selector="Button">
-						<Setter Property="Padding" Value="15,0,15,0" />
-						<Setter Property="Margin" Value="10,0,0,0" />
-						<Setter Property="Height" Value="30" />
-						<Setter Property="HorizontalContentAlignment" Value="Center" />
-						<Setter Property="VerticalContentAlignment" Value="Center" />
-					</Style>
-				</Grid.Styles>
+				</Menu.Styles>
+
+				<!-- Import Menu -->
+					
+				<MenuItem Name="importToolStripMenuItem" Header="_Import">
+					<MenuItem IsVisible="{CompiledBinding AnyAccounts}" Command="{CompiledBinding ToggleAutoScan}" Header="A_uto Scan Library">
+						<MenuItem.Icon>
+							<CheckBox BorderThickness="0" IsChecked="{CompiledBinding AutoScanChecked, Mode=TwoWay}" IsHitTestVisible="False" />
+						</MenuItem.Icon>
+					</MenuItem>
+					<MenuItem IsVisible="{CompiledBinding !AnyAccounts}" Command="{CompiledBinding AddAccountsAsync}" Header="No accounts yet. A_dd Account..." />
+						
+					<!-- Scan Library -->
+					<MenuItem IsVisible="{CompiledBinding OneAccount}" IsEnabled="{CompiledBinding !ActivelyScanning}" Name="scanLibraryToolStripMenuItem" Command="{CompiledBinding ScanAccountAsync}" Header="Scan _Library" />
+					<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding !ActivelyScanning}" Name="scanLibraryOfAllAccountsToolStripMenuItem" Command="{CompiledBinding ScanAllAccountsAsync}" Header="Scan Library of _All Accounts" />
+					<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding !ActivelyScanning}" Command="{CompiledBinding ScanSomeAccountsAsync}" Header="Scan Library of _Some Accounts" />
+						
+					<Separator IsVisible="{CompiledBinding AnyAccounts}" />
+						
+					<!-- Remove Books -->
+					<MenuItem IsVisible="{CompiledBinding OneAccount}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksAsync}" Header="_Remove Library Books" />
+					<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksAllAsync}" Header="_Remove Books from All Accounts" />
+					<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksSomeAsync}" Header="_Remove Books from Some Accounts" />
+						
+					<Separator />
+					<MenuItem Command="{CompiledBinding LocateAudiobooksAsync}" Header="L_ocate Audiobooks..." />
+
+				</MenuItem>
+					
+				<!-- Liberate Menu -->
+
+				<MenuItem Header="_Liberate">
+					<MenuItem Command="{CompiledBinding BackupAllBooks}" Header="{CompiledBinding BookBackupsToolStripText}" />
+					<MenuItem Command="{CompiledBinding BackupAllPdfs}" Header="{CompiledBinding PdfBackupsToolStripText}" />
+					<MenuItem Command="{CompiledBinding ConvertAllToMp3Async}" Header="Convert all _M4b to Mp3 [Long-running]..." />
+					<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
+				</MenuItem>
+
+				<!-- Export Menu -->
+
+				<MenuItem Header="E_xport">
+					<!-- Remove height style property for menu item -->
+					<MenuItem IsEnabled="{CompiledBinding LibraryStats.HasBookResults}" Command="{CompiledBinding ExportLibraryAsync}" Header="E_xport Library" InputGesture="ctrl+S" />
+				</MenuItem>
+
+				<!-- Quick Filters Menu -->
+
+				<MenuItem Name="quickFiltersToolStripMenuItem" Header="Quick _Filters" ItemsSource="{CompiledBinding QuickFilterMenuItems}" />
+
+				<!-- Visible Books Menu -->
+
+				<MenuItem Header="{CompiledBinding VisibleCountMenuItemText}" >
+					<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText_2}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
+					<MenuItem Command="{CompiledBinding ReplaceTagsAsync}" Header="Replace _Tags..." />
+					<MenuItem Command="{CompiledBinding SetBookDownloadedAsync}" Header="Set book '_Downloaded' status manually..." />
+					<MenuItem Command="{CompiledBinding SetPdfDownloadedAsync}" Header="Set _PDF 'Downloaded' status manually..." />
+					<MenuItem Command="{CompiledBinding SetDownloadedAutoAsync}" Header="Set '_Downloaded' status automatically..." />
+					<MenuItem Command="{CompiledBinding RemoveVisibleAsync}" Header="_Remove from library..." />
+				</MenuItem>
+
+				<!-- Settings Menu -->
+
+				<MenuItem Header="_Settings" Name="settingsToolStripMenuItem">
+					<MenuItem Name="accountsToolStripMenuItem" Command="{CompiledBinding ShowAccountsAsync}" Header="_Accounts..." InputGesture="ctrl+shift+A"/>
+					<MenuItem Name="basicSettingsToolStripMenuItem" Command="{CompiledBinding ShowSettingsAsync}" Header="_Settings..." InputGesture="ctrl+P" />
+					<Separator />
+					<MenuItem Command="{CompiledBinding ShowTrashBinAsync}" Header="Trash Bin" />
+					<MenuItem Command="{CompiledBinding LaunchHangover}" Header="Launch _Hangover" />
+					<Separator />
+					<MenuItem Command="{CompiledBinding StartWalkthroughAsync}" Header="Take a Guided _Tour of Libation" />
+					<MenuItem Command="{CompiledBinding ShowAboutAsync}" Header="A_bout..." />
+				</MenuItem>
+			</Menu>
 				
-				<StackPanel Grid.Column="0" Orientation="Horizontal">
-					<Button Name="filterHelpBtn" Margin="0" Command="{CompiledBinding FilterHelpBtn}" Content="?"/>
-					<Button Name="addQuickFilterBtn" Command="{CompiledBinding AddQuickFilterBtn}" Content="Add To Quick Filters"/>
-				</StackPanel>
-
-				<StackPanel Grid.Column="1" Orientation="Horizontal">
-					<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" IsEnabled="{CompiledBinding RemoveBooksButtonEnabled}" Command="{CompiledBinding RemoveBooksBtn}" Content="{CompiledBinding RemoveBooksButtonText}"/>
-					<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" Command="{CompiledBinding DoneRemovingBtn}" Content="Done Removing Books"/>
-				</StackPanel>
-				
-				<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding FilterString, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
-
-				<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
-					<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
-					<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Command="{CompiledBinding ToggleQueueHideBtn}">
-						<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource	LeftArrows}">
-							<Path.RenderTransform>
-								<RotateTransform Angle="{CompiledBinding QueueButtonAngle}"/>
-							</Path.RenderTransform>
-						</Path>
-					</Button>
-				</StackPanel>
-
-			</Grid>
-			<Border Grid.Row="2" BorderThickness="1" BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-				<SplitView IsPaneOpen="{CompiledBinding QueueOpen}" DisplayMode="Inline" OpenPaneLength="400" MinWidth="400" PanePlacement="Right">
-
-					<!-- Process Queue -->
-					<SplitView.Pane>
-						<views:ProcessQueueControl DataContext="{CompiledBinding ProcessQueue}"/>
-					</SplitView.Pane>
-
-					<!-- Product Display Grid -->
-					<views:ProductsDisplay
-						Name="productsDisplay"
-						DataContext="{CompiledBinding ProductsDisplay}"						
-						LiberateClicked="ProductsDisplay_LiberateClicked"
-						LiberateSeriesClicked="ProductsDisplay_LiberateSeriesClicked"
-						ConvertToMp3Clicked="ProductsDisplay_ConvertToMp3Clicked" />				
-				</SplitView>
-			</Border>			
-			
-			<!-- Bottom Status Strip -->
-			<Grid Grid.Row="3" Margin="0,10,0,0" VerticalAlignment="Bottom" ColumnDefinitions="Auto,Auto,*,Auto">
-				<Grid.Styles>
-					<Style Selector="ProgressBar:horizontal">
-						<Setter Property="MinWidth" Value="100" />
-					</Style>
-				</Grid.Styles>
-				<TextBlock FontSize="14" Grid.Column="0" Text="Upgrading:" VerticalAlignment="Center" IsVisible="{CompiledBinding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}" />
-				<ProgressBar Grid.Column="1" Margin="5,0,10,0" VerticalAlignment="Stretch" Width="100" Value="{CompiledBinding DownloadProgress}" IsVisible="{CompiledBinding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-				<TextBlock FontSize="14" Grid.Column="2" Text="{CompiledBinding VisibleCountText}" VerticalAlignment="Center" />
-				<TextBlock FontSize="14" Grid.Column="3" Text="{CompiledBinding LibraryStats.StatusString}" VerticalAlignment="Center" />		
-			</Grid>
+			<StackPanel IsVisible="{CompiledBinding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+				<Path VerticalAlignment="Center" Fill="{StaticResource IconFill}" Data="{StaticResource ImportIcon}" />
+				<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{CompiledBinding ScanningText}"/>
+			</StackPanel>
 		</Grid>
-	</Border>
+		</Border>
+		<!-- Buttons and Search Box -->
+		<Grid Grid.Row="1" Margin="8" Height="30" ColumnDefinitions="Auto,*,Auto">
+
+			<Grid.Styles>
+				<Style Selector="TextBox">
+					<Setter Property="MinHeight" Value="10" />
+				</Style>
+				<Style Selector="Button">
+					<Setter Property="Padding" Value="15,0,15,0" />
+					<Setter Property="Margin" Value="10,0,0,0" />
+					<Setter Property="Height" Value="30" />
+					<Setter Property="HorizontalContentAlignment" Value="Center" />
+					<Setter Property="VerticalContentAlignment" Value="Center" />
+				</Style>
+			</Grid.Styles>
+				
+			<StackPanel Grid.Column="0" Orientation="Horizontal">
+				<Button Name="filterHelpBtn" Margin="0" Command="{CompiledBinding FilterHelpBtn}" Content="?"/>
+				<Button Name="addQuickFilterBtn" Command="{CompiledBinding AddQuickFilterBtn}" Content="Add To Quick Filters"/>
+			</StackPanel>
+
+			<StackPanel Grid.Column="1" Orientation="Horizontal">
+				<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" IsEnabled="{CompiledBinding RemoveBooksButtonEnabled}" Command="{CompiledBinding RemoveBooksBtn}" Content="{CompiledBinding RemoveBooksButtonText}"/>
+				<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" Command="{CompiledBinding DoneRemovingBtn}" Content="Done Removing Books"/>
+			</StackPanel>
+				
+			<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding FilterString, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
+
+			<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
+				<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
+				<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Command="{CompiledBinding ToggleQueueHideBtn}">
+					<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource	LeftArrows}">
+						<Path.RenderTransform>
+							<RotateTransform Angle="{CompiledBinding QueueButtonAngle}"/>
+						</Path.RenderTransform>
+					</Path>
+				</Button>
+			</StackPanel>
+
+		</Grid>
+		
+		<Border Grid.Row="2" Margin="8,0" BorderThickness="1" BorderBrush="{DynamicResource SystemBaseMediumLowColor}">
+			<SplitView IsPaneOpen="{CompiledBinding QueueOpen}" DisplayMode="Inline" OpenPaneLength="400" MinWidth="400" PanePlacement="Right">
+
+				<!-- Process Queue -->
+				<SplitView.Pane>
+					<Border BorderThickness="1,0,0,0" BorderBrush="{DynamicResource SystemBaseMediumLowColor}">
+						<views:ProcessQueueControl DataContext="{CompiledBinding ProcessQueue}"/>
+					</Border>
+				</SplitView.Pane>
+
+				<!-- Product Display Grid -->
+				<views:ProductsDisplay
+					Name="productsDisplay"
+					DataContext="{CompiledBinding ProductsDisplay}"						
+					LiberateClicked="ProductsDisplay_LiberateClicked"
+					LiberateSeriesClicked="ProductsDisplay_LiberateSeriesClicked"
+					ConvertToMp3Clicked="ProductsDisplay_ConvertToMp3Clicked" />				
+			</SplitView>
+		</Border>
+			
+		<!-- Bottom Status Strip -->
+		<Grid Grid.Row="3" Margin="8" VerticalAlignment="Bottom" ColumnDefinitions="Auto,Auto,*,Auto">
+			<Grid.Styles>
+				<Style Selector="ProgressBar:horizontal">
+					<Setter Property="MinWidth" Value="100" />
+				</Style>
+			</Grid.Styles>
+			<TextBlock FontSize="14" Grid.Column="0" Text="Upgrading:" VerticalAlignment="Center" IsVisible="{CompiledBinding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}" />
+			<ProgressBar Grid.Column="1" Margin="5,0,10,0" VerticalAlignment="Stretch" Width="100" Value="{CompiledBinding DownloadProgress}" IsVisible="{CompiledBinding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+			<TextBlock FontSize="14" Grid.Column="2" Text="{CompiledBinding VisibleCountText}" VerticalAlignment="Center" />
+			<TextBlock FontSize="14" Grid.Column="3" Text="{CompiledBinding LibraryStats.StatusString}" VerticalAlignment="Center" />		
+		</Grid>
+	</Grid>
 </Window>

Source/LibationAvalonia/app.manifest

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. 
+       
+       Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>

Source/LibationFileManager/IInteropFunctions.cs

@@ -1,14 +1,56 @@
 using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 
 namespace LibationFileManager
 {
-    public interface IInteropFunctions
+#nullable enable
+	public interface IInteropFunctions
     {
+		/// <summary>
+		/// Implementation of native web view control https://github.com/maxkatz6/AvaloniaWebView
+		/// </summary>
+		IWebViewAdapter? CreateWebViewAdapter();
         void SetFolderIcon(string image, string directory);
         void DeleteFolderIcon(string directory);
         Process RunAsRoot(string exe, string args);
         void InstallUpgrade(string upgradeBundle);
         bool CanUpgrade { get; }
     }
+
+	public class WebViewNavigationEventArgs : EventArgs
+	{
+		public Uri? Request { get; init; }
+	}
+
+	public interface IWebView
+	{
+		event EventHandler<WebViewNavigationEventArgs>? NavigationCompleted;
+		event EventHandler<WebViewNavigationEventArgs>? NavigationStarted;
+		event EventHandler? DOMContentLoaded;
+		bool CanGoBack { get; }
+		bool CanGoForward { get; }
+		Uri? Source { get; set; }
+		bool GoBack();
+		bool GoForward();
+		Task<string?> InvokeScriptAsync(string scriptName);
+		void Navigate(Uri url);
+		Task NavigateToString(string text);
+		void Refresh();
+		void Stop();
+	}
+
+	public interface IWebViewAdapter : IWebView
+	{
+		object NativeWebView { get; }
+		IPlatformHandle2 PlatformHandle { get; }
+		void HandleResize(int width, int height, float zoom);
+		bool HandleKeyDown(uint key, uint keyModifiers);
+	}
+
+	public interface IPlatformHandle2
+	{
+		IntPtr Handle { get; }
+		string? HandleDescriptor { get; }
+	}
 }

Source/LibationFileManager/NullInteropFunctions.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+#nullable enable
+
 namespace LibationFileManager
 {
     public class NullInteropFunctions : IInteropFunctions
@@ -9,7 +11,8 @@ namespace LibationFileManager
 		public NullInteropFunctions() { }
         public NullInteropFunctions(params object[] values) { }
 
-        public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
+		public IWebViewAdapter? CreateWebViewAdapter() => throw new PlatformNotSupportedException();
+		public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
         public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
 		public bool CanUpgrade => throw new PlatformNotSupportedException();
 		public Process RunAsRoot(string exe, string args) => throw new PlatformNotSupportedException();

Source/LibationUiBase/GridView/EntryStatus.cs

@@ -58,7 +58,7 @@ namespace LibationUiBase.GridView
 		public abstract object BackgroundBrush { get; }
 		public object ButtonImage => GetLiberateIcon();
 		public string ToolTip => GetTooltip();
-		protected Book Book { get; }
+		private Book Book { get; }
 
 		private DateTime lastBookUpdate;
 		private LiberatedStatus bookStatus;

Source/LibationUiBase/GridView/GridEntry[TStatus].cs

@@ -154,6 +154,14 @@ namespace LibationUiBase.GridView
 			if (udi.Book.AudibleProductId != Book.AudibleProductId)
 				return;
 
+			if (udi.Book != LibraryBook.Book)
+			{
+				//If UserDefinedItem was changed on a different Book instance (such as when batch liberating via menus),
+				//Liberate.Book and LibraryBook.Book instances will not have the current DB state.
+				Invoke(() => UpdateLibraryBook(new LibraryBook(udi.Book, LibraryBook.DateAdded, LibraryBook.Account)));
+				return;
+			}
+
 			// UDI changed, possibly in a different context/view. Update this viewmodel. Call NotifyPropertyChanged to notify view.
 			// - This method responds to tons of incidental changes. Do not persist to db from here. Committing to db must be a volitional action by the caller, not incidental. Otherwise batch changes would be impossible; we would only have slow one-offs
 			// - Don't restrict notifying view to 'only if property changed'. This same book instance can get passed to a different view, then changed there. When the chain of events makes its way back here, the property is unchanged (because it's the same instance), but this view is out of sync. NotifyPropertyChanged will then update this view.

Source/LibationUiBase/GridView/QueryExtensions.cs

@@ -1,4 +1,5 @@
-using DataLayer;
+using ApplicationServices;
+using DataLayer;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -39,6 +40,26 @@ namespace LibationUiBase.GridView
 				return null;
 			}
 		}
+
+		public static bool SearchSetsDiffer(this HashSet<IGridEntry>? searchSet, HashSet<IGridEntry>? otherSet)
+			=> searchSet is null != otherSet is null ||
+					(searchSet is not null &&
+					otherSet is not null &&
+					searchSet.Intersect(otherSet).Count() != searchSet.Count);
+
+		public static HashSet<IGridEntry>? FilterEntries(this IEnumerable<IGridEntry> entries, string searchString)
+		{
+			if (string.IsNullOrEmpty(searchString)) return null;
+
+			var searchResultSet = SearchEngineCommands.Search(searchString);
+
+			var booksFilteredIn = entries.IntersectBy(searchResultSet.Docs.Select(d => d.ProductId), l => l.AudibleProductId);
+
+			//Find all series containing children that match the search criteria
+			var seriesFilteredIn = booksFilteredIn.OfType<ILibraryBookEntry>().Where(lbe => lbe.Parent is not null).Select(lbe => lbe.Parent).Distinct();
+
+			return booksFilteredIn.Concat(seriesFilteredIn).ToHashSet();
+		}
 	}
 #nullable disable
 }

Source/LibationUiBase/GridView/RowComparerBase.cs

@@ -0,0 +1,96 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace LibationUiBase.GridView
+{
+	/// <summary>
+	/// This compare class ensures that all top-level grid entries (standalone books or series parents)
+	/// are sorted by PropertyName while all episodes remain immediately beneath their parents and remain
+	/// sorted by series index, ascending.
+	/// </summary>
+	public abstract class RowComparerBase : IComparer, IComparer<IGridEntry>, IComparer<object>
+	{
+		public abstract string PropertyName { get; set; }
+
+		public int Compare(object x, object y)
+		{
+			if (x is null && y is not null) return -1;
+			if (x is not null && y is null) return 1;
+			if (x is null && y is null) return 0;
+
+			var geA = (IGridEntry)x;
+			var geB = (IGridEntry)y;
+
+			var sortDirection = GetSortOrder();
+
+			ISeriesEntry parentA = null;
+			ISeriesEntry parentB = null;
+
+			if (geA is ILibraryBookEntry lbA && lbA.Parent is ISeriesEntry seA)
+				parentA = seA;
+			if (geB is ILibraryBookEntry lbB && lbB.Parent is ISeriesEntry seB)
+				parentB = seB;
+
+			//both a and b are top-level grid entries
+			if (parentA is null && parentB is null)
+				return InternalCompare(geA, geB);
+
+			//a is top-level, b is a child
+			if (parentA is null && parentB is not null)
+			{
+				// b is a child of a, parent is always first
+				if (parentB == geA)
+					return sortDirection is ListSortDirection.Ascending ? -1 : 1;
+				else
+					return InternalCompare(geA, parentB);
+			}
+
+			//a is a child, b is a top-level
+			if (parentA is not null && parentB is null)
+			{
+				// a is a child of b, parent is always first
+				if (parentA == geB)
+					return sortDirection is ListSortDirection.Ascending ? 1 : -1;
+				else
+					return InternalCompare(parentA, geB);
+			}
+
+			//both are children of the same series
+			if (parentA == parentB)
+			{
+				//Podcast episodes usually all have the same PurchaseDate and DateAdded property:
+				//the date that the series was added to the library. So when sorting by PurchaseDate
+				//and DateAdded, compare SeriesOrder instead..
+				return PropertyName switch
+				{
+					nameof(IGridEntry.DateAdded) or nameof (IGridEntry.PurchaseDate) => geA.SeriesOrder.CompareTo(geB.SeriesOrder),
+					_ => InternalCompare(geA, geB),
+				};
+			}
+
+			//a and b are children of different series.
+			return InternalCompare(parentA, parentB);
+		}
+
+		protected abstract ListSortDirection GetSortOrder();
+
+		private int InternalCompare(IGridEntry x, IGridEntry y)
+		{
+			var val1 = x.GetMemberValue(PropertyName);
+			var val2 = y.GetMemberValue(PropertyName);
+
+			var compare =  x.GetMemberComparer(val1.GetType()).Compare(val1, val2);
+			
+			return compare == 0 && x.Liberate.IsSeries && y.Liberate.IsSeries
+				//Both a and b are series parents and compare as equal, so break the tie.
+				? x.AudibleProductId.CompareTo(y.AudibleProductId)
+				: compare;
+		}
+
+		public int Compare(IGridEntry x, IGridEntry y)
+		{
+			return Compare((object)x, y);
+		}
+	}
+}

Source/LibationUiBase/GridView/SeriesEntry[TStatus].cs

@@ -47,7 +47,7 @@ namespace LibationUiBase.GridView
 
 			Children = children
 				.Select(c => new LibraryBookEntry<TStatus>(c, this))
-				.OrderBy(c => c.SeriesIndex)
+				.OrderByDescending(c => c.SeriesOrder)
 				.ToList<ILibraryBookEntry>();
 
 			UpdateLibraryBook(parent);

Source/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.Designer.cs

@@ -28,123 +28,120 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.passwordLbl = new System.Windows.Forms.Label();
-			this.passwordTb = new System.Windows.Forms.TextBox();
-			this.submitBtn = new System.Windows.Forms.Button();
-			this.localeLbl = new System.Windows.Forms.Label();
-			this.usernameLbl = new System.Windows.Forms.Label();
-			this.externalLoginLink = new System.Windows.Forms.LinkLabel();
-			this.externalLoginLbl2 = new System.Windows.Forms.Label();
-			this.externalLoginLbl1 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
+			passwordLbl = new System.Windows.Forms.Label();
+			passwordTb = new System.Windows.Forms.TextBox();
+			submitBtn = new System.Windows.Forms.Button();
+			localeLbl = new System.Windows.Forms.Label();
+			usernameLbl = new System.Windows.Forms.Label();
+			externalLoginLink = new System.Windows.Forms.LinkLabel();
+			externalLoginLbl2 = new System.Windows.Forms.Label();
+			externalLoginLbl1 = new System.Windows.Forms.Label();
+			SuspendLayout();
 			// 
 			// passwordLbl
 			// 
-			this.passwordLbl.AutoSize = true;
-			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
-			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.passwordLbl.Name = "passwordLbl";
-			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
-			this.passwordLbl.TabIndex = 2;
-			this.passwordLbl.Text = "Password";
+			passwordLbl.AutoSize = true;
+			passwordLbl.Location = new System.Drawing.Point(14, 47);
+			passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			passwordLbl.Name = "passwordLbl";
+			passwordLbl.Size = new System.Drawing.Size(57, 15);
+			passwordLbl.TabIndex = 2;
+			passwordLbl.Text = "Password";
 			// 
 			// passwordTb
 			// 
-			this.passwordTb.Location = new System.Drawing.Point(83, 44);
-			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.passwordTb.Name = "passwordTb";
-			this.passwordTb.PasswordChar = '*';
-			this.passwordTb.Size = new System.Drawing.Size(233, 23);
-			this.passwordTb.TabIndex = 3;
+			passwordTb.Location = new System.Drawing.Point(83, 44);
+			passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			passwordTb.Name = "passwordTb";
+			passwordTb.PasswordChar = '*';
+			passwordTb.Size = new System.Drawing.Size(233, 23);
+			passwordTb.TabIndex = 3;
 			// 
 			// submitBtn
 			// 
-			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.submitBtn.Location = new System.Drawing.Point(293, 176);
-			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.submitBtn.Name = "submitBtn";
-			this.submitBtn.Size = new System.Drawing.Size(88, 27);
-			this.submitBtn.TabIndex = 7;
-			this.submitBtn.Text = "Submit";
-			this.submitBtn.UseVisualStyleBackColor = true;
-			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			submitBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
+			submitBtn.Location = new System.Drawing.Point(293, 176);
+			submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			submitBtn.Name = "submitBtn";
+			submitBtn.Size = new System.Drawing.Size(88, 27);
+			submitBtn.TabIndex = 7;
+			submitBtn.Text = "Submit";
+			submitBtn.UseVisualStyleBackColor = true;
+			submitBtn.Click += submitBtn_Click;
 			// 
 			// localeLbl
 			// 
-			this.localeLbl.AutoSize = true;
-			this.localeLbl.Location = new System.Drawing.Point(14, 10);
-			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.localeLbl.Name = "localeLbl";
-			this.localeLbl.Size = new System.Drawing.Size(61, 15);
-			this.localeLbl.TabIndex = 0;
-			this.localeLbl.Text = "Locale: {0}";
+			localeLbl.AutoSize = true;
+			localeLbl.Location = new System.Drawing.Point(14, 10);
+			localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			localeLbl.Name = "localeLbl";
+			localeLbl.Size = new System.Drawing.Size(61, 15);
+			localeLbl.TabIndex = 0;
+			localeLbl.Text = "Locale: {0}";
 			// 
 			// usernameLbl
 			// 
-			this.usernameLbl.AutoSize = true;
-			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
-			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.usernameLbl.Name = "usernameLbl";
-			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
-			this.usernameLbl.TabIndex = 1;
-			this.usernameLbl.Text = "Username: {0}";
+			usernameLbl.AutoSize = true;
+			usernameLbl.Location = new System.Drawing.Point(14, 25);
+			usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			usernameLbl.Name = "usernameLbl";
+			usernameLbl.Size = new System.Drawing.Size(80, 15);
+			usernameLbl.TabIndex = 1;
+			usernameLbl.Text = "Username: {0}";
 			// 
 			// externalLoginLink
 			// 
-			this.externalLoginLink.AutoSize = true;
-			this.externalLoginLink.Location = new System.Drawing.Point(14, 93);
-			this.externalLoginLink.Name = "externalLoginLink";
-			this.externalLoginLink.Size = new System.Drawing.Size(107, 15);
-			this.externalLoginLink.TabIndex = 4;
-			this.externalLoginLink.TabStop = true;
-			this.externalLoginLink.Text = "Or click here to log";
-			this.externalLoginLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.externalLoginLink_LinkClicked);
+			externalLoginLink.AutoSize = true;
+			externalLoginLink.Location = new System.Drawing.Point(14, 93);
+			externalLoginLink.Name = "externalLoginLink";
+			externalLoginLink.Size = new System.Drawing.Size(166, 15);
+			externalLoginLink.TabIndex = 4;
+			externalLoginLink.TabStop = true;
+			externalLoginLink.Text = "Trouble Logging in? Click here";
+			externalLoginLink.LinkClicked += externalLoginLink_LinkClicked;
 			// 
 			// externalLoginLbl2
 			// 
-			this.externalLoginLbl2.AutoSize = true;
-			this.externalLoginLbl2.Location = new System.Drawing.Point(14, 108);
-			this.externalLoginLbl2.Name = "externalLoginLbl2";
-			this.externalLoginLbl2.Size = new System.Drawing.Size(352, 45);
-			this.externalLoginLbl2.TabIndex = 6;
-			this.externalLoginLbl2.Text = "This more advanced login is recommended if you\'re experiencing\r\nerrors logging in" +
-    " the conventional way above or if you\'re not\r\ncomfortable typing your password h" +
-    "ere.";
+			externalLoginLbl2.AutoSize = true;
+			externalLoginLbl2.Location = new System.Drawing.Point(14, 108);
+			externalLoginLbl2.Name = "externalLoginLbl2";
+			externalLoginLbl2.Size = new System.Drawing.Size(352, 45);
+			externalLoginLbl2.TabIndex = 6;
+			externalLoginLbl2.Text = "This more advanced login is recommended if you're experiencing\r\nerrors logging in the conventional way above or if you're not\r\ncomfortable typing your password here.";
 			// 
 			// externalLoginLbl1
 			// 
-			this.externalLoginLbl1.AutoSize = true;
-			this.externalLoginLbl1.Location = new System.Drawing.Point(83, 93);
-			this.externalLoginLbl1.Name = "externalLoginLbl1";
-			this.externalLoginLbl1.Size = new System.Drawing.Size(158, 15);
-			this.externalLoginLbl1.TabIndex = 5;
-			this.externalLoginLbl1.Text = "to log in using your browser.";
+			externalLoginLbl1.AutoSize = true;
+			externalLoginLbl1.Location = new System.Drawing.Point(177, 93);
+			externalLoginLbl1.Name = "externalLoginLbl1";
+			externalLoginLbl1.Size = new System.Drawing.Size(158, 15);
+			externalLoginLbl1.TabIndex = 5;
+			externalLoginLbl1.Text = "to log in using your browser.";
 			// 
 			// LoginChoiceEagerDialog
 			// 
-			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(394, 216);
-			this.Controls.Add(this.externalLoginLbl2);
-			this.Controls.Add(this.externalLoginLbl1);
-			this.Controls.Add(this.externalLoginLink);
-			this.Controls.Add(this.usernameLbl);
-			this.Controls.Add(this.localeLbl);
-			this.Controls.Add(this.submitBtn);
-			this.Controls.Add(this.passwordLbl);
-			this.Controls.Add(this.passwordTb);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "LoginChoiceEagerDialog";
-			this.ShowIcon = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Audible Login";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
+			AcceptButton = submitBtn;
+			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			ClientSize = new System.Drawing.Size(394, 216);
+			Controls.Add(externalLoginLbl2);
+			Controls.Add(externalLoginLbl1);
+			Controls.Add(externalLoginLink);
+			Controls.Add(usernameLbl);
+			Controls.Add(localeLbl);
+			Controls.Add(submitBtn);
+			Controls.Add(passwordLbl);
+			Controls.Add(passwordTb);
+			FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			MaximizeBox = false;
+			MinimizeBox = false;
+			Name = "LoginChoiceEagerDialog";
+			ShowIcon = false;
+			StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			Text = "Audible Login";
+			ResumeLayout(false);
+			PerformLayout();
 		}
 
 		#endregion

Source/LibationWinForms/Dialogs/Login/WebLoginDialog.Designer.cs

@@ -0,0 +1,46 @@
+namespace LibationWinForms.Login
+{
+	partial class WebLoginDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			SuspendLayout();
+			// 
+			// WebLoginDialog
+			// 
+			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			ClientSize = new System.Drawing.Size(484, 761);
+			Name = "WebLoginDialog";
+			StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			Text = "Audible Login";
+			ResumeLayout(false);
+		}
+
+		#endregion
+	}
+}

Source/LibationWinForms/Dialogs/Login/WebLoginDialog.cs

@@ -0,0 +1,62 @@
+using Dinah.Core;
+using LibationFileManager;
+using System;
+using System.Windows.Forms;
+
+namespace LibationWinForms.Login
+{
+	public partial class WebLoginDialog : Form
+	{
+		public string ResponseUrl { get; private set; }
+		private readonly string accountID;
+		private readonly IWebViewAdapter webView;
+		public WebLoginDialog()
+		{
+			InitializeComponent();
+			webView = InteropFactory.Create().CreateWebViewAdapter();
+
+			var webViewControl = webView.NativeWebView as Control;
+			webViewControl.Dock = DockStyle.Fill;
+			Controls.Add(webViewControl);
+
+			webView.NavigationStarted += WebView_NavigationStarted;
+			webView.DOMContentLoaded += WebView_DOMContentLoaded;
+			this.SetLibationIcon();
+		}
+
+		public WebLoginDialog(string accountID, string loginUrl) : this()
+		{
+			this.accountID = ArgumentValidator.EnsureNotNullOrWhiteSpace(accountID, nameof(accountID));
+			webView.Source = new Uri(ArgumentValidator.EnsureNotNullOrWhiteSpace(loginUrl, nameof(loginUrl)));
+		}
+
+		private void WebView_NavigationStarted(object sender, WebViewNavigationEventArgs e)
+		{
+			if (e.Request?.AbsolutePath.Contains("/ap/maplanding") is true)
+			{
+				ResponseUrl = e.Request.ToString();
+				DialogResult = DialogResult.OK;
+				Close();
+			}
+		}
+
+		private async void WebView_DOMContentLoaded(object sender, EventArgs e)
+		{
+			await webView.InvokeScriptAsync(getScript(accountID));
+		}
+
+		private static string getScript(string accountID) => $$"""
+			(function() {
+				var inputs = document.getElementsByTagName('input');
+				for (index = 0; index < inputs.length; ++index) {
+					if (inputs[index].name.includes('email')) {
+						inputs[index].value = '{{accountID}}';
+					}
+					if (inputs[index].name.includes('password')) {
+						inputs[index].focus();
+					}
+				}
+			})()
+			""";
+	}
+}

Source/LibationWinForms/Dialogs/Login/WebLoginDialog.resx

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

Source/LibationWinForms/Dialogs/Login/WinformLoginBase.cs

@@ -1,15 +1,22 @@
 using System;
+using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
 {
 	public abstract class WinformLoginBase
 	{
-		/// <returns>True if ShowDialog's DialogResult == OK</returns>
-		protected static bool ShowDialog(System.Windows.Forms.Form dialog)
+		private readonly IWin32Window _owner;
+		protected WinformLoginBase(IWin32Window owner)
 		{
-			var result = dialog.ShowDialog();
+			_owner = owner;
+		}
+
+		/// <returns>True if ShowDialog's DialogResult == OK</returns>
+		protected bool ShowDialog(Form dialog)
+		{
+			var result = dialog.ShowDialog(_owner);
 			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
-			return result == System.Windows.Forms.DialogResult.OK;
+			return result == DialogResult.OK;
 		}
 	}
 }

Source/LibationWinForms/Dialogs/Login/WinformLoginCallback.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using AudibleApi;
 using AudibleUtilities;
 using LibationWinForms.Dialogs.Login;
@@ -12,7 +13,7 @@ namespace LibationWinForms.Login
 
 		public string DeviceName { get; } = "Libation";
 
-		public WinformLoginCallback(Account account)
+		public WinformLoginCallback(Account account, IWin32Window owner) : base(owner)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}

Source/LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using AudibleApi;
 using AudibleUtilities;
 using LibationWinForms.Dialogs.Login;
@@ -9,20 +10,37 @@ namespace LibationWinForms.Login
 	public class WinformLoginChoiceEager : WinformLoginBase, ILoginChoiceEager
 	{
 		/// <summary>Convenience method. Recommended when wiring up Winforms to <see cref="ApplicationServices.LibraryCommands.ImportAccountAsync"/></summary>
-		public static async Task<ApiExtended> ApiExtendedFunc(Account account) => await ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account));
+		public static Func<Account, Task<ApiExtended>> CreateApiExtendedFunc(IWin32Window owner) => a => ApiExtendedFunc(a, owner);
+
+		private static async Task<ApiExtended> ApiExtendedFunc(Account account, IWin32Window owner)
+			=> await ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account, owner));
 
 		public ILoginCallback LoginCallback { get; private set; }
 
 		private Account _account { get; }
 
-		public WinformLoginChoiceEager(Account account)
+		private WinformLoginChoiceEager(Account account, IWin32Window owner) : base(owner)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
-			LoginCallback = new WinformLoginCallback(_account);
+			LoginCallback = new WinformLoginCallback(_account, owner);
 		}
 
 		public Task<ChoiceOut> StartAsync(ChoiceIn choiceIn)
 		{
+			if (Environment.OSVersion.Version.Major >= 10)
+			{
+				try
+				{
+					using var weblogin = new WebLoginDialog(_account.AccountId, choiceIn.LoginUrl);
+					if (ShowDialog(weblogin))
+						return Task.FromResult(ChoiceOut.External(weblogin.ResponseUrl));
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, $"Failed to run {nameof(WebLoginDialog)}");
+				}
+			}
+
 			using var dialog = new LoginChoiceEagerDialog(_account);
 
 			if (!ShowDialog(dialog) || (dialog.LoginMethod is LoginMethod.Api && string.IsNullOrWhiteSpace(dialog.Password)))
@@ -33,13 +51,13 @@ namespace LibationWinForms.Login
 				case LoginMethod.Api:
 					return Task.FromResult(ChoiceOut.WithApi(dialog.Email, dialog.Password));
 				case LoginMethod.External:
-				{
-					using var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
+					{
+						using var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
 						return Task.FromResult(
 							ShowDialog(externalDialog)
 							? ChoiceOut.External(externalDialog.ResponseUrl)
 							: null);
-				}
+					}
 				default:
 					throw new Exception($"Unknown {nameof(LoginMethod)} value");
 			}

Source/LibationWinForms/Form1.ScanAuto.cs

@@ -32,7 +32,7 @@ namespace LibationWinForms
 				// in autoScan, new books SHALL NOT show dialog
 				try
 				{
-					Task importAsync() => LibraryCommands.ImportAccountAsync(Login.WinformLoginChoiceEager.ApiExtendedFunc, accounts);
+					Task importAsync() => LibraryCommands.ImportAccountAsync(Login.WinformLoginChoiceEager.CreateApiExtendedFunc(this), accounts);
 					if (InvokeRequired)
 						await Invoke(importAsync);
 					else

Source/LibationWinForms/Form1.ScanManual.cs

@@ -74,7 +74,7 @@ namespace LibationWinForms
 		{
 			try
 			{
-				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(Login.WinformLoginChoiceEager.ApiExtendedFunc, accounts);
+				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(Login.WinformLoginChoiceEager.CreateApiExtendedFunc(this), accounts);
 
 				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
 				if (Configuration.Instance.ShowImportedStats && newAdded > 0)

Source/LibationWinForms/GridView/GridEntryBindingList.cs

@@ -1,6 +1,4 @@
 using ApplicationServices;
-using Dinah.Core.DataBinding;
-using LibationSearchEngine;
 using LibationUiBase.GridView;
 using System;
 using System.Collections.Generic;
@@ -20,47 +18,62 @@ namespace LibationWinForms.GridView
 	 * 
 	 * Remove is overridden to ensure that removed items are removed from
 	 * the base list (visible items) as well as the FilterRemoved list.
+	 * 
+	 * Using BindingList.Add/Insert and BindingList.Remove will cause the
+	 * BindingList to subscribe/unsibscribe to/from the item's PropertyChanged
+	 * event. Adding or removing from the underlying list will not change the
+	 * BindingList's subscription to that item.
 	 */
 	internal class GridEntryBindingList : BindingList<IGridEntry>, IBindingListView
 	{
-		public GridEntryBindingList() : base(new List<IGridEntry>()) { }
-		public GridEntryBindingList(IEnumerable<IGridEntry> enumeration) : base(new List<IGridEntry>(enumeration)) { }
+		public GridEntryBindingList(IEnumerable<IGridEntry> enumeration) : base(new List<IGridEntry>(enumeration))
+		{
+			SearchEngineCommands.SearchEngineUpdated += SearchEngineCommands_SearchEngineUpdated;
+			ListChanged += GridEntryBindingList_ListChanged;
+			refreshEntries();
+		}
 
 		/// <returns>All items in the list, including those filtered out.</returns>
 		public List<IGridEntry> AllItems() => Items.Concat(FilterRemoved).ToList();
 
 		/// <summary>All items that pass the current filter</summary>
 		public IEnumerable<ILibraryBookEntry> GetFilteredInItems()
-			=> SearchResults is null
-			? FilterRemoved
+			=> FilteredInGridEntries?
 				.OfType<ILibraryBookEntry>()
-				.Union(Items.OfType<ILibraryBookEntry>())
-			: FilterRemoved
+			?? FilterRemoved
 				.OfType<ILibraryBookEntry>()
-				.Join(SearchResults.Docs, o => o.Book.AudibleProductId, i => i.ProductId, (o, _) => o)
 				.Union(Items.OfType<ILibraryBookEntry>());
 
 		public bool SupportsFiltering => true;
-		public string Filter { get => FilterString; set => ApplyFilter(value); }
+		public string Filter
+		{
+			get => FilterString;
+			set
+			{
+				FilterString = value;
 
-		/// <summary>When true, itms will not be checked filtered by search criteria on item changed<summary>
-		public bool SuspendFilteringOnUpdate { get; set; }
+				if (Items.Count + FilterRemoved.Count == 0)
+					return;
 
-		protected MemberComparer<IGridEntry> Comparer { get; } = new();
+				FilteredInGridEntries = AllItems().FilterEntries(FilterString);
+				refreshEntries();
+			}
+		}
+
+		protected RowComparer Comparer { get; } = new();
 		protected override bool SupportsSortingCore => true;
 		protected override bool SupportsSearchingCore => true;
 		protected override bool IsSortedCore => isSorted;
 		protected override PropertyDescriptor SortPropertyCore => propertyDescriptor;
-		protected override ListSortDirection SortDirectionCore => listSortDirection;
+		protected override ListSortDirection SortDirectionCore => Comparer.SortOrder;
 
 		/// <summary> Items that were removed from the base list due to filtering </summary>
 		private readonly List<IGridEntry> FilterRemoved = new();
 		private string FilterString;
-		private SearchResultSet SearchResults;
 		private bool isSorted;
-		private ListSortDirection listSortDirection;
 		private PropertyDescriptor propertyDescriptor;
-
+		/// <summary> All GridEntries present in the current filter set. If null, no filter is applied and all entries are filtered in.(This was a performance choice)</summary>
+		private HashSet<IGridEntry> FilteredInGridEntries;
 
 		#region Unused - Advanced Filtering
 		public bool SupportsAdvancedSorting => false;
@@ -78,25 +91,61 @@ namespace LibationWinForms.GridView
 			base.Remove(entry);
 		}
 
-		private void ApplyFilter(string filterString)
+		/// <summary>
+		/// This method should be called whenever there's been a change to the
+		/// set of all GridEntries that affects sort order or filter status
+		/// </summary>
+		private void refreshEntries()
 		{
-			if (filterString != FilterString)
-				RemoveFilter();
+			var priorState = RaiseListChangedEvents;
+			RaiseListChangedEvents = false;
 
-			FilterString = filterString;
-			SearchResults = SearchEngineCommands.Search(filterString);
-
-			var booksFilteredIn = Items.BookEntries().Join(SearchResults.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => (IGridEntry)lbe);
-
-			//Find all series containing children that match the search criteria
-			var seriesFilteredIn = Items.SeriesEntries().Where(s => s.Children.Join(SearchResults.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => lbe).Any());
-
-			var filteredOut = Items.Except(booksFilteredIn.Concat(seriesFilteredIn)).ToList();
-
-			foreach (var item in filteredOut)
+			if (FilteredInGridEntries is null)
 			{
-				FilterRemoved.Add(item);
-				base.Remove(item);
+				addRemovedItemsBack(FilterRemoved.ToList());
+			}
+			else
+			{
+				var addBackEntries = FilterRemoved.Intersect(FilteredInGridEntries).ToList();
+				var toRemoveEntries = Items.Except(FilteredInGridEntries).ToList();
+
+				addRemovedItemsBack(addBackEntries);
+
+				foreach (var newRemove in toRemoveEntries)
+				{
+					FilterRemoved.Add(newRemove);
+					base.Remove(newRemove);
+				}
+			}
+
+			SortInternal();
+
+			ResetList();
+			RaiseListChangedEvents = priorState;
+
+			void addRemovedItemsBack(List<IGridEntry> addBackEntries)
+			{
+				//Add removed entries back into Items so they are displayed
+				//(except for episodes that are collapsed)
+				foreach (var addBack in addBackEntries)
+				{
+					if (addBack is ILibraryBookEntry lbe && lbe.Parent is ISeriesEntry se && !se.Liberate.Expanded)
+						continue;
+
+					FilterRemoved.Remove(addBack);
+					Add(addBack);
+				}
+			}
+		}
+
+		private void SearchEngineCommands_SearchEngineUpdated(object sender, EventArgs e)
+		{
+			var filterResults = AllItems().FilterEntries(FilterString);
+
+			if (FilteredInGridEntries.SearchSetsDiffer(filterResults))
+			{
+				FilteredInGridEntries = filterResults;
+				refreshEntries();
 			}
 		}
 
@@ -114,7 +163,7 @@ namespace LibationWinForms.GridView
 
 		public void CollapseItem(ISeriesEntry sEntry)
 		{
-			foreach (var episode in sEntry.Children.Join(Items.BookEntries(), o => o, i => i, (_, i) => i).ToList())
+			foreach (var episode in sEntry.Children.Intersect(Items.BookEntries()).ToList())
 			{
 				FilterRemoved.Add(episode);
 				base.Remove(episode);
@@ -127,9 +176,9 @@ namespace LibationWinForms.GridView
 		{
 			var sindex = Items.IndexOf(sEntry);
 
-			foreach (var episode in sEntry.Children.Join(FilterRemoved.BookEntries(), o => o, i => i, (_, i) => i).ToList())
+			foreach (var episode in Comparer.OrderEntries(sEntry.Children.Intersect(FilterRemoved.BookEntries())).ToList())
 			{
-				if (SearchResults is null || SearchResults.Docs.Any(d => d.ProductId == episode.AudibleProductId))
+				if (FilteredInGridEntries?.Contains(episode) ?? true)
 				{
 					FilterRemoved.Remove(episode);
 					InsertItem(++sindex, episode);
@@ -140,108 +189,54 @@ namespace LibationWinForms.GridView
 
 		public void RemoveFilter()
 		{
-			if (FilterString is null) return;
-
-			int visibleCount = Items.Count;
-
-			foreach (var item in FilterRemoved.ToList())
-			{
-				if (item is ISeriesEntry || (item is ILibraryBookEntry lbe && (lbe.Liberate.IsBook || lbe.Parent.Liberate.Expanded)))
-				{
-					FilterRemoved.Remove(item);
-					InsertItem(visibleCount++, item);
-				}
-			}
-
-			if (IsSortedCore)
-				Sort();
-			else
-			//No user sort is applied, so do default sorting by DateAdded, descending
-			{
-				Comparer.PropertyName = nameof(IGridEntry.DateAdded);
-				Comparer.Direction = ListSortDirection.Descending;
-				Sort();
-			}
-
-			OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
-
 			FilterString = null;
-			SearchResults = null;
+			FilteredInGridEntries = null;
+			refreshEntries();
 		}
 
 		protected override void ApplySortCore(PropertyDescriptor property, ListSortDirection direction)
 		{
 			Comparer.PropertyName = property.Name;
-			Comparer.Direction = direction;
+			Comparer.SortOrder = direction;
 
-			Sort();
+			SortInternal();
 
 			propertyDescriptor = property;
-			listSortDirection = direction;
 			isSorted = true;
 
-			OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+			ResetList();
 		}
 
-		protected void Sort()
+		private void SortInternal()
 		{
 			var itemsList = (List<IGridEntry>)Items;
-
-			var children = itemsList.BookEntries().Where(i => i.Liberate.IsEpisode).ToList();
-
-			var sortedItems = itemsList.Except(children).OrderBy(ge => ge, Comparer).ToList();
+			//User Order/OrderDescending and replace items in list instead of using List.Sort() to achieve stable sorting.
+			var sortedItems = Comparer.OrderEntries(itemsList).ToList();
 
 			itemsList.Clear();
-
-			//Only add parentless items at this stage. After these items are added in the
-			//correct sorting order, go back and add the children beneath their parents.
 			itemsList.AddRange(sortedItems);
-
-			foreach (var parent in children.Select(c => c.Parent).Distinct())
-			{
-				var pIndex = itemsList.IndexOf(parent);
-
-				//children are sorted beneath their series parent
-				foreach (var c in children.Where(c => c.Parent == parent).OrderBy(c => c, Comparer))
-					itemsList.Insert(++pIndex, c);
-			}
 		}
 
-		protected override void OnListChanged(ListChangedEventArgs e)
+		private void GridEntryBindingList_ListChanged(object sender, ListChangedEventArgs e)
 		{
-			if (e.ListChangedType == ListChangedType.ItemChanged)
-			{
-				if (FilterString is not null && !SuspendFilteringOnUpdate && Items[e.NewIndex] is ILibraryBookEntry lbItem)
-				{
-					SearchResults = SearchEngineCommands.Search(FilterString);
-					if (!SearchResults.Docs.Any(d => d.ProductId == lbItem.AudibleProductId))
-					{
-						FilterRemoved.Add(lbItem);
-						base.Remove(lbItem);
-						return;
-					}
-				}
-
-				if (isSorted && e.PropertyDescriptor == SortPropertyCore)
-				{
-					var item = Items[e.NewIndex];
-					Sort();
-					var newIndex = Items.IndexOf(item);
-
-					base.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemMoved, newIndex, e.NewIndex));
-					return;
-				}
-			}
-			base.OnListChanged(e);
+			if (e.ListChangedType == ListChangedType.ItemChanged && IsSortedCore && e.PropertyDescriptor == SortPropertyCore)
+				refreshEntries();
 		}
 
 		protected override void RemoveSortCore()
 		{
 			isSorted = false;
 			propertyDescriptor = base.SortPropertyCore;
-			listSortDirection = base.SortDirectionCore;
+			Comparer.SortOrder = base.SortDirectionCore;
+			ResetList();
+		}
 
+		private void ResetList()
+		{
+			var priorState = RaiseListChangedEvents;
+			RaiseListChangedEvents = true;
 			OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+			RaiseListChangedEvents = priorState;
 		}
 	}
 }

Source/LibationWinForms/GridView/ProductsDisplay.cs

@@ -279,7 +279,7 @@ namespace LibationWinForms.GridView
 					.Select(lbe => lbe.LibraryBook)
 					.Where(lb => !lb.Book.HasLiberated());
 
-				var removedBooks = await LibraryCommands.FindInactiveBooks(Login.WinformLoginChoiceEager.ApiExtendedFunc, lib, accounts);
+				var removedBooks = await LibraryCommands.FindInactiveBooks(Login.WinformLoginChoiceEager.CreateApiExtendedFunc(this), lib, accounts);
 
 				var removable = allBooks.Where(lbe => removedBooks.Any(rb => rb.Book.AudibleProductId == lbe.AudibleProductId)).ToList();
 

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -181,7 +181,7 @@ namespace LibationWinForms.GridView
 				geList.AddRange(seriesEntry.Children);
 			}
 
-			bindingList = new GridEntryBindingList(geList.OrderByDescending(e => e.DateAdded));
+			bindingList = new GridEntryBindingList(geList);
 			bindingList.CollapseAll();
 			syncBindingSource.DataSource = bindingList;
 			VisibleCountChanged?.Invoke(this, bindingList.GetFilteredInItems().Count());
@@ -189,20 +189,22 @@ namespace LibationWinForms.GridView
 
 		internal void UpdateGrid(List<LibraryBook> dbBooks)
 		{
+			//First row that is in view in the DataGridView
+			var topRow = gridEntryDataGridView.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Displayed)?.Index ?? 0;
+
 			#region Add new or update existing grid entries
 
 			//Remove filter prior to adding/updating boooks
 			string existingFilter = syncBindingSource.Filter;
 			Filter(null);
 
-			bindingList.SuspendFilteringOnUpdate = true;
-
 			//Add absent entries to grid, or update existing entry
 
 			var allEntries = bindingList.AllItems().BookEntries();
 			var seriesEntries = bindingList.AllItems().SeriesEntries().ToList();
 			var parentedEpisodes = dbBooks.ParentedEpisodes().ToHashSet();
 
+			bindingList.RaiseListChangedEvents = false;
 			foreach (var libraryBook in dbBooks.OrderBy(e => e.DateAdded))
 			{
 				var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId);
@@ -218,10 +220,11 @@ namespace LibationWinForms.GridView
 					AddOrUpdateEpisode(libraryBook, existingEntry, seriesEntries, dbBooks);
 				}
 			}
-
-			bindingList.SuspendFilteringOnUpdate = false;
+			bindingList.RaiseListChangedEvents = true;
 
 			//Re-apply filter after adding new/updating existing books to capture any changes
+			//The Filter call also ensures that the binding list is reset so the DataGridView
+			//is made aware of all changes that were made while RaiseListChangedEvents was false
 			Filter(existingFilter);
 
 			#endregion
@@ -235,6 +238,8 @@ namespace LibationWinForms.GridView
 				.ExceptBy(dbBooks.Select(lb => lb.Book.AudibleProductId), ge => ge.AudibleProductId);
 
 			RemoveBooks(removedBooks);
+
+			gridEntryDataGridView.FirstDisplayedScrollingRowIndex = topRow;
 		}
 
 		public void RemoveBooks(IEnumerable<ILibraryBookEntry> removedBooks)

Source/LibationWinForms/GridView/RowComparer.cs

@@ -0,0 +1,20 @@
+using LibationUiBase.GridView;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+namespace LibationWinForms.GridView
+{
+	internal class RowComparer : RowComparerBase
+	{
+		public ListSortDirection SortOrder { get; set; } = ListSortDirection.Descending;
+		public override string PropertyName { get; set; } = nameof(IGridEntry.DateAdded);
+		protected override ListSortDirection GetSortOrder() => SortOrder;
+
+		/// <summary>
+		/// Helper method for ordering grid entries
+		/// </summary>
+		public IOrderedEnumerable<IGridEntry> OrderEntries(IEnumerable<IGridEntry> entries)
+			=> SortOrder is ListSortDirection.Descending ? entries.OrderDescending(this) : entries.Order(this);
+	}
+}

Source/LoadByOS/LinuxConfigApp/LinuxInterop.cs

@@ -20,6 +20,7 @@ namespace LinuxConfigApp
 		public LinuxInterop() { }
 		public LinuxInterop(params object[] values) { }
 
+		public IWebViewAdapter CreateWebViewAdapter() => null;
 		public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
 		public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
 

Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
+    <!--<TargetFramework>net7.0-macos</TargetFramework>-->
     <ImplicitUsings>enable</ImplicitUsings>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>

Source/LoadByOS/MacOSConfigApp/MacOSInterop.cs

@@ -10,6 +10,7 @@ namespace MacOSConfigApp
 		public MacOSInterop() { }
         public MacOSInterop(params object[] values) { }
 
+		public IWebViewAdapter CreateWebViewAdapter() => null;
 		public void SetFolderIcon(string image, string directory)
 		{
 			Process.Start("fileicon", $"set {directory.SurroundWithQuotes()} {image.SurroundWithQuotes()}").WaitForExit();

Source/LoadByOS/MacOSConfigApp/MacWebViewAdapter.cs

@@ -0,0 +1,134 @@
+/* Work-in-progress
+ * 
+ * 
+using LibationFileManager;
+using ObjCRuntime;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WebKit;
+
+#nullable enable
+
+namespace MacOSConfigApp;
+
+internal class WKNavigationDelegate1 : WKNavigationDelegate
+{
+	public override void DidStartProvisionalNavigation(WKWebView webView, WKNavigation navigation)
+	{
+		base.DidStartProvisionalNavigation(webView, navigation);
+	}
+}
+internal class MacWebViewAdapter : IWebViewAdapter, IDisposable
+{
+	private readonly WKWebView _webView;
+	public IPlatformHandle2 PlatformHandle { get; }
+
+	public bool CanGoBack => _webView.CanGoBack;
+
+	public bool CanGoForward => _webView.CanGoForward;
+
+	public Uri? Source { get => _webView?.Url; set => throw new NotImplementedException(); }
+
+	public object NativeWebView { get; }
+
+	public event EventHandler<WebViewNavigationEventArgs>? NavigationCompleted;
+	public event EventHandler<WebViewNavigationEventArgs>? NavigationStarted;
+	public event EventHandler? DOMContentLoaded;
+
+	WKNavigationDelegate1 navDelegate;
+	public MacWebViewAdapter()
+	{
+		var frame = new CGRect(0, 0, 500, 800);
+		NativeWebView = _webView = new WKWebView(frame, new WKWebViewConfiguration());
+		_webView.NavigationDelegate = navDelegate = new WKNavigationDelegate1();
+		PlatformHandle = new MacViewHandle(_webView.Handle);
+	}
+
+	public void Dispose()
+	{
+		_webView?.Dispose();
+	}
+
+	public bool GoBack()
+	{
+		if (_webView.CanGoBack)
+		{
+			_webView.GoBack();
+			return true;
+		}
+		else return false;
+	}
+
+	public bool GoForward()
+	{
+		if (_webView.CanGoForward)
+		{
+			_webView.GoForward();
+			return true;
+		}
+		else return false;
+	}
+
+	public bool HandleKeyDown(uint key, uint keyModifiers)
+	{
+		return false;
+	}
+
+	public void HandleResize(int width, int height, float zoom)
+	{
+
+	}
+
+	public async Task<string?> InvokeScriptAsync(string scriptName)
+	{
+		var result = await _webView.EvaluateJavaScriptAsync(scriptName);
+
+		return result.ToString();
+	}
+
+	public void Navigate(Uri url)
+	{
+		NSUrl? nsurl = url;
+		if (nsurl is null) return;
+
+		var request = new NSUrlRequest(nsurl);
+
+		_webView.LoadRequest(request);
+
+	}
+
+
+	public Task NavigateToString(string text)
+	{
+		throw new NotImplementedException();
+	}
+
+	public void Refresh()
+	{
+		throw new NotImplementedException();
+	}
+
+	public void Stop()
+	{
+		throw new NotImplementedException();
+	}
+}
+
+
+internal class MacViewHandle : IPlatformHandle2
+{
+	private NativeHandle? _view;
+
+	public MacViewHandle(NativeHandle view)
+	{
+		_view = view;
+	}
+
+	public nint Handle => _view?.Handle ?? 0;
+	public string HandleDescriptor => "NativeHandle";
+}
+
+*/

Source/LoadByOS/WindowsConfigApp/WinInterop.cs

@@ -12,7 +12,10 @@ namespace WindowsConfigApp
         public WinInterop() { }
         public WinInterop(params object[] values) { }
 
-        public void SetFolderIcon(string image, string directory)
+#nullable enable
+		public IWebViewAdapter? CreateWebViewAdapter() => new WindowsWebView2Adapter();
+#nullable disable
+		public void SetFolderIcon(string image, string directory)
         {
 			var icon = Image.Load(image).ToIcon();
 			new DirectoryInfo(directory)?.SetIcon(icon, "Music");
@@ -50,5 +53,5 @@ namespace WindowsConfigApp
 
             return Process.Start(psi);
 		}
-    }
+	}
 }

Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj

@@ -2,8 +2,10 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+	<TargetFramework>net7.0-windows</TargetFramework>
+	<UseWindowsForms>true</UseWindowsForms>
+	<EnableWindowsTargeting>true</EnableWindowsTargeting>
+	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishReadyToRun>true</PublishReadyToRun>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -23,6 +25,10 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1722.45" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\LibationUiBase\LibationUiBase.csproj" />
   </ItemGroup>

Source/LoadByOS/WindowsConfigApp/WindowsWebView2Adapter.cs

@@ -0,0 +1,114 @@
+using LibationFileManager;
+using Microsoft.Web.WebView2.WinForms;
+using System;
+using System.Threading.Tasks;
+
+#nullable enable
+namespace WindowsConfigApp;
+
+internal class WindowsWebView2Adapter : IWebViewAdapter, IDisposable
+{
+	public object NativeWebView { get; }
+	private readonly WebView2 _webView;
+
+	public WindowsWebView2Adapter()
+	{
+		NativeWebView = _webView = new WebView2();
+		PlatformHandle = new WebView2Handle { Handle = _webView.Handle };
+
+		_webView.CoreWebView2InitializationCompleted += _webView_CoreWebView2InitializationCompleted;
+
+		_webView.NavigationStarting += (s, a) =>
+		{
+			NavigationStarted?.Invoke(this, new WebViewNavigationEventArgs { Request = new Uri(a.Uri) });
+		};
+		_webView.NavigationCompleted += (s, a) =>
+		{
+			NavigationCompleted?.Invoke(this, new WebViewNavigationEventArgs { Request = _webView.Source });
+		};
+	}
+
+	private void _webView_CoreWebView2InitializationCompleted(object? sender, Microsoft.Web.WebView2.Core.CoreWebView2InitializationCompletedEventArgs e)
+	{
+		_webView.CoreWebView2.DOMContentLoaded -= CoreWebView2_DOMContentLoaded;
+		_webView.CoreWebView2.DOMContentLoaded += CoreWebView2_DOMContentLoaded;
+	}
+
+	private void CoreWebView2_DOMContentLoaded(object? sender, Microsoft.Web.WebView2.Core.CoreWebView2DOMContentLoadedEventArgs e)
+		=> DOMContentLoaded?.Invoke(this, e);
+
+	public IPlatformHandle2 PlatformHandle { get; } 
+
+	public bool CanGoBack => _webView.CanGoBack;
+
+	public bool CanGoForward => _webView.CanGoForward;
+
+	public Uri? Source
+	{
+		get => _webView.Source;
+		set => _webView.Source = value;
+	}
+
+	public event EventHandler<WebViewNavigationEventArgs>? NavigationStarted;
+	public event EventHandler<WebViewNavigationEventArgs>? NavigationCompleted;
+	public event EventHandler? DOMContentLoaded;
+
+	public void Dispose()
+	{
+		_webView.Dispose();
+	}
+
+	public bool GoBack()
+	{
+		_webView.GoBack();
+		return true;
+	}
+
+	public bool GoForward()
+	{
+		_webView.GoForward();
+		return true;
+	}
+
+	public async Task<string?> InvokeScriptAsync(string scriptName)
+	{
+		return await _webView.ExecuteScriptAsync(scriptName);
+	}
+
+	public void Navigate(Uri url)
+	{
+		_webView.Source = url;
+	}
+
+	public async Task NavigateToString(string text)
+	{
+		await _webView.EnsureCoreWebView2Async();
+
+		_webView.NavigateToString(text);
+	}
+
+	public void Refresh()
+	{
+		_webView.Refresh();
+	}
+
+	public void Stop()
+	{
+		_webView.Stop();
+	}
+
+	public void HandleResize(int width, int height, float zoom)
+	{
+	}
+
+	public bool HandleKeyDown(uint key, uint keyModifiers)
+	{
+		return false;
+	}
+}
+
+internal class WebView2Handle : IPlatformHandle2
+{
+	public IntPtr Handle { get; init; }
+	public string HandleDescriptor => "HWND";
+}