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

Pass account info to login dialogs

Browse Source
This commit is contained in:
Robert McRackan 2020-08-28 13:55:03 -04:00
parent a12391f0ab
commit d24c10ddf5
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationServices/UNTESTED/LibraryCommands.cs
View File

@ -12,14 +12,14 @@ namespace ApplicationServices
{ {
public static class LibraryCommands public static class LibraryCommands
{ {
public static async Task<(int totalCount, int newCount)> ImportAccountAsync(ILoginCallback callback, params Account[] accounts) public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
{ {
if (accounts is null || accounts.Length == 0) if (accounts is null || accounts.Length == 0)
return (0, 0); return (0, 0);
try try
{ {
var importItems = await scanAccountsAsync(callback, accounts); var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
var totalCount = importItems.Count; var totalCount = importItems.Count;
Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}"); Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
@ -39,11 +39,13 @@ namespace ApplicationServices
} }
} }
private static async Task<List<ImportItem>> scanAccountsAsync(ILoginCallback callback, Account[] accounts) private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
{ {
var tasks = new List<Task<List<ImportItem>>>(); var tasks = new List<Task<List<ImportItem>>>();
foreach (var account in accounts) foreach (var account in accounts)
{ {
var callback = loginCallbackFactoryFunc(account);
// get APIs in serial, esp b/c of logins // get APIs in serial, esp b/c of logins
var api = await AudibleApiActions.GetApiAsync(callback, account); var api = await AudibleApiActions.GetApiAsync(callback, account);

3
InternalUtilities/Account.cs
View File

@ -88,8 +88,7 @@ namespace InternalUtilities
public Account(string accountId) public Account(string accountId)
{ {
ArgumentValidator.EnsureNotNullOrWhiteSpace(accountId, nameof(accountId)); AccountId = ArgumentValidator.EnsureNotNullOrWhiteSpace(accountId, nameof(accountId)).Trim();
AccountId = accountId.Trim();
} }
public override string ToString() => $"{AccountId} - {Locale?.Name ?? "[empty]"}"; public override string ToString() => $"{AccountId} - {Locale?.Name ?? "[empty]"}";

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>3.1.12.311</Version> <Version>3.1.12.315</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
LibationWinForms/UNTESTED/Dialogs/IndexLibraryDialog.cs
View File

@ -31,7 +31,7 @@ namespace LibationWinForms.Dialogs
try try
{ {
(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync(new WinformResponder(), _accounts); (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
} }
catch catch
{ {

11
LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs
View File

@ -1,10 +1,19 @@
using System; using System;
using AudibleApi;
using InternalUtilities;
using LibationWinForms.Dialogs.Login; using LibationWinForms.Dialogs.Login;
namespace LibationWinForms.Login namespace LibationWinForms.Login
{ {
public class WinformResponder : AudibleApi.ILoginCallback public class WinformResponder : ILoginCallback
{ {
private Account _account { get; }
public WinformResponder(Account account)
{
_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
}
public string Get2faCode() public string Get2faCode()
{ {
using var dialog = new _2faCodeDialog(); using var dialog = new _2faCodeDialog();