v5.2.1

*  basic => Settings
* advanced => Move settings files

AaxDecrypter/AaxcDownloadConverter.cs

@@ -8,6 +8,11 @@ using System.IO;
 
 namespace AaxDecrypter
 {
+    public enum OutputFormat
+    {
+        Mp4a,
+        Mp3
+    }
     public class AaxcDownloadConverter
     {
         public event EventHandler<AppleTags> RetrievedTags;
@@ -21,6 +26,7 @@ namespace AaxDecrypter
         private DownloadLicense downloadLicense { get; }
         private AaxFile aaxFile;
         private byte[] coverArt;
+        private OutputFormat OutputFormat;
 
         private StepSequence steps { get; }
         private NetworkFileStreamPersister nfsPersister;
@@ -28,10 +34,10 @@ namespace AaxDecrypter
         private string jsonDownloadState => Path.Combine(cacheDir, Path.GetFileNameWithoutExtension(OutputFileName) + ".json");
         private string tempFile => PathLib.ReplaceExtension(jsonDownloadState, ".aaxc");
 
-        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic)
+        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
         {
             ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
-            OutputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
+            OutputFileName = outFileName;
             var outDir = Path.GetDirectoryName(OutputFileName);
             if (!Directory.Exists(outDir))
                 throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
@@ -43,10 +49,11 @@ namespace AaxDecrypter
             cacheDir = cacheDirectory;
 
             downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+            OutputFormat = outputFormat;
 
             steps = new StepSequence
             {
-                Name = "Download and Convert Aaxc To M4b",
+                Name = "Download and Convert Aaxc To " + (outputFormat == OutputFormat.Mp4a ? "M4b" : "Mp3"),
 
                 ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
                 ["Step 2: Download Decrypted Audiobook"] = Step2_DownloadAndCombine,
@@ -125,7 +132,6 @@ namespace AaxDecrypter
 
         public bool Step2_DownloadAndCombine()
         {
-            OutputFormat format = OutputFormat.Mp4a;
 
             DecryptProgressUpdate?.Invoke(this, 0);
 
@@ -134,15 +140,20 @@ namespace AaxDecrypter
 
             FileStream outFile = File.OpenWrite(OutputFileName);
 
+            aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
+
             aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            var decryptionResult = aaxFile.DecryptAaxc(outFile, downloadLicense.AudibleKey, downloadLicense.AudibleIV, format, downloadLicense.ChapterInfo);
+
+            var decryptionResult = OutputFormat == OutputFormat.Mp4a ? aaxFile.ConvertToMp4a(outFile, downloadLicense.ChapterInfo) : aaxFile.ConvertToMp3(outFile);
             aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
+            aaxFile.Close();
+
             downloadLicense.ChapterInfo = aaxFile.Chapters;
 
             if (decryptionResult == ConversionResult.NoErrorsDetected
                 && coverArt is not null
-                && format == OutputFormat.Mp4a)
+                && OutputFormat == OutputFormat.Mp4a)
             {
                 //This handles a special case where the aaxc file doesn't contain cover art and
                 //Libation downloaded it instead (Animal Farm). Currently only works for Mp4a files.

DtoImporterService/ContributorImporter.cs

@@ -71,7 +71,8 @@ namespace DtoImporterService
 
 			foreach (var p in people)
 			{
-				var person = DbContext.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
+				// Should be 'Single' not 'First'. A user had a duplicate get in somehow though so I'm now using 'First' defensively
+				var person = DbContext.Contributors.Local.FirstOrDefault(c => c.Name == p.Name);
 				if (person == null)
 				{
 					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;

FileLiberator/DownloadDecryptBook.cs

@@ -87,8 +87,20 @@ namespace FileLiberator
                         aaxcDecryptDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
                 }
 
-                var proposedOutputFile = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].m4b");
-                aaxcDownloader = new AaxcDownloadConverter(proposedOutputFile, cacheDir, aaxcDecryptDlLic) { AppName = "Libation" };
+
+                var format = Configuration.Instance.DecryptToLossy ? OutputFormat.Mp3 : OutputFormat.Mp4a;
+
+                var extension = format switch
+                {
+                    OutputFormat.Mp4a => "m4b",
+                    OutputFormat.Mp3 => "mp3",
+                    _ => throw new NotImplementedException(),
+                };
+
+                 var proposedOutputFile = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
+
+
+                aaxcDownloader = new AaxcDownloadConverter(proposedOutputFile, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
                 aaxcDownloader.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
                 aaxcDownloader.DecryptTimeRemaining += (s, remaining) => UpdateRemainingTime?.Invoke(this, remaining);
                 aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;

FileManager/AudibleFileStorage.cs

@@ -28,16 +28,16 @@ namespace FileManager
 		public static AudibleFileStorage AAXC { get; } = new AaxcFileStorage();
 		public static AudibleFileStorage PDF { get; } = new PdfFileStorage();
 
-		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.DownloadsInProgressEnum, "DownloadsInProgress")).FullName;
+		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
 
-        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.DecryptInProgressEnum, "DecryptInProgress")).FullName;
+        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
 
         public static string BooksDirectory
         {
             get
             {
                 if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                    Configuration.Instance.Books = Path.Combine(Configuration.Instance.LibationFiles, "Books");
+                    Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
                 return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
             }
         }

FileManager/Configuration.cs

@@ -11,11 +11,28 @@ namespace FileManager
 {
     public class Configuration
     {
-        // settings will be persisted when all are true
-        // - property (not field)
-        // - string
-        // - public getter
-        // - public setter
+        public bool LibationSettingsAreValid
+            => File.Exists(APPSETTINGS_JSON)
+            && SettingsFileIsValid(SettingsFilePath);
+
+        public static bool SettingsFileIsValid(string settingsFile)
+        {
+            if (!Directory.Exists(Path.GetDirectoryName(settingsFile)) || !File.Exists(settingsFile))
+                return false;
+
+            var pDic = new PersistentDictionary(settingsFile, isReadOnly: true);
+
+            var booksDir = pDic.GetString(nameof(Books));
+            if (booksDir is null || !Directory.Exists(booksDir))
+                return false;
+
+            if (string.IsNullOrWhiteSpace(pDic.GetString(nameof(InProgress))))
+                return false;
+
+            return true;
+        }
+
+        #region persistent configuration settings/values
 
         #region // properties to test reflection
         /*
@@ -33,16 +50,39 @@ namespace FileManager
         */
         #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.
+        // config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
+        // exceptions: appsettings.json, LibationFiles dir, Settings.json
+
         private PersistentDictionary persistentDictionary;
 
-        public bool FilesExist
-            => File.Exists(APPSETTINGS_JSON)
-            && File.Exists(SettingsFilePath)
-            && Directory.Exists(LibationFiles)
-            && Directory.Exists(Books);
+        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 string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
+        public static string GetDescription(string propertyName)
+        {
+            var attribute = typeof(Configuration)
+                .GetProperty(propertyName)
+                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
+                .SingleOrDefault()
+                as DescriptionAttribute;
+
+            return attribute?.Description;
+        }
+
+        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
+
         [Description("Location for book storage. Includes destination of newly liberated books")]
         public string Books
         {
@@ -50,14 +90,34 @@ namespace FileManager
             set => persistentDictionary.Set(nameof(Books), value);
         }
 
-		#region known directories
-		public const string WIN_TEMP_LABEL = "WinTemp";
-        public const string LIBATION_FILES_LABEL = "LibationFiles";
-        public const string USER_PROFILE_LABEL = "UserProfile";
-        
-        public static string AppDir_Relative => @".\LibationFiles";
+        // temp/working dir(s) should be outside of dropbox
+        [Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
+        public string InProgress
+        {
+            get => persistentDictionary.GetString(nameof(InProgress));
+            set => persistentDictionary.Set(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);
+        }
+
+        [Description("Decrypt to lossy format?")]
+        public bool DecryptToLossy
+        {
+            get => persistentDictionary.Get<bool>(nameof(DecryptToLossy));
+            set => persistentDictionary.Set(nameof(DecryptToLossy), value);
+        }
+
+        #endregion
+
+        #region known directories
+        public static string AppDir_Relative => $@".\{LIBATION_FILES_KEY}";
         public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES_KEY));
-        public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles"));
+        public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
         public static string WinTemp => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
         public static string UserProfile => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation"));
 
@@ -88,7 +148,8 @@ namespace FileManager
             (KnownDirectories.AppDir, () => AppDir_Relative),
             (KnownDirectories.WinTemp, () => WinTemp),
             (KnownDirectories.MyDocs, () => MyDocs),
-            // this is important to not let very early calls try to accidentally load LibationFiles too early
+            // this is important to not let very early calls try to accidentally load LibationFiles too early.
+            // also, keep this at bottom of this list
             (KnownDirectories.LibationFiles, () => libationFilesPathCache)
         };
         public static string GetKnownDirectoryPath(KnownDirectories directory)
@@ -102,52 +163,21 @@ namespace FileManager
             if (string.IsNullOrWhiteSpace(directory))
                 return KnownDirectories.None;
 
-            var dirFunc = directoryOptionsPaths.SingleOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
+            // 'First' instead of 'Single' because LibationFiles could match other directories. eg: default value of LibationFiles == UserProfile.
+            // 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
+		#endregion
 
-        // default setting and directory creation occur in class responsible for files.
-        // config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
-        // exceptions: appsettings.json, LibationFiles dir, Settings.json
-
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
-        public string InProgress
-        {
-            get => persistentDictionary.GetString(nameof(InProgress));
-            set => persistentDictionary.Set(nameof(InProgress), value);
-        }
-
-        [Description("Temporary location of files while they're in process of being downloaded.\r\nWhen download is complete, the final file will be in [LibationFiles]\\DownloadsFinal")]
-        public string DownloadsInProgressEnum
-        {
-            get => persistentDictionary.GetString(nameof(DownloadsInProgressEnum));
-            set => persistentDictionary.Set(nameof(DownloadsInProgressEnum), value);
-        }
-
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being decrypted.\r\nWhen decryption is complete, the final file will be in Books location")]
-        public string DecryptInProgressEnum
-        {
-            get => persistentDictionary.GetString(nameof(DecryptInProgressEnum));
-            set => persistentDictionary.Set(nameof(DecryptInProgressEnum), value);
-        }
-
-        [Description("Allow Libation for fix up audiobook metadata?")]
-        public bool AllowLibationFixup
-        {
-            get => persistentDictionary.Get<bool>(nameof(AllowLibationFixup));
-            set => persistentDictionary.Set(nameof(AllowLibationFixup), value);
-        }
-        // 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
-
-        // singleton stuff
-        public static Configuration Instance { get; } = new Configuration();
+		#region singleton stuff
+		public static Configuration Instance { get; } = new Configuration();
         private Configuration() { }
+		#endregion
 
-        private const string APPSETTINGS_JSON = "appsettings.json";
-        // this is the key in appsettings. The string happens to match the metadirectory name but separate concern. keep separate
+		#region LibationFiles
+
+		private const string APPSETTINGS_JSON = "appsettings.json";
         private const string LIBATION_FILES_KEY = "LibationFiles";
 
         [Description("Location for storage of program-created files")]
@@ -205,21 +235,6 @@ namespace FileManager
             return valueFinal;
         }
 
