Update AAXClean

rmcrackan · Aug 28, 2023 · 42a93bf · 42a93bf
1 parent f86c77a
commit 42a93bf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="1.1.0" />
+	  <PackageReference Include="AAXClean.Codecs" Version="1.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Source/FileLiberator/ConvertToMp3.cs b/Source/FileLiberator/ConvertToMp3.cs
@@ -60,6 +60,11 @@ public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 						config.LameMatchSourceBR,
 						chapters);
 
+					if (m4bBook.AppleTags.Tracks is (int trackNum, int trackCount))
+					{
+						lameConfig.ID3.Track = trackCount > 0 ? $"{trackNum}/{trackCount}" : trackNum.ToString();
+					}
+
 					using var mp3File = File.Open(Path.GetTempFileName(), FileMode.OpenOrCreate, FileAccess.ReadWrite);
 					try
 					{

diff --git a/Source/LibationFileManager/AudibleFileStorage.cs b/Source/LibationFileManager/AudibleFileStorage.cs
@@ -170,21 +170,19 @@ public void Refresh()
 
 				try
 				{
-					using var fileStream = File.OpenRead(path);
-
 					if (format is OutputFormat.M4b)
 					{
-						var mp4File = await Task.Run(() => new AAXClean.Mp4File(fileStream), cancellationToken);
+						var tags = await Task.Run(() => AAXClean.AppleTags.FromFile(path));
 
-						if (mp4File?.AppleTags?.Asin is not null)
-							audioFile = new FilePathCache.CacheEntry(mp4File.AppleTags.Asin, FileType.Audio, path);
+						if (tags?.Asin is not null)
+							audioFile = new FilePathCache.CacheEntry(tags.Asin, FileType.Audio, path);
 					}
 					else
 					{
-						var id3 = NAudio.Lame.ID3.Id3Tag.Create(fileStream);
+						using var fileStream = File.OpenRead(path);
+						var id3 = await Task.Run(() => NAudio.Lame.ID3.Id3Tag.Create(fileStream));
 
-						var asin
-							= id3?.Children
+						var asin = id3?.Children
 							.OfType<NAudio.Lame.ID3.TXXXFrame>()
 							.FirstOrDefault(f => f.FieldName == "AUDIBLE_ASIN")
 							?.FieldValue;

diff --git a/Source/LibationUiBase/GridView/GridContextMenu.cs b/Source/LibationUiBase/GridView/GridContextMenu.cs
@@ -95,20 +95,4 @@ public ITemplateEditor CreateTemplateEditor<T>(LibraryBook libraryBook, string e
 
 		return TemplateEditor<T>.CreateFilenameEditor(Configuration.Instance.Books, existingTemplate, folderDto, fileDto);
 	}
-
-
-}
-class Command : ICommand
-{
-	public event EventHandler CanExecuteChanged;
-
-	public bool CanExecute(object parameter)
-	{
-		throw new NotImplementedException();
-	}
-
-	public void Execute(object parameter)
-	{
-		throw new NotImplementedException();
-	}
 }