added license debugging

Added logging of download license.

AaxDecrypter/AaxcDownloadConverter.cs

@@ -2,6 +2,7 @@
 using Dinah.Core;
 using Dinah.Core.Diagnostics;
 using Dinah.Core.IO;
+using Dinah.Core.Logging;
 using Dinah.Core.StepRunner;
 using System;
 using System.IO;
@@ -39,6 +40,7 @@ namespace AaxDecrypter
             ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
             OutputFileName = outFileName;
             var outDir = Path.GetDirectoryName(OutputFileName);
+
             if (!Directory.Exists(outDir))
                 throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
             if (File.Exists(OutputFileName))
@@ -51,6 +53,8 @@ namespace AaxDecrypter
             downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
             OutputFormat = outputFormat;
 
+            Serilog.Log.Logger.Verbose("Download License. {@DebugInfo}", downloadLicense);
+
             steps = new StepSequence
             {
                 Name = "Download and Convert Aaxc To " + (outputFormat == OutputFormat.Mp4a ? "M4b" : "Mp3"),

DataLayer/EfClasses/Book.cs

@@ -88,8 +88,8 @@ namespace DataLayer
 			Category = category;
 
             // simple assigns
-            Title = title;
-            Description = description;
+            Title = title.Trim();
+            Description = description.Trim();
             LengthInMinutes = lengthInMinutes;
 
             // assigns with biz logic

DtoImporterService/BookImporter.cs

@@ -67,9 +67,6 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
-			//Add any subtitle after the title title.
-			var title = item.Title + (!string.IsNullOrWhiteSpace(item.Subtitle) ? $": {item.Subtitle}" : "");
-
 			// absence of authors is very rare, but possible
 			if (!item.Authors?.Any() ?? true)
 				item.Authors = new[] { new Person { Name = "", Asin = null } };
@@ -105,7 +102,7 @@ namespace DtoImporterService
 
 			var book = DbContext.Books.Add(new Book(
 				new AudibleProductId(item.ProductId),
-				title,
+				item.TitleWithSubtitle,
 				item.Description,
 				item.LengthInMinutes,
 				authors,

FileLiberator/DownloadDecryptBook.cs

@@ -70,12 +70,12 @@ namespace FileLiberator
                 var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
 
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-
+                
                 var aaxcDecryptDlLic = new DownloadLicense
                     (
-                    contentLic.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic.Voucher?.Key,
-                    contentLic.Voucher?.Iv,
+                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
+                    contentLic?.Voucher?.Key,
+                    contentLic?.Voucher?.Iv,
                     Resources.UserAgent
                     );
 

FileManager/Configuration.cs

@@ -4,8 +4,12 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using Dinah.Core.Logging;
+using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Serilog;
+using Serilog.Events;
 
 namespace FileManager
 {
@@ -34,28 +38,6 @@ namespace FileManager
 
         #region persistent configuration settings/values
 
-        #region // properties to test reflection
-        /*
-        // field should NOT be populated
-        public string TestField;
-        // int should NOT be populated
-        public int TestInt { get; set; }
-        // read-only should NOT be populated
-        public string TestGet { get; } // get only: should NOT get auto-populated
-        // set-only should NOT be populated
-        public string TestSet { private get; set; }
-
-        // get and set: SHOULD be auto-populated
-        public string TestGetSet { get; set; }
-        */
-        #endregion
-
-        // settings will be persisted when all are true
-        // - property (not field)
-        // - string
-        // - public getter
-        // - public setter
-
         // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
 
         // default setting and directory creation occur in class responsible for files.
@@ -65,8 +47,12 @@ namespace FileManager
         private PersistentDictionary persistentDictionary;
 
         public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.Set(propertyName, newValue);
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue);
+        public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
+
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+            => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
 
         public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
@@ -83,11 +69,43 @@ namespace FileManager
 
         public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
 
+        #region MainForm: X, Y, Width, Height, MainFormIsMaximized
+        public int MainFormX
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormX));
+            set => persistentDictionary.SetNonString(nameof(MainFormX), value);
+        }
+
+        public int MainFormY
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormY));
+            set => persistentDictionary.SetNonString(nameof(MainFormY), value);
+        }
+
+        public int MainFormWidth
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormWidth));
+            set => persistentDictionary.SetNonString(nameof(MainFormWidth), value);
+        }
+
+        public int MainFormHeight
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormHeight));
+            set => persistentDictionary.SetNonString(nameof(MainFormHeight), value);
+        }
+
+        public bool MainFormIsMaximized
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(MainFormIsMaximized));
+            set => persistentDictionary.SetNonString(nameof(MainFormIsMaximized), value);
+        }
+        #endregion
+
         [Description("Location for book storage. Includes destination of newly liberated books")]
         public string Books
         {
             get => persistentDictionary.GetString(nameof(Books));
-            set => persistentDictionary.Set(nameof(Books), value);
+            set => persistentDictionary.SetString(nameof(Books), value);
         }
 
         // temp/working dir(s) should be outside of dropbox
@@ -95,21 +113,21 @@ namespace FileManager
         public string InProgress
         {
             get => persistentDictionary.GetString(nameof(InProgress));
-            set => persistentDictionary.Set(nameof(InProgress), value);
+            set => persistentDictionary.SetString(nameof(InProgress), value);
         }
 
         [Description("Allow Libation for fix up audiobook metadata?")]
         public bool AllowLibationFixup
         {
-            get => persistentDictionary.Get<bool>(nameof(AllowLibationFixup));
-            set => persistentDictionary.Set(nameof(AllowLibationFixup), value);
+            get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
+            set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
         }
 
         [Description("Decrypt to lossy format?")]
         public bool DecryptToLossy
         {
-            get => persistentDictionary.Get<bool>(nameof(DecryptToLossy));
-            set => persistentDictionary.Set(nameof(DecryptToLossy), value);
+            get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
+            set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
         }
 
         #endregion
@@ -167,6 +185,63 @@ namespace FileManager
             // since it's a list, order matters and non-LibationFiles will be returned first
             var dirFunc = directoryOptionsPaths.FirstOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
             return dirFunc == default ? KnownDirectories.None : dirFunc.directory;
+        }
+        #endregion
+
+        #region logging
+        private IConfigurationRoot configuration;
+        public void ConfigureLogging()
+        {
+            //// with code. also persists to Settings.json
+            //SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+            //// hack which achieves the same, in memory only
+            //configuration["Serilog:WriteTo:1:Args:path"] = logPath;
+
+            configuration = new ConfigurationBuilder()
+                .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
+                .Build();
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+        }
+
+        [Description("The importance of a log event")]
+        public LogEventLevel LogLevel
+        {
+            get
+            {
+                try
+                {
+                    var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
+                    var logLevelEnum = Enum<LogEventLevel>.Parse(logLevelStr);
+                    return logLevelEnum;
+                }
+                catch
+                {
+                    return LogEventLevel.Information;
+                }
+            }
+            set
+            {
+                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
+                if (!valueWasChanged)
+                {
+                    Log.Logger.Information("LogLevel.set attempt. No change");
+                    return;
+                }
+
+                configuration.Reload();
+
+                Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
+                {
+                    LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
+                    LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
+                    LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
+                    LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
+                    LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
+                    LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled()
+                });
+            }
         }
 		#endregion
 
