Bugfix #1269 : Chardonnay. Bad filter string causes infinite loop

Fix download error (#1252 )

I'm merging this one and releasing ASAP.

Source/AaxDecrypter/IDownloadOptions.cs

@@ -19,9 +19,9 @@ namespace AaxDecrypter
         public KeyData(string keyPart1, string? keyPart2 = null)
         {
             ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));
-            KeyPart1 = Convert.FromBase64String(keyPart1);
+            KeyPart1 = Convert.FromHexString(keyPart1);
             if (keyPart2 != null)
-                KeyPart2 = Convert.FromBase64String(keyPart2);
+                KeyPart2 = Convert.FromHexString(keyPart2);
         }
 	}    
 

Source/AppScaffolding/AppScaffolding.csproj

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

Source/FileLiberator/DownloadOptions.cs

@@ -108,8 +108,8 @@ namespace FileLiberator
 			ContentMetadata = licInfo.ContentMetadata;
 			InputType
 			= licInfo.DrmType is AudibleApi.Common.DrmType.Widevine ? AAXClean.FileType.Dash
-			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 8 && licInfo.DecryptionKeys[0].KeyPart2 is null ? AAXClean.FileType.Aax
-			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 32 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 32 ? AAXClean.FileType.Aaxc
+			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 4 && licInfo.DecryptionKeys[0].KeyPart2 is null ? AAXClean.FileType.Aax
+			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 16 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 16 ? AAXClean.FileType.Aaxc
 			: null;
 
 			//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.

Source/LibationAvalonia/ViewModels/MainVM.Filters.cs

@@ -14,8 +14,10 @@ namespace LibationAvalonia.ViewModels
 {
 	partial class MainVM
 	{
-		private QuickFilters.NamedFilter? lastGoodFilter = new(string.Empty, null);
-		private QuickFilters.NamedFilter? _selectedNamedFilter = new(string.Empty, null);
+		private string lastGoodSearch = string.Empty;
+		private QuickFilters.NamedFilter? lastGoodFilter => new(lastGoodSearch, null);
+
+        private QuickFilters.NamedFilter? _selectedNamedFilter = new(string.Empty, null);
 		private bool _firstFilterIsDefault = true;
 
 		/// <summary> Library filterting query </summary>
@@ -64,15 +66,16 @@ namespace LibationAvalonia.ViewModels
 			try
 			{
 				await ProductsDisplay.Filter(tryFilter);
-				lastGoodFilter = namedFilter;
+                lastGoodSearch = namedFilter?.Filter ?? "";
 			}
 			catch (Exception ex)
 			{
 				Serilog.Log.Logger.Error(ex, "Error performing filtering. {@namedFilter} {@lastGoodFilter}", namedFilter, lastGoodFilter);
 				await MessageBox.Show($"Bad filter string: \"{tryFilter}\"\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
 
-				// re-apply last good filter
-				await PerformFilter(lastGoodFilter);
+                // re-apply last good filter
+                namedFilter = (namedFilter ?? new(string.Empty, null)) with { Filter = lastGoodSearch };
+                await PerformFilter(namedFilter);
 			}
 		}