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

update dependencies

Browse Source
This commit is contained in:
Robert McRackan 2021-09-03 23:02:28 -04:00
parent 437e85fd12
commit 126919d578
11 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AaxDecrypter/AaxDecrypter.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AAXClean" Version="0.1.8" /> <PackageReference Include="AAXClean" Version="0.1.8" />
<PackageReference Include="Dinah.Core" Version="1.0.5.2" /> <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
FileManager/FileManager.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dinah.Core" Version="1.0.5.2" /> <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Octokit" Version="0.50.0" /> <PackageReference Include="Octokit" Version="0.50.0" />
<PackageReference Include="Polly" Version="7.2.2" /> <PackageReference Include="Polly" Version="7.2.2" />

2
InternalUtilities/InternalUtilities.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AudibleApi" Version="1.1.5.1" /> <PackageReference Include="AudibleApi" Version="1.2.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
LibationLauncher/LibationLauncher.csproj
View File

@ -13,7 +13,7 @@
<!-- <PublishSingleFile>true</PublishSingleFile> --> <!-- <PublishSingleFile>true</PublishSingleFile> -->
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<Version>5.6.5.1</Version> <Version>5.6.5.5</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

2
LibationWinForms/AsyncNotifyPropertyChanged.cs
View File

@ -9,6 +9,6 @@ namespace LibationWinForms
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
public void NotifyPropertyChanged([CallerMemberName] string propertyName = "") public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
=> this.UIThread(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName))); => this.UIThreadAsync(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
} }
} }

16
LibationWinForms/BookLiberation/AudioDecodeForm.cs
View File

@ -1,8 +1,8 @@
using DataLayer; using System;
using DataLayer;
using Dinah.Core.Net.Http; using Dinah.Core.Net.Http;
using Dinah.Core.Windows.Forms; using Dinah.Core.Threading;
using LibationWinForms.BookLiberation.BaseForms; using LibationWinForms.BookLiberation.BaseForms;
using System;
namespace LibationWinForms.BookLiberation namespace LibationWinForms.BookLiberation
{ {
@ -47,7 +47,7 @@ namespace LibationWinForms.BookLiberation
if (downloadProgress.ProgressPercentage == 0) if (downloadProgress.ProgressPercentage == 0)
updateRemainingTime(0); updateRemainingTime(0);
else else
progressBar1.UIThread(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage); progressBar1.UIThreadAsync(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
} }
public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
@ -61,7 +61,7 @@ namespace LibationWinForms.BookLiberation
public override void OnTitleDiscovered(object sender, string title) public override void OnTitleDiscovered(object sender, string title)
{ {
this.UIThread(() => this.Text = DecodeActionName + " " + title); this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
this.title = title; this.title = title;
updateBookInfo(); updateBookInfo();
} }
@ -79,14 +79,14 @@ namespace LibationWinForms.BookLiberation
} }
public override void OnCoverImageDiscovered(object sender, byte[] coverArt) public override void OnCoverImageDiscovered(object sender, byte[] coverArt)
=> pictureBox1.UIThread(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt)); => pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
#endregion #endregion
// thread-safe UI updates // thread-safe UI updates
private void updateBookInfo() private void updateBookInfo()
=> bookInfoLbl.UIThread(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}"); => bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
private void updateRemainingTime(int remaining) private void updateRemainingTime(int remaining)
=> remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec"); => remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
} }
} }

7
LibationWinForms/BookLiberation/AutomatedBackupsForm.cs
View File