@@ -188,12 +263,19 @@ namespace FileManager
                 if (libationFilesPathCache is not null)
                     return libationFilesPathCache;
 
-                // must write here before SettingsFilePath in next step reads cache
+                // FIRST: must write here before SettingsFilePath in next step reads cache
                 libationFilesPathCache = getLiberationFilesSettingFromJson();
 
-                // load json values into memory. create settings if not exists
+                // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
                 persistentDictionary = new PersistentDictionary(SettingsFilePath);
 
+                // Config init in Program.ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
+                // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
+                var logPath = Path.Combine(LibationFiles, "Log.log");
+                bool settingWasChanged = SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+                if (settingWasChanged)
+                    configuration?.Reload();
+
                 return libationFilesPathCache;
             }
         }
@@ -235,38 +317,27 @@ namespace FileManager
             return valueFinal;
         }
 
-        public bool TrySetLibationFiles(string directory)
+        public void SetLibationFiles(string directory)
         {
-            // this is WRONG. need to MOVE settings; not DELETE them
-
-            //// if moving from default, delete old settings file and dir (if empty)
-            //if (LibationFiles.EqualsInsensitive(AppDir))
-            //{
-            //    File.Delete(SettingsFilePath);
-            //    System.Threading.Thread.Sleep(100);
-            //    if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-            //        Directory.Delete(AppDir);
-            //}
-
-
             libationFilesPathCache = null;
 
-
             var startingContents = File.ReadAllText(APPSETTINGS_JSON);
             var jObj = JObject.Parse(startingContents);
 
             jObj[LIBATION_FILES_KEY] = directory;
 
             var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            if (startingContents != endingContents)
+            if (startingContents == endingContents)
+                return;
+
+            // now it's set in the file again but no settings have moved yet
+            File.WriteAllText(APPSETTINGS_JSON, endingContents);
+
+            try
             {
-                try { Serilog.Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory }); }
-                catch { }
-                File.WriteAllText(APPSETTINGS_JSON, endingContents);
+                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
             }
-
-
-            return true;
+            catch { }
         }
         #endregion
     }

FileManager/FileManager.csproj

@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>

FileManager/PersistentDictionary.cs

@@ -47,7 +47,7 @@ namespace FileManager
             return stringCache[propertyName];
         }
 
-        public T Get<T>(string propertyName)
+        public T GetNonString<T>(string propertyName)
         {
             var obj = GetObject(propertyName);
             if (obj is null) return default;
@@ -68,10 +68,32 @@ namespace FileManager
             return objectCache[propertyName];
         }
 
+        public string GetStringFromJsonPath(string jsonPath, string propertyName) => GetStringFromJsonPath($"{jsonPath}.{propertyName}");
+        public string GetStringFromJsonPath(string jsonPath)
+        {
+            if (!stringCache.ContainsKey(jsonPath))
+            {
+                try
+                {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null)
+                        return null;
+                    stringCache[jsonPath] = (string)token;
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+
+            return stringCache[jsonPath];
+        }
+
         public bool Exists(string propertyName) => readFile().ContainsKey(propertyName);
 
         private object locker { get; } = new object();
-        public void Set(string propertyName, string newValue)
+        public void SetString(string propertyName, string newValue)
         {
             // only do this check in string cache, NOT object cache
             if (stringCache.ContainsKey(propertyName) && stringCache[propertyName] == newValue)
@@ -83,7 +105,7 @@ namespace FileManager
             writeFile(propertyName, newValue);
         }
 
-        public void Set(string propertyName, object newValue)
+        public void SetNonString(string propertyName, object newValue)
         {
             // set cache
             objectCache[propertyName] = newValue;
@@ -97,19 +119,6 @@ namespace FileManager
             if (IsReadOnly)
                 return;
 
-            try
-            {
-                var str = newValue?.ToString();
-                var formattedValue
-                    = str is null ? "[null]"
-                    : string.IsNullOrEmpty(str) ? "[empty]"
-                    : string.IsNullOrWhiteSpace(str) ? $"[whitespace. Length={str.Length}]"
-                    : str.Length > 100 ? $"[Length={str.Length}] {str[0..50]}...{str[^50..^0]}"
-                    : str;
-                Serilog.Log.Logger.Information($"Config changed. {propertyName}={formattedValue}");
-            }
-            catch { }
-
             // write new setting to file
             lock (locker)
             {
@@ -119,31 +128,80 @@ namespace FileManager
                 jObject[propertyName] = newValue;
                 var endContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
 
-                if (startContents != endContents)
-                    File.WriteAllText(Filepath, endContents);
+                if (startContents == endContents)
+                    return;
+                
+                File.WriteAllText(Filepath, endContents);
             }
+
+            try
+            {
+                var str = formatValueForLog(newValue?.ToString());
+                Serilog.Log.Logger.Information("Config changed. {@DebugInfo}", new { propertyName, newValue = str });
+            }
+            catch { }
         }
 
-        // special case: no caching. no logging
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
         {
             if (IsReadOnly)
-                return;
+                return false;
+
+            var path = $"{jsonPath}.{propertyName}";
 
-            lock (locker)
             {
-                var jObject = readFile();
-                var token = jObject.SelectToken(jsonPath);
-                var oldValue = (string)token[propertyName];
+                // only do this check in string cache, NOT object cache
+                if (stringCache.ContainsKey(path) && stringCache[path] == newValue)
+                    return false;
 
-                if (oldValue != newValue)
+                // set cache
+                stringCache[path] = newValue;
+            }
+
+            try
+            {
+                lock (locker)
                 {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null || token[propertyName] is null)
+                        return false;
+
+                    var oldValue = token.Value<string>(propertyName);
+                    if (oldValue == newValue)
+                        return false;
+
                     token[propertyName] = newValue;
                     File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
                 }
             }
+            catch (Exception exDebug)
+            {
+                return false;
+            }
+
+            if (!suppressLogging)
+            {
+                try
+                {
+                    var str = formatValueForLog(newValue?.ToString());
+                    Serilog.Log.Logger.Information("Config changed. {@DebugInfo}", new { jsonPath, propertyName, newValue = str });
+                }
+                catch { }
+            }
+
+            return true;
         }
 