-        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 static string GetDescription(string propertyName)
-        {
-            var attribute = typeof(Configuration)
-                .GetProperty(propertyName)
-                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
-                .SingleOrDefault()
-                as DescriptionAttribute;
-
-            return attribute?.Description;
-        }
-
         public bool TrySetLibationFiles(string directory)
         {
             // this is WRONG. need to MOVE settings; not DELETE them
@@ -244,10 +259,15 @@ namespace FileManager
 
             var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
             if (startingContents != endingContents)
+            {
+                try { Serilog.Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory }); }
+                catch { }
                 File.WriteAllText(APPSETTINGS_JSON, endingContents);
+            }
 
 
             return true;
         }
+        #endregion
     }
 }

FileManager/PersistentDictionary.cs

@@ -10,14 +10,16 @@ namespace FileManager
     public class PersistentDictionary
     {
         public string Filepath { get; }
+        public bool IsReadOnly { get; }
 
         // optimize for strings. expectation is most settings will be strings and a rare exception will be something else
         private Dictionary<string, string> stringCache { get; } = new Dictionary<string, string>();
         private Dictionary<string, object> objectCache { get; } = new Dictionary<string, object>();
 
-        public PersistentDictionary(string filepath)
+        public PersistentDictionary(string filepath, bool isReadOnly = false)
         {
             Filepath = filepath;
+            IsReadOnly = isReadOnly;
 
             if (File.Exists(Filepath))
                 return;
@@ -25,6 +27,9 @@ namespace FileManager
             // will create any missing directories, incl subdirectories. if all already exist: no action
             Directory.CreateDirectory(Path.GetDirectoryName(filepath));
 
+            if (IsReadOnly)
+                return;
+
             File.WriteAllText(Filepath, "{}");
             System.Threading.Thread.Sleep(100);
         }
@@ -34,7 +39,9 @@ namespace FileManager
             if (!stringCache.ContainsKey(propertyName))
             {
                 var jObject = readFile();
-                stringCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<string>() : null;
+                if (!jObject.ContainsKey(propertyName))
+                    return null;
+                stringCache[propertyName] = jObject[propertyName].Value<string>();
             }
 
             return stringCache[propertyName];
@@ -42,10 +49,10 @@ namespace FileManager
 
         public T Get<T>(string propertyName)
         {
-            var o = GetObject(propertyName);
-            if (o is null) return default;
-            if (o is JToken jt) return jt.Value<T>();
-            return (T)o;
+            var obj = GetObject(propertyName);
+            if (obj is null) return default;
+            if (obj is JToken jToken) return jToken.Value<T>();
+            return (T)obj;
         }
 
         public object GetObject(string propertyName)
@@ -53,17 +60,21 @@ namespace FileManager
             if (!objectCache.ContainsKey(propertyName))
             {
                 var jObject = readFile();
-                objectCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<object>() : null;
+                if (!jObject.ContainsKey(propertyName))
+                    return null;
+                objectCache[propertyName] = jObject[propertyName].Value<object>();
             }
 
             return objectCache[propertyName];
         }
 
