tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved event logging to LibationBaseForm

Browse Source
This commit is contained in:
Mbucari 2021-09-23 19:29:25 -06:00
parent 803a0b7ccf
commit 71075838eb
10 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
FileLiberator/ConvertToMp3.cs
View File

@ -29,21 +29,6 @@ namespace FileLiberator
public event EventHandler<string> StatusUpdate; public event EventHandler<string> StatusUpdate;
public event EventHandler<LibraryBook> Completed; public event EventHandler<LibraryBook> 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 long fileSize;
private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3"); private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");

15
FileLiberator/DownloadDecryptBook.cs
View File

@ -30,21 +30,6 @@ namespace FileLiberator
public event EventHandler<string> StatusUpdate; public event EventHandler<string> StatusUpdate;
public event EventHandler<LibraryBook> Completed; public event EventHandler<LibraryBook> 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<StatusHandler> ProcessAsync(LibraryBook libraryBook) public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
{ {
Begin?.Invoke(this, libraryBook); Begin?.Invoke(this, libraryBook);

6
FileLiberator/DownloadFile.cs
View File

@ -13,12 +13,6 @@ namespace FileLiberator
public event EventHandler<string> StreamingCompleted; public event EventHandler<string> StreamingCompleted;
public event EventHandler<TimeSpan> StreamingTimeRemaining; public event EventHandler<TimeSpan> 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<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath) public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
{ {
var client = new HttpClient(); var client = new HttpClient();

9
FileLiberator/DownloadPdf.cs
View File

@ -17,15 +17,6 @@ namespace FileLiberator
=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook)) => !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
&& !libraryBook.Book.PDF_Exists; && !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<StatusHandler> ProcessItemAsync(LibraryBook libraryBook) public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
{ {
var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook); var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);

5
LibationWinForms/BookLiberation/AudioConvertForm.cs
View File

@ -24,7 +24,10 @@ namespace LibationWinForms.BookLiberation
base.OnBegin(sender, libraryBook); base.OnBegin(sender, libraryBook);
} }
public override void OnCompleted(object sender, LibraryBook 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 #endregion
} }

21
LibationWinForms/BookLiberation/AudioDecodeForm.cs
View File

@ -21,6 +21,8 @@ namespace LibationWinForms.BookLiberation
#region IProcessable event handler overrides #region IProcessable event handler overrides
public override void OnBegin(object sender, LibraryBook libraryBook) public override void OnBegin(object sender, LibraryBook libraryBook)
{ {
base.OnBegin(sender, libraryBook);
GetCoverArtDelegate = () => FileManager.PictureStorage.GetPictureSynchronously( GetCoverArtDelegate = () => FileManager.PictureStorage.GetPictureSynchronously(
new FileManager.PictureDefinition( new FileManager.PictureDefinition(
libraryBook.Book.PictureId, libraryBook.Book.PictureId,
@ -41,6 +43,7 @@ namespace LibationWinForms.BookLiberation
#region IStreamable event handler overrides #region IStreamable event handler overrides
public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
{ {
base.OnStreamingProgressChanged(sender, downloadProgress);
if (!downloadProgress.ProgressPercentage.HasValue) if (!downloadProgress.ProgressPercentage.HasValue)
return; return;
@ -51,16 +54,23 @@ namespace LibationWinForms.BookLiberation
} }
public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
=> updateRemainingTime((int)timeRemaining.TotalSeconds); {
base.OnStreamingTimeRemaining(sender, timeRemaining);
updateRemainingTime((int)timeRemaining.TotalSeconds);
}
#endregion #endregion
#region IAudioDecodable event handlers #region IAudioDecodable event handlers
public override void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) public override void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
=> setCoverArtDelegate(GetCoverArtDelegate?.Invoke()); {
base.OnRequestCoverArt(sender, setCoverArtDelegate);
setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
}
public override void OnTitleDiscovered(object sender, string title) public override void OnTitleDiscovered(object sender, string title)
{ {
base.OnTitleDiscovered(sender, title);
this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title); this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
this.title = title; this.title = title;
updateBookInfo(); updateBookInfo();
@ -68,18 +78,23 @@ namespace LibationWinForms.BookLiberation
public override void OnAuthorsDiscovered(object sender, string authors) public override void OnAuthorsDiscovered(object sender, string authors)
{ {
base.OnAuthorsDiscovered(sender, authors);
authorNames = authors; authorNames = authors;
updateBookInfo(); updateBookInfo();
} }
public override void OnNarratorsDiscovered(object sender, string narrators) public override void OnNarratorsDiscovered(object sender, string narrators)
{ {
base.OnNarratorsDiscovered(sender, narrators);
narratorNames = narrators; narratorNames = narrators;
updateBookInfo(); updateBookInfo();
} }
public override void OnCoverImageDiscovered(object sender, byte[] coverArt) public override void OnCoverImageDiscovered(object sender, byte[] coverArt)
=> pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt)); {
base.OnCoverImageDiscovered(sender, coverArt);
pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
}
#endregion #endregion
// thread-safe UI updates // thread-safe UI updates

5
LibationWinForms/BookLiberation/AudioDecryptForm.cs
View File

@ -24,7 +24,10 @@ namespace LibationWinForms.BookLiberation
base.OnBegin(sender, libraryBook); base.OnBegin(sender, libraryBook);
} }
public override void OnCompleted(object sender, LibraryBook 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 #endregion
} }

32
LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs
View File

@ -137,24 +137,36 @@ namespace LibationWinForms.BookLiberation.BaseForms
#endregion #endregion
#region IStreamable event handlers #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 OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
public virtual void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) { } 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 #endregion
#region IProcessable event handlers #region IProcessable event handlers
public virtual void OnBegin(object sender, LibraryBook libraryBook) { } public virtual void OnBegin(object sender, LibraryBook libraryBook)
public virtual void OnStatusUpdate(object sender, string statusUpdate) { } => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.Begin), Book = libraryBook.LogFriendly() });
public virtual void OnCompleted(object sender, LibraryBook libraryBook) { } 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 #endregion
#region IAudioDecodable event handlers #region IAudioDecodable event handlers
public virtual void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { } public virtual void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
public virtual void OnTitleDiscovered(object sender, string title) { } => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.RequestCoverArt) });
public virtual void OnAuthorsDiscovered(object sender, string authors) { } public virtual void OnTitleDiscovered(object sender, string title)
public virtual void OnNarratorsDiscovered(object sender, string narrators) { } => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.TitleDiscovered), Title = title });
public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt) { } 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 #endregion
} }
} }

2
LibationWinForms/BookLiberation/DownloadForm.cs
View File

@ -20,10 +20,12 @@ namespace LibationWinForms.BookLiberation
#region IStreamable event handler overrides #region IStreamable event handler overrides
public override void OnStreamingBegin(object sender, string beginString) public override void OnStreamingBegin(object sender, string beginString)
{ {
base.OnStreamingBegin(sender, beginString);
filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString); filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
} }
public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) 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 // this won't happen with download file. it will happen with download string
if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0) if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
return; return;

12
LibationWinForms/BookLiberation/PdfDownloadForm.cs
View File

@ -4,7 +4,15 @@ namespace LibationWinForms.BookLiberation
{ {
internal class PdfDownloadForm : DownloadForm internal class PdfDownloadForm : DownloadForm
{ {
public override void OnBegin(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Begin: {libraryBook.Book}"); public override void OnBegin(object sender, LibraryBook libraryBook)
public override void OnCompleted(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Completed: {libraryBook.Book}"); {
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}");
}
} }
} }