+        private static string formatValueForLog(string value)
+            => value is null ? "[null]"
+            : string.IsNullOrEmpty(value) ? "[empty]"
+            : string.IsNullOrWhiteSpace(value) ? $"[whitespace. Length={value.Length}]"
+            : value.Length > 100 ? $"[Length={value.Length}] {value[0..50]}...{value[^50..^0]}"
+            : value;
+
         private JObject readFile()
         {
             var settingsJsonContents = File.ReadAllText(Filepath);

LibationLauncher/LibationLauncher.csproj

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

LibationLauncher/Program.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Windows.Forms;
 using AudibleApi;
 using AudibleApi.Authorization;
+using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms;
 using LibationWinForms.Dialogs;
-using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Serilog;
@@ -18,9 +18,16 @@ namespace LibationLauncher
 {
 	static class Program
 	{
+		[System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError = true)]
+		[return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
+		static extern bool AllocConsole();
+
 		[STAThread]
 		static void Main()
 		{
+			//// uncomment to see Console. MUST be called before anything writes to Console. Might only work from VS
+			//AllocConsole();
+
 			Application.SetHighDpiMode(HighDpiMode.SystemAware);
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
@@ -47,8 +54,8 @@ namespace LibationLauncher
 
 			ensureSerilogConfig(config);
 			configureLogging(config);
-			checkForUpdate(config);
 			logStartupState(config);
+			checkForUpdate(config);
 
 			Application.Run(new Form1());
 		}
@@ -74,7 +81,7 @@ namespace LibationLauncher
 			// check for existing settigns in default location
 			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-				config.TrySetLibationFiles(defaultLibationFilesDir);
+				config.SetLibationFiles(defaultLibationFilesDir);
 
 			if (config.LibationSettingsAreValid)
 				return;
@@ -87,7 +94,7 @@ namespace LibationLauncher
 			}
 
 			if (setupDialog.IsNewUser)
-				config.TrySetLibationFiles(defaultLibationFilesDir);
+				config.SetLibationFiles(defaultLibationFilesDir);
 			else if (setupDialog.IsReturningUser)
 			{
 				var libationFilesDialog = new LibationFilesDialog();
@@ -98,7 +105,7 @@ namespace LibationLauncher
 					return;
 				}
 
-				config.TrySetLibationFiles(libationFilesDialog.SelectedDirectory);
+				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
 				if (config.LibationSettingsAreValid)
 					return;
 
@@ -257,7 +264,7 @@ namespace LibationLauncher
 								new JObject
 								{
 									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(Configuration.Instance.LibationFiles, "_Log.log") },
+									{ "path", Path.Combine(config.LibationFiles, "_Log.log") },
 									{ "rollingInterval", "Month" },
 									// Serilog template formatting examples
 									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
@@ -276,109 +283,24 @@ namespace LibationLauncher
 			config.SetObject("Serilog", serilogObj);
 		}
 
+		// to restore original: Console.SetOut(origOut);
+		private static TextWriter origOut { get; } = Console.Out;
+
 		private static void configureLogging(Configuration config)
 		{
-			// override path. always use current libation files
-			var logPath = Path.Combine(Configuration.Instance.LibationFiles, "Log.log");
-			config.SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath);
+			config.ConfigureLogging();
 
-			//// hack which achieves the same
-			//configuration["Serilog:WriteTo:1:Args:path"] = logPath;
-
-			// CONFIGURATION-DRIVEN (json)
-			var configuration = new ConfigurationBuilder()
-				.AddJsonFile(config.SettingsFilePath)
-				.Build();
-			Log.Logger = new LoggerConfiguration()
-				.ReadFrom.Configuration(configuration)
-				.CreateLogger();
-
-			//// MANUAL HARD CODED
-			//Log.Logger = new LoggerConfiguration()
-			//  // requires: using Dinah.Core.Logging;
-			//	.Enrich.WithCaller()
-			//	.MinimumLevel.Information()
-			//	.WriteTo.File(logPath,
-			//		rollingInterval: RollingInterval.Month,
-			//		outputTemplate: code_outputTemplate)
-			//	.CreateLogger();
+			// Fwd Console to serilog.
+			// Serilog also write to Console (should probably change this) so it might be asking for trouble.
+			// SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
+			// Empirical testing so far has shown no issues.
+			Console.SetOut(new MultiTextWriter(origOut, new SerilogTextWriter()));
 
 			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
 			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
 			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
 		}
 
-		private static void checkForUpdate(Configuration config)
-		{
-			string zipUrl;
-			string selectedPath;
-
-			try
-			{
-				// timed out
-				var latest = getLatestRelease(TimeSpan.FromSeconds(30));
-				if (latest is null)
-					return;
-
-				var latestVersionString = latest.TagName.Trim('v');
-				if (!Version.TryParse(latestVersionString, out var latestRelease))
-					return;
-
-				// we're up to date
-				if (latestRelease <= BuildVersion)
-					return;
-
-				// we have an update
-				var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
-				zipUrl = zip?.BrowserDownloadUrl;
-				if (zipUrl is null)
-				{
-					MessageBox.Show(latest.HtmlUrl, "New version available");
-					return;
-				}
-
-				var result = MessageBox.Show($"New version available @ {latest.HtmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-				if (result != DialogResult.Yes)
-					return;
-
-				using var fileSelector = new SaveFileDialog { FileName = zip.Name, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-				if (fileSelector.ShowDialog() != DialogResult.OK)
-					return;
-				selectedPath = fileSelector.FileName;
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);
-				return;
-			}
-
-			try
-			{
-				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error downloading update", "Error downloading update", ex);
-			}
-		}
-
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
-		{
-			var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
-			if (task.Wait(timeout))
-				return task.Result;
-			return null;
-		}
-		private static Octokit.Release getLatestRelease()
-		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
-
-			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
-		}
-
 		private static void logStartupState(Configuration config)
 		{
 			// begin logging session with a form feed
@@ -406,19 +328,92 @@ namespace LibationLauncher
 				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
 			});
 
-			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
-			if (Log.Logger.IsVerboseEnabled())
-				MessageBox.Show(@"
-Warning: verbose logging is enabled.
+			MessageBoxVerboseLoggingWarning.ShowIfTrue();
+		}
 
