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

bug fix around latest skip-bad-book feature

Browse Source
This commit is contained in:
Robert McRackan 2020-12-23 16:07:47 -05:00
parent cefab86ce1
commit bc6f53c8ea
3 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FileLiberator/UNTESTED/DecryptBook.cs
View File

@ -78,11 +78,11 @@ namespace FileLiberator
Dinah.Core.IO.FileExt.SafeDelete(aaxFilename); Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
} }
var statusHandler = new StatusHandler();
var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId); var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
if (!finalAudioExists) if (!finalAudioExists)
statusHandler.AddError("Cannot find final audio file after decryption"); return new StatusHandler { "Cannot find final audio file after decryption" };
return statusHandler;
return new StatusHandler();
} }
finally finally
{ {

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>4.1.7.1</Version> <Version>4.1.8.1</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

105
LibationWinForms/UNTESTED/BookLiberation/ProcessorAutomationController.cs
View File

@ -334,6 +334,10 @@ namespace LibationWinForms.BookLiberation
protected abstract Task RunAsync(); protected abstract Task RunAsync();
protected abstract string SkipDialogText { get; }
protected abstract MessageBoxButtons SkipDialogButtons { get; }
protected abstract DialogResult CreateSkipFileResult { get; }
public async Task RunBackupAsync() public async Task RunBackupAsync()
{ {
AutomatedBackupsForm.Show(); AutomatedBackupsForm.Show();
@ -351,46 +355,47 @@ namespace LibationWinForms.BookLiberation
LogMe.Info("DONE"); LogMe.Info("DONE");
} }
protected abstract string SkipDialogText { get; } protected async Task<bool> ProcessOneAsync(Func<LibraryBook, Task<StatusHandler>> func, LibraryBook libraryBook)
protected abstract MessageBoxButtons SkipDialogButtons { get; }
protected abstract DialogResult CreateSkipFileResult { get; }
protected bool ValidateStatusAsync(StatusHandler statusHandler, LibraryBook libraryBook)
{ {
if (!statusHandler.HasErrors) string logMessage;
return true;
LogMe.Error("ERROR. All books have not been processed. Most recent valid book: processing failed");
foreach (var errorMessage in statusHandler.Errors)
LogMe.Error(errorMessage);
try try
{ {
var dialogResult = MessageBox.Show(SkipDialogText, "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question); var statusHandler = await func(libraryBook);
if (dialogResult == DialogResult.Abort) if (statusHandler.IsSuccess)
return false; return true;
if (dialogResult == CreateSkipFileResult) foreach (var errorMessage in statusHandler.Errors)
{ LogMe.Error(errorMessage);
var path = FileManager.AudibleFileStorage.Audio.CreateSkipFile(
libraryBook.Book.Title,
libraryBook.Book.AudibleProductId,
statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}"));
LogMe.Info($@"
Created new skip file
[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}
{path}
".Trim());
}
return true; logMessage = statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}");
} }
catch (Exception ex) catch (Exception ex)
{ {
LogMe.Error(ex, "Error attempting to display skip option box"); LogMe.Error(ex);
return false;
logMessage = ex.Message + "\r\n|\r\n" + ex.StackTrace;
} }
LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
var dialogResult = MessageBox.Show(SkipDialogText, "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question);
if (dialogResult == DialogResult.Abort)
return false;
if (dialogResult == CreateSkipFileResult)
{
var path = FileManager.AudibleFileStorage.Audio.CreateSkipFile(libraryBook.Book.Title, libraryBook.Book.AudibleProductId, logMessage);
LogMe.Info($@"
Created new 'skip' file
[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}
{path}
".Trim());
}
return true;
} }
} }
class BackupSingle : BackupRunner class BackupSingle : BackupRunner
@ -415,11 +420,8 @@ An error occurred while trying to process this book. Skip this book permanently?
protected override async Task RunAsync() protected override async Task RunAsync()
{ {
if (_libraryBook is null) if (_libraryBook is not null)
return; await ProcessOneAsync(Processable.ProcessSingleAsync, _libraryBook);
var statusHandler = await Processable.ProcessSingleAsync(_libraryBook);
ValidateStatusAsync(statusHandler, _libraryBook);
} }
} }
class BackupLoop : BackupRunner class BackupLoop : BackupRunner
@ -443,29 +445,20 @@ An error occurred while trying to process this book
{ {
// support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here // support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here
foreach (var libraryBook in Processable.GetValidLibraryBooks()) foreach (var libraryBook in Processable.GetValidLibraryBooks())
{ {
try var keepGoing = await ProcessOneAsync(Processable.ProcessBookAsync_NoValidation, libraryBook);
{ if (!keepGoing)
var statusHandler = await Processable.ProcessBookAsync_NoValidation(libraryBook); return;
var keepGoing = ValidateStatusAsync(statusHandler, libraryBook); if (!AutomatedBackupsForm.KeepGoing)
if (!keepGoing) {
return; if (AutomatedBackupsForm.KeepGoingVisible && !AutomatedBackupsForm.KeepGoingChecked)
LogMe.Info("'Keep going' is unchecked");
return;
}
}
if (!AutomatedBackupsForm.KeepGoing) LogMe.Info("Done. All books have been processed");
{
if (AutomatedBackupsForm.KeepGoingVisible && !AutomatedBackupsForm.KeepGoingChecked)
LogMe.Info("'Keep going' is unchecked");
return;
}
}
catch (Exception exc)
{
LogMe.Error(exc);
}
}
LogMe.Info("Done. All books have been processed");
} }
} }
} }