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

Fix account persistence edge case

Browse Source
This commit is contained in:
Robert McRackan 2020-08-25 15:58:56 -04:00
parent dd25792864
commit dd3b032b21
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InternalUtilities/Account.cs
View File

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

4
InternalUtilities/AccountsSettings.cs
View File

@ -113,7 +113,9 @@ namespace InternalUtilities
return false;
account.Updated -= update;
return _accounts_backing.Remove(account);
var result = _accounts_backing.Remove(account);
update_no_validate();
return result;
}
private void validate(Account account)

2
LibationLauncher/LibationLauncher.csproj
View File

@ -13,7 +13,7 @@
<!-- <PublishSingleFile>true</PublishSingleFile> -->
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<Version>3.1.12.271</Version>
<Version>3.1.12.279</Version>
</PropertyGroup>
<ItemGroup>

27
LibationWinForms/UNTESTED/Form1.cs
View File

@ -8,6 +8,7 @@ using Dinah.Core;
using Dinah.Core.Drawing;
using Dinah.Core.Windows.Forms;
using FileManager;
using InternalUtilities;
using LibationWinForms.Dialogs;
namespace LibationWinForms
@ -42,6 +43,8 @@ namespace LibationWinForms
PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
setImportMenu();
setVisibleCount(null, 0);
reloadGrid();
@ -55,8 +58,8 @@ namespace LibationWinForms
setBackupCounts(null, null);
}
#region reload grid
bool isProcessingGridSelect = false;
#region reload grid
bool isProcessingGridSelect = false;
private void reloadGrid()
{
// suppressed filter while init'ing UI
@ -223,10 +226,19 @@ namespace LibationWinForms
doFilter(lastGoodFilter);
}
}
#endregion
#endregion
#region index menu
private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
#region Import menu
private void setImportMenu()
{
var hasMultipleAccounts = AudibleApiStorage.GetPersistentAccountsSettings().Accounts.Count > 1;
scanLibraryToolStripMenuItem.Visible = !hasMultipleAccounts;
scanLibraryOfAllAccountsToolStripMenuItem.Visible = hasMultipleAccounts;
scanLibraryOfSomeAccountsToolStripMenuItem.Visible = hasMultipleAccounts;
}
private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
{
using var dialog = new IndexLibraryDialog();
dialog.ShowDialog();
@ -309,7 +321,10 @@ private void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, Eve
#region settings menu
private void accountsToolStripMenuItem_Click(object sender, EventArgs e)
=> new AccountsDialog().ShowDialog();
{
new AccountsDialog().ShowDialog();
setImportMenu();
}
private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();