+        public bool Exists(string propertyName) => readFile().ContainsKey(propertyName);
+
         private object locker { get; } = new object();
         public void Set(string propertyName, string newValue)
         {
             // only do this check in string cache, NOT object cache
-            if (stringCache[propertyName] == newValue)
+            if (stringCache.ContainsKey(propertyName) && stringCache[propertyName] == newValue)
                 return;
 
             // set cache
@@ -83,6 +94,9 @@ namespace FileManager
 
         private void writeFile(string propertyName, JToken newValue)
         {
+            if (IsReadOnly)
+                return;
+
             try
             {
                 var str = newValue?.ToString();
@@ -113,6 +127,9 @@ namespace FileManager
         // special case: no caching. no logging
         public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
         {
+            if (IsReadOnly)
+                return;
+
             lock (locker)
             {
                 var jObject = readFile();

LibationLauncher/LibationLauncher.csproj

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

LibationLauncher/Program.cs

@@ -26,201 +26,119 @@ namespace LibationLauncher
 			Application.SetCompatibleTextRenderingDefault(false);
 
 			// must occur before access to Configuration instance
-			migrate_to_v5_2_0();
+			migrate_to_v5_2_0__pre_config();
 
-			createSettings();
+
+			//***********************************************//
+			//                                               //
+			//   do not use Configuration before this line   //
+			//                                               //
+			//***********************************************//
+
+
+			var config = Configuration.Instance;
+
+			createSettings(config);
 
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
 
-			migrate_to_v4_0_0();
-			migrate_to_v5_0_0();
-			
-			ensureSerilogConfig();
-			configureLogging();
-			checkForUpdate();
-			logStartupState();
+			migrate_to_v5_0_0(config);
+			migrate_to_v5_2_0__post_config(config);
+
+			ensureSerilogConfig(config);
+			configureLogging(config);
+			checkForUpdate(config);
+			logStartupState(config);
 
 			Application.Run(new Form1());
 		}
 
-		private static void createSettings()
+		private static void createSettings(Configuration config)
 		{
-			static bool configSetupIsComplete(Configuration config)
-				=> config.FilesExist
-				&& !string.IsNullOrWhiteSpace(config.DownloadsInProgressEnum)
-				&& !string.IsNullOrWhiteSpace(config.DecryptInProgressEnum);
+			// all returns should be preceded by either:
+			// - if config.LibationSettingsAreValid
+			// - error message, Exit()
 
-			var config = Configuration.Instance;
-			if (configSetupIsComplete(config))
+			static void CancelInstallation()
+			{
+				MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				Application.Exit();
+				Environment.Exit(0);
+			}
+
+			if (config.LibationSettingsAreValid)
 				return;
 
-			var isAdvanced = false;
+			var defaultLibationFilesDir = Configuration.UserProfile;
+
+			// check for existing settigns in default location
+			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
+			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
+				config.TrySetLibationFiles(defaultLibationFilesDir);
+
+			if (config.LibationSettingsAreValid)
+				return;
 
 			var setupDialog = new SetupDialog();
-			setupDialog.NoQuestionsBtn_Click += (_, __) =>
+			if (setupDialog.ShowDialog() != DialogResult.OK)
 			{
-				config.DownloadsInProgressEnum ??= Configuration.WIN_TEMP_LABEL;
-				config.DecryptInProgressEnum ??= Configuration.WIN_TEMP_LABEL;
-				config.Books ??= Configuration.AppDir_Relative;
+				CancelInstallation();
+				return;
+			}
+
+			if (setupDialog.IsNewUser)
+				config.TrySetLibationFiles(defaultLibationFilesDir);
+			else if (setupDialog.IsReturningUser)
+			{
+				var libationFilesDialog = new LibationFilesDialog();
+
+				if (libationFilesDialog.ShowDialog() != DialogResult.OK)
+				{
+					CancelInstallation();
+					return;
+				}
+
+				config.TrySetLibationFiles(libationFilesDialog.SelectedDirectory);
+				if (config.LibationSettingsAreValid)
+					return;
+
+				// path did not result in valid settings
+				MessageBox.Show(
+					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
+					"New install?",
+					MessageBoxButtons.YesNo,
+					MessageBoxIcon.Question);
+
+				if (libationFilesDialog.ShowDialog() != DialogResult.Yes)
+				{
+					CancelInstallation();
+					return;
+				}
+			}
+
+			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
+			config.Books ??= Path.Combine(defaultLibationFilesDir, "Books");
+			config.InProgress ??= Configuration.WinTemp;
+			config.AllowLibationFixup = true;
+			config.DecryptToLossy = false;
+
+			if (new SettingsDialog().ShowDialog() != DialogResult.OK)
+			{
+				CancelInstallation();
+				return;
+			}
+
+			if (config.LibationSettingsAreValid)
+				return;
+
+			CancelInstallation();
+		}
+
+		#region migrate_to_v5_0_0 re-register device if device info not in settings
+		private static void migrate_to_v5_0_0(Configuration config)
+		{
+			if (!config.Exists(nameof(config.AllowLibationFixup)))
 				config.AllowLibationFixup = true;
-			};
-			// setupDialog.BasicBtn_Click += (_, __) => // no action needed
-			setupDialog.AdvancedBtn_Click += (_, __) => isAdvanced = true;
-			setupDialog.ShowDialog();
-
-			if (isAdvanced)
-			{
-				var dialog = new LibationFilesDialog();
-				if (dialog.ShowDialog() != DialogResult.OK)
-					MessageBox.Show("Libation Files location not changed");
-			}
-
-			if (configSetupIsComplete(config))
-				return;
-
-			if (new SettingsDialog().ShowDialog() == DialogResult.OK)
-				return;
-
-			MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-			Application.Exit();
-			Environment.Exit(0);
-		}
-
-		#region v3 => v4 migration
-		static string AccountsSettingsFileLegacy30 => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
-
-		private static void migrate_to_v4_0_0()
-		{
-			migrateLegacyIdentityFile();
-
-			updateSettingsFile();
-		}
-
-		private static void migrateLegacyIdentityFile()
-		{
-			if (File.Exists(AccountsSettingsFileLegacy30))
-			{
-				// don't always rely on applicable POCOs. some is legacy and must be: json file => JObject
-				try
-				{
-					updateLegacyFileWithLocale();
-
-					var account = createAccountFromLegacySettings();
-					account.DecryptKey = getDecryptKey(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 { }
-
-				// delete legacy token file
-				File.Delete(AccountsSettingsFileLegacy30);
-			}
-		}
-
-		private static void updateLegacyFileWithLocale()
-		{
-			var legacyContents = File.ReadAllText(AccountsSettingsFileLegacy30);
-			var legacyJObj = JObject.Parse(legacyContents);
-
-			// attempt to update legacy token file with locale from settings
-			if (!legacyJObj.ContainsKey("LocaleName"))
-			{
-				var settings = File.ReadAllText(Configuration.Instance.SettingsFilePath);
-				var settingsJObj = JObject.Parse(settings);
-				if (settingsJObj.TryGetValue("LocaleCountryCode", out var localeName))
-				{
-					// update legacy token file with locale from settings
-					legacyJObj.AddFirst(new JProperty("LocaleName", localeName.Value<string>()));
-
-					// save
-					var newContents = legacyJObj.ToString(Formatting.Indented);
-					File.WriteAllText(AccountsSettingsFileLegacy30, newContents);
-				}
-			}
-		}
-
-		private static Account createAccountFromLegacySettings()
-		{
-			// get required locale from settings file
-			var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
-			if (!JObject.Parse(settingsContents).TryGetValue("LocaleCountryCode", out var jLocale))
-				return null;
-
-			var localeName = jLocale.Value<string>();
-			var locale = Localization.Get(localeName);
-
-			var api = EzApiCreator.GetApiAsync(locale, AccountsSettingsFileLegacy30).GetAwaiter().GetResult();
-			var email = api.GetEmailAsync().GetAwaiter().GetResult();
-
-			// identity has likely been updated above. re-get contents
-			var legacyContents = File.ReadAllText(AccountsSettingsFileLegacy30);
-
-			var identity = Identity.FromJson(legacyContents);
-
-			if (!identity.IsValid)
-				return null;
-
-			var account = new Account(email)
-			{
-				AccountName = $"{email} - {locale.Name}",
-				LibraryScan = true,
-				IdentityTokens = identity
-			};
-
-			return account;
-		}
-
-		private static string getDecryptKey(Account account)
-		{
-			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))
-				return jToken.Value<string>() ?? "";
-
-			return "";
-		}
-
-		private static void updateSettingsFile()
-		{
-			if (!File.Exists(Configuration.Instance.SettingsFilePath))
-				return;
-
-			// use JObject to remove decrypt key and locale from Settings.json
-			var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
-			var jObj = JObject.Parse(settingsContents);
-
-			var jLocale = jObj.Property("LocaleCountryCode");
-			var jDecryptKey = jObj.Property("DecryptKey");
-
-			jDecryptKey?.Remove();
-			jLocale?.Remove();
-
-			if (jDecryptKey != null || jLocale != null)
-			{
-				var newContents = jObj.ToString(Formatting.Indented);
-				File.WriteAllText(Configuration.Instance.SettingsFilePath, newContents);
-			}
-		}
-		#endregion
-
-		#region migrate_to_v5_0_0 re-gegister device if device info not in settings
-		private static void migrate_to_v5_0_0()
-		{
-			var persistentDictionary = new PersistentDictionary(Configuration.Instance.SettingsFilePath);
-
-			var config = Configuration.Instance;
-			if (persistentDictionary.GetString(nameof(config.AllowLibationFixup)) is null)
-            {
-				persistentDictionary.Set(nameof(config.AllowLibationFixup), true);
-			}
 
 			if (!File.Exists(AudibleApiStorage.AccountsSettingsFile))
 				return;
@@ -260,19 +178,21 @@ namespace LibationLauncher
 		}
 		#endregion
 
-		#region migrate to v5.2.0 : get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
-		private static void migrate_to_v5_2_0()
+		#region migrate to v5.2.0
+		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
+		private static void migrate_to_v5_2_0__pre_config()
 		{
 			{
 				var settingsKey = "DownloadsInProgressEnum";
 				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-					UNSAFE_MigrationHelper.Settings_Update(settingsKey, translatePath(value));
+				{
+					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
+					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
+				}
 			}
 
 			{
-				var settingsKey = "DecryptInProgressEnum";
-				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-					UNSAFE_MigrationHelper.Settings_Update(settingsKey, translatePath(value));
+				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
 			}
 
 			{ // appsettings.json
@@ -291,12 +211,19 @@ namespace LibationLauncher
 				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
 				_ => path
 			};
+
+		private static void migrate_to_v5_2_0__post_config(Configuration config)
+		{
+			if (!config.Exists(nameof(config.AllowLibationFixup)))
+				config.AllowLibationFixup = true;
+
+			if (!config.Exists(nameof(config.DecryptToLossy)))
+				config.DecryptToLossy = false;
+		}
 		#endregion
 
-		private static void ensureSerilogConfig()
+		private static void ensureSerilogConfig(Configuration config)
 		{
-			var config = Configuration.Instance;
-
 			if (config.GetObject("Serilog") != null)
 				return;
 
@@ -349,10 +276,8 @@ namespace LibationLauncher
 			config.SetObject("Serilog", serilogObj);
 		}
 
-		private static void configureLogging()
+		private static void configureLogging(Configuration config)
 		{
-			var config = Configuration.Instance;
-
 			// override path. always use current libation files
 			var logPath = Path.Combine(Configuration.Instance.LibationFiles, "Log.log");
 			config.SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath);
@@ -383,15 +308,17 @@ namespace LibationLauncher
 			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
 		}
 
-		private static void checkForUpdate()
+		private static void checkForUpdate(Configuration config)
 		{
+			string zipUrl;
+			string selectedPath;
+
 			try
 			{
-				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);
+				// 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))
@@ -403,47 +330,57 @@ namespace LibationLauncher
 
 				// we have an update
 				var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
-				var zipUrl = zip?.BrowserDownloadUrl;
+				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.Information);
+				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;
-				var selectedPath = fileSelector.FileName;
-
-				try
-				{
-					LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
-				}
-				catch (Exception ex)
-				{
-					Error(ex, "Error downloading update");
-				}
+				selectedPath = fileSelector.FileName;
 			}
 			catch (Exception ex)
 			{
-				Error(ex, "Error checking for update");
+				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 void Error(Exception ex, string message)
+		private static Octokit.Release getLatestRelease(TimeSpan timeout)
 		{
-			Log.Logger.Error(ex, message);
-			MessageBox.Show($"{message}\r\nSee log for details");
+			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()
+		private static void logStartupState(Configuration config)
 		{
-			var config = Configuration.Instance;
-
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin Libation. {@DebugInfo}", new
@@ -460,11 +397,11 @@ namespace LibationLauncher
 				config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,
 
-				config.DownloadsInProgressEnum,
+				config.InProgress,
+
 				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
 				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
 
-				config.DecryptInProgressEnum,
 				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
 				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
 			});

LibationWinForms/Dialogs/AccountsDialog.cs

@@ -125,7 +125,7 @@ namespace LibationWinForms.Dialogs
 			}
 			catch (Exception ex)
 			{
-				MessageBox.Show($"Error: {ex.Message}", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				MessageBoxAlertAdmin.Show("Error attempting to save accounts", "Error saving accounts", ex);
 			}
 		}
 

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.cs

@@ -9,9 +9,11 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class DirectoryOrCustomSelectControl : UserControl
 	{
+		public bool SelectedDirectoryIsKnown => knownDirectoryRb.Checked;
+		public bool SelectedDirectoryIsCustom => customDirectoryRb.Checked;
 		public string SelectedDirectory
-			=> customDirectoryRb.Checked ? customTb.Text.Trim()
-			: knownDirectoryRb.Checked ? directorySelectControl.SelectedDirectory
+			=> SelectedDirectoryIsKnown ? directorySelectControl.SelectedDirectory
+			: SelectedDirectoryIsCustom ? customTb.Text.Trim()
 			: null;
 
 		public DirectoryOrCustomSelectControl()
@@ -25,8 +27,8 @@ namespace LibationWinForms.Dialogs
 		/// <summary>Set items for combobox</summary>
 		/// <param name="knownDirectories">List rather than IEnumerable so that client can determine display order</param>
 		/// <param name="defaultDirectory"></param>
-		public void SetDirectoryItems(List<Configuration.KnownDirectories> knownDirectories, Configuration.KnownDirectories? defaultDirectory = Configuration.KnownDirectories.UserProfile)
-			=> this.directorySelectControl.SetDirectoryItems(knownDirectories, defaultDirectory);
+		public void SetDirectoryItems(List<Configuration.KnownDirectories> knownDirectories, Configuration.KnownDirectories? defaultDirectory = Configuration.KnownDirectories.UserProfile, string subDirectory = null)
+			=> this.directorySelectControl.SetDirectoryItems(knownDirectories, defaultDirectory, subDirectory);
 
 		/// <summary>set selection</summary>
 		/// <param name="directory"></param>
@@ -41,7 +43,13 @@ namespace LibationWinForms.Dialogs
 		public void SelectDirectory(string directory)
 		{
 			directory = directory?.Trim() ?? "";
-			selectDir(Configuration.GetKnownDirectory(directory), directory);
+
+			// remove SubDirectory setting to find known directories
+			var noSubDir = this.directorySelectControl.RemoveSubDirectoryFromPath(directory);
+			var knownDir = Configuration.GetKnownDirectory(noSubDir);
+			// DO NOT remove SubDirectory setting for custom
+			var customDir = directory;
+			selectDir(knownDir, customDir);
 		}
 
 		private void selectDir(Configuration.KnownDirectories knownDir, string customDir)

LibationWinForms/Dialogs/DirectorySelectControl.cs

@@ -13,14 +13,17 @@ namespace LibationWinForms.Dialogs
 		{
 			public string Description { get; }
 			public Configuration.KnownDirectories Value { get; }
+			private DirectorySelectControl _parentControl;
 
-			public string FullPath => Configuration.GetKnownDirectoryPath(Value);
+			public string FullPath => _parentControl.AddSubDirectoryToPath(Configuration.GetKnownDirectoryPath(Value));
 
 			/// <summary>Displaying relative paths is confusing. UI should display absolute equivalent</summary>
-			public string UiDisplayPath => Value == Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute : FullPath;
+			public string UiDisplayPath => Value == Configuration.KnownDirectories.AppDir ? _parentControl.AddSubDirectoryToPath(Configuration.AppDir_Absolute) : FullPath;
 
-			public DirectoryComboBoxItem(Configuration.KnownDirectories knownDirectory)
+			public DirectoryComboBoxItem(DirectorySelectControl parentControl, Configuration.KnownDirectories knownDirectory)
 			{
+				_parentControl = parentControl;
+
 				Value = knownDirectory;
 				Description = Value.GetDescription();
 			}
@@ -28,20 +31,42 @@ namespace LibationWinForms.Dialogs
 			public override string ToString() => Description;
 		}
 
-		private DirectoryComboBoxItem selectedItem => (DirectoryComboBoxItem)this.directoryComboBox.SelectedItem;
 		public string SelectedDirectory => selectedItem?.FullPath;
 
+		private string _subDirectory;
+		internal string AddSubDirectoryToPath(string path) => string.IsNullOrWhiteSpace(_subDirectory) ? path : System.IO.Path.Combine(path, _subDirectory);
+		internal string RemoveSubDirectoryFromPath(string path)
+		{
+			if (string.IsNullOrWhiteSpace(_subDirectory))
+				return path;
+
+			path = path?.Trim() ?? "";
+			if (string.IsNullOrWhiteSpace(path))
+				return path;
+
+			var bottomDir = System.IO.Path.GetFileName(path);
+			if (_subDirectory.EqualsInsensitive(bottomDir))
+				return System.IO.Path.GetDirectoryName(path);
+
+			return path;
+		}
+
+		private DirectoryComboBoxItem selectedItem => (DirectoryComboBoxItem)this.directoryComboBox.SelectedItem;
+
 		public DirectorySelectControl() => InitializeComponent();
 
 		/// <summary>Set items for combobox</summary>
 		/// <param name="knownDirectories">List rather than IEnumerable so that client can determine display order</param>
 		/// <param name="defaultDirectory">Optional default item to select</param>
-		public void SetDirectoryItems(List<Configuration.KnownDirectories> knownDirectories, Configuration.KnownDirectories? defaultDirectory = null)
+		public void SetDirectoryItems(List<Configuration.KnownDirectories> knownDirectories, Configuration.KnownDirectories? defaultDirectory = null, string subDirectory = null)
 		{
+			// set this 1st so all DirectoryComboBoxItems can reference it
+			_subDirectory = subDirectory;
+
 			this.directoryComboBox.Items.Clear();
 
 			foreach (var dir in knownDirectories.Where(d => d != Configuration.KnownDirectories.None).Distinct())
-				this.directoryComboBox.Items.Add(new DirectoryComboBoxItem(dir));
+				this.directoryComboBox.Items.Add(new DirectoryComboBoxItem(this, dir));
 
 			SelectDirectory(defaultDirectory);
 		}
@@ -49,7 +74,14 @@ namespace LibationWinForms.Dialogs
 		/// <summary>set selection</summary>
 		/// <param name="directory"></param>
 		/// <returns>True is there was a matching entry</returns>
-		public bool SelectDirectory(string directory) => SelectDirectory(Configuration.GetKnownDirectory(directory));
+		public bool SelectDirectory(string directory)
+		{
+			directory = directory?.Trim() ?? "";
+
+			var noSubDir = RemoveSubDirectoryFromPath(directory);
+			var knownDir = Configuration.GetKnownDirectory(noSubDir);
+			return SelectDirectory(knownDir);
+		}
 
 		/// <summary>set selection</summary>
 		/// <param name="directory"></param>

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -35,9 +35,10 @@ namespace LibationWinForms.Dialogs
 				}
 				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);
+					MessageBoxAlertAdmin.Show(
+						"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
+						"Error importing library",
+						ex);
 				}
 			}
 