-This should be used for debugging only. It creates many
-more logs and debug files, neither of which are as
-strictly anonomous.
+		private static void checkForUpdate(Configuration config)
+		{
+			string zipUrl;
+			string selectedPath;
 
-When you are finished debugging, it's highly recommended
-to set your debug MinimumLevel to Information and restart
-Libation.
-".Trim(), "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			try
+			{
+				// timed out
+				var latest = getLatestRelease(TimeSpan.FromSeconds(10));
+				if (latest is null)
+					return;
+
+				var latestVersionString = latest.TagName.Trim('v');
+				if (!Version.TryParse(latestVersionString, out var latestRelease))
+					return;
+
+				// we're up to date
+				if (latestRelease <= BuildVersion)
+					return;
+
+				// we have an update
+				var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+				zipUrl = zip?.BrowserDownloadUrl;
+
+				Log.Logger.Information("Update available: {@DebugInfo}", new {
+					latestRelease = latestRelease.ToString(),
+					latest.HtmlUrl,
+					zipUrl
+				});
+
+				if (zipUrl is null)
+				{
+					MessageBox.Show(latest.HtmlUrl, "New version available");
+					return;
+				}
+
+				var result = MessageBox.Show($"New version available @ {latest.HtmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+				if (result != DialogResult.Yes)
+					return;
+
+				using var fileSelector = new SaveFileDialog { FileName = zip.Name, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
+				if (fileSelector.ShowDialog() != DialogResult.OK)
+					return;
+				selectedPath = fileSelector.FileName;
+			}
+			catch (AggregateException aggEx)
+			{
+				Log.Logger.Error(aggEx, "Checking for new version too often");
+				return;
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);
+				return;
+			}
+
+			try
+			{
+				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show("Error downloading update", "Error downloading update", ex);
+			}
+		}
+
+		private static Octokit.Release getLatestRelease(TimeSpan timeout)
+		{
+			var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
+			if (task.Wait(timeout))
+				return task.Result;
+
+			Log.Logger.Information("Timed out");
+			return null;
+		}
+		private static Octokit.Release getLatestRelease()
+		{
+			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
+
+			// https://octokitnet.readthedocs.io/en/latest/releases/
+			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
+			var latest = releases.First(r => !r.Draft && !r.Prerelease);
+			return latest;
 		}
 
 		private static Version BuildVersion => System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;

LibationWinForms/BookLiberation/DecryptForm.Designer.cs

@@ -31,7 +31,6 @@
 			this.pictureBox1 = new System.Windows.Forms.PictureBox();
 			this.bookInfoLbl = new System.Windows.Forms.Label();
 			this.progressBar1 = new System.Windows.Forms.ProgressBar();
-			this.rtbLog = new System.Windows.Forms.RichTextBox();
 			this.remainingTimeLbl = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
 			this.SuspendLayout();
@@ -60,28 +59,16 @@
 			// 
 			this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.progressBar1.Location = new System.Drawing.Point(14, 607);
+			this.progressBar1.Location = new System.Drawing.Point(14, 143);
 			this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.progressBar1.Name = "progressBar1";
 			this.progressBar1.Size = new System.Drawing.Size(611, 27);
 			this.progressBar1.TabIndex = 2;
 			// 
-			// rtbLog
-			// 
-			this.rtbLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.rtbLog.Location = new System.Drawing.Point(14, 136);
-			this.rtbLog.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.rtbLog.Name = "rtbLog";
-			this.rtbLog.Size = new System.Drawing.Size(678, 463);
-			this.rtbLog.TabIndex = 1;
-			this.rtbLog.Text = "";
-			// 
 			// remainingTimeLbl
 			// 
 			this.remainingTimeLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.remainingTimeLbl.Location = new System.Drawing.Point(632, 607);
+			this.remainingTimeLbl.Location = new System.Drawing.Point(632, 143);
 			this.remainingTimeLbl.Name = "remainingTimeLbl";
 			this.remainingTimeLbl.Size = new System.Drawing.Size(60, 31);
 			this.remainingTimeLbl.TabIndex = 3;
@@ -92,9 +79,8 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(707, 647);
+			this.ClientSize = new System.Drawing.Size(707, 183);
 			this.Controls.Add(this.remainingTimeLbl);
-			this.Controls.Add(this.rtbLog);
 			this.Controls.Add(this.progressBar1);
 			this.Controls.Add(this.bookInfoLbl);
 			this.Controls.Add(this.pictureBox1);
@@ -102,8 +88,6 @@
 			this.Name = "DecryptForm";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "DecryptForm";
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DecryptForm_FormClosing);
-			this.Load += new System.EventHandler(this.DecryptForm_Load);
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);
 			this.PerformLayout();
@@ -115,7 +99,6 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Label bookInfoLbl;
         private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.RichTextBox rtbLog;
         private System.Windows.Forms.Label remainingTimeLbl;
     }
 }

LibationWinForms/BookLiberation/DecryptForm.cs

@@ -1,43 +1,21 @@
 using System;
 using System.Windows.Forms;
-using Dinah.Core.Drawing;
-using Dinah.Core.IO;
 using Dinah.Core.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {
     public partial class DecryptForm : Form
     {
-		public DecryptForm()
-        {
-            InitializeComponent();
-        }
-
-        System.IO.TextWriter origOut { get; } = Console.Out;
-        private void DecryptForm_Load(object sender, EventArgs e)
-        {
-            // redirect Console.WriteLine to console, textbox
-            var multiLogger = new MultiTextWriter(
-                origOut,
-                new RichTextBoxTextWriter(this.rtbLog),
-                new SerilogTextWriter());
-            Console.SetOut(multiLogger);
-        }
-
-        private void DecryptForm_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            // restore original
-            Console.SetOut(origOut);
-        }
+		public DecryptForm() => InitializeComponent();
 
         // book info
-        string title;
-        string authorNames;
-        string narratorNames;
+        private string title;
+        private string authorNames;
+        private string narratorNames;
 
         public void SetTitle(string title)
         {
-            this.UIThread(() => this.Text = " Decrypting " + title);
+            this.UIThread(() => this.Text = "Decrypting " + title);
             this.title = title;
             updateBookInfo();
         }
@@ -62,15 +40,15 @@ namespace LibationWinForms.BookLiberation
         public void UpdateProgress(int percentage)
         {
             if (percentage == 0)
-                remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = "ETA:\r\n0 sec");
-
+                updateRemainingTime(0);
             else
                 progressBar1.UIThread(() => progressBar1.Value = percentage);
         }
 
         public void UpdateRemainingTime(TimeSpan remaining)
-        {
-            remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{(int)remaining.TotalSeconds} sec");
-        }
+            => updateRemainingTime((int)remaining.TotalSeconds);
+
+        private void updateRemainingTime(int remaining)
+            => remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
     }
 }

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using DataLayer;
+using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Windows.Forms;
 using FileLiberator;
@@ -440,7 +441,26 @@ namespace LibationWinForms.BookLiberation
 
             LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
 
