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

Merge branch 'master' of https://github.com/Mbucari/Libation

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2021-06-24 16:57:51 -06:00
commit 9550aac788
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FileLiberator/DownloadBook.cs
View File

@ -39,7 +39,7 @@ namespace FileLiberator
=> FileUtility.GetValidFilename( => FileUtility.GetValidFilename(
AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DownloadsInProgress,
libraryBook.Book.Title, libraryBook.Book.Title,
"aax", "aaxc",
libraryBook.Book.AudibleProductId); libraryBook.Book.AudibleProductId);
private async Task<string> downloadAaxcBookAsync(LibraryBook libraryBook, string tempAaxFilename) private async Task<string> downloadAaxcBookAsync(LibraryBook libraryBook, string tempAaxFilename)

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.4.0.63</Version> <Version>4.4.0.64</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

14
LibationLauncher/Program.cs
View File

@ -30,7 +30,7 @@ namespace LibationLauncher
migrate_to_v4_0_0(); migrate_to_v4_0_0();
migrate_to_v4_0_3(); // add setting for whether to delete/retain aax migrate_to_v4_0_3(); // add setting for whether to delete/retain aax
migrate_to_v5_x_x(); migrate_to_v5_0_0();
ensureLoggingConfig(); ensureLoggingConfig();
ensureSerilogConfig(); ensureSerilogConfig();
@ -229,15 +229,19 @@ namespace LibationLauncher
} }
#endregion #endregion
#region migrate_to_v5_x_x re-gegister device if device info not in settings #region migrate_to_v5_0_0 re-gegister device if device info not in settings
private static void migrate_to_v5_x_x() private static void migrate_to_v5_0_0()
{ {
if (!File.Exists(AudibleApiStorage.AccountsSettingsFile)) if (!File.Exists(AudibleApiStorage.AccountsSettingsFile))
return; return;
var accountsPersister = AudibleApiStorage.GetAccountsSettingsPersister(); var accountsPersister = AudibleApiStorage.GetAccountsSettingsPersister();
foreach (var account in accountsPersister?.AccountsSettings?.Accounts) var accounts = accountsPersister?.AccountsSettings?.Accounts;
if (accounts is null)
return;
foreach (var account in accounts)
{ {
var identity = account?.IdentityTokens; var identity = account?.IdentityTokens;
@ -249,7 +253,7 @@ namespace LibationLauncher
!string.IsNullOrWhiteSpace(identity.AmazonAccountId)) !string.IsNullOrWhiteSpace(identity.AmazonAccountId))
continue; continue;
var authorize = new AudibleApi.Authorization.Authorize(identity.Locale); var authorize = new Authorize(identity.Locale);
try try
{ {