LibationWinForms/Dialogs/LibationFilesDialog.Designer.cs

@@ -31,7 +31,7 @@
 			this.libationFilesDescLbl = new System.Windows.Forms.Label();
 			this.cancelBtn = new System.Windows.Forms.Button();
 			this.saveBtn = new System.Windows.Forms.Button();
-			this.directoryOrCustomSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
+			this.libationFilesSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
 			this.SuspendLayout();
 			// 
 			// libationFilesDescLbl
@@ -52,7 +52,7 @@
 			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);
-			this.cancelBtn.TabIndex = 10;
+			this.cancelBtn.TabIndex = 3;
 			this.cancelBtn.Text = "Cancel";
 			this.cancelBtn.UseVisualStyleBackColor = true;
 			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
@@ -64,26 +64,26 @@
 			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);
-			this.saveBtn.TabIndex = 9;
+			this.saveBtn.TabIndex = 2;
 			this.saveBtn.Text = "Save";
 			this.saveBtn.UseVisualStyleBackColor = true;
 			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
 			// 
-			// directoryOrCustomSelectControl
+			// libationFilesSelectControl
 			// 
-			this.directoryOrCustomSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.libationFilesSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.directoryOrCustomSelectControl.Location = new System.Drawing.Point(14, 28);
-			this.directoryOrCustomSelectControl.Name = "directoryOrCustomSelectControl";
-			this.directoryOrCustomSelectControl.Size = new System.Drawing.Size(909, 81);
-			this.directoryOrCustomSelectControl.TabIndex = 11;
+			this.libationFilesSelectControl.Location = new System.Drawing.Point(14, 28);
+			this.libationFilesSelectControl.Name = "libationFilesSelectControl";
+			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 81);
+			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.Controls.Add(this.directoryOrCustomSelectControl);
+			this.Controls.Add(this.libationFilesSelectControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);
 			this.Controls.Add(this.libationFilesDescLbl);
@@ -103,6 +103,6 @@
 		private System.Windows.Forms.Label libationFilesDescLbl;
 		private System.Windows.Forms.Button cancelBtn;
 		private System.Windows.Forms.Button saveBtn;
-		private DirectoryOrCustomSelectControl directoryOrCustomSelectControl;
+		private DirectoryOrCustomSelectControl libationFilesSelectControl;
 	}
 }

LibationWinForms/Dialogs/LibationFilesDialog.cs

@@ -6,8 +6,7 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class LibationFilesDialog : Form
 	{
-		private Configuration config { get; } = Configuration.Instance;
-		private Func<string, string> desc { get; } = Configuration.GetDescription;
+		public string SelectedDirectory { get; private set; }
 
 		public LibationFilesDialog() => InitializeComponent();
 
@@ -16,27 +15,32 @@ namespace LibationWinForms.Dialogs
 			if (this.DesignMode)
 				return;
 
-			libationFilesDescLbl.Text = desc(nameof(config.LibationFiles));
+			var config = Configuration.Instance;
 
-			directoryOrCustomSelectControl.SetSearchTitle("Libation Files");
-			directoryOrCustomSelectControl.SetDirectoryItems(new()
+			libationFilesDescLbl.Text = Configuration.GetDescription(nameof(config.LibationFiles));
+
+			libationFilesSelectControl.SetSearchTitle("Libation Files");
+			libationFilesSelectControl.SetDirectoryItems(new()
 			{
 				Configuration.KnownDirectories.UserProfile,
 				Configuration.KnownDirectories.AppDir,
 				Configuration.KnownDirectories.MyDocs
 			}, Configuration.KnownDirectories.UserProfile);
-			directoryOrCustomSelectControl.SelectDirectory(config.LibationFiles);
+			libationFilesSelectControl.SelectDirectory(config.LibationFiles);
 		}
 
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
-			var libationDir = directoryOrCustomSelectControl.SelectedDirectory;
-			if (!config.TrySetLibationFiles(libationDir))
+			var libationDir = libationFilesSelectControl.SelectedDirectory;
+
+			if (!System.IO.Directory.Exists(libationDir))
 			{
-				MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir);
+				MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir, "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
 
+			SelectedDirectory = libationDir;
+
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.Designer.cs

@@ -0,0 +1,155 @@
+
+namespace LibationWinForms.Dialogs
+{
+	partial class MessageBoxAlertAdminDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessageBoxAlertAdminDialog));
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			this.descriptionLbl = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.githubLink = new System.Windows.Forms.LinkLabel();
+			this.okBtn = new System.Windows.Forms.Button();
+			this.logsLink = new System.Windows.Forms.LinkLabel();
+			this.exceptionTb = new System.Windows.Forms.TextBox();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Location = new System.Drawing.Point(12, 12);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(64, 64);
+			this.pictureBox1.TabIndex = 0;
+			this.pictureBox1.TabStop = false;
+			// 
+			// descriptionLbl
+			// 
+			this.descriptionLbl.AutoSize = true;
+			this.descriptionLbl.Location = new System.Drawing.Point(82, 12);
+			this.descriptionLbl.Name = "descriptionLbl";
+			this.descriptionLbl.Size = new System.Drawing.Size(89, 45);
+			this.descriptionLbl.TabIndex = 0;
+			this.descriptionLbl.Text = "[Error message]\r\n[Error message]\r\n[Error message]";
+			// 
+			// label1
+			// 
+			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 244);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(269, 90);
+			this.label1.TabIndex = 2;
+			this.label1.Text = resources.GetString("label1.Text");
+			// 
+			// githubLink
+			// 
+			this.githubLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.githubLink.AutoSize = true;
+			this.githubLink.Location = new System.Drawing.Point(271, 274);
+			this.githubLink.Name = "githubLink";
+			this.githubLink.Size = new System.Drawing.Size(116, 15);
+			this.githubLink.TabIndex = 3;
+			this.githubLink.TabStop = true;
+			this.githubLink.Text = "Click to go to github";
+			this.githubLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.githubLink_LinkClicked);
+			// 
+			// okBtn
+			// 
+			this.okBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.okBtn.Location = new System.Drawing.Point(256, 347);
+			this.okBtn.Name = "okBtn";
+			this.okBtn.Size = new System.Drawing.Size(75, 23);
+			this.okBtn.TabIndex = 5;
+			this.okBtn.Text = "OK";
+			this.okBtn.UseVisualStyleBackColor = true;
+			this.okBtn.Click += new System.EventHandler(this.okBtn_Click);
+			// 
+			// logsLink
+			// 
+			this.logsLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.logsLink.AutoSize = true;
+			this.logsLink.Location = new System.Drawing.Point(271, 289);
+			this.logsLink.Name = "logsLink";
+			this.logsLink.Size = new System.Drawing.Size(155, 15);
+			this.logsLink.TabIndex = 4;
+			this.logsLink.TabStop = true;
+			this.logsLink.Text = "Click to open log files folder";
+			this.logsLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.logsLink_LinkClicked);
+			// 
+			// exceptionTb
+			// 
+			this.exceptionTb.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.exceptionTb.Location = new System.Drawing.Point(12, 82);
+			this.exceptionTb.Multiline = true;
+			this.exceptionTb.Name = "exceptionTb";
+			this.exceptionTb.ReadOnly = true;
+			this.exceptionTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.exceptionTb.Size = new System.Drawing.Size(560, 159);
+			this.exceptionTb.TabIndex = 1;
+			// 
+			// MessageBoxAlertAdminDialog
+			// 
+			this.AcceptButton = this.okBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(584, 382);
+			this.Controls.Add(this.exceptionTb);
+			this.Controls.Add(this.logsLink);
+			this.Controls.Add(this.okBtn);
+			this.Controls.Add(this.githubLink);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.descriptionLbl);
+			this.Controls.Add(this.pictureBox1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MessageBoxAlertAdminDialog";
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "MessageBoxAlertAdmin";
+			this.Load += new System.EventHandler(this.MessageBoxAlertAdminDialog_Load);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.PictureBox pictureBox1;
+		private System.Windows.Forms.Label descriptionLbl;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.LinkLabel githubLink;
+		private System.Windows.Forms.Button okBtn;
+		private System.Windows.Forms.LinkLabel logsLink;
+		private System.Windows.Forms.TextBox exceptionTb;
+	}
+}

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using Dinah.Core;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class MessageBoxAlertAdminDialog : Form
+	{
+		public MessageBoxAlertAdminDialog() => InitializeComponent();
+
+		/// <summary>
+		/// Displays a message box with specified text and caption.
+		/// </summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="exception">Exception to display</param>
+		public MessageBoxAlertAdminDialog(string text, string caption, Exception exception) : this()
+		{
+			this.descriptionLbl.Text = text;
+			this.Text = caption;
+			this.exceptionTb.Text = $"{exception.Message}\r\n\r\n{exception.StackTrace}";
+		}
+
+		private void MessageBoxAlertAdminDialog_Load(object sender, EventArgs e)
+		{
+			if (this.DesignMode)
+				return;
+
+			System.Media.SystemSounds.Hand.Play();
+			pictureBox1.Image = SystemIcons.Error.ToBitmap();
+		}
+
+		private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+			=> Go.To.Url("https://github.com/rmcrackan/Libation/issues");
+
+		private void logsLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+			=> Go.To.Folder(FileManager.Configuration.Instance.LibationFiles);
+
+		private void okBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+	}
+}

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.resx

@@ -57,4 +57,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="label1.Text" xml:space="preserve">
+    <value>If you'd like to report this error to an advinistrator:
+
+Step 1: Go to Libation's "issues" page on github
+Step 2: Find your log files
+Setp 3: Click "New issue" button
+Step 4: Drag/drop your log files</value>
+  </data>
 </root>

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -28,174 +28,50 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.booksLocationLbl = new System.Windows.Forms.Label();
-			this.booksLocationTb = new System.Windows.Forms.TextBox();
-			this.booksLocationSearchBtn = new System.Windows.Forms.Button();
 			this.booksLocationDescLbl = new System.Windows.Forms.Label();
-			this.downloadsInProgressGb = new System.Windows.Forms.GroupBox();
-			this.downloadsInProgressLibationFilesRb = new System.Windows.Forms.RadioButton();
-			this.downloadsInProgressWinTempRb = new System.Windows.Forms.RadioButton();
-			this.downloadsInProgressDescLbl = new System.Windows.Forms.Label();
-			this.decryptInProgressGb = new System.Windows.Forms.GroupBox();
-			this.decryptInProgressLibationFilesRb = new System.Windows.Forms.RadioButton();
-			this.decryptInProgressWinTempRb = new System.Windows.Forms.RadioButton();
-			this.decryptInProgressDescLbl = new System.Windows.Forms.Label();
+			this.inProgressDescLbl = new System.Windows.Forms.Label();
 			this.saveBtn = new System.Windows.Forms.Button();
 			this.cancelBtn = new System.Windows.Forms.Button();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.advancedSettingsGb = new System.Windows.Forms.GroupBox();