-            var dialogResult = MessageBox.Show(SkipDialogText, "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question);
+            string details;
+            try
+            {
+                static string trunc(string str)
+                    => string.IsNullOrWhiteSpace(str) ? "[empty]"
+                    : (str.Length > 50) ? $"{str.Truncate(47)}..."
+                    : str;
+
+                details =
+$@"  Title: {libraryBook.Book.Title}
+  ID: {libraryBook.Book.AudibleProductId}
+  Author: {trunc(libraryBook.Book.AuthorNames)}
+  Narr: {trunc(libraryBook.Book.NarratorNames)}";
+            }
+            catch
+            {
+                details = "[Error retrieving details]";
+            }
+
+            var dialogResult = MessageBox.Show(string.Format(SkipDialogText, details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question);
 
             if (dialogResult == DialogResult.Abort)
                 return false;
@@ -464,6 +484,7 @@ Created new 'skip' file
 
         protected override string SkipDialogText => @"
 An error occurred while trying to process this book. Skip this book permanently?
+{0}
 
 - Click YES to skip this book permanently.
 
@@ -487,7 +508,8 @@ An error occurred while trying to process this book. Skip this book permanently?
     class BackupLoop : BackupRunner
     {
         protected override string SkipDialogText => @"
-An error occurred while trying to process this book
+An error occurred while trying to process this book.
+{0}
 
 - ABORT: stop processing books.
 

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.Designer.cs

@@ -49,7 +49,7 @@ namespace LibationWinForms.Dialogs
 			// customDirectoryRb
 			// 
 			this.customDirectoryRb.AutoSize = true;
-			this.customDirectoryRb.Location = new System.Drawing.Point(2, 56);
+			this.customDirectoryRb.Location = new System.Drawing.Point(2, 62);
 			this.customDirectoryRb.Name = "customDirectoryRb";
 			this.customDirectoryRb.Size = new System.Drawing.Size(14, 13);
 			this.customDirectoryRb.TabIndex = 2;
@@ -60,7 +60,7 @@ namespace LibationWinForms.Dialogs
 			// 
 			this.customTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.customTb.Location = new System.Drawing.Point(22, 52);
+			this.customTb.Location = new System.Drawing.Point(22, 58);
 			this.customTb.Name = "customTb";
 			this.customTb.Size = new System.Drawing.Size(588, 23);
 			this.customTb.TabIndex = 3;
@@ -68,7 +68,7 @@ namespace LibationWinForms.Dialogs
 			// customBtn
 			// 
 			this.customBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.customBtn.Location = new System.Drawing.Point(616, 52);
+			this.customBtn.Location = new System.Drawing.Point(616, 58);
 			this.customBtn.Name = "customBtn";
 			this.customBtn.Size = new System.Drawing.Size(41, 27);
 			this.customBtn.TabIndex = 4;
@@ -82,7 +82,7 @@ namespace LibationWinForms.Dialogs
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.directorySelectControl.Location = new System.Drawing.Point(23, 0);
 			this.directorySelectControl.Name = "directorySelectControl";
-			this.directorySelectControl.Size = new System.Drawing.Size(635, 46);
+			this.directorySelectControl.Size = new System.Drawing.Size(635, 52);
 			this.directorySelectControl.TabIndex = 5;
 			// 
 			// DirectoryOrCustomSelectControl
@@ -95,7 +95,7 @@ namespace LibationWinForms.Dialogs
 			this.Controls.Add(this.customDirectoryRb);
 			this.Controls.Add(this.knownDirectoryRb);
 			this.Name = "DirectoryOrCustomSelectControl";
-			this.Size = new System.Drawing.Size(660, 81);
+			this.Size = new System.Drawing.Size(660, 87);
 			this.Load += new System.EventHandler(this.DirectoryOrCustomSelectControl_Load);
 			this.ResumeLayout(false);
 			this.PerformLayout();

LibationWinForms/Dialogs/DirectorySelectControl.Designer.cs

@@ -30,7 +30,7 @@ namespace LibationWinForms.Dialogs
 		private void InitializeComponent()
 		{
 			this.directoryComboBox = new System.Windows.Forms.ComboBox();
-			this.label1 = new System.Windows.Forms.Label();
+			this.textBox1 = new System.Windows.Forms.TextBox();
 			this.SuspendLayout();
 			// 
 			// directoryComboBox
@@ -45,23 +45,24 @@ namespace LibationWinForms.Dialogs
 			this.directoryComboBox.TabIndex = 0;
 			this.directoryComboBox.SelectedIndexChanged += new System.EventHandler(this.directoryComboBox_SelectedIndexChanged);
 			// 
-			// label1
+			// textBox1
 			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(0, 26);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(97, 15);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Select a directory";
+			this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.textBox1.Location = new System.Drawing.Point(0, 29);
+			this.textBox1.Name = "textBox1";
+			this.textBox1.ReadOnly = true;
+			this.textBox1.Size = new System.Drawing.Size(647, 23);
+			this.textBox1.TabIndex = 1;
 			// 
 			// DirectorySelectControl
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.label1);
+			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.directoryComboBox);
 			this.Name = "DirectorySelectControl";
-			this.Size = new System.Drawing.Size(647, 46);
+			this.Size = new System.Drawing.Size(647, 52);
 			this.Load += new System.EventHandler(this.DirectorySelectControl_Load);
 			this.ResumeLayout(false);
 			this.PerformLayout();
@@ -71,6 +72,6 @@ namespace LibationWinForms.Dialogs
 		#endregion
 
 		private System.Windows.Forms.ComboBox directoryComboBox;
-		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.TextBox textBox1;
 	}
 }

LibationWinForms/Dialogs/DirectorySelectControl.cs

@@ -107,6 +107,6 @@ namespace LibationWinForms.Dialogs
 
 		}
 
-		private void directoryComboBox_SelectedIndexChanged(object sender, EventArgs e) => this.label1.Text = selectedItem.UiDisplayPath;
+		private void directoryComboBox_SelectedIndexChanged(object sender, EventArgs e) => this.textBox1.Text = selectedItem.UiDisplayPath;
 	}
 }

LibationWinForms/Dialogs/LibationFilesDialog.Designer.cs

@@ -75,14 +75,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.libationFilesSelectControl.Location = new System.Drawing.Point(14, 28);
 			this.libationFilesSelectControl.Name = "libationFilesSelectControl";
-			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 81);
+			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 87);
 			this.libationFilesSelectControl.TabIndex = 1;
 			// 
 			// LibationFilesDialog
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(933, 158);
+			this.ClientSize = new System.Drawing.Size(933, 164);
 			this.Controls.Add(this.libationFilesSelectControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);

LibationWinForms/Dialogs/Login/MfaDialog.cs

