oops, wrong branch. revert

This commit is contained in:
rmcrackan
2026-05-18 09:42:08 -04:00
parent 0b0d1afc48
commit 49e9b0c9ce
4 changed files with 12 additions and 17 deletions

View File

@@ -77,6 +77,6 @@ partial class MainVM
if (Configuration.Instance.AutoDownloadEpisodes
&& stats.PendingBooks + stats.pdfsNotDownloaded > 0)
_ = BackupAllBooksAsync(stats.LibraryBooks);
BackupAllBooks(stats.LibraryBooks);
}
}

View File

@@ -16,16 +16,18 @@ partial class MainVM
/// <summary> This gets called by the "Begin Book and PDF Backups" menu item. </summary>
public async Task BackupAllBooks()
=> await BackupAllBooksAsync(await Task.Run(DbContexts.GetUnliberated_Flat_NoTracking));
{
var books = await Task.Run(DbContexts.GetUnliberated_Flat_NoTracking);
BackupAllBooks(books);
}
/// <summary> Queues backup for the given library subset (menu, auto-download after scan, etc.). </summary>
private async Task BackupAllBooksAsync(IEnumerable<LibraryBook> books)
private void BackupAllBooks(IEnumerable<LibraryBook> books)
{
try
{
var unliberated = books.UnLiberated().ToArray();
await Dispatcher.UIThread.InvokeAsync(() =>
Dispatcher.UIThread.Invoke(() =>
{
if (ProcessQueue.QueueDownloadDecrypt(unliberated))
setQueueCollapseState(false);

View File

@@ -16,31 +16,24 @@ public partial class Form1
private async void beginBookBackupsToolStripMenuItem_Click(object? _ = null, EventArgs? __ = null)
{
var library = await Task.Run(DbContexts.GetUnliberated_Flat_NoTracking);
await BackupAllBooksAsync(library);
BackupAllBooks(library);
}
private Task BackupAllBooksAsync(IEnumerable<LibraryBook> books)
private void BackupAllBooks(IEnumerable<LibraryBook> books)
{
try
{
var unliberated = books.UnLiberated().ToArray();
void queue()
Invoke(() =>
{
if (processBookQueue1.ViewModel.QueueDownloadDecrypt(unliberated))
SetQueueCollapseState(false);
}
if (InvokeRequired)
Invoke(queue);
else
queue();
});
}
catch (Exception ex)
{
Serilog.Log.Logger.Error(ex, "An error occurred while backing up all library books");
}
return Task.CompletedTask;
}
private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)

View File

@@ -32,7 +32,7 @@ public partial class Form1
return;
if ((libraryStats.PendingBooks + libraryStats.pdfsNotDownloaded) > 0)
_ = BackupAllBooksAsync(libraryStats.LibraryBooks);
BackupAllBooks(libraryStats.LibraryBooks);
};
}