From 9152e12fe10a3cb03e71a3673889f9a5b7f966ee Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Mon, 18 Sep 2023 10:14:54 -0600 Subject: [PATCH] Fix #748 --- Source/FileLiberator/DownloadDecryptBook.cs | 11 +++++++++-- .../ViewModels/ProcessBookViewModel.cs | 2 +- Source/LibationWinForms/ProcessQueue/ProcessBook.cs | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/FileLiberator/DownloadDecryptBook.cs b/Source/FileLiberator/DownloadDecryptBook.cs index 8ec11816..47ea4bb6 100644 --- a/Source/FileLiberator/DownloadDecryptBook.cs +++ b/Source/FileLiberator/DownloadDecryptBook.cs @@ -375,8 +375,15 @@ namespace FileLiberator { 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 index 941310b8..d0f405cb 100644 --- a/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs +++ b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs @@ -265,7 +265,7 @@ namespace LibationAvalonia.ViewModels 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 index 16fc8427..ce09658a 100644 --- a/Source/LibationWinForms/ProcessQueue/ProcessBook.cs +++ b/Source/LibationWinForms/ProcessQueue/ProcessBook.cs @@ -250,7 +250,7 @@ namespace LibationWinForms.ProcessQueue 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);