@@ -14,49 +14,74 @@ namespace LibationWinForms.Dialogs.Login
 	{
 		private RadioButton[] radioButtons { get; }
 
+		AudibleApi.MfaConfig _mfaConfig { get; }
+
 		public MfaDialog(AudibleApi.MfaConfig mfaConfig)
 		{
 			InitializeComponent();
 
+			_mfaConfig = mfaConfig;
+
 			radioButtons = new[] { this.radioButton1, this.radioButton2, this.radioButton3 };
 
 			// optional string settings
 			if (!string.IsNullOrWhiteSpace(mfaConfig.Title))
 				this.Text = mfaConfig.Title;
-			setOptional(this.radioButton1, mfaConfig.Button1Text);
-			setOptional(this.radioButton2, mfaConfig.Button2Text);
-			setOptional(this.radioButton3, mfaConfig.Button3Text);
 
-			// mandatory values
-			radioButton1.Name = mfaConfig.Button1Name;
-			radioButton1.Tag = mfaConfig.Button1Value;
+			setRadioButton(0, this.radioButton1);
+			setRadioButton(1, this.radioButton2);
+			setRadioButton(2, this.radioButton3);
 
-			radioButton2.Name = mfaConfig.Button2Name;
-			radioButton2.Tag = mfaConfig.Button2Value;
-
-			radioButton3.Name = mfaConfig.Button3Name;
-			radioButton3.Tag = mfaConfig.Button3Value;
+			Serilog.Log.Logger.Information("{@DebugInfo}", new {
+				paramButtonCount = mfaConfig.Buttons.Count,
+				visibleRadioButtonCount = radioButtons.Count(rb => rb.Visible)
+			});
 		}
 
-		private static void setOptional(RadioButton radioButton, string text)
+		private void setRadioButton(int pos, RadioButton rb)
 		{
-			if (!string.IsNullOrWhiteSpace(text))
-				radioButton.Text = text;
+			if (_mfaConfig.Buttons.Count <= pos)
+			{
+				rb.Checked = false;
+				rb.Enabled = false;
+				rb.Visible = false;
+				return;
+			}
+
+			var btn = _mfaConfig.Buttons[pos];
+
+			// optional
+			if (!string.IsNullOrWhiteSpace(btn.Text))
+				rb.Text = btn.Text;
+
+			// mandatory values
+			rb.Name = btn.Name;
+			rb.Tag = btn.Value;
 		}
 
 		public string SelectedName { get; private set; }
 		public string SelectedValue { get; private set; }
 		private void submitBtn_Click(object sender, EventArgs e)
 		{
-			Serilog.Log.Logger.Debug("RadioButton states: {@DebugInfo}", new {
+			Serilog.Log.Logger.Information("RadioButton states: {@DebugInfo}", new {
+				rb1_visible = radioButton1.Visible,
 				rb1_checked = radioButton1.Checked,
+
+				r21_visible = radioButton2.Visible,
 				r21_checked = radioButton2.Checked,
+
+				rb3_visible = radioButton3.Visible,
 				rb3_checked = radioButton3.Checked
 			});
 
-			var selected = radioButtons.Single(rb => rb.Checked);
+			var selected = radioButtons.FirstOrDefault(rb => rb.Checked);
+			if (selected is null)
+			{
+				MessageBox.Show("No MFA option selected", "None selected", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
 
-			Serilog.Log.Logger.Debug("Selected: {@DebugInfo}", new { isSelected = selected is not null, name = selected?.Name, value = selected?.Tag });
+			Serilog.Log.Logger.Information("Selected: {@DebugInfo}", new { isSelected = selected is not null, name = selected?.Name, value = selected?.Tag });
 
 			SelectedName = selected.Name;
 			SelectedValue = (string)selected.Tag;

LibationWinForms/Dialogs/Login/WinformResponder.cs

@@ -17,7 +17,7 @@ namespace LibationWinForms.Login
 		public string Get2faCode()
 		{
 			using var dialog = new _2faCodeDialog();
-			if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+			if (showDialog(dialog))
 				return dialog.Code;
 			return null;
 		}
@@ -25,7 +25,7 @@ namespace LibationWinForms.Login
 		public string GetCaptchaAnswer(byte[] captchaImage)
 		{
 			using var dialog = new CaptchaDialog(captchaImage);
-			if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+			if (showDialog(dialog))
 				return dialog.Answer;
 			return null;
 		}
@@ -33,7 +33,7 @@ namespace LibationWinForms.Login
 		public (string name, string value) GetMfaChoice(MfaConfig mfaConfig)
 		{
 			using var dialog = new MfaDialog(mfaConfig);
-			if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+			if (showDialog(dialog))
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
 		}
@@ -41,7 +41,7 @@ namespace LibationWinForms.Login
 		public (string email, string password) GetLogin()
 		{
 			using var dialog = new AudibleLoginDialog(_account);
-			if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+			if (showDialog(dialog))
 				return (dialog.Email, dialog.Password);
 			return (null, null);
 		}
@@ -49,7 +49,15 @@ namespace LibationWinForms.Login
 		public void ShowApprovalNeeded()
 		{
 			using var dialog = new ApprovalNeededDialog();
-			dialog.ShowDialog();
+			showDialog(dialog);
+		}
+
+		/// <returns>True if ShowDialog's DialogResult == OK</returns>
+		private static bool showDialog(System.Windows.Forms.Form dialog)
+		{
+			var result = dialog.ShowDialog();
+			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
+			return result == System.Windows.Forms.DialogResult.OK;
 		}
 	}
 }

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -37,9 +37,11 @@
 			this.convertLosslessRb = new System.Windows.Forms.RadioButton();
 			this.inProgressSelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
 			this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
+			this.logsBtn = new System.Windows.Forms.Button();
 			this.booksSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
 			this.booksGb = new System.Windows.Forms.GroupBox();
-			this.logsBtn = new System.Windows.Forms.Button();
+			this.loggingLevelLbl = new System.Windows.Forms.Label();
+			this.loggingLevelCb = new System.Windows.Forms.ComboBox();
 			this.advancedSettingsGb.SuspendLayout();
 			this.booksGb.SuspendLayout();
 			this.SuspendLayout();
@@ -67,7 +69,7 @@
 			// saveBtn
 			// 
 			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(714, 380);
+			this.saveBtn.Location = new System.Drawing.Point(714, 419);
 			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
 			this.saveBtn.Size = new System.Drawing.Size(88, 27);
@@ -80,7 +82,7 @@
 			// 
 			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 380);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 419);
 			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
 			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
@@ -93,18 +95,17 @@
 			// 
 			this.advancedSettingsGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.advancedSettingsGb.Controls.Add(this.logsBtn);
 			this.advancedSettingsGb.Controls.Add(this.convertLossyRb);
 			this.advancedSettingsGb.Controls.Add(this.convertLosslessRb);
 			this.advancedSettingsGb.Controls.Add(this.inProgressSelectControl);
 			this.advancedSettingsGb.Controls.Add(this.allowLibationFixupCbox);
 			this.advancedSettingsGb.Controls.Add(this.inProgressDescLbl);
-			this.advancedSettingsGb.Location = new System.Drawing.Point(12, 141);
+			this.advancedSettingsGb.Location = new System.Drawing.Point(12, 176);
 			this.advancedSettingsGb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.advancedSettingsGb.Name = "advancedSettingsGb";
 			this.advancedSettingsGb.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 226);
-			this.advancedSettingsGb.TabIndex = 3;
+			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 232);
+			this.advancedSettingsGb.TabIndex = 5;
 			this.advancedSettingsGb.TabStop = false;
 			this.advancedSettingsGb.Text = "Advanced settings for control freaks";
 			// 
@@ -136,7 +137,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.inProgressSelectControl.Location = new System.Drawing.Point(10, 175);
 			this.inProgressSelectControl.Name = "inProgressSelectControl";
-			this.inProgressSelectControl.Size = new System.Drawing.Size(552, 46);
+			this.inProgressSelectControl.Size = new System.Drawing.Size(552, 52);
 			this.inProgressSelectControl.TabIndex = 2;
 			// 
 			// allowLibationFixupCbox
@@ -152,13 +153,23 @@
 			this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
 			this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
 			// 
+			// logsBtn
+			// 
+			this.logsBtn.Location = new System.Drawing.Point(262, 147);
+			this.logsBtn.Name = "logsBtn";
+			this.logsBtn.Size = new System.Drawing.Size(132, 23);
+			this.logsBtn.TabIndex = 4;
+			this.logsBtn.Text = "Open log folder";
+			this.logsBtn.UseVisualStyleBackColor = true;
+			this.logsBtn.Click += new System.EventHandler(this.logsBtn_Click);
+			// 
 			// booksSelectControl
 			// 
 			this.booksSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.booksSelectControl.Location = new System.Drawing.Point(7, 37);
 			this.booksSelectControl.Name = "booksSelectControl";
-			this.booksSelectControl.Size = new System.Drawing.Size(895, 81);
+			this.booksSelectControl.Size = new System.Drawing.Size(895, 87);
 			this.booksSelectControl.TabIndex = 1;
 			// 
 			// booksGb
@@ -169,20 +180,28 @@
 			this.booksGb.Controls.Add(this.booksLocationDescLbl);
 			this.booksGb.Location = new System.Drawing.Point(12, 12);
 			this.booksGb.Name = "booksGb";