+			this.convertLossyRb = new System.Windows.Forms.RadioButton();
+			this.convertLosslessRb = new System.Windows.Forms.RadioButton();
+			this.inProgressSelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
 			this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
-			this.downloadsInProgressGb.SuspendLayout();
-			this.decryptInProgressGb.SuspendLayout();
-			this.groupBox1.SuspendLayout();
+			this.booksSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
+			this.booksGb = new System.Windows.Forms.GroupBox();
+			this.logsBtn = new System.Windows.Forms.Button();
+			this.advancedSettingsGb.SuspendLayout();
+			this.booksGb.SuspendLayout();
 			this.SuspendLayout();
 			// 
-			// booksLocationLbl
-			// 
-			this.booksLocationLbl.AutoSize = true;
-			this.booksLocationLbl.Location = new System.Drawing.Point(14, 20);
-			this.booksLocationLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.booksLocationLbl.Name = "booksLocationLbl";
-			this.booksLocationLbl.Size = new System.Drawing.Size(85, 15);
-			this.booksLocationLbl.TabIndex = 0;
-			this.booksLocationLbl.Text = "Books location";
-			// 
-			// booksLocationTb
-			// 
-			this.booksLocationTb.Location = new System.Drawing.Point(111, 16);
-			this.booksLocationTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.booksLocationTb.Name = "booksLocationTb";
-			this.booksLocationTb.Size = new System.Drawing.Size(760, 23);
-			this.booksLocationTb.TabIndex = 1;
-			// 
-			// booksLocationSearchBtn
-			// 
-			this.booksLocationSearchBtn.Location = new System.Drawing.Point(878, 14);
-			this.booksLocationSearchBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.booksLocationSearchBtn.Name = "booksLocationSearchBtn";
-			this.booksLocationSearchBtn.Size = new System.Drawing.Size(41, 27);
-			this.booksLocationSearchBtn.TabIndex = 2;
-			this.booksLocationSearchBtn.Text = "...";
-			this.booksLocationSearchBtn.UseVisualStyleBackColor = true;
-			this.booksLocationSearchBtn.Click += new System.EventHandler(this.booksLocationSearchBtn_Click);
-			// 
 			// booksLocationDescLbl
 			// 
 			this.booksLocationDescLbl.AutoSize = true;
-			this.booksLocationDescLbl.Location = new System.Drawing.Point(107, 43);
+			this.booksLocationDescLbl.Location = new System.Drawing.Point(7, 19);
 			this.booksLocationDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.booksLocationDescLbl.Name = "booksLocationDescLbl";
-			this.booksLocationDescLbl.Size = new System.Drawing.Size(39, 15);
-			this.booksLocationDescLbl.TabIndex = 3;
-			this.booksLocationDescLbl.Text = "[desc]";
+			this.booksLocationDescLbl.Size = new System.Drawing.Size(69, 15);
+			this.booksLocationDescLbl.TabIndex = 2;
+			this.booksLocationDescLbl.Text = "[book desc]";
 			// 
-			// downloadsInProgressGb
+			// inProgressDescLbl
 			// 
-			this.downloadsInProgressGb.Controls.Add(this.downloadsInProgressLibationFilesRb);
-			this.downloadsInProgressGb.Controls.Add(this.downloadsInProgressWinTempRb);
-			this.downloadsInProgressGb.Controls.Add(this.downloadsInProgressDescLbl);
-			this.downloadsInProgressGb.Location = new System.Drawing.Point(10, 49);
-			this.downloadsInProgressGb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.downloadsInProgressGb.Name = "downloadsInProgressGb";
-			this.downloadsInProgressGb.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.downloadsInProgressGb.Size = new System.Drawing.Size(884, 135);
-			this.downloadsInProgressGb.TabIndex = 4;
-			this.downloadsInProgressGb.TabStop = false;
-			this.downloadsInProgressGb.Text = "Downloads in progress";
-			// 
-			// downloadsInProgressLibationFilesRb
-			// 
-			this.downloadsInProgressLibationFilesRb.AutoSize = true;
-			this.downloadsInProgressLibationFilesRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.downloadsInProgressLibationFilesRb.Location = new System.Drawing.Point(10, 93);
-			this.downloadsInProgressLibationFilesRb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.downloadsInProgressLibationFilesRb.Name = "downloadsInProgressLibationFilesRb";
-			this.downloadsInProgressLibationFilesRb.Size = new System.Drawing.Size(215, 34);
-			this.downloadsInProgressLibationFilesRb.TabIndex = 2;
-			this.downloadsInProgressLibationFilesRb.TabStop = true;
-			this.downloadsInProgressLibationFilesRb.Text = "[desc]\r\n[libationFiles\\DownloadsInProgress]";
-			this.downloadsInProgressLibationFilesRb.UseVisualStyleBackColor = true;
-			// 
-			// downloadsInProgressWinTempRb
-			// 
-			this.downloadsInProgressWinTempRb.AutoSize = true;
-			this.downloadsInProgressWinTempRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.downloadsInProgressWinTempRb.Location = new System.Drawing.Point(10, 52);
-			this.downloadsInProgressWinTempRb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.downloadsInProgressWinTempRb.Name = "downloadsInProgressWinTempRb";
-			this.downloadsInProgressWinTempRb.Size = new System.Drawing.Size(200, 34);
-			this.downloadsInProgressWinTempRb.TabIndex = 1;
-			this.downloadsInProgressWinTempRb.TabStop = true;
-			this.downloadsInProgressWinTempRb.Text = "[desc]\r\n[winTemp\\DownloadsInProgress]";
-			this.downloadsInProgressWinTempRb.UseVisualStyleBackColor = true;
-			// 
-			// downloadsInProgressDescLbl
-			// 
-			this.downloadsInProgressDescLbl.AutoSize = true;
-			this.downloadsInProgressDescLbl.Location = new System.Drawing.Point(7, 18);
-			this.downloadsInProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.downloadsInProgressDescLbl.Name = "downloadsInProgressDescLbl";
-			this.downloadsInProgressDescLbl.Size = new System.Drawing.Size(43, 30);
-			this.downloadsInProgressDescLbl.TabIndex = 0;
-			this.downloadsInProgressDescLbl.Text = "[desc]\r\n[line 2]";
-			// 
-			// decryptInProgressGb
-			// 
-			this.decryptInProgressGb.Controls.Add(this.decryptInProgressLibationFilesRb);
-			this.decryptInProgressGb.Controls.Add(this.decryptInProgressWinTempRb);
-			this.decryptInProgressGb.Controls.Add(this.decryptInProgressDescLbl);
-			this.decryptInProgressGb.Location = new System.Drawing.Point(10, 193);
-			this.decryptInProgressGb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.decryptInProgressGb.Name = "decryptInProgressGb";
-			this.decryptInProgressGb.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.decryptInProgressGb.Size = new System.Drawing.Size(884, 135);
-			this.decryptInProgressGb.TabIndex = 5;
-			this.decryptInProgressGb.TabStop = false;
-			this.decryptInProgressGb.Text = "Decrypt in progress";
-			// 
-			// decryptInProgressLibationFilesRb
-			// 
-			this.decryptInProgressLibationFilesRb.AutoSize = true;
-			this.decryptInProgressLibationFilesRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.decryptInProgressLibationFilesRb.Location = new System.Drawing.Point(7, 93);
-			this.decryptInProgressLibationFilesRb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.decryptInProgressLibationFilesRb.Name = "decryptInProgressLibationFilesRb";
-			this.decryptInProgressLibationFilesRb.Size = new System.Drawing.Size(197, 34);
-			this.decryptInProgressLibationFilesRb.TabIndex = 2;
-			this.decryptInProgressLibationFilesRb.TabStop = true;
-			this.decryptInProgressLibationFilesRb.Text = "[desc]\r\n[libationFiles\\DecryptInProgress]";
-			this.decryptInProgressLibationFilesRb.UseVisualStyleBackColor = true;
-			// 
-			// decryptInProgressWinTempRb
-			// 
-			this.decryptInProgressWinTempRb.AutoSize = true;
-			this.decryptInProgressWinTempRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.decryptInProgressWinTempRb.Location = new System.Drawing.Point(7, 52);
-			this.decryptInProgressWinTempRb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.decryptInProgressWinTempRb.Name = "decryptInProgressWinTempRb";
-			this.decryptInProgressWinTempRb.Size = new System.Drawing.Size(182, 34);
-			this.decryptInProgressWinTempRb.TabIndex = 1;
-			this.decryptInProgressWinTempRb.TabStop = true;
-			this.decryptInProgressWinTempRb.Text = "[desc]\r\n[winTemp\\DecryptInProgress]";
-			this.decryptInProgressWinTempRb.UseVisualStyleBackColor = true;
-			// 
-			// decryptInProgressDescLbl
-			// 
-			this.decryptInProgressDescLbl.AutoSize = true;
-			this.decryptInProgressDescLbl.Location = new System.Drawing.Point(7, 18);
-			this.decryptInProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.decryptInProgressDescLbl.Name = "decryptInProgressDescLbl";
-			this.decryptInProgressDescLbl.Size = new System.Drawing.Size(43, 30);
-			this.decryptInProgressDescLbl.TabIndex = 0;
-			this.decryptInProgressDescLbl.Text = "[desc]\r\n[line 2]";
+			this.inProgressDescLbl.AutoSize = true;
+			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 127);
+			this.inProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.inProgressDescLbl.Name = "inProgressDescLbl";
+			this.inProgressDescLbl.Size = new System.Drawing.Size(43, 45);
+			this.inProgressDescLbl.TabIndex = 1;
+			this.inProgressDescLbl.Text = "[desc]\r\n[line 2]\r\n[line 3]";
 			// 
 			// 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, 401);
+			this.saveBtn.Location = new System.Drawing.Point(714, 380);
 			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);
-			this.saveBtn.TabIndex = 7;
+			this.saveBtn.TabIndex = 4;
 			this.saveBtn.Text = "Save";
 			this.saveBtn.UseVisualStyleBackColor = true;
 			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
@@ -204,38 +80,109 @@
 			// 
 			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, 401);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 380);
 			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);
-			this.cancelBtn.TabIndex = 8;
+			this.cancelBtn.TabIndex = 5;
 			this.cancelBtn.Text = "Cancel";
 			this.cancelBtn.UseVisualStyleBackColor = true;
 			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
 			// 
-			// groupBox1
+			// advancedSettingsGb
 			// 
