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

Fix v3 => v4 migration bug. Improved error handing

Browse Source
This commit is contained in:
Robert McRackan 2020-08-31 21:27:56 -04:00
parent d5cd569319
commit cd604d03b1
6 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FileLiberator/UNTESTED/DownloadBook.cs
View File

@ -67,7 +67,7 @@ namespace FileLiberator
: "Error downloading file";
var ex = new Exception(exMsg);
Serilog.Log.Error(ex, "Download error {@DebugInfo}", new
Serilog.Log.Logger.Error(ex, "Download error {@DebugInfo}", new
{
libraryBook.Book.Title,
libraryBook.Book.AudibleProductId,

2
LibationLauncher/LibationLauncher.csproj
View File

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

29
LibationLauncher/UNTESTED/Program.cs
View File

@ -99,9 +99,12 @@ namespace LibationLauncher
{
updateLegacyFileWithLocale();
var account = addAccountToNewAccountFile();
var account = createAccountFromLegacySettings();
account.DecryptKey = getDecryptKey(account);
importDecryptKey(account);
// the next few methods need persistence. to be a good citizen, dispose of persister at the end of current scope
using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
persister.AccountsSettings.Add(account);
}
// migration is a convenience. if something goes wrong: just move on
catch { }
@ -133,7 +136,7 @@ namespace LibationLauncher
}
}
private static Account addAccountToNewAccountFile()
private static Account createAccountFromLegacySettings()
{
// get required locale from settings file
var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
@ -161,24 +164,22 @@ namespace LibationLauncher
IdentityTokens = identity
};
// saves to new file
using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
persister.AccountsSettings.Add(account);
return account;
}
private static void importDecryptKey(Account account)
private static string getDecryptKey(Account account)
{
if (account is null || !string.IsNullOrWhiteSpace(account.DecryptKey) || !File.Exists(Configuration.Instance.SettingsFilePath))
return;
if (!string.IsNullOrWhiteSpace(account?.DecryptKey))
return account.DecryptKey;
if (!File.Exists(Configuration.Instance.SettingsFilePath) || account is null)
return "";
var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
if (JObject.Parse(settingsContents).TryGetValue("DecryptKey", out var jToken))
{
var decryptKey = jToken.Value<string>() ?? "";
account.DecryptKey = decryptKey;
}
return jToken.Value<string>() ?? "";
return "";
}
private static void updateSettingsFile()

4
LibationWinForms/UNTESTED/Dialogs/IndexLibraryDialog.Designer.cs generated
View File

@ -36,7 +36,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(28, 24);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(260, 13);
this.label1.Size = new System.Drawing.Size(263, 13);
this.label1.TabIndex = 0;
this.label1.Text = "Scanning Audible library. This may take a few minutes";
//
@ -44,7 +44,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(319, 63);
this.ClientSize = new System.Drawing.Size(440, 63);
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;

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

@ -33,9 +33,10 @@ namespace LibationWinForms.Dialogs
{
(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
}
catch
catch (Exception ex)
{
var msg = "Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator";
Serilog.Log.Logger.Error(ex, msg);
MessageBox.Show(msg, "Error importing library", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

6
WinFormsDesigner/Dialogs/IndexLibraryDialog.Designer.cs generated
View File

@ -36,15 +36,15 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(28, 24);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(260, 13);
this.label1.Size = new System.Drawing.Size(263, 13);
this.label1.TabIndex = 0;
this.label1.Text = "Scanning Audible library. This may take a few minutes";
this.label1.Text = "Scanning Audible library. This may take a few minutes.";
//
// IndexLibraryDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(319, 63);
this.ClientSize = new System.Drawing.Size(440, 63);
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;