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

Merge pull request #252 from Mbucari/master

Browse Source 
Fixed Issue #251
This commit is contained in:
rmcrackan 2022-05-18 14:47:40 -04:00 committed by GitHub
commit 898d38cb6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/AaxDecrypter/AaxDecrypter.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AAXClean" Version="0.4.6" /> <PackageReference Include="AAXClean" Version="0.4.7" />
<PackageReference Include="AAXClean.Codecs" Version="0.2.7" /> <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
</ItemGroup> </ItemGroup>

5
Source/FileLiberator/DownloadDecryptBook.cs
View File

@ -71,8 +71,9 @@ namespace FileLiberator
new StatusHandler { "Decrypt failed" }; new StatusHandler { "Decrypt failed" };
} }
// moves new files from temp dir to final dest // moves new files from temp dir to final dest.
var movedAudioFile = moveFilesToBooksDir(libraryBook, entries); // This could take a few seconds if moving hundreds of files.
var movedAudioFile = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
// decrypt failed // decrypt failed
if (!movedAudioFile) if (!movedAudioFile)

1
Source/LibationWinForms/Dialogs/SettingsDialog.AudioSettings.cs
View File

@ -21,7 +21,6 @@ namespace LibationWinForms.Dialogs
private void convertFormatRb_CheckedChanged(object sender, EventArgs e) private void convertFormatRb_CheckedChanged(object sender, EventArgs e)
{ {
lameOptionsGb.Enabled = convertLossyRb.Checked;
lameTargetRb_CheckedChanged(sender, e); lameTargetRb_CheckedChanged(sender, e);
LameMatchSourceBRCbox_CheckedChanged(sender, e); LameMatchSourceBRCbox_CheckedChanged(sender, e);
} }

24
Source/LibationWinForms/Form1.ProcessQueue.cs
View File

@ -23,7 +23,18 @@ namespace LibationWinForms
private void ProductsGrid_LiberateClicked(object sender, LibraryBook e) private void ProductsGrid_LiberateClicked(object sender, LibraryBook e)
{ {
if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated) if (e.Book.Audio_Exists())
{
// liberated: open explorer to file
var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
if (!Go.To.File(filePath))
{
var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
MessageBox.Show($"File not found" + suffix);
}
return;
}
else if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
{ {
SetQueueCollapseState(false); SetQueueCollapseState(false);
processBookQueue1.AddDownloadDecrypt(e); processBookQueue1.AddDownloadDecrypt(e);
@ -33,16 +44,7 @@ namespace LibationWinForms
SetQueueCollapseState(false); SetQueueCollapseState(false);
processBookQueue1.AddDownloadPdf(e); processBookQueue1.AddDownloadPdf(e);
} }
else if (e.Book.Audio_Exists())
{
// liberated: open explorer to file
var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
if (!Go.To.File(filePath))
{
var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
MessageBox.Show($"File not found" + suffix);
}
}
} }
private void SetQueueCollapseState(bool collapsed) private void SetQueueCollapseState(bool collapsed)