-			this.groupBox1.Controls.Add(this.allowLibationFixupCbox);
-			this.groupBox1.Controls.Add(this.downloadsInProgressGb);
-			this.groupBox1.Controls.Add(this.decryptInProgressGb);
-			this.groupBox1.Location = new System.Drawing.Point(18, 61);
-			this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.groupBox1.Size = new System.Drawing.Size(902, 334);
-			this.groupBox1.TabIndex = 6;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Advanced settings for control freaks";
+			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.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.TabStop = false;
+			this.advancedSettingsGb.Text = "Advanced settings for control freaks";
+			// 
+			// convertLossyRb
+			// 
+			this.convertLossyRb.AutoSize = true;
+			this.convertLossyRb.Location = new System.Drawing.Point(7, 88);
+			this.convertLossyRb.Name = "convertLossyRb";
+			this.convertLossyRb.Size = new System.Drawing.Size(242, 19);
+			this.convertLossyRb.TabIndex = 0;
+			this.convertLossyRb.Text = "Download my books as .MP3 files (Lossy)";
+			this.convertLossyRb.UseVisualStyleBackColor = true;
+			// 
+			// convertLosslessRb
+			// 
+			this.convertLosslessRb.AutoSize = true;
+			this.convertLosslessRb.Checked = true;
+			this.convertLosslessRb.Location = new System.Drawing.Point(7, 63);
+			this.convertLosslessRb.Name = "convertLosslessRb";
+			this.convertLosslessRb.Size = new System.Drawing.Size(327, 19);
+			this.convertLosslessRb.TabIndex = 0;
+			this.convertLosslessRb.TabStop = true;
+			this.convertLosslessRb.Text = "Download my books as .M4B files (Lossless Mp4a format)";
+			this.convertLosslessRb.UseVisualStyleBackColor = true;
+			// 
+			// inProgressSelectControl
+			// 
+			this.inProgressSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | 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.TabIndex = 2;
 			// 
 			// allowLibationFixupCbox
 			// 
 			this.allowLibationFixupCbox.AutoSize = true;
-			this.allowLibationFixupCbox.Location = new System.Drawing.Point(10, 24);
+			this.allowLibationFixupCbox.Checked = true;
+			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.allowLibationFixupCbox.Location = new System.Drawing.Point(7, 22);
 			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
 			this.allowLibationFixupCbox.Size = new System.Drawing.Size(262, 19);
-			this.allowLibationFixupCbox.TabIndex = 6;
+			this.allowLibationFixupCbox.TabIndex = 0;
 			this.allowLibationFixupCbox.Text = "Allow Libation to fix up audiobook metadata";
 			this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
+			this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
+			// 
+			// 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.TabIndex = 1;
+			// 
+			// booksGb
+			// 
+			this.booksGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.booksGb.Controls.Add(this.booksSelectControl);
+			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.TabStop = false;
+			this.booksGb.Text = "Books location";
+			// 
+			// logsBtn
+			// 
+			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);
 			// 
 			// SettingsDialog
 			// 
@@ -243,47 +190,37 @@
 			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, 442);
-			this.Controls.Add(this.groupBox1);
+			this.ClientSize = new System.Drawing.Size(933, 421);
+			this.Controls.Add(this.booksGb);
+			this.Controls.Add(this.advancedSettingsGb);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);
-			this.Controls.Add(this.booksLocationDescLbl);
-			this.Controls.Add(this.booksLocationSearchBtn);
-			this.Controls.Add(this.booksLocationTb);
-			this.Controls.Add(this.booksLocationLbl);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
 			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "SettingsDialog";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Edit Settings";
 			this.Load += new System.EventHandler(this.SettingsDialog_Load);
-			this.downloadsInProgressGb.ResumeLayout(false);
-			this.downloadsInProgressGb.PerformLayout();
-			this.decryptInProgressGb.ResumeLayout(false);
-			this.decryptInProgressGb.PerformLayout();
-			this.groupBox1.ResumeLayout(false);
-			this.groupBox1.PerformLayout();
+			this.advancedSettingsGb.ResumeLayout(false);
+			this.advancedSettingsGb.PerformLayout();
+			this.booksGb.ResumeLayout(false);
+			this.booksGb.PerformLayout();
 			this.ResumeLayout(false);
-			this.PerformLayout();
 
 		}
 
 		#endregion
-		private System.Windows.Forms.Label booksLocationLbl;
-		private System.Windows.Forms.TextBox booksLocationTb;
-		private System.Windows.Forms.Button booksLocationSearchBtn;
 		private System.Windows.Forms.Label booksLocationDescLbl;
-		private System.Windows.Forms.GroupBox downloadsInProgressGb;
-		private System.Windows.Forms.Label downloadsInProgressDescLbl;
-		private System.Windows.Forms.RadioButton downloadsInProgressWinTempRb;
-		private System.Windows.Forms.RadioButton downloadsInProgressLibationFilesRb;
-		private System.Windows.Forms.GroupBox decryptInProgressGb;
-		private System.Windows.Forms.Label decryptInProgressDescLbl;
-		private System.Windows.Forms.RadioButton decryptInProgressLibationFilesRb;
-		private System.Windows.Forms.RadioButton decryptInProgressWinTempRb;
+		private System.Windows.Forms.Label inProgressDescLbl;
 		private System.Windows.Forms.Button saveBtn;
 		private System.Windows.Forms.Button cancelBtn;
-		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox advancedSettingsGb;
         private System.Windows.Forms.CheckBox allowLibationFixupCbox;
-    }
+		private DirectoryOrCustomSelectControl booksSelectControl;
+		private DirectorySelectControl inProgressSelectControl;
+        private System.Windows.Forms.RadioButton convertLossyRb;
+        private System.Windows.Forms.RadioButton convertLosslessRb;
+		private System.Windows.Forms.GroupBox booksGb;
+		private System.Windows.Forms.Button logsBtn;
+	}
 }

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -19,71 +19,78 @@ namespace LibationWinForms.Dialogs
 				return;
 
 			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
-			this.downloadsInProgressDescLbl.Text = desc(nameof(config.DownloadsInProgressEnum));
-			this.decryptInProgressDescLbl.Text = desc(nameof(config.DecryptInProgressEnum));
+			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
 
-			var winTempText = "In your Windows temporary folder\r\n";
-			this.downloadsInProgressWinTempRb.Text = $"{winTempText}{Path.Combine(Configuration.WinTemp, "DownloadsInProgress")}";
-			this.decryptInProgressWinTempRb.Text = $"{winTempText}{Path.Combine(Configuration.WinTemp, "DecryptInProgress")}";
-
-			var libFileText = "In your Libation Files (ie: program-created files)\r\n";
-			this.downloadsInProgressLibationFilesRb.Text = $"{libFileText}{Path.Combine(config.LibationFiles, "DownloadsInProgress")}";
-			this.decryptInProgressLibationFilesRb.Text = $"{libFileText}{Path.Combine(config.LibationFiles, "DecryptInProgress")}";
-
-			this.booksLocationTb.Text
-				= !string.IsNullOrWhiteSpace(config.Books)
-				? config.Books
-				: Path.GetDirectoryName(Exe.FileLocationOnDisk);
+			booksSelectControl.SetSearchTitle("books location");
+			booksSelectControl.SetDirectoryItems(
+				new()
+				{
+					Configuration.KnownDirectories.UserProfile,
+					Configuration.KnownDirectories.AppDir,
+					Configuration.KnownDirectories.MyDocs
+				},
+				Configuration.KnownDirectories.UserProfile,
+				"Books");
+			booksSelectControl.SelectDirectory(config.Books);
 
 			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
+			convertLosslessRb.Checked = !config.DecryptToLossy;
+			convertLossyRb.Checked = config.DecryptToLossy;
 
-			switch (config.DownloadsInProgressEnum)
-			{
-				case Configuration.LIBATION_FILES_LABEL:
-					downloadsInProgressLibationFilesRb.Checked = true;
-					break;
-				case Configuration.WIN_TEMP_LABEL:
-				default:
-					downloadsInProgressWinTempRb.Checked = true;
-					break;
-			}
+			allowLibationFixupCbox_CheckedChanged(this, e);
 
-			switch (config.DecryptInProgressEnum)
+			inProgressSelectControl.SetDirectoryItems(new()
 			{
-				case Configuration.LIBATION_FILES_LABEL:
-					decryptInProgressLibationFilesRb.Checked = true;
-					break;
-				case Configuration.WIN_TEMP_LABEL:
-				default:
-					decryptInProgressWinTempRb.Checked = true;
-					break;
+				Configuration.KnownDirectories.WinTemp,
+				Configuration.KnownDirectories.UserProfile,
+				Configuration.KnownDirectories.AppDir,
+				Configuration.KnownDirectories.MyDocs,
+				Configuration.KnownDirectories.LibationFiles
+			}, Configuration.KnownDirectories.WinTemp);
+			inProgressSelectControl.SelectDirectory(config.InProgress);
+		}
+
+        private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
+        {
+			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
+			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
+
+			if (!allowLibationFixupCbox.Checked)
+            {
+				convertLosslessRb.Checked = true;
 			}
 		}
 
-		private void booksLocationSearchBtn_Click(object sender, EventArgs e) => selectFolder("Search for books location", this.booksLocationTb);
-
-		private static void selectFolder(string desc, TextBox textbox)
-		{
-			using var dialog = new FolderBrowserDialog { Description = desc, SelectedPath = "" };
-			dialog.ShowDialog();
-			if (!string.IsNullOrWhiteSpace(dialog.SelectedPath))
-				textbox.Text = dialog.SelectedPath;
-		}
+		private void logsBtn_Click(object sender, EventArgs e) => Go.To.Folder(Configuration.Instance.LibationFiles);
 
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
 			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
-			config.DownloadsInProgressEnum = downloadsInProgressLibationFilesRb.Checked ? Configuration.LIBATION_FILES_LABEL : Configuration.WIN_TEMP_LABEL;
-			config.DecryptInProgressEnum = decryptInProgressLibationFilesRb.Checked ? Configuration.LIBATION_FILES_LABEL : Configuration.WIN_TEMP_LABEL;
+			config.DecryptToLossy = convertLossyRb.Checked;
 
-			var newBooks = this.booksLocationTb.Text;
-			if (!Directory.Exists(newBooks))
+			config.InProgress = inProgressSelectControl.SelectedDirectory;
+
+			var newBooks = booksSelectControl.SelectedDirectory;
+
+			if (string.IsNullOrWhiteSpace(newBooks))
 			{
-				MessageBox.Show($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}");
+				MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
-			else
-				config.Books = newBooks;
+
+			if (!Directory.Exists(newBooks))
+			{
+				if (booksSelectControl.SelectedDirectoryIsCustom)
+				{
+					MessageBox.Show($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}", "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return;
+				}
+
+				if (booksSelectControl.SelectedDirectoryIsKnown)
+					Directory.CreateDirectory(newBooks);
+			}
+
+			config.Books = newBooks;
 
 			this.DialogResult = DialogResult.OK;
 			this.Close();

LibationWinForms/Dialogs/SettingsDialog.resx

@@ -57,67 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="booksLocationLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="booksLocationTb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="booksLocationSearchBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="booksLocationDescLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressGb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressLibationFilesRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressWinTempRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressDescLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressLibationFilesRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressWinTempRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="downloadsInProgressDescLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressGb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressLibationFilesRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressWinTempRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressDescLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressLibationFilesRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressWinTempRb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="decryptInProgressDescLbl.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="saveBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cancelBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

LibationWinForms/Dialogs/SetupDialog.Designer.cs

@@ -30,63 +30,57 @@
 		{
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SetupDialog));
 			this.welcomeLbl = new System.Windows.Forms.Label();