@ -1,7 +1,6 @@
using Dinah.Core.Windows.Forms; using System;
using System;
using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using Dinah.Core.Threading;
namespace LibationWinForms.BookLiberation namespace LibationWinForms.BookLiberation
{ {
@ -19,7 +18,7 @@ namespace LibationWinForms.BookLiberation
public void WriteLine(string text) public void WriteLine(string text)
{ {
if (!IsDisposed) if (!IsDisposed)
logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}")); logTb.UIThreadAsync(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
} }
public void FinalizeUI() public void FinalizeUI()

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

@ -1,9 +1,9 @@
using DataLayer; using System;
using System.Windows.Forms;
using DataLayer;
using Dinah.Core.Net.Http; using Dinah.Core.Net.Http;
using Dinah.Core.Threading; using Dinah.Core.Threading;
using FileLiberator; using FileLiberator;
using System;
using System.Windows.Forms;
namespace LibationWinForms.BookLiberation.BaseForms namespace LibationWinForms.BookLiberation.BaseForms
{ {
@ -122,8 +122,8 @@ namespace LibationWinForms.BookLiberation.BaseForms
/// <summary> /// <summary>
/// If the form was shown using Show (not ShowDialog), Form.Close calls Form.Dispose /// If the form was shown using Show (not ShowDialog), Form.Close calls Form.Dispose
/// </summary> /// </summary>
private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThread(Close); private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThreadAsync(Close);
private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThread(Dispose); private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThreadAsync(Dispose);
/// <summary> /// <summary>
/// If StreamingBegin is fired from a worker thread, the window will be created on that /// If StreamingBegin is fired from a worker thread, the window will be created on that
@ -132,7 +132,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
/// could cause it to freeze. Form.BeginInvoke won't work until the form is created /// could cause it to freeze. Form.BeginInvoke won't work until the form is created
/// (ie. shown) because Control doesn't get a window handle until it is Shown. /// (ie. shown) because Control doesn't get a window handle until it is Shown.
/// </summary> /// </summary>
private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThread(Show); private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThreadAsync(Show);
#endregion #endregion

19
LibationWinForms/BookLiberation/DownloadForm.cs
View File

@ -1,9 +1,8 @@
using Dinah.Core.Net.Http; using System;
using Dinah.Core.Windows.Forms;
using LibationWinForms.BookLiberation.BaseForms;
using System;
using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using Dinah.Core.Net.Http;
using Dinah.Core.Threading;
using LibationWinForms.BookLiberation.BaseForms;
namespace LibationWinForms.BookLiberation namespace LibationWinForms.BookLiberation
{ {
@ -21,7 +20,7 @@ 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)
{ {
filenameLbl.UIThread(() => filenameLbl.Text = beginString); filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
} }
public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
{ {
@ -29,11 +28,11 @@ namespace LibationWinForms.BookLiberation
if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0) if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
return; return;
progressLbl.UIThread(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}"); progressLbl.UIThreadAsync(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0; var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
var i = int.Parse(Math.Truncate(d).ToString()); var i = int.Parse(Math.Truncate(d).ToString());
progressBar1.UIThread(() => progressBar1.Value = i); progressBar1.UIThreadAsync(() => progressBar1.Value = i);
lastDownloadProgress = DateTime.Now; lastDownloadProgress = DateTime.Now;
} }
@ -50,14 +49,14 @@ namespace LibationWinForms.BookLiberation
private void timer_Tick(object sender, EventArgs e) private void timer_Tick(object sender, EventArgs e)
{ {
// if no update in the last 30 seconds, display frozen label // if no update in the last 30 seconds, display frozen label
lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now); lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
if (lastUpdateLbl.Visible) if (lastUpdateLbl.Visible)
{ {
var diff = DateTime.Now - lastDownloadProgress; var diff = DateTime.Now - lastDownloadProgress;
var min = (int)diff.TotalMinutes; var min = (int)diff.TotalMinutes;
var minText = min > 0 ? $"{min}min " : ""; var minText = min > 0 ? $"{min}min " : "";
lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago"); lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
} }
} }
private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop(); private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();

21
LibationWinForms/Form1.cs
View File

@ -3,10 +3,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using ApplicationServices; using ApplicationServices;
using DataLayer;
using Dinah.Core; using Dinah.Core;
using Dinah.Core.Drawing; using Dinah.Core.Drawing;
using Dinah.Core.Windows.Forms; using Dinah.Core.Threading;
using FileManager; using FileManager;
using InternalUtilities; using InternalUtilities;
using LibationWinForms.Dialogs; using LibationWinForms.Dialogs;
@ -134,11 +133,11 @@ namespace LibationWinForms
// suppressed filter while init'ing UI // suppressed filter while init'ing UI
var prev_isProcessingGridSelect = isProcessingGridSelect; var prev_isProcessingGridSelect = isProcessingGridSelect;
isProcessingGridSelect = true; isProcessingGridSelect = true;
this.UIThread(() => setGrid()); this.UIThreadSync(() => setGrid());
isProcessingGridSelect = prev_isProcessingGridSelect; isProcessingGridSelect = prev_isProcessingGridSelect;
// UI init complete. now we can apply filter // UI init complete. now we can apply filter
this.UIThread(() => doFilter(lastGoodFilter)); this.UIThreadAsync(() => doFilter(lastGoodFilter));
setBackupCounts(null, null); setBackupCounts(null, null);
} }
@ -158,7 +157,7 @@ namespace LibationWinForms
currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill }; currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
currProductsGrid.VisibleCountChanged += setVisibleCount; currProductsGrid.VisibleCountChanged += setVisibleCount;
gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid)); gridPanel.UIThreadSync(() => gridPanel.Controls.Add(currProductsGrid));
currProductsGrid.Display(); currProductsGrid.Display();
} }
ResumeLayout(); ResumeLayout();
@ -229,9 +228,9 @@ namespace LibationWinForms
: "All books have been liberated"; : "All books have been liberated";
// update UI // update UI
statusStrip1.UIThread(() => backupsCountsLbl.Text = statusStripText); statusStrip1.UIThreadAsync(() => backupsCountsLbl.Text = statusStripText);
menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0); menuStrip1.UIThreadAsync(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText)); menuStrip1.UIThreadAsync(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
} }
private void setPdfBackupCounts(LibraryCommands.LibraryStats libraryStats) private void setPdfBackupCounts(LibraryCommands.LibraryStats libraryStats)
{ {
@ -251,9 +250,9 @@ namespace LibationWinForms
: "All PDFs have been downloaded"; : "All PDFs have been downloaded";
// update UI // update UI
statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText); statusStrip1.UIThreadAsync(() => pdfsCountsLbl.Text = statusStripText);
menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0); menuStrip1.UIThreadAsync(() => beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0);
menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText)); menuStrip1.UIThreadAsync(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
} }
#endregion #endregion

2
LibationWinForms/LibationWinForms.csproj
View File

@ -13,7 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.0.5.1" /> <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>