diff --git a/FileLiberator/ConvertToMp3.cs b/FileLiberator/ConvertToMp3.cs index 07da90bf..ab99927a 100644 --- a/FileLiberator/ConvertToMp3.cs +++ b/FileLiberator/ConvertToMp3.cs @@ -29,21 +29,6 @@ namespace FileLiberator public event EventHandler StatusUpdate; public event EventHandler Completed; - public ConvertToMp3() - { - RequestCoverArt += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) }); - TitleDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = e }); - AuthorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = e }); - NarratorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = e }); - CoverImageDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = e?.Length }); - - StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e }); - StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e }); - - Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() }); - Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() }); - } - private long fileSize; private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3"); diff --git a/FileLiberator/DownloadDecryptBook.cs b/FileLiberator/DownloadDecryptBook.cs index f832c8a8..4843ecd1 100644 --- a/FileLiberator/DownloadDecryptBook.cs +++ b/FileLiberator/DownloadDecryptBook.cs @@ -30,21 +30,6 @@ namespace FileLiberator public event EventHandler StatusUpdate; public event EventHandler Completed; - public DownloadDecryptBook() - { - RequestCoverArt += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) }); - TitleDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = e }); - AuthorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = e }); - NarratorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = e }); - CoverImageDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = e?.Length }); - - StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e }); - StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e }); - - Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() }); - Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() }); - } - public async Task ProcessAsync(LibraryBook libraryBook) { Begin?.Invoke(this, libraryBook); diff --git a/FileLiberator/DownloadFile.cs b/FileLiberator/DownloadFile.cs index d0a816b8..9f23b1e0 100644 --- a/FileLiberator/DownloadFile.cs +++ b/FileLiberator/DownloadFile.cs @@ -13,12 +13,6 @@ namespace FileLiberator public event EventHandler StreamingCompleted; public event EventHandler StreamingTimeRemaining; - public DownloadFile() - { - StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e }); - StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e }); - } - public async Task PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath) { var client = new HttpClient(); diff --git a/FileLiberator/DownloadPdf.cs b/FileLiberator/DownloadPdf.cs index 74e4a66d..0ed4cd6b 100644 --- a/FileLiberator/DownloadPdf.cs +++ b/FileLiberator/DownloadPdf.cs @@ -17,15 +17,6 @@ namespace FileLiberator => !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook)) && !libraryBook.Book.PDF_Exists; - public DownloadPdf() - { - StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e }); - StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e }); - - Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() }); - Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() }); - } - public override async Task ProcessItemAsync(LibraryBook libraryBook) { var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook); diff --git a/LibationWinForms/BookLiberation/AudioConvertForm.cs b/LibationWinForms/BookLiberation/AudioConvertForm.cs index 1bedf9bf..4960cfa3 100644 --- a/LibationWinForms/BookLiberation/AudioConvertForm.cs +++ b/LibationWinForms/BookLiberation/AudioConvertForm.cs @@ -24,7 +24,10 @@ namespace LibationWinForms.BookLiberation base.OnBegin(sender, libraryBook); } public override void OnCompleted(object sender, LibraryBook libraryBook) - => LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}"); + { + base.OnCompleted(sender, libraryBook); + LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}"); + } #endregion } diff --git a/LibationWinForms/BookLiberation/AudioDecodeForm.cs b/LibationWinForms/BookLiberation/AudioDecodeForm.cs index 255268c4..3a54f5aa 100644 --- a/LibationWinForms/BookLiberation/AudioDecodeForm.cs +++ b/LibationWinForms/BookLiberation/AudioDecodeForm.cs @@ -21,6 +21,8 @@ namespace LibationWinForms.BookLiberation #region IProcessable event handler overrides public override void OnBegin(object sender, LibraryBook libraryBook) { + base.OnBegin(sender, libraryBook); + GetCoverArtDelegate = () => FileManager.PictureStorage.GetPictureSynchronously( new FileManager.PictureDefinition( libraryBook.Book.PictureId, @@ -41,6 +43,7 @@ namespace LibationWinForms.BookLiberation #region IStreamable event handler overrides public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { + base.OnStreamingProgressChanged(sender, downloadProgress); if (!downloadProgress.ProgressPercentage.HasValue) return; @@ -51,16 +54,23 @@ namespace LibationWinForms.BookLiberation } public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) - => updateRemainingTime((int)timeRemaining.TotalSeconds); + { + base.OnStreamingTimeRemaining(sender, timeRemaining); + updateRemainingTime((int)timeRemaining.TotalSeconds); + } #endregion #region IAudioDecodable event handlers public override void OnRequestCoverArt(object sender, Action setCoverArtDelegate) - => setCoverArtDelegate(GetCoverArtDelegate?.Invoke()); + { + base.OnRequestCoverArt(sender, setCoverArtDelegate); + setCoverArtDelegate(GetCoverArtDelegate?.Invoke()); + } public override void OnTitleDiscovered(object sender, string title) { + base.OnTitleDiscovered(sender, title); this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title); this.title = title; updateBookInfo(); @@ -68,18 +78,23 @@ namespace LibationWinForms.BookLiberation public override void OnAuthorsDiscovered(object sender, string authors) { + base.OnAuthorsDiscovered(sender, authors); authorNames = authors; updateBookInfo(); } public override void OnNarratorsDiscovered(object sender, string narrators) { + base.OnNarratorsDiscovered(sender, narrators); narratorNames = narrators; updateBookInfo(); } - public override void OnCoverImageDiscovered(object sender, byte[] coverArt) - => pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt)); + public override void OnCoverImageDiscovered(object sender, byte[] coverArt) + { + base.OnCoverImageDiscovered(sender, coverArt); + pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt)); + } #endregion // thread-safe UI updates diff --git a/LibationWinForms/BookLiberation/AudioDecryptForm.cs b/LibationWinForms/BookLiberation/AudioDecryptForm.cs index 477c3bb7..58d8d3ac 100644 --- a/LibationWinForms/BookLiberation/AudioDecryptForm.cs +++ b/LibationWinForms/BookLiberation/AudioDecryptForm.cs @@ -24,7 +24,10 @@ namespace LibationWinForms.BookLiberation base.OnBegin(sender, libraryBook); } public override void OnCompleted(object sender, LibraryBook libraryBook) - => LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}"); + { + base.OnCompleted(sender, libraryBook); + LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}"); + } #endregion } diff --git a/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs b/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs index 5cd32e01..0b8eeef7 100644 --- a/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs +++ b/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs @@ -137,24 +137,36 @@ namespace LibationWinForms.BookLiberation.BaseForms #endregion #region IStreamable event handlers - public virtual void OnStreamingBegin(object sender, string beginString) { } + public virtual void OnStreamingBegin(object sender, string beginString) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IStreamable.StreamingBegin), Message = beginString }); public virtual void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { } public virtual void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) { } - public virtual void OnStreamingCompleted(object sender, string completedString) { } + public virtual void OnStreamingCompleted(object sender, string completedString) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IStreamable.StreamingCompleted), Message = completedString }); + #endregion #region IProcessable event handlers - public virtual void OnBegin(object sender, LibraryBook libraryBook) { } - public virtual void OnStatusUpdate(object sender, string statusUpdate) { } - public virtual void OnCompleted(object sender, LibraryBook libraryBook) { } + public virtual void OnBegin(object sender, LibraryBook libraryBook) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.Begin), Book = libraryBook.LogFriendly() }); + public virtual void OnStatusUpdate(object sender, string statusUpdate) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.StatusUpdate), Status = statusUpdate }); + public virtual void OnCompleted(object sender, LibraryBook libraryBook) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.Completed), Book = libraryBook.LogFriendly() }); + #endregion #region IAudioDecodable event handlers - public virtual void OnRequestCoverArt(object sender, Action setCoverArtDelegate) { } - public virtual void OnTitleDiscovered(object sender, string title) { } - public virtual void OnAuthorsDiscovered(object sender, string authors) { } - public virtual void OnNarratorsDiscovered(object sender, string narrators) { } - public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt) { } + public virtual void OnRequestCoverArt(object sender, Action setCoverArtDelegate) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.RequestCoverArt) }); + public virtual void OnTitleDiscovered(object sender, string title) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.TitleDiscovered), Title = title }); + public virtual void OnAuthorsDiscovered(object sender, string authors) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.AuthorsDiscovered), Authors = authors }); + public virtual void OnNarratorsDiscovered(object sender, string narrators) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.NarratorsDiscovered), Narrators = narrators }); + public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt) + => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.CoverImageDiscovered), CoverImageBytes = coverArt?.Length }); #endregion } } diff --git a/LibationWinForms/BookLiberation/DownloadForm.cs b/LibationWinForms/BookLiberation/DownloadForm.cs index 1843aaa3..42127070 100644 --- a/LibationWinForms/BookLiberation/DownloadForm.cs +++ b/LibationWinForms/BookLiberation/DownloadForm.cs @@ -20,10 +20,12 @@ namespace LibationWinForms.BookLiberation #region IStreamable event handler overrides public override void OnStreamingBegin(object sender, string beginString) { + base.OnStreamingBegin(sender, beginString); filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString); } public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { + base.OnStreamingProgressChanged(sender, downloadProgress); // this won't happen with download file. it will happen with download string if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0) return; diff --git a/LibationWinForms/BookLiberation/PdfDownloadForm.cs b/LibationWinForms/BookLiberation/PdfDownloadForm.cs index 3def88c2..85d85eef 100644 --- a/LibationWinForms/BookLiberation/PdfDownloadForm.cs +++ b/LibationWinForms/BookLiberation/PdfDownloadForm.cs @@ -4,7 +4,15 @@ namespace LibationWinForms.BookLiberation { internal class PdfDownloadForm : DownloadForm { - public override void OnBegin(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Begin: {libraryBook.Book}"); - public override void OnCompleted(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Completed: {libraryBook.Book}"); + public override void OnBegin(object sender, LibraryBook libraryBook) + { + base.OnBegin(sender, libraryBook); + LogMe.Info($"PDF Step, Begin: {libraryBook.Book}"); + } + public override void OnCompleted(object sender, LibraryBook libraryBook) + { + base.OnCompleted(sender, libraryBook); + LogMe.Info($"PDF Step, Completed: {libraryBook.Book}"); + } } }