-			this.noQuestionsBtn = new System.Windows.Forms.Button();
-			this.basicBtn = new System.Windows.Forms.Button();
-			this.advancedBtn = new System.Windows.Forms.Button();
+			this.newUserBtn = new System.Windows.Forms.Button();
+			this.returningUserBtn = new System.Windows.Forms.Button();
 			this.SuspendLayout();
 			// 
 			// welcomeLbl
 			// 
 			this.welcomeLbl.AutoSize = true;
-			this.welcomeLbl.Location = new System.Drawing.Point(12, 9);
+			this.welcomeLbl.Location = new System.Drawing.Point(14, 10);
+			this.welcomeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.welcomeLbl.Name = "welcomeLbl";
-			this.welcomeLbl.Size = new System.Drawing.Size(399, 117);
+			this.welcomeLbl.Size = new System.Drawing.Size(449, 135);
 			this.welcomeLbl.TabIndex = 0;
 			this.welcomeLbl.Text = resources.GetString("welcomeLbl.Text");
 			// 
-			// noQuestionsBtn
+			// newUserBtn
 			// 
-			this.noQuestionsBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-			| System.Windows.Forms.AnchorStyles.Right)));
-			this.noQuestionsBtn.Location = new System.Drawing.Point(15, 129);
-			this.noQuestionsBtn.Name = "noQuestionsBtn";
-			this.noQuestionsBtn.Size = new System.Drawing.Size(396, 57);
-			this.noQuestionsBtn.TabIndex = 1;
-			this.noQuestionsBtn.Text = "NO-QUESTIONS SETUP\r\n\r\nAccept all defaults";
-			this.noQuestionsBtn.UseVisualStyleBackColor = true;
+			this.newUserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.newUserBtn.Location = new System.Drawing.Point(18, 156);
+			this.newUserBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.newUserBtn.Name = "newUserBtn";
+			this.newUserBtn.Size = new System.Drawing.Size(462, 66);
+			this.newUserBtn.TabIndex = 2;
+			this.newUserBtn.Text = "NEW USER\r\n\r\nChoose settings";
+			this.newUserBtn.UseVisualStyleBackColor = true;
+			this.newUserBtn.Click += new System.EventHandler(this.newUserBtn_Click);
 			// 
-			// basicBtn
+			// returningUserBtn
 			// 
-			this.basicBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-			| System.Windows.Forms.AnchorStyles.Right)));
-			this.basicBtn.Location = new System.Drawing.Point(15, 192);
-			this.basicBtn.Name = "basicBtn";
-			this.basicBtn.Size = new System.Drawing.Size(396, 57);
-			this.basicBtn.TabIndex = 2;
-			this.basicBtn.Text = "BASIC SETUP\r\n\r\nChoose settings";
-			this.basicBtn.UseVisualStyleBackColor = true;
-			// 
-			// advancedBtn
-			// 
-			this.advancedBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-			| System.Windows.Forms.AnchorStyles.Right)));
-			this.advancedBtn.Location = new System.Drawing.Point(15, 255);
-			this.advancedBtn.Name = "advancedBtn";
-			this.advancedBtn.Size = new System.Drawing.Size(396, 57);
-			this.advancedBtn.TabIndex = 3;
-			this.advancedBtn.Text = "ADVANCED SETUP\r\n\r\nChoose settings and where to store them";
-			this.advancedBtn.UseVisualStyleBackColor = true;
+			this.returningUserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.returningUserBtn.Location = new System.Drawing.Point(18, 228);
+			this.returningUserBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.returningUserBtn.Name = "returningUserBtn";
+			this.returningUserBtn.Size = new System.Drawing.Size(462, 66);
+			this.returningUserBtn.TabIndex = 3;
+			this.returningUserBtn.Text = "RETURNING USER\r\n\r\nI have previously installed Libation. This is an upgrade or re-" +
+    "install";
+			this.returningUserBtn.UseVisualStyleBackColor = true;
+			this.returningUserBtn.Click += new System.EventHandler(this.returningUserBtn_Click);
 			// 
 			// SetupDialog
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(423, 324);
-			this.Controls.Add(this.advancedBtn);
-			this.Controls.Add(this.basicBtn);
-			this.Controls.Add(this.noQuestionsBtn);
+			this.ClientSize = new System.Drawing.Size(493, 308);
+			this.Controls.Add(this.returningUserBtn);
+			this.Controls.Add(this.newUserBtn);
 			this.Controls.Add(this.welcomeLbl);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "SetupDialog";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
 			this.Text = "Welcome to Libation";
@@ -98,8 +92,7 @@
 		#endregion
 
 		private System.Windows.Forms.Label welcomeLbl;
-		private System.Windows.Forms.Button noQuestionsBtn;
-		private System.Windows.Forms.Button basicBtn;
-		private System.Windows.Forms.Button advancedBtn;
+		private System.Windows.Forms.Button newUserBtn;
+		private System.Windows.Forms.Button returningUserBtn;
 	}
 }

LibationWinForms/Dialogs/SetupDialog.cs

@@ -5,33 +5,25 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class SetupDialog : Form
 	{
-		public event EventHandler NoQuestionsBtn_Click
+		public bool IsNewUser { get; private set; }
+		public bool IsReturningUser { get; private set; }
+
+		public SetupDialog() => InitializeComponent();
+
+		private void newUserBtn_Click(object sender, EventArgs e)
 		{
-			add => noQuestionsBtn.Click += value;
-			remove => noQuestionsBtn.Click -= value;
+			IsNewUser = true;
+
+			this.DialogResult = DialogResult.OK;
+			Close();
 		}
 
-		public event EventHandler BasicBtn_Click
+		private void returningUserBtn_Click(object sender, EventArgs e)
 		{
-			add => basicBtn.Click += value;
-			remove => basicBtn.Click -= value;
+			IsReturningUser = true;
+
+			this.DialogResult = DialogResult.OK;
+			Close();
 		}
-
-		public event EventHandler AdvancedBtn_Click
-		{
-			add => advancedBtn.Click += value;
-			remove => advancedBtn.Click -= value;
-		}
-
-		public SetupDialog()
-		{
-			InitializeComponent();
-
-			noQuestionsBtn.Click += btn_Click;
-			basicBtn.Click += btn_Click;
-			advancedBtn.Click += btn_Click;
-		}
-
-		private void btn_Click(object sender, EventArgs e) => Close();
 	}
 }

LibationWinForms/Dialogs/SetupDialog.resx

@@ -66,6 +66,6 @@ After you make your selections, get started by importing your library.
 Go to Import > Scan Library
 
 Download your entire library from the "Liberate" tab or
-liberate your books one at a time by clicking the stoplight</value>
+liberate your books one at a time by clicking the stoplight.</value>
   </data>
 </root>

LibationWinForms/Dialogs/TEMP_TestNewControls.Designer.cs

@@ -1,81 +0,0 @@
-
-namespace LibationWinForms.Dialogs
-{
-	partial class TEMP_TestNewControls
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button1 = new System.Windows.Forms.Button();
-			this.directorySelectControl1 = new LibationWinForms.Dialogs.DirectorySelectControl();
-			this.directoryOrCustomSelectControl1 = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
-			this.SuspendLayout();
-			// 
-			// button1
-			// 
-			this.button1.Location = new System.Drawing.Point(438, 375);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "button1";
-			this.button1.UseVisualStyleBackColor = true;
-			this.button1.Click += new System.EventHandler(this.button1_Click);
-			// 
-			// directorySelectControl1
-			// 
-			this.directorySelectControl1.Location = new System.Drawing.Point(30, 54);
-			this.directorySelectControl1.Name = "directorySelectControl1";
-			this.directorySelectControl1.Size = new System.Drawing.Size(758, 46);
-			this.directorySelectControl1.TabIndex = 4;
-			// 
-			// directoryOrCustomSelectControl1
-			// 
-			this.directoryOrCustomSelectControl1.Location = new System.Drawing.Point(128, 199);
-			this.directoryOrCustomSelectControl1.Name = "directoryOrCustomSelectControl1";
-			this.directoryOrCustomSelectControl1.Size = new System.Drawing.Size(660, 81);
-			this.directoryOrCustomSelectControl1.TabIndex = 5;
-			// 
-			// TEMP_TestNewControls
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(800, 450);
-			this.Controls.Add(this.directoryOrCustomSelectControl1);
-			this.Controls.Add(this.directorySelectControl1);
-			this.Controls.Add(this.button1);
-			this.Name = "TEMP_TestNewControls";
-			this.Text = "TEMP_TestNewControls";
-			this.Load += new System.EventHandler(this.TEMP_TestNewControls_Load);
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-		private System.Windows.Forms.Button button1;
-		private DirectorySelectControl directorySelectControl1;
-		private DirectoryOrCustomSelectControl directoryOrCustomSelectControl1;
-	}
-}

LibationWinForms/Dialogs/TEMP_TestNewControls.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class TEMP_TestNewControls : Form
-	{
-		public TEMP_TestNewControls()
-        {
-            InitializeComponent();
-        }
-
-		private void TEMP_TestNewControls_Load(object sender, EventArgs e)
-		{
-
-			if (this.DesignMode)
-				return;
-
-
-
-			{
-				var dirCtrl = this.directorySelectControl1;
-				dirCtrl.SetDirectoryItems(new()
-				{
-					FileManager.Configuration.KnownDirectories.AppDir,
-					FileManager.Configuration.KnownDirectories.MyDocs,
-					FileManager.Configuration.KnownDirectories.LibationFiles,
-					FileManager.Configuration.KnownDirectories.MyDocs,
-					FileManager.Configuration.KnownDirectories.None,
-					FileManager.Configuration.KnownDirectories.WinTemp,
-					FileManager.Configuration.KnownDirectories.UserProfile
-				}
-				,
-				FileManager.Configuration.KnownDirectories.MyDocs
-				);
-			}
-
-
-
-			{
-				var dirOrCustCtrl = this.directoryOrCustomSelectControl1;
-				dirOrCustCtrl.SetSearchTitle("Libation Files");
-				dirOrCustCtrl.SetDirectoryItems(new()
-				{
-					FileManager.Configuration.KnownDirectories.AppDir,
-					FileManager.Configuration.KnownDirectories.MyDocs,
-					FileManager.Configuration.KnownDirectories.LibationFiles,
-					FileManager.Configuration.KnownDirectories.MyDocs,
-					FileManager.Configuration.KnownDirectories.None,
-					FileManager.Configuration.KnownDirectories.WinTemp,
-					FileManager.Configuration.KnownDirectories.UserProfile
-				}
-				,
-				FileManager.Configuration.KnownDirectories.MyDocs
-				);
-			}
-
-
-
-		}
-
-		private void button1_Click(object sender, EventArgs e)
-		{
-
-
-
-			var dirCtrl = this.directorySelectControl1;
-			var x = dirCtrl.SelectedDirectory;
-			dirCtrl.SelectDirectory(FileManager.Configuration.KnownDirectories.UserProfile);
-
-
-
-
-			var dirOrCustCtrl = this.directoryOrCustomSelectControl1;
-			var y = dirOrCustCtrl.SelectedDirectory;
-			dirOrCustCtrl.SelectDirectory(FileManager.Configuration.KnownDirectories.UserProfile);
-
-
-
-		}
-    }
-}