-			this.booksGb.Size = new System.Drawing.Size(908, 123);
-			this.booksGb.TabIndex = 6;
+			this.booksGb.Size = new System.Drawing.Size(908, 129);
+			this.booksGb.TabIndex = 1;
 			this.booksGb.TabStop = false;
 			this.booksGb.Text = "Books location";
 			// 
-			// logsBtn
+			// loggingLevelLbl
 			// 
-			this.logsBtn.Location = new System.Drawing.Point(826, 18);
-			this.logsBtn.Name = "logsBtn";
-			this.logsBtn.Size = new System.Drawing.Size(75, 64);
-			this.logsBtn.TabIndex = 3;
-			this.logsBtn.Text = "Open log\r\nfiles folder";
-			this.logsBtn.UseVisualStyleBackColor = true;
-			this.logsBtn.Click += new System.EventHandler(this.logsBtn_Click);
+			this.loggingLevelLbl.AutoSize = true;
+			this.loggingLevelLbl.Location = new System.Drawing.Point(12, 150);
+			this.loggingLevelLbl.Name = "loggingLevelLbl";
+			this.loggingLevelLbl.Size = new System.Drawing.Size(78, 15);
+			this.loggingLevelLbl.TabIndex = 2;
+			this.loggingLevelLbl.Text = "Logging level";
+			// 
+			// loggingLevelCb
+			// 
+			this.loggingLevelCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.loggingLevelCb.FormattingEnabled = true;
+			this.loggingLevelCb.Location = new System.Drawing.Point(96, 147);
+			this.loggingLevelCb.Name = "loggingLevelCb";
+			this.loggingLevelCb.Size = new System.Drawing.Size(129, 23);
+			this.loggingLevelCb.TabIndex = 3;
 			// 
 			// SettingsDialog
 			// 
@@ -190,7 +209,10 @@
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(933, 421);
+			this.ClientSize = new System.Drawing.Size(933, 462);
+			this.Controls.Add(this.logsBtn);
+			this.Controls.Add(this.loggingLevelCb);
+			this.Controls.Add(this.loggingLevelLbl);
 			this.Controls.Add(this.booksGb);
 			this.Controls.Add(this.advancedSettingsGb);
 			this.Controls.Add(this.cancelBtn);
@@ -206,6 +228,7 @@
 			this.booksGb.ResumeLayout(false);
 			this.booksGb.PerformLayout();
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -222,5 +245,7 @@
         private System.Windows.Forms.RadioButton convertLosslessRb;
 		private System.Windows.Forms.GroupBox booksGb;
 		private System.Windows.Forms.Button logsBtn;
+		private System.Windows.Forms.Label loggingLevelLbl;
+		private System.Windows.Forms.ComboBox loggingLevelCb;
 	}
 }

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -18,6 +18,13 @@ namespace LibationWinForms.Dialogs
 			if (this.DesignMode)
 				return;
 
+			{
+				loggingLevelCb.Items.Clear();
+				foreach (var level in Enum<Serilog.Events.LogEventLevel>.GetValues())
+					loggingLevelCb.Items.Add(level);
+				loggingLevelCb.SelectedItem = config.LogLevel;
+			}
+
 			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
 			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
 
@@ -65,11 +72,6 @@ namespace LibationWinForms.Dialogs
 
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
-			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
-			config.DecryptToLossy = convertLossyRb.Checked;
-
-			config.InProgress = inProgressSelectControl.SelectedDirectory;
-
 			var newBooks = booksSelectControl.SelectedDirectory;
 
 			if (string.IsNullOrWhiteSpace(newBooks))
@@ -92,6 +94,22 @@ namespace LibationWinForms.Dialogs
 
 			config.Books = newBooks;
 
+			{
+				var logLevelOld = config.LogLevel;
+				var logLevelNew = (Serilog.Events.LogEventLevel)loggingLevelCb.SelectedItem;
+
+				config.LogLevel = logLevelNew;
+
+				// only warn if changed during this time. don't want to warn every time user happens to change settings while level is verbose
+				if (logLevelOld != logLevelNew)
+					MessageBoxVerboseLoggingWarning.ShowIfTrue();
+			}
+
+			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
+			config.DecryptToLossy = convertLossyRb.Checked;
+
+			config.InProgress = inProgressSelectControl.SelectedDirectory;
+
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}

LibationWinForms/Form1.Designer.cs

@@ -51,7 +51,6 @@
 			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.advancedSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
 			this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
@@ -232,8 +231,7 @@
 			// 
 			this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.accountsToolStripMenuItem,
-            this.basicSettingsToolStripMenuItem,
-            this.advancedSettingsToolStripMenuItem});
+            this.basicSettingsToolStripMenuItem});
 			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
 			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
 			this.settingsToolStripMenuItem.Text = "&Settings";
@@ -241,24 +239,17 @@
 			// accountsToolStripMenuItem
 			// 
 			this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
-			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
 			this.accountsToolStripMenuItem.Text = "&Accounts...";
 			this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
 			// 
 			// basicSettingsToolStripMenuItem
 			// 
 			this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
-			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
 			this.basicSettingsToolStripMenuItem.Text = "&Settings...";
 			this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
 			// 
-			// advancedSettingsToolStripMenuItem
-			// 
-			this.advancedSettingsToolStripMenuItem.Name = "advancedSettingsToolStripMenuItem";
-			this.advancedSettingsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
-			this.advancedSettingsToolStripMenuItem.Text = "&Move settings files...";
-			this.advancedSettingsToolStripMenuItem.Click += new System.EventHandler(this.advancedSettingsToolStripMenuItem_Click);
-			// 
 			// statusStrip1
 			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -325,6 +316,7 @@
 			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "Form1";
 			this.Text = "Libation: Liberate your Library";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
 			this.Load += new System.EventHandler(this.Form1_Load);
 			this.menuStrip1.ResumeLayout(false);
 			this.menuStrip1.PerformLayout();
@@ -359,7 +351,6 @@
 		private System.Windows.Forms.ToolStripMenuItem editQuickFiltersToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.ToolStripMenuItem basicSettingsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem advancedSettingsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem accountsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem scanLibraryOfAllAccountsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem scanLibraryOfSomeAccountsToolStripMenuItem;

LibationWinForms/Form1.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
 using DataLayer;
@@ -33,6 +34,31 @@ namespace LibationWinForms
 
 			beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
             beginPdfBackupsToolStripMenuItem_format = beginPdfBackupsToolStripMenuItem.Text;
+
+            // after backing up formats: can set default/temp visible text
+            backupsCountsLbl.Text = "[Calculating backed up book quantities]";
+            pdfsCountsLbl.Text = "[Calculating backed up PDFs]";
+			setVisibleCount(null, 0);
+
+            if (this.DesignMode)
+                return;
+
+            // independent UI updates
+            this.Load += setBackupCountsAsync;
+            this.Load += (_, __) => RestoreSizeAndLocation();
+            this.Load += (_, __) => RefreshImportMenu();
+
+            // start background service
+            this.Load += (_, __) => startBackgroundImageDownloader();
+        }
+
+        private static void startBackgroundImageDownloader()
+        {
+            // load default/missing cover images. this will also initiate the background image downloader
+            var format = System.Drawing.Imaging.ImageFormat.Jpeg;
+            PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
+            PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
+            PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
         }
 
         private void Form1_Load(object sender, EventArgs e)
