From bb8b43581049b405c4a1eb07db3f08bcab88458f Mon Sep 17 00:00:00 2001
From: Michael Bucari-Tovo <mbucari1@gmail.com>
Date: Tue, 30 Dec 2025 14:45:10 -0700
Subject: [PATCH] Improve Find Better Quality Audiobooks scanner

Try to load best audio format from actual liberated audiobook files
Allow re-scanning after completing scanning.
---
 Source/FileLiberator/AudioFormatDecoder.cs    |  2 +-
 .../FindBetterQualityBooksDialog.axaml        | 17 +++-
 .../FindBetterQualityBooksDialog.axaml.cs     | 81 +++++++++++++++----
 .../Views/ProcessQueueControl.axaml.cs        |  2 +
 4 files changed, 83 insertions(+), 19 deletions(-)

diff --git a/Source/FileLiberator/AudioFormatDecoder.cs b/Source/FileLiberator/AudioFormatDecoder.cs
index 1894298d..33d0761e 100644
--- a/Source/FileLiberator/AudioFormatDecoder.cs
+++ b/Source/FileLiberator/AudioFormatDecoder.cs
@@ -12,7 +12,7 @@ using System.IO;
 namespace AaxDecrypter;
 
 /// <summary> Read audio codec, bitrate, sample rate, and channel count from MP4 and MP3 audio files. </summary>