LibationWinForms/Form1.Designer.cs

@@ -43,6 +43,7 @@
 			this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -57,27 +58,27 @@
 			this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
 			this.pdfsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
 			this.addFilterBtn = new System.Windows.Forms.Button();
-			this.noAccountsYetAddAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
 			this.statusStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// gridPanel
 			// 
-			this.gridPanel.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.gridPanel.Location = new System.Drawing.Point(12, 56);
+			this.gridPanel.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.gridPanel.Location = new System.Drawing.Point(14, 65);
+			this.gridPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.gridPanel.Name = "gridPanel";
-			this.gridPanel.Size = new System.Drawing.Size(839, 386);
+			this.gridPanel.Size = new System.Drawing.Size(979, 445);
 			this.gridPanel.TabIndex = 5;
 			// 
 			// filterHelpBtn
 			// 
-			this.filterHelpBtn.Location = new System.Drawing.Point(12, 27);
+			this.filterHelpBtn.Location = new System.Drawing.Point(14, 31);
+			this.filterHelpBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.filterHelpBtn.Name = "filterHelpBtn";
-			this.filterHelpBtn.Size = new System.Drawing.Size(22, 23);
+			this.filterHelpBtn.Size = new System.Drawing.Size(26, 27);
 			this.filterHelpBtn.TabIndex = 3;
 			this.filterHelpBtn.Text = "?";
 			this.filterHelpBtn.UseVisualStyleBackColor = true;
@@ -86,9 +87,10 @@
 			// filterBtn
 			// 
 			this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.filterBtn.Location = new System.Drawing.Point(776, 27);
+			this.filterBtn.Location = new System.Drawing.Point(905, 31);
+			this.filterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.filterBtn.Name = "filterBtn";
-			this.filterBtn.Size = new System.Drawing.Size(75, 23);
+			this.filterBtn.Size = new System.Drawing.Size(88, 27);
 			this.filterBtn.TabIndex = 2;
 			this.filterBtn.Text = "Filter";
 			this.filterBtn.UseVisualStyleBackColor = true;
@@ -96,34 +98,36 @@
 			// 
 			// filterSearchTb
 			// 
-			this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-			| System.Windows.Forms.AnchorStyles.Right)));
-			this.filterSearchTb.Location = new System.Drawing.Point(186, 29);
+			this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.filterSearchTb.Location = new System.Drawing.Point(217, 33);
+			this.filterSearchTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.filterSearchTb.Name = "filterSearchTb";
-			this.filterSearchTb.Size = new System.Drawing.Size(584, 20);
+			this.filterSearchTb.Size = new System.Drawing.Size(681, 23);
 			this.filterSearchTb.TabIndex = 1;
 			this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
 			// 
 			// menuStrip1
 			// 
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.importToolStripMenuItem,
-			this.liberateToolStripMenuItem,
-			this.exportToolStripMenuItem,
-			this.quickFiltersToolStripMenuItem,
-			this.settingsToolStripMenuItem});
+            this.importToolStripMenuItem,
+            this.liberateToolStripMenuItem,
+            this.exportToolStripMenuItem,
+            this.quickFiltersToolStripMenuItem,
+            this.settingsToolStripMenuItem});
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Size = new System.Drawing.Size(863, 24);
+			this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
+			this.menuStrip1.Size = new System.Drawing.Size(1007, 24);
 			this.menuStrip1.TabIndex = 0;
 			this.menuStrip1.Text = "menuStrip1";
 			// 
 			// importToolStripMenuItem
 			// 
 			this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.noAccountsYetAddAccountToolStripMenuItem,
-			this.scanLibraryToolStripMenuItem,
-			this.scanLibraryOfAllAccountsToolStripMenuItem,
+            this.noAccountsYetAddAccountToolStripMenuItem,
+            this.scanLibraryToolStripMenuItem,
+            this.scanLibraryOfAllAccountsToolStripMenuItem,
             this.scanLibraryOfSomeAccountsToolStripMenuItem});
 			this.importToolStripMenuItem.Name = "importToolStripMenuItem";
 			this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
@@ -134,6 +138,7 @@
 			this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
 			this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
 			this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
+			this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
 			// 
 			// scanLibraryToolStripMenuItem
 			// 
@@ -159,8 +164,8 @@
 			// liberateToolStripMenuItem
 			// 
 			this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.beginBookBackupsToolStripMenuItem,
-			this.beginPdfBackupsToolStripMenuItem});
+            this.beginBookBackupsToolStripMenuItem,
+            this.beginPdfBackupsToolStripMenuItem});
 			this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
 			this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
 			this.liberateToolStripMenuItem.Text = "&Liberate";
@@ -182,17 +187,24 @@
 			// exportToolStripMenuItem
 			// 
 			this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.exportLibraryToolStripMenuItem});
+            this.exportLibraryToolStripMenuItem});
 			this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
 			this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
 			this.exportToolStripMenuItem.Text = "E&xport";
 			// 
+			// exportLibraryToolStripMenuItem
+			// 
+			this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
+			this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+			this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
+			this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
+			// 
 			// quickFiltersToolStripMenuItem
 			// 
 			this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.firstFilterIsDefaultToolStripMenuItem,
-			this.editQuickFiltersToolStripMenuItem,
-			this.toolStripSeparator1});
+            this.firstFilterIsDefaultToolStripMenuItem,
+            this.editQuickFiltersToolStripMenuItem,
+            this.toolStripSeparator1});
 			this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
 			this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
 			this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
@@ -219,9 +231,9 @@
 			// settingsToolStripMenuItem
 			// 
 			this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			this.accountsToolStripMenuItem,
-			this.basicSettingsToolStripMenuItem,
-			this.advancedSettingsToolStripMenuItem});
+            this.accountsToolStripMenuItem,
+            this.basicSettingsToolStripMenuItem,
+            this.advancedSettingsToolStripMenuItem});
 			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
 			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
 			this.settingsToolStripMenuItem.Text = "&Settings";
@@ -237,26 +249,27 @@
 			// 
 			this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
 			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
-			this.basicSettingsToolStripMenuItem.Text = "&Basic Settings...";
+			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 = "Ad&vanced Settings...";
+			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[] {
-			this.visibleCountLbl,
-			this.springLbl,
-			this.backupsCountsLbl,
-			this.pdfsCountsLbl});
-			this.statusStrip1.Location = new System.Drawing.Point(0, 445);
+            this.visibleCountLbl,
+            this.springLbl,
+            this.backupsCountsLbl,
+            this.pdfsCountsLbl});
+			this.statusStrip1.Location = new System.Drawing.Point(0, 517);
 			this.statusStrip1.Name = "statusStrip1";
-			this.statusStrip1.Size = new System.Drawing.Size(863, 22);
+			this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
+			this.statusStrip1.Size = new System.Drawing.Size(1007, 22);
 			this.statusStrip1.TabIndex = 6;
 			this.statusStrip1.Text = "statusStrip1";
 			// 
@@ -269,7 +282,7 @@
 			// springLbl
 			// 
 			this.springLbl.Name = "springLbl";
-			this.springLbl.Size = new System.Drawing.Size(233, 17);
+			this.springLbl.Size = new System.Drawing.Size(375, 17);
 			this.springLbl.Spring = true;
 			// 
 			// backupsCountsLbl
@@ -286,33 +299,20 @@
 			// 
 			// addFilterBtn
 			// 
-			this.addFilterBtn.Location = new System.Drawing.Point(40, 27);
+			this.addFilterBtn.Location = new System.Drawing.Point(47, 31);
+			this.addFilterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.addFilterBtn.Name = "addFilterBtn";
-			this.addFilterBtn.Size = new System.Drawing.Size(140, 23);
+			this.addFilterBtn.Size = new System.Drawing.Size(163, 27);
 			this.addFilterBtn.TabIndex = 4;
 			this.addFilterBtn.Text = "Add To Quick Filters";
 			this.addFilterBtn.UseVisualStyleBackColor = true;
 			this.addFilterBtn.Click += new System.EventHandler(this.AddFilterBtn_Click);
 			// 
-			// noAccountsYetAddAccountToolStripMenuItem
-			// 
-			this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
-			this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
-			this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
-			// 
-			// exportLibraryToolStripMenuItem
-			// 
-			this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
-			this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
-			this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
-			// 
 			// Form1
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(863, 467);
+			this.ClientSize = new System.Drawing.Size(1007, 539);
 			this.Controls.Add(this.filterBtn);
 			this.Controls.Add(this.addFilterBtn);
 			this.Controls.Add(this.filterSearchTb);
@@ -322,6 +322,7 @@
 			this.Controls.Add(this.menuStrip1);
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.MainMenuStrip = this.menuStrip1;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "Form1";
 			this.Text = "Libation: Liberate your Library";
 			this.Load += new System.EventHandler(this.Form1_Load);

LibationWinForms/Form1.cs

@@ -338,8 +338,7 @@ namespace LibationWinForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Logger.Error(ex, "Error attempting to export library");
-                MessageBox.Show("Error attempting to export your library. Error message:\r\n\r\n" + ex.Message, "Error exporting", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBoxAlertAdmin.Show("Error attempting to export your library.", "Error exporting", ex);
             }
         }
         #endregion
@@ -399,13 +398,20 @@ namespace LibationWinForms
 
         private void advancedSettingsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var oldLocation = Configuration.Instance.LibationFiles;
-            new LibationFilesDialog().ShowDialog();
+            var libationFilesDialog = new LibationFilesDialog();
+            if (libationFilesDialog.ShowDialog() != DialogResult.OK)
+                return;
 
             // no change
-            if (System.IO.Path.GetFullPath(oldLocation).EqualsInsensitive(System.IO.Path.GetFullPath(Configuration.Instance.LibationFiles)))
+            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",

LibationWinForms/Form1.resx

@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/MessageBoxAlertAdmin.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using LibationWinForms.Dialogs;
+
+namespace LibationWinForms
+{
+	public static class MessageBoxAlertAdmin
+	{
+		/// <summary>
+		/// Logs error. Displays a message box dialog with specified text and caption.
+		/// </summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="exception">Exception to log</param>
+		/// <returns>One of the System.Windows.Forms.DialogResult values.</returns>
+		public static System.Windows.Forms.DialogResult Show(string text, string caption, Exception exception)
+		{
+			Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
+
+			using var form = new MessageBoxAlertAdminDialog(text, caption, exception);
+			return form.ShowDialog();
+		}
+	}
+}

LibationWinForms/ProductsGrid.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using ApplicationServices;
 using DataLayer;
+using Dinah.Core;
 using Dinah.Core.Collections.Generic;
 using Dinah.Core.DataBinding;
 using Dinah.Core.Windows.Forms;
@@ -178,7 +179,7 @@ namespace LibationWinForms
             if (FileManager.AudibleFileStorage.Audio.Exists(productId))
             {
                 var filePath = FileManager.AudibleFileStorage.Audio.GetPath(productId);
-                System.Diagnostics.Process.Start("explorer.exe", $"/select, \"{filePath}\"");
+                Go.To.File(filePath);
                 return;
             }