Merge pull request #751 from Mbucari/master

Minor Bug Fixes
rmcrackan · Sep 18, 2023 · 02dbf8a · 02dbf8a
2 parents 8326389 + 9152e12
commit 02dbf8a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/Source/ApplicationServices/LibraryCommands.cs b/Source/ApplicationServices/LibraryCommands.cs
@@ -126,7 +126,7 @@ public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task
 					    | LibraryOptions.ResponseGroupOptions.Contributors | LibraryOptions.ResponseGroupOptions.ProvidedReview
 					    | LibraryOptions.ResponseGroupOptions.ProductPlans | LibraryOptions.ResponseGroupOptions.Series
 					    | LibraryOptions.ResponseGroupOptions.CategoryLadders | LibraryOptions.ResponseGroupOptions.ProductExtendedAttrs
-					    | LibraryOptions.ResponseGroupOptions.PdfUrl,
+					    | LibraryOptions.ResponseGroupOptions.PdfUrl | LibraryOptions.ResponseGroupOptions.OriginAsin,
 					ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
                 };
                 var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);

diff --git a/Source/FileLiberator/DownloadDecryptBook.cs b/Source/FileLiberator/DownloadDecryptBook.cs
@@ -375,8 +375,15 @@ private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
         {
             if (Configuration.Instance.AllowLibationFixup)
             {
-                e = OnRequestCoverArt();
-				abDownloader.SetCoverArt(e);
+                try
+                {
+                    e = OnRequestCoverArt();
+                    abDownloader.SetCoverArt(e);
+                }
+                catch (Exception ex)
+                {
+                    Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
+                }
             }
 
             if (e is not null)

diff --git a/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
@@ -265,7 +265,7 @@ private void UnlinkProcessable(Processable processable)
 		private byte[] AudioDecodable_RequestCoverArt(object sender, EventArgs e)
 		{
 			var quality
-				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High
+				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High && LibraryBook.Book.PictureLarge is not null
 				? new PictureDefinition(LibraryBook.Book.PictureLarge, PictureSize.Native)
 				: new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._500x500);
 

diff --git a/Source/LibationWinForms/ProcessQueue/ProcessBook.cs b/Source/LibationWinForms/ProcessQueue/ProcessBook.cs
@@ -250,7 +250,7 @@ private void updateBookInfo()
 		private byte[] AudioDecodable_RequestCoverArt(object sender, EventArgs e)
 		{
 			var quality
-				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High
+				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High && LibraryBook.Book.PictureLarge is not null
 				? new PictureDefinition(LibraryBook.Book.PictureLarge, PictureSize.Native)
 				: new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._500x500);