-internal static class AudioFormatDecoder
+public static class AudioFormatDecoder
 {
 	public static AudioFormat FromMpeg4(string filename)
 	{
diff --git a/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml b/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml
index 78e37c1d..9a7fc641 100644
--- a/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml
@@ -13,9 +13,9 @@
 	  <DataGrid
 		Name="booksDataGrid"
 		GridLinesVisibility="All"
-		CanUserReorderColumns="False"
-		CanUserResizeColumns="False"
-		CanUserSortColumns="False"
+		CanUserReorderColumns="True"
+		CanUserResizeColumns="True"
+		CanUserSortColumns="True"
 		AutoGenerateColumns="False"
 		IsReadOnly="True"
 		ItemsSource="{CompiledBinding Books}">
@@ -33,11 +33,17 @@
 				    Header="ASIN"/>
 
 				<DataGridTextColumn
-    				Width="*"
+    				Width="120"
 				    IsReadOnly="True"
 				    Binding="{CompiledBinding Title}"
 				    Header="Title"/>
 
+				<DataGridTextColumn
+    				Width="120"
+				    IsReadOnly="True"
+				    Binding="{CompiledBinding FoundFile}"
+				    Header="Best Found File"/>
+
 				<DataGridTextColumn
     				Width="90"
 				    IsReadOnly="True"
@@ -47,6 +53,7 @@
 				<DataGridTextColumn
     				Width="90"
 				    IsReadOnly="True"
+					SortMemberPath="Bitrate"
 				    Binding="{CompiledBinding BitrateString}"
 				    Header="Existing&#xa;Bitrate"/>
 
@@ -59,6 +66,7 @@
 				<DataGridTextColumn
     				Width="90"
 				    IsReadOnly="True"
+					SortMemberPath="AvailableBitrate"
 				    Binding="{CompiledBinding AvailableBitrateString}"
 				    Header="Available&#xa;Bitrate"/>
 
@@ -78,6 +86,7 @@
 		  <Button Grid.Column="1" Classes="SaveButton" Content="Scan Audible for Higher Quality Audio" IsVisible="{Binding !IsScanning}" Command="{Binding ScanAsync}" />
 		  <Button Grid.Column="1" Classes="SaveButton" Content="Stop Scan" IsVisible="{Binding IsScanning}" Command="{Binding StopScan}" />
 
+		  <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding ScanCount}" Margin="10,0,0,0" />
 		  <Button Grid.Column="3" Classes="SaveButton" Content="{Binding MarkBooksButtonText}"
 			IsVisible="{Binding SignificantCount}" Command="{Binding MarkBooksAsync}" />
 	  </Grid>
diff --git a/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml.cs
index 6201dc14..785dbd50 100644
--- a/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/FindBetterQualityBooksDialog.axaml.cs
@@ -1,9 +1,11 @@
+using AaxDecrypter;
 using ApplicationServices;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 using DataLayer;
+using Dinah.Core;
 using Dinah.Core.Net.Http;
 using DynamicData;
 using LibationAvalonia.ViewModels;
@@ -58,10 +60,7 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
 	private static bool ShouldScan(LibraryBook lb)
 		=> lb.Book.ContentType is ContentType.Product //only scan books, not podcasts
 		&& !lb.Book.IsSpatial //skip spatial audio books. When querying the /metadata endpoint, it will only show ac-4 data for spatial audiobooks.
-		&& lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated //only check if the book is liberated
-		&& lb.Book.UserDefinedItem.LastDownloadedFormat is not null //Don't check if it wast downloaded prior to adding format tracking
-		&& lb.Book.UserDefinedItem.LastDownloadedFormat.Codec is not Codec.Mp3 //If they downloaded as mp3, no way to tell what source material was. Skip.
-		&& lb.Book.AudioExists; //only check if audio files exist
+		&& lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated;
 
 	private void OnBookDataAdded(BookData bookData)
 	{
@@ -117,6 +116,7 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
 		}
 		public bool IsScanning { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
 		public string? MarkBooksButtonText { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
+		public string? ScanCount { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
 
 		private CancellationTokenSource? cts;
 
@@ -145,20 +145,51 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
             if (cts?.IsCancellationRequested is true || Design.IsDesignMode)
                 return;
             IsScanning = true;
-            try
+
+			foreach (var b in Books)
+			{
+				b.AvailableBitrate = 0;
+				b.AvailableCodec = null;
+				b.ScanStatus = ScanStatus.None;
+			}
+			ScanCount = $"0 of {Books.Count:N0} scanned";
+
+			try
             {
                 using var cli = new HttpClient();
                 cts = new CancellationTokenSource();
-				foreach (var b in Books.Where(b => b.ScanStatus is not ScanStatus.Completed))
+				for(int i = 0; i < Books.Count; i++)
 				{
+					var b = Books[i];
 					var url = GetUrl(b.LibraryBook);
 					try
 					{
+						var (file, bestformat) = FindHighestExistingFormat(b.LibraryBook);
+
+						if (file is not null)
+						{
+							b.FoundFile = Configuration.Instance.Books?.Path is string booksDir ? Path.GetRelativePath(booksDir, file) : file;
+							b.Bitrate = bestformat.BitRate;
+							b.Codec = bestformat.CodecString;
+						}
+						else if (b.LibraryBook.Book.UserDefinedItem.LastDownloadedFormat is not null)
+						{
+							b.FoundFile = "File not found. Using 'Last Downloaded' format.";
+							b.Bitrate = b.LibraryBook.Book.UserDefinedItem.LastDownloadedFormat.BitRate;
+							b.Codec = b.LibraryBook.Book.UserDefinedItem.LastDownloadedFormat.CodecString;
+						}
+						else
+						{
+							b.FoundFile = "File not found and no 'Last Downloaded' format found.";
+							b.ScanStatus = ScanStatus.Error;
+							continue;
+						}
+
 						var resp = await cli.GetAsync(url, cts.Token);
 						var (codecString, bitrate) = await ReadAudioInfoAsync(resp.EnsureSuccessStatusCode());
 
-						b.AvailableBitrate = bitrate;
 						b.AvailableCodec = codecString;
+						b.AvailableBitrate = bitrate;
 						b.ScanStatus = ScanStatus.Completed;
 					}
 					catch (OperationCanceledException)
@@ -174,6 +205,7 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
 					finally
 					{
 						SignificantCount = Books.Count(b => b.IsSignificant);
+						ScanCount = $"{i:N0} of {Books.Count:N0} scanned";
 					}
 				}
             }
@@ -185,6 +217,21 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
 			}
 		}
 
+		private static (string? file, AudioFormat format) FindHighestExistingFormat(LibraryBook libraryBook)
+		{
+			var largestfile
+				= AudibleFileStorage.Audio
+				.GetPaths(libraryBook.Book.AudibleProductId)
+				.Select(p => new FileInfo(p))
+				.Where(f => f.Exists && f.Extension.EqualsInsensitive(".m4b"))
+				.OrderByDescending(f => f.Length)
+				.FirstOrDefault();
+
+			if (largestfile is null)
+				return (null, AudioFormat.Default);
+			return (largestfile.FullName, AudioFormatDecoder.FromMpeg4(largestfile.FullName));
+		}
+
         static async Task<(string codec, int bitrate)> ReadAudioInfoAsync(HttpResponseMessage response)
         {
 			var data = await response.Content.ReadAsJObjectAsync();
@@ -224,15 +271,21 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
 			LibraryBook = libraryBook;
 			Asin = libraryBook.Book.AudibleProductId;
 			Title = libraryBook.Book.Title;
-			Codec = libraryBook.Book.UserDefinedItem.LastDownloadedFormat!.CodecString;
-			Bitrate = libraryBook.Book.UserDefinedItem.LastDownloadedFormat.BitRate;
-			BitrateString = GetBitrateString(Bitrate);
 		}
 		public string Asin { get; }
 		public string Title { get; }
-		public string Codec { get; }
-		public int Bitrate { get; }
-		public string BitrateString { get; }
+		public string? FoundFile { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
+		public string? Codec { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
+		public int Bitrate
+		{
+			get => field;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref field, value);
+				BitrateString = GetBitrateString(value);
+			}
+		}
+		public string? BitrateString { get => field; private set => this.RaiseAndSetIfChanged(ref field, value); }
 		public string? AvailableCodec { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
 		public int AvailableBitrate
 		{
@@ -248,6 +301,6 @@ public partial class FindBetterQualityBooksDialog : DialogWindow
 		public string? AvailableBitrateString { get => field; private set => this.RaiseAndSetIfChanged(ref field, value); }
 		public bool IsSignificant { get => field; private set => this.RaiseAndSetIfChanged(ref field, value); }
 		public ScanStatus ScanStatus { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
-		private static string GetBitrateString(int bitrate) => $"{bitrate} kbps";
+		private static string? GetBitrateString(int bitrate) => bitrate > 0 ? $"{bitrate} kbps" : null;
 	}
 }
\ No newline at end of file
diff --git a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
index 3e24e9bd..708b0585 100644
--- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
@@ -2,9 +2,11 @@
 using Avalonia.Data.Converters;
 using Avalonia.Threading;
 using DataLayer;
+using LibationFileManager;
 using LibationUiBase;
 using LibationUiBase.ProcessQueue;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;