@@ -40,29 +66,89 @@ namespace LibationWinForms
             if (this.DesignMode)
                 return;
 
-			// load default/missing cover images. this will also initiate the background image downloader
-			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
-			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
-
-            RefreshImportMenu();
-
-			setVisibleCount(null, 0);
-
-			reloadGrid();
-
+            reloadGrid();
+            
             // also applies filter. ONLY call AFTER loading grid
             loadInitialQuickFilterState();
-
-            // init bottom counts
-            backupsCountsLbl.Text = "[Calculating backed up book quantities]";
-            pdfsCountsLbl.Text = "[Calculating backed up PDFs]";
-            setBackupCounts(null, null);
         }
 
-		#region reload grid
-		bool isProcessingGridSelect = false;
+        private void Form1_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            SaveSizeAndLocation();
+        }
+
+		private void RestoreSizeAndLocation()
+		{
+            var config = Configuration.Instance;
+
+            var width = config.MainFormWidth;
+            var height = config.MainFormHeight;
+
+            // too small -- something must have gone wrong. use defaults
+            if (width < 25 || height < 25)
+            {
+                width = 1023;
+                height = 578;
+            }
+
+            // Fit to the current screen size in case the screen resolution changed since the size was last persisted
+            if (width > Screen.PrimaryScreen.WorkingArea.Width)
+                width = Screen.PrimaryScreen.WorkingArea.Width;
+            if (height > Screen.PrimaryScreen.WorkingArea.Height)
+                height = Screen.PrimaryScreen.WorkingArea.Height;
+
+            var x = config.MainFormX;
+            var y = config.MainFormY;
+
+            var rect = new System.Drawing.Rectangle(x, y, width, height);
+
+            // is proposed rect on a screen?
+            if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
+            {
+                this.StartPosition = FormStartPosition.Manual;
+                this.DesktopBounds = rect;
+            }
+            else
+            {
+                this.StartPosition = FormStartPosition.WindowsDefaultLocation;
+                this.Size = rect.Size;
+            }
+
+            // FINAL: for Maximized: start normal state, set size and location, THEN set max state
+            this.WindowState = config.MainFormIsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
+        }
+
+        private void SaveSizeAndLocation()
+        {
+            System.Drawing.Point location;
+            System.Drawing.Size size;
+
+            // save location and size if the state is normal
+            if (this.WindowState == FormWindowState.Normal)
+            {
+                location = this.Location;
+                size = this.Size;
+            }
+            else
+            {
+                // save the RestoreBounds if the form is minimized or maximized
+                location = this.RestoreBounds.Location;
+                size = this.RestoreBounds.Size;
+            }
+            
+            var config = Configuration.Instance;
+
+            config.MainFormX = location.X;
+            config.MainFormY = location.Y;
+
+            config.MainFormWidth = size.Width;
+            config.MainFormHeight = size.Height;
+
+            config.MainFormIsMaximized = this.WindowState == FormWindowState.Maximized;
+        }
+
+        #region reload grid
+        bool isProcessingGridSelect = false;
         private void reloadGrid()
         {
             // suppressed filter while init'ing UI
@@ -84,14 +170,14 @@ namespace LibationWinForms
                 {
                     gridPanel.Controls.Remove(currProductsGrid);
                     currProductsGrid.VisibleCountChanged -= setVisibleCount;
-                    currProductsGrid.BackupCountsChanged -= setBackupCounts;
+                    currProductsGrid.BackupCountsChanged -= setBackupCountsAsync;
                     currProductsGrid.Dispose();
                 }
 
                 currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
                 currProductsGrid.VisibleCountChanged += setVisibleCount;
-                currProductsGrid.BackupCountsChanged += setBackupCounts;
-                gridPanel.Controls.Add(currProductsGrid);
+                currProductsGrid.BackupCountsChanged += setBackupCountsAsync;
+                gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid));
                 currProductsGrid.Display();
             }
             ResumeLayout();
@@ -103,15 +189,17 @@ namespace LibationWinForms
         #endregion
 
         #region bottom: backup counts
-        private void setBackupCounts(object _, object __)
+        private async void setBackupCountsAsync(object _, object __)
         {
-            var books = DbContexts.GetContext()
-                .GetLibrary_Flat_NoTracking()
-                .Select(sp => sp.Book)
-                .ToList();
+            await Task.Run(() => {
+                var books = DbContexts.GetContext()
+                    .GetLibrary_Flat_NoTracking()
+                    .Select(sp => sp.Book)
+                    .ToList();
 
-			setBookBackupCounts(books);
-			setPdfBackupCounts(books);
+                setBookBackupCounts(books);
+                setPdfBackupCounts(books);
+            });
 		}
         enum AudioFileState { full, aax, none }
         private void setBookBackupCounts(IEnumerable<Book> books)
@@ -395,31 +483,6 @@ namespace LibationWinForms
         private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
 
         private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
-
-        private void advancedSettingsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var libationFilesDialog = new LibationFilesDialog();
-            if (libationFilesDialog.ShowDialog() != DialogResult.OK)
-                return;
-
-            // no change
-            if (System.IO.Path.GetFullPath(libationFilesDialog.SelectedDirectory).EqualsInsensitive(System.IO.Path.GetFullPath(Configuration.Instance.LibationFiles)))
-                return;
-
-            if (!Configuration.Instance.TrySetLibationFiles(libationFilesDialog.SelectedDirectory))
-            {
-                MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationFilesDialog.SelectedDirectory, "Error saving change", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            MessageBox.Show(
-                "You have changed a file path important for this program. All files will remain in their original location; nothing will be moved. Libation must be restarted so these changes are handled correctly.",
-                "Closing Libation",
-                MessageBoxButtons.OK,
-                MessageBoxIcon.Exclamation);
-            Application.Exit();
-            Environment.Exit(0);
-        }
-        #endregion
-    }
+		#endregion
+	}
 }

LibationWinForms/MessageBoxWarnIfVerboseLogging.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core.Logging;
+using Serilog;
+
+namespace LibationWinForms
+{
+	public static class MessageBoxVerboseLoggingWarning
+	{
+		public static void ShowIfTrue()
+		{
+			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
+			if (Log.Logger.IsVerboseEnabled())
+				MessageBox.Show(@"
+Warning: verbose logging is enabled.
+
+This should be used for debugging only. It creates many
+more logs and debug files, neither of which are as
+strictly anonomous.
+
+When you are finished debugging, it's highly recommended
+to set your debug MinimumLevel to Information and restart
+Libation.
+".Trim(), "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+		}
+	}
+}

README.md

@@ -37,7 +37,7 @@
 * Powerful advanced search built on the Lucene search engine
 * Customizable saved filters for common searches
 * Open source
-* Tested on US Audible only. Should theoretically also work for Canada, UK, Germany, France, and Australia
+* Supports most regions: US, UK, Canada, Germany, France, Australia, Japan, India, and Spain
 
 <a name="theBad"/>