v5.2.1

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

.gitignore

@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -12,6 +13,9 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -19,10 +23,15 @@
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
+[Oo]ut/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -36,9 +45,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -52,7 +62,9 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
 
 # StyleCop
 StyleCopReport.xml
@@ -60,7 +72,7 @@ StyleCopReport.xml
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
@@ -77,6 +89,7 @@ StyleCopReport.xml
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -119,9 +132,6 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -132,6 +142,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -179,6 +194,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -203,12 +220,14 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -221,7 +240,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -252,6 +271,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -287,12 +309,8 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
+# CodeRush personal settings
+.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -317,7 +335,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,11 +344,29 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+
+### manually ignored files
+
+# Windows shortcuts
+*.lnk
 
-# manually ignored files
 /__TODO.txt
 /DataLayer/LibationContext.db
-*.lnk

AaxDecrypter/AaxDecrypter.csproj

@@ -5,41 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TagLibSharp" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <ProjectReference Include="..\..\AAXClean\AAXClean.csproj" />
     <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="DecryptLib\avcodec-58.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avdevice-58.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avfilter-7.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avformat-58.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avutil-56.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\ffmpeg.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\ffprobe.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swresample-3.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swscale-5.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,4 +1,5 @@
-using Dinah.Core;
+using AAXClean;
+using Dinah.Core;
 using Dinah.Core.Diagnostics;
 using Dinah.Core.IO;
 using Dinah.Core.StepRunner;
@@ -7,90 +8,59 @@ using System.IO;
 
 namespace AaxDecrypter
 {
-    public interface ISimpleAaxcToM4bConverter
+    public enum OutputFormat
     {
-        event EventHandler<AaxcTagLibFile> RetrievedTags;
-        event EventHandler<byte[]> RetrievedCoverArt;
-        event EventHandler<TimeSpan> DecryptTimeRemaining;
-        event EventHandler<int> DecryptProgressUpdate;
-        bool Run();
-        string AppName { get; set; }
-        string outDir { get; }
-        string outputFileName { get; }
-        DownloadLicense downloadLicense { get; }
-        AaxcTagLibFile aaxcTagLib { get; }
-        byte[] coverArt { get; }
-        void SetCoverArt(byte[] coverArt);
-        void SetOutputFilename(string outFileName);
+        Mp4a,
+        Mp3
     }
-    public interface IAdvancedAaxcToM4bConverter : ISimpleAaxcToM4bConverter
+    public class AaxcDownloadConverter
     {
-        void Cancel();
-        bool Step1_CreateDir();
-        bool Step2_GetMetadata();
-        bool Step3_DownloadAndCombine();
-        bool Step4_RestoreMetadata();
-        bool Step5_CreateCue();
-        bool Step6_CreateNfo();
-    }
-    public class AaxcDownloadConverter : IAdvancedAaxcToM4bConverter
-    {
-        public event EventHandler<AaxcTagLibFile> RetrievedTags;
+        public event EventHandler<AppleTags> RetrievedTags;
         public event EventHandler<byte[]> RetrievedCoverArt;
         public event EventHandler<int> DecryptProgressUpdate;
         public event EventHandler<TimeSpan> DecryptTimeRemaining;
         public string AppName { get; set; } = nameof(AaxcDownloadConverter);
-        public string outDir { get; private set; }
-        public string outputFileName { get; private set; }
-        public DownloadLicense downloadLicense { get; private set; }
-        public AaxcTagLibFile aaxcTagLib { get; private set; }
-        public byte[] coverArt { get; private set; }
+        public string OutputFileName { get; private set; }
+
+        private string cacheDir { get; }
+        private DownloadLicense downloadLicense { get; }
+        private AaxFile aaxFile;
+        private byte[] coverArt;
+        private OutputFormat OutputFormat;
 
         private StepSequence steps { get; }
-        private FFMpegAaxcProcesser aaxcProcesser;
+        private NetworkFileStreamPersister nfsPersister;
         private bool isCanceled { get; set; }
+        private string jsonDownloadState => Path.Combine(cacheDir, Path.GetFileNameWithoutExtension(OutputFileName) + ".json");
+        private string tempFile => PathLib.ReplaceExtension(jsonDownloadState, ".aaxc");
 
-        public static AaxcDownloadConverter Create(string outDirectory, DownloadLicense dlLic)
+        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
         {
-            var converter = new AaxcDownloadConverter(outDirectory, dlLic);
-            converter.SetOutputFilename(Path.GetTempFileName());
-            return converter;
-        }
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
+            OutputFileName = outFileName;
+            var outDir = Path.GetDirectoryName(OutputFileName);
+            if (!Directory.Exists(outDir))
+                throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
+            if (File.Exists(OutputFileName))
+                File.Delete(OutputFileName);
 
-        private AaxcDownloadConverter(string outDirectory, DownloadLicense dlLic)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(outDirectory, nameof(outDirectory));
-            ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+            if (!Directory.Exists(cacheDirectory))
+                throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
+            cacheDir = cacheDirectory;
 
-            if (!Directory.Exists(outDirectory))
-                throw new ArgumentNullException(nameof(outDirectory), "Directory does not exist");
-            outDir = outDirectory;
+            downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+            OutputFormat = outputFormat;
 
             steps = new StepSequence
             {
-                Name = "Convert Aax To M4b",
+                Name = "Download and Convert Aaxc To " + (outputFormat == OutputFormat.Mp4a ? "M4b" : "Mp3"),
 
-                ["Step 1: Create Dir"] = Step1_CreateDir,
-                ["Step 2: Get Aaxc Metadata"] = Step2_GetMetadata,
-                ["Step 3: Download Decrypted Audiobook"] = Step3_DownloadAndCombine,
-                ["Step 4: Restore Aaxc Metadata"] = Step4_RestoreMetadata,
-                ["Step 5: Create Cue"] = Step5_CreateCue,
-                ["Step 6: Create Nfo"] = Step6_CreateNfo,
+                ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
+                ["Step 2: Download Decrypted Audiobook"] = Step2_DownloadAndCombine,
+                ["Step 3: Create Cue"] = Step3_CreateCue,
+                ["Step 4: Create Nfo"] = Step4_CreateNfo,
+                ["Step 5: Cleanup"] = Step5_Cleanup,
             };
-
-            aaxcProcesser = new FFMpegAaxcProcesser(dlLic);
-            aaxcProcesser.ProgressUpdate += AaxcProcesser_ProgressUpdate;
-
-            downloadLicense = dlLic;
-        }
-
-        public void SetOutputFilename(string outFileName)
-        {
-            outputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
-            outDir = Path.GetDirectoryName(outputFileName);
-
-            if (File.Exists(outputFileName))
-                File.Delete(outputFileName);
         }
 
         public void SetCoverArt(byte[] coverArt)
@@ -111,134 +81,148 @@ namespace AaxDecrypter
                 return false;
             }
 
-            var speedup = (int)(aaxcTagLib.Properties.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
+            var speedup = (int)(aaxFile.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
             Console.WriteLine("Speedup is " + speedup + "x realtime.");
             Console.WriteLine("Done");
             return true;
         }
 
-        public bool Step1_CreateDir()
-        {
-            ProcessRunner.WorkingDir = outDir;
-            Directory.CreateDirectory(outDir);
-
-            return !isCanceled;
-        }
-
-        public bool Step2_GetMetadata()
+        public bool Step1_GetMetadata()
         {
             //Get metadata from the file over http
-            var client = new System.Net.Http.HttpClient();
-            client.DefaultRequestHeaders.Add("User-Agent", downloadLicense.UserAgent);
-            var networkFile = NetworkFileAbstraction.CreateAsync(client, new Uri(downloadLicense.DownloadUrl)).GetAwaiter().GetResult();
-
-            aaxcTagLib = new AaxcTagLibFile(networkFile);
-
-            if (coverArt is null && aaxcTagLib.AppleTags.Pictures.Length > 0)
+                       
+            if (File.Exists(jsonDownloadState))
             {
-                coverArt = aaxcTagLib.AppleTags.Pictures[0].Data.Data;
+                try
+                {
+                    nfsPersister = new NetworkFileStreamPersister(jsonDownloadState);
+                    //If More thaan ~1 hour has elapsed since getting the download url, it will expire.
+                    //The new url will be to the same file.
+                    nfsPersister.NetworkFileStream.SetUriForSameFile(new Uri(downloadLicense.DownloadUrl));
+                }
+                catch
+                {
+                    FileExt.SafeDelete(jsonDownloadState);
+                    FileExt.SafeDelete(tempFile);
+                    nfsPersister = NewNetworkFilePersister();
+                }
             }
+            else
+            {
+                nfsPersister = NewNetworkFilePersister();
+            }
+            nfsPersister.NetworkFileStream.BeginDownloading();
 
-            RetrievedTags?.Invoke(this, aaxcTagLib);
+            aaxFile = new AaxFile(nfsPersister.NetworkFileStream);
+            coverArt = aaxFile.AppleTags.Cover;
+
+            RetrievedTags?.Invoke(this, aaxFile.AppleTags);
             RetrievedCoverArt?.Invoke(this, coverArt);
 
             return !isCanceled;
         }
-
-        public bool Step3_DownloadAndCombine()
+        private NetworkFileStreamPersister NewNetworkFilePersister()
         {
-            DecryptProgressUpdate?.Invoke(this, int.MaxValue);
+            var headers = new System.Net.WebHeaderCollection();
+            headers.Add("User-Agent", downloadLicense.UserAgent);
 
-            bool userSuppliedChapters = downloadLicense.ChapterInfo != null;
+            NetworkFileStream networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
+            return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+        }
 
-            string metadataPath = null;
-
-            if (userSuppliedChapters)
-            {
-                //Only write chaopters to the metadata file. All other aaxc metadata will be
-                //wiped out but is restored in Step 3.
-                metadataPath = Path.Combine(outDir, Path.GetFileName(outputFileName) + ".ffmeta");
-                File.WriteAllText(metadataPath, downloadLicense.ChapterInfo.ToFFMeta(true));
-            }
-
-            aaxcProcesser.ProcessBook(
-                outputFileName,
-                metadataPath)
-                .GetAwaiter()
-                .GetResult();
-
-            if (!userSuppliedChapters && aaxcProcesser.Succeeded)
-                downloadLicense.ChapterInfo = new ChapterInfo(outputFileName);
-
-            if (userSuppliedChapters)
-                FileExt.SafeDelete(metadataPath);
+        public bool Step2_DownloadAndCombine()
+        {
 
             DecryptProgressUpdate?.Invoke(this, 0);
 
-            return aaxcProcesser.Succeeded && !isCanceled;
+            if (File.Exists(OutputFileName))
+                FileExt.SafeDelete(OutputFileName);
+
+            FileStream outFile = File.OpenWrite(OutputFileName);
+
+            aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
+
+            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+
+            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
+                && 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.
+                using var decryptedBook = new Mp4File(OutputFileName, FileAccess.ReadWrite);
+                decryptedBook.AppleTags?.SetCoverArt(coverArt);
+                decryptedBook.Save();
+                decryptedBook.Close();
+            }
+
+            nfsPersister.Dispose();
+
+            DecryptProgressUpdate?.Invoke(this, 0);
+
+            return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled;
         }
 
-        private void AaxcProcesser_ProgressUpdate(object sender, AaxcProcessUpdate e)
+        private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
         {
-            double remainingSecsToProcess = (aaxcTagLib.Properties.Duration - e.ProcessPosition).TotalSeconds;
+            var duration = aaxFile.Duration;
+            double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
             double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
                 DecryptTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
 
-            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / aaxcTagLib.Properties.Duration.TotalSeconds;
+            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
             DecryptProgressUpdate?.Invoke(this, (int)progressPercent);
         }
 
-        /// <summary>
-        /// Copy all aacx metadata to m4b file, including cover art.
-        /// </summary>
-        public bool Step4_RestoreMetadata()
-        {
-            var outFile = new AaxcTagLibFile(outputFileName);
-            outFile.CopyTagsFrom(aaxcTagLib);
-
-            if (outFile.AppleTags.Pictures.Length == 0 && coverArt is not null)
-            {
-                outFile.AddPicture(coverArt);
-            }
-
-            outFile.Save();
-
-            return !isCanceled;
-        }
-
-        public bool Step5_CreateCue()
+        public bool Step3_CreateCue()
         {
+            // not a critical step. its failure should not prevent future steps from running
             try
             {
-                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
+                File.WriteAllText(PathLib.ReplaceExtension(OutputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(OutputFileName), downloadLicense.ChapterInfo));
             }
             catch (Exception ex)
             {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step5_CreateCue)}. FAILED");
+                Serilog.Log.Logger.Error(ex, $"{nameof(Step3_CreateCue)}. FAILED");
             }
             return !isCanceled;
         }
 
-        public bool Step6_CreateNfo()
+        public bool Step4_CreateNfo()
         {
+            // not a critical step. its failure should not prevent future steps from running
             try
             {
-                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".nfo"), NFO.CreateContents(AppName, aaxcTagLib, downloadLicense.ChapterInfo));
+                File.WriteAllText(PathLib.ReplaceExtension(OutputFileName, ".nfo"), NFO.CreateContents(AppName, aaxFile, downloadLicense.ChapterInfo));
             }
             catch (Exception ex)
             {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step5_CreateCue)}. FAILED");
+                Serilog.Log.Logger.Error(ex, $"{nameof(Step4_CreateNfo)}. FAILED");
             }
             return !isCanceled;
         }
 
+        public bool Step5_Cleanup()
+        {
+            FileExt.SafeDelete(jsonDownloadState);
+            FileExt.SafeDelete(tempFile);
+            return !isCanceled;
+        }
+
         public void Cancel()
         {
             isCanceled = true;
-            aaxcProcesser.Cancel();
+            aaxFile?.Cancel();
         }
     }
 }

AaxDecrypter/AaxcTagLibFile.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Linq;
-using Dinah.Core;
-using TagLib;
-using TagLib.Mpeg4;
-
-namespace AaxDecrypter
-{
-    public class AaxcTagLibFile : TagLib.Mpeg4.File
-    {
-        // ©
-        private const byte COPYRIGHT = 0xa9;
-
-        private static ReadOnlyByteVector narratorType { get; } = new ReadOnlyByteVector(COPYRIGHT, (byte)'n', (byte)'r', (byte)'t');
-        private static ReadOnlyByteVector descriptionType { get; } = new ReadOnlyByteVector(COPYRIGHT, (byte)'d', (byte)'e', (byte)'s');
-        private static ReadOnlyByteVector publisherType { get; } = new ReadOnlyByteVector(COPYRIGHT, (byte)'p', (byte)'u', (byte)'b');
-
-        public string AsciiTitleSansUnabridged => TitleSansUnabridged?.UnicodeToAscii();
-        public string AsciiFirstAuthor => FirstAuthor?.UnicodeToAscii();
-        public string AsciiNarrator => Narrator?.UnicodeToAscii();
-        public string AsciiComment => Comment?.UnicodeToAscii();
-        public string AsciiLongDescription => LongDescription?.UnicodeToAscii();
-
-        public AppleTag AppleTags => GetTag(TagTypes.Apple) as AppleTag;
-
-        public string Comment => AppleTags.Comment;
-        public string[] Authors => AppleTags.Performers;
-        public string FirstAuthor => Authors?.Length > 0 ? Authors[0] : default;
-        public string TitleSansUnabridged => AppleTags.Title?.Replace(" (Unabridged)", "");
-
-        public string BookCopyright => _copyright is not null && _copyright.Length > 0 ? _copyright[0] : default;
-        public string RecordingCopyright => _copyright is not null && _copyright.Length > 1 ? _copyright[1] : default;
-        private string[] _copyright => AppleTags.Copyright?.Replace("©", string.Empty)?.Replace("(P)", string.Empty)?.Split(';');
-
-        public string Narrator => getAppleTagsText(narratorType);
-        public string LongDescription => getAppleTagsText(descriptionType);
-        public string ReleaseDate => getAppleTagsText("rldt");
-        public string Publisher => getAppleTagsText(publisherType);
-        private string getAppleTagsText(ByteVector byteVector)
-        {
-            string[] text = AppleTags.GetText(byteVector);
-            return text.Length == 0 ? default : text[0];
-        }
-
-        public AaxcTagLibFile(IFileAbstraction abstraction)
-            : base(abstraction, ReadStyle.Average)
-        {          
-        }
-
-        public AaxcTagLibFile(string path) 
-            : this(new LocalFileAbstraction(path))
-        {
-        }
-        /// <summary>
-        /// Copy all metadata fields in the source file, even those that TagLib doesn't
-        /// recognize, to the output file.
-        /// NOTE: Chapters aren't stored in MPEG-4 metadata. They are encoded as a Timed
-        /// Text Stream (MPEG-4 Part 17), so taglib doesn't read or write them.
-        /// </summary>
-        /// <param name="sourceFile">File from which tags will be coppied.</param>
-        public void CopyTagsFrom(AaxcTagLibFile sourceFile)
-        {
-            AppleTags.Clear();
-
-            foreach (var stag in sourceFile.AppleTags)
-            {
-                AppleTags.SetData(stag.BoxType, stag.Children.Cast<AppleDataBox>().ToArray());
-            }
-        }
-        public void AddPicture(byte[] coverArt)
-        {
-            AppleTags.SetData("covr", coverArt, 0);
-        }
-    }
-}

AaxDecrypter/Chapters.cs

@@ -1,85 +0,0 @@
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-
-namespace AaxDecrypter
-{
-    public class ChapterInfo
-    {
-        private List<Chapter> _chapterList = new List<Chapter>();
-        public IEnumerable<Chapter> Chapters => _chapterList.AsEnumerable();
-        public int Count => _chapterList.Count;
-        public ChapterInfo() { }
-        public ChapterInfo(string audiobookFile) 
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_chapters -print_format json \"" + audiobookFile + "\""
-            };
-
-            var jString = info.RunHidden().Output;
-            var chapterJObject = JObject.Parse(jString);
-            var chapters = chapterJObject["chapters"]
-                .Select(c => new Chapter(
-                    c["tags"]?["title"]?.Value<string>(), 
-                    c["start_time"].Value<double>(),
-                    c["end_time"].Value<double>()
-                    ));
-
-            _chapterList.AddRange(chapters);
-        }
-        public void AddChapter(Chapter chapter)
-        {
-            ArgumentValidator.EnsureNotNull(chapter, nameof(chapter));
-            _chapterList.Add(chapter);
-        }
-        public string ToFFMeta(bool includeFFMetaHeader)
-        {
-            var ffmetaChapters = new StringBuilder();
-
-            if (includeFFMetaHeader)
-                ffmetaChapters.AppendLine(";FFMETADATA1\n");
-
-            foreach (var c in Chapters)
-            {
-                ffmetaChapters.AppendLine(c.ToFFMeta());
-            }
-            return ffmetaChapters.ToString();
-        }
-    }
-    public class Chapter
-    {
-        public string Title { get; }
-        public TimeSpan StartOffset { get; }
-        public TimeSpan EndOffset { get; }
-        public Chapter(string title, long startOffsetMs, long lengthMs)
-        {
-            ArgumentValidator.EnsureNotNullOrEmpty(title, nameof(title));
-            ArgumentValidator.EnsureGreaterThan(startOffsetMs, nameof(startOffsetMs), -1);
-            ArgumentValidator.EnsureGreaterThan(lengthMs, nameof(lengthMs), 0);
-
-            Title = title;
-            StartOffset = TimeSpan.FromMilliseconds(startOffsetMs);
-            EndOffset = StartOffset +  TimeSpan.FromMilliseconds(lengthMs);
-        }
-        public Chapter(string title, double startTimeSec, double endTimeSec)
-            :this(title, (long)(startTimeSec * 1000), (long)((endTimeSec - startTimeSec) * 1000))
-        {
-        }
-
-        public string ToFFMeta()
-        {
-            return "[CHAPTER]\n" +
-                "TIMEBASE=1/1000\n" +
-                "START=" + StartOffset.TotalMilliseconds + "\n" +
-                "END=" + EndOffset.TotalMilliseconds + "\n" +
-                "title=" + Title;
-        }
-    }
-}

AaxDecrypter/Cue.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
+using AAXClean;
 using Dinah.Core;
 
 namespace AaxDecrypter

AaxDecrypter/DecryptSupportLibraries.cs

@@ -1,16 +0,0 @@
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public static class DecryptSupportLibraries
-    {
-        // OTHER EXTERNAL DEPENDENCIES
-        // ffprobe has these pre-req.s as I'm using it:
-        // avcodec-58.dll, avdevice-58.dll, avfilter-7.dll, avformat-58.dll, avutil-56.dll, swresample-3.dll, swscale-5.dll, taglib-sharp.dll
-
-        private static string appPath_ { get; } = Path.GetDirectoryName(Dinah.Core.Exe.FileLocationOnDisk);
-        private static string decryptLib_ { get; } = Path.Combine(appPath_, "DecryptLib");
-        public static string ffmpegPath { get; } = Path.Combine(decryptLib_, "ffmpeg.exe");
-        public static string ffprobePath { get; } = Path.Combine(decryptLib_, "ffprobe.exe");
-    }
-}

AaxDecrypter/DownloadLicense.cs

@@ -1,4 +1,5 @@
-using Dinah.Core;
+using AAXClean;
+using Dinah.Core;
 
 namespace AaxDecrypter
 {

AaxDecrypter/FFMpegAaxcProcesser.cs

@@ -1,244 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace AaxDecrypter
-{
-    class AaxcProcessUpdate
-    {
-        public AaxcProcessUpdate(TimeSpan position, double speed)
-        {
-            ProcessPosition = position;
-            ProcessSpeed = speed;
-            EventTime = DateTime.Now;
-        }
-        public TimeSpan ProcessPosition { get; }
-        public double ProcessSpeed { get; }
-        public DateTime EventTime { get; }
-    }
-
-    /// <summary>
-    /// Download audible aaxc, decrypt, and remux with chapters.
-    /// </summary>
-    class FFMpegAaxcProcesser
-    {
-        public event EventHandler<AaxcProcessUpdate> ProgressUpdate;
-        public string FFMpegPath { get; }
-        public DownloadLicense DownloadLicense { get; }
-        public bool IsRunning { get; private set; }
-        public bool Succeeded { get; private set; }
-        public string FFMpegRemuxerStandardError => remuxerError.ToString();
-        public string FFMpegDownloaderStandardError => downloaderError.ToString();
-
-
-        private StringBuilder remuxerError { get; } = new StringBuilder();
-        private StringBuilder downloaderError { get; } = new StringBuilder();
-        private static Regex processedTimeRegex { get; } = new Regex("time=(\\d{2}):(\\d{2}):(\\d{2}).\\d{2}.*speed=\\s{0,1}([0-9]*[.]?[0-9]+)(?:e\\+([0-9]+)){0,1}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        private Process downloader;
-        private Process remuxer;
-        private bool isCanceled = false;
-
-        public FFMpegAaxcProcesser( DownloadLicense downloadLicense)
-        {
-            FFMpegPath = DecryptSupportLibraries.ffmpegPath;
-            DownloadLicense = downloadLicense;
-        }
-
-        public async Task ProcessBook(string outputFile, string ffmetaChaptersPath = null)
-        {
-            //This process gets the aaxc from the url and streams the decrypted
-            //aac stream to standard output
-            downloader = new Process
-            {
-                StartInfo = getDownloaderStartInfo()
-            };
-
-            //This process retreves an aac stream from standard input and muxes
-            // it into an m4b along with the cover art and metadata.
-            remuxer = new Process
-            {
-                StartInfo = getRemuxerStartInfo(outputFile, ffmetaChaptersPath)
-            };
-
-            IsRunning = true;
-
-            downloader.ErrorDataReceived += Downloader_ErrorDataReceived;
-            downloader.Start();
-            downloader.BeginErrorReadLine();
-
-            remuxer.ErrorDataReceived += Remuxer_ErrorDataReceived;
-            remuxer.Start();
-            remuxer.BeginErrorReadLine();
-
-            //Thic check needs to be placed after remuxer has started
-            if (isCanceled) return;
-
-            var pipedOutput = downloader.StandardOutput.BaseStream;
-            var pipedInput = remuxer.StandardInput.BaseStream;
-
-
-            //All the work done here. Copy download standard output into
-            //remuxer standard input
-            await Task.Run(() =>
-            {
-                int lastRead = 0;
-                byte[] buffer = new byte[32 * 1024];
-
-                do
-                {
-                    lastRead = pipedOutput.Read(buffer, 0, buffer.Length);
-                    pipedInput.Write(buffer, 0, lastRead);
-                } while (lastRead > 0 && !remuxer.HasExited);
-            });
-
-            //Closing input stream terminates remuxer
-            pipedInput.Close();
-
-            //If the remuxer exited due to failure, downloader will still have
-            //data in the pipe. Force kill downloader to continue.
-            if (remuxer.HasExited && !downloader.HasExited)
-                downloader.Kill();
-
-            remuxer.WaitForExit();
-            downloader.WaitForExit();
-
-            IsRunning = false;
-            Succeeded = downloader.ExitCode == 0 && remuxer.ExitCode == 0;
-        }
-        public void Cancel()
-        {
-            isCanceled = true;
-
-            if (IsRunning && !remuxer.HasExited)
-                remuxer.Kill();
-            if (IsRunning && !downloader.HasExited)
-                downloader.Kill();
-        }
-        private void Downloader_ErrorDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            if (string.IsNullOrEmpty(e.Data))
-                return;
-
-            downloaderError.AppendLine(e.Data);            
-        }
-
-        private void Remuxer_ErrorDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            if (string.IsNullOrEmpty(e.Data))
-                return;
-
-            remuxerError.AppendLine(e.Data);
-
-            if (processedTimeRegex.IsMatch(e.Data))
-            {
-                //get timestamp of of last processed audio stream position
-                //and processing speed
-                var match = processedTimeRegex.Match(e.Data);
-
-                int hours = int.Parse(match.Groups[1].Value);
-                int minutes = int.Parse(match.Groups[2].Value);
-                int seconds = int.Parse(match.Groups[3].Value);
-
-                var position = new TimeSpan(hours, minutes, seconds);
-
-                double speed = double.Parse(match.Groups[4].Value);
-                int exp = match.Groups[5].Success ? int.Parse(match.Groups[5].Value) : 0;
-                speed *= Math.Pow(10, exp);
-
-                ProgressUpdate?.Invoke(this, new AaxcProcessUpdate(position, speed));
-            }
-
-            if (e.Data.Contains("aac bitstream error"))
-            {
-                //This happens if input is corrupt (should never happen) or if caller
-                //supplied wrong key/iv
-                var process = sender as Process;
-                process.Kill();
-            }
-        }
-
-        private ProcessStartInfo getDownloaderStartInfo() =>
-         new ProcessStartInfo
-         {
-             FileName = FFMpegPath,
-             RedirectStandardError = true,
-             RedirectStandardOutput = true,
-             CreateNoWindow = true,
-             WindowStyle = ProcessWindowStyle.Hidden,
-             UseShellExecute = false,
-             WorkingDirectory = Path.GetDirectoryName(FFMpegPath),
-             ArgumentList ={
-                    "-nostdin",
-                    "-audible_key",
-                    DownloadLicense.AudibleKey,
-                    "-audible_iv",
-                    DownloadLicense.AudibleIV,
-                    "-user_agent",
-                    DownloadLicense.UserAgent, //user-agent is requied for CDN to serve the file
-                    "-i",
-                    DownloadLicense.DownloadUrl, 
-                    "-c:a", //audio codec
-                    "copy", //copy stream
-                    "-f", //force output format: adts
-                    "adts",
-                    "pipe:" //pipe output to stdout
-                }
-         };
-
-        private ProcessStartInfo getRemuxerStartInfo(string outputFile, string ffmetaChaptersPath = null)
-        {
-           var startInfo = new ProcessStartInfo
-            {
-                FileName = FFMpegPath,
-                RedirectStandardError = true,
-                RedirectStandardInput = true,
-                CreateNoWindow = true,
-                WindowStyle = ProcessWindowStyle.Hidden,
-                UseShellExecute = false,
-                WorkingDirectory = Path.GetDirectoryName(FFMpegPath),
-            };
-
-            startInfo.ArgumentList.Add("-thread_queue_size");
-            startInfo.ArgumentList.Add("1024");
-            startInfo.ArgumentList.Add("-f"); //force input format: aac
-            startInfo.ArgumentList.Add("aac");
-            startInfo.ArgumentList.Add("-i"); //read input from stdin
-            startInfo.ArgumentList.Add("pipe:");
-
-            if (ffmetaChaptersPath is null)
-            {
-                //copy metadata from aaxc file.
-                startInfo.ArgumentList.Add("-user_agent");
-                startInfo.ArgumentList.Add(DownloadLicense.UserAgent);
-                startInfo.ArgumentList.Add("-i");
-                startInfo.ArgumentList.Add(DownloadLicense.DownloadUrl);
-            }
-            else
-            {
-                //copy metadata from supplied metadata file
-                startInfo.ArgumentList.Add("-f");
-                startInfo.ArgumentList.Add("ffmetadata");
-                startInfo.ArgumentList.Add("-i");
-                startInfo.ArgumentList.Add(ffmetaChaptersPath);
-            }
-
-            startInfo.ArgumentList.Add("-map"); //map file 0 (aac audio stream)
-            startInfo.ArgumentList.Add("0");
-            startInfo.ArgumentList.Add("-map_chapters"); //copy chapter data from file 1 (either metadata file or aaxc file)
-            startInfo.ArgumentList.Add("1");
-            startInfo.ArgumentList.Add("-c"); //copy all mapped streams
-            startInfo.ArgumentList.Add("copy");
-            startInfo.ArgumentList.Add("-f"); //force output format: mp4
-            startInfo.ArgumentList.Add("mp4");
-            startInfo.ArgumentList.Add("-movflags"); 
-            startInfo.ArgumentList.Add("disable_chpl"); //Disable Nero chapters format
-            startInfo.ArgumentList.Add(outputFile);
-            startInfo.ArgumentList.Add("-y"); //overwrite existing
-
-            return startInfo;
-        }
-    }
-}

AaxDecrypter/NFO.cs

@@ -1,27 +1,29 @@
-
+using AAXClean;
+using Dinah.Core;
+
 namespace AaxDecrypter
 {
     public static class NFO
     {
-        public static string CreateContents(string ripper, AaxcTagLibFile aaxcTagLib, ChapterInfo chapters)
+        public static string CreateContents(string ripper, AAXClean.Mp4File aaxcTagLib, ChapterInfo chapters)
         {
-            var _hours = (int)aaxcTagLib.Properties.Duration.TotalHours;
+            var _hours = (int)aaxcTagLib.Duration.TotalHours;
             var myDuration
                 = (_hours > 0 ? _hours + " hours, " : string.Empty)
-                + aaxcTagLib.Properties.Duration.Minutes + " minutes, "
-                + aaxcTagLib.Properties.Duration.Seconds + " seconds";
+                + aaxcTagLib.Duration.Minutes + " minutes, "
+                + aaxcTagLib.Duration.Seconds + " seconds";
 
             var nfoString
                 = "General Information\r\n"
                 + "======================\r\n"
-                + $" Title:                  {aaxcTagLib.AsciiTitleSansUnabridged ?? "[unknown]"}\r\n"
-                + $" Author:                 {aaxcTagLib.AsciiFirstAuthor ?? "[unknown]"}\r\n"
-                + $" Read By:                {aaxcTagLib.AsciiNarrator ?? "[unknown]"}\r\n"
-                + $" Release Date:           {aaxcTagLib.ReleaseDate ?? "[unknown]"}\r\n"
-                + $" Book Copyright:         {aaxcTagLib.BookCopyright ?? "[unknown]"}\r\n"
-                + $" Recording Copyright:    {aaxcTagLib.RecordingCopyright ?? "[unknown]"}\r\n"
-                + $" Genre:                  {aaxcTagLib.AppleTags.FirstGenre ?? "[unknown]"}\r\n"
-                + $" Publisher:              {aaxcTagLib.Publisher ?? "[unknown]"}\r\n"
+                + $" Title:                  {aaxcTagLib.AppleTags.TitleSansUnabridged?.UnicodeToAscii() ?? "[unknown]"}\r\n"
+                + $" Author:                 {aaxcTagLib.AppleTags.FirstAuthor?.UnicodeToAscii() ?? "[unknown]"}\r\n"
+                + $" Read By:                {aaxcTagLib.AppleTags.Narrator?.UnicodeToAscii() ?? "[unknown]"}\r\n"
+                + $" Release Date:           {aaxcTagLib.AppleTags.ReleaseDate ?? "[unknown]"}\r\n"
+                + $" Book Copyright:         {aaxcTagLib.AppleTags.BookCopyright ?? "[unknown]"}\r\n"
+                + $" Recording Copyright:    {aaxcTagLib.AppleTags.RecordingCopyright ?? "[unknown]"}\r\n"
+                + $" Genre:                  {aaxcTagLib.AppleTags.Generes ?? "[unknown]"}\r\n"
+                + $" Publisher:              {aaxcTagLib.AppleTags.Publisher ?? "[unknown]"}\r\n"
                 + $" Duration:               {myDuration}\r\n"
                 + $" Chapters:               {chapters.Count}\r\n"
                 + "\r\n"
@@ -29,22 +31,22 @@ namespace AaxDecrypter
                 + "Media Information\r\n"
                 + "======================\r\n"
                 + " Source Format:          Audible AAX\r\n"
-                + $" Source Sample Rate:     {aaxcTagLib.Properties.AudioSampleRate} Hz\r\n"
-                + $" Source Channels:        {aaxcTagLib.Properties.AudioChannels}\r\n"
-                + $" Source Bitrate:         {aaxcTagLib.Properties.AudioBitrate} Kbps\r\n"
+                + $" Source Sample Rate:     {aaxcTagLib.TimeScale} Hz\r\n"
+                + $" Source Channels:        {aaxcTagLib.AudioChannels}\r\n"
+                + $" Source Bitrate:         {aaxcTagLib.AverageBitrate} Kbps\r\n"
                 + "\r\n"
                 + " Lossless Encode:        Yes\r\n"
                 + " Encoded Codec:          AAC / M4B\r\n"
-                + $" Encoded Sample Rate:    {aaxcTagLib.Properties.AudioSampleRate} Hz\r\n"
-                + $" Encoded Channels:       {aaxcTagLib.Properties.AudioChannels}\r\n"
-                + $" Encoded Bitrate:        {aaxcTagLib.Properties.AudioBitrate} Kbps\r\n"
+                + $" Encoded Sample Rate:    {aaxcTagLib.TimeScale} Hz\r\n"
+                + $" Encoded Channels:       {aaxcTagLib.AudioChannels}\r\n"
+                + $" Encoded Bitrate:        {aaxcTagLib.AverageBitrate} Kbps\r\n"
                 + "\r\n"
                 + $" Ripper:                 {ripper}\r\n"
                 + "\r\n"
                 + "\r\n"
                 + "Book Description\r\n"
                 + "================\r\n"
-                + (!string.IsNullOrWhiteSpace(aaxcTagLib.LongDescription) ? aaxcTagLib.AsciiLongDescription : aaxcTagLib.AsciiComment);
+                + (!string.IsNullOrWhiteSpace(aaxcTagLib.AppleTags.LongDescription) ? aaxcTagLib.AppleTags.LongDescription.UnicodeToAscii() : aaxcTagLib.AppleTags.Comment?.UnicodeToAscii());
 
             return nfoString;
         }

AaxDecrypter/NetworkFileAbstraction.cs

@@ -1,135 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace AaxDecrypter
-{
-    /// <summary>
-    /// Provides a <see cref="TagLib.File.IFileAbstraction"/> for a file over Http.
-    /// </summary>
-    class NetworkFileAbstraction : TagLib.File.IFileAbstraction
-    {
-        private NetworkFileStream aaxNetworkStream;
-
-        public static async Task<NetworkFileAbstraction> CreateAsync(HttpClient client, Uri webFileUri)
-        {
-            var response = await client.GetAsync(webFileUri, HttpCompletionOption.ResponseHeadersRead);
-
-            if (response.StatusCode != System.Net.HttpStatusCode.OK)
-                throw new Exception("Can't read file from client.");
-
-            var contentLength = response.Content.Headers.ContentLength ?? 0;
-
-            var networkStream = await response.Content.ReadAsStreamAsync();
-
-            var networkFile = new NetworkFileAbstraction(Path.GetFileName(webFileUri.LocalPath), networkStream, contentLength);
-
-            return networkFile;
-        }
-
-        private NetworkFileAbstraction(string fileName, Stream netStream, long contentLength)
-        {
-            Name = fileName;
-            aaxNetworkStream = new NetworkFileStream(netStream, contentLength);
-        }
-        public string Name { get; private set; }
-
-        public Stream ReadStream => aaxNetworkStream;
-
-        public Stream WriteStream => throw new NotImplementedException();
-
-        public void CloseStream(Stream stream)
-        {
-            aaxNetworkStream.Close();
-        }
-
-        private class NetworkFileStream : Stream
-        {
-            private const int BUFF_SZ = 2 * 1024;
-
-            private FileStream _fileBacker;
-
-            private Stream _networkStream;
-
-            private long networkBytesRead = 0;
-
-            private long _contentLength;
-            public NetworkFileStream(Stream netStream, long contentLength)
-            {
-                _networkStream = netStream;
-                _contentLength = contentLength;
-                _fileBacker = File.Create(Path.GetTempFileName(), BUFF_SZ, FileOptions.DeleteOnClose);
-            }
-            public override bool CanRead => true;
-
-            public override bool CanSeek => true;
-
-            public override bool CanWrite => false;
-
-            public override long Length => _contentLength;
-
-            public override long Position { get => _fileBacker.Position; set => Seek(value, 0); }
-
-            public override void Flush()
-            {
-                throw new NotImplementedException();
-            }
-            public override void SetLength(long value)
-            {
-                throw new NotImplementedException();
-            }
-            public override void Write(byte[] buffer, int offset, int count)
-            {
-                throw new NotImplementedException();
-            }
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                long requiredLength = Position + count;
-
-                if (requiredLength > networkBytesRead)
-                    readWebFileToPosition(requiredLength);
-
-                return _fileBacker.Read(buffer, offset, count);
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                long newPosition = (long)origin + offset;
-
-                if (newPosition > networkBytesRead)
-                    readWebFileToPosition(newPosition);
-
-                _fileBacker.Position = newPosition;
-                return newPosition;
-            }
-
-            public override void Close()
-            {
-                _fileBacker.Close();
-                _networkStream.Close();
-            }
-            /// <summary>
-            /// Read more data from <see cref="_networkStream"/> into <see cref="_fileBacker"/> as needed. 
-            /// </summary>
-            /// <param name="requiredLength">Length of strem required for the operation.</param>
-            private void readWebFileToPosition(long requiredLength)
-            {
-                byte[] buff = new byte[BUFF_SZ];
-
-                long backerPosition = _fileBacker.Position;
-
-                _fileBacker.Position = networkBytesRead;
-
-                while (networkBytesRead < requiredLength)
-                {
-                    int bytesRead = _networkStream.Read(buff, 0, BUFF_SZ);
-                    _fileBacker.Write(buff, 0, bytesRead);
-                    networkBytesRead += bytesRead;
-                }
-
-                _fileBacker.Position = backerPosition;
-            }
-        }
-    }
-}

AaxDecrypter/NetworkFileStream.cs

@@ -0,0 +1,455 @@
+using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AaxDecrypter
+{
+    /// <summary>
+    /// A <see cref="CookieContainer"/> for a single Uri.
+    /// </summary>
+    public class SingleUriCookieContainer : CookieContainer
+    {
+        private Uri baseAddress;
+        public Uri Uri
+        { 
+            get => baseAddress; 
+            set 
+            { 
+                baseAddress = new UriBuilder(value.Scheme, value.Host).Uri; 
+            } 
+        }
+
+        public CookieCollection GetCookies()
+        {
+            return base.GetCookies(Uri);
+        }
+    }
+
+    /// <summary>
+    /// A resumable, simultaneous file downloader and reader.
+    /// </summary>
+    public class NetworkFileStream : Stream, IUpdatable
+    {
+        public event EventHandler Updated;
+
+        #region Public Properties
+
+        /// <summary>
+        /// Location to save the downloaded data.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public string SaveFilePath { get; }
+
+        /// <summary>
+        /// Http(s) address of the file to download.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public Uri Uri { get; private set; }
+
+        /// <summary>
+        /// All cookies set by caller or by the remote server.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public SingleUriCookieContainer CookieContainer { get; }
+
+        /// <summary>
+        /// Http headers to be sent to the server with the request.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public WebHeaderCollection RequestHeaders { get; private set; }
+
+        /// <summary>
+        /// The position in <see cref="SaveFilePath"/> that has been written and flushed to disk.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public long WritePosition { get; private set; }
+
+        /// <summary>
+        /// The total length of the <see cref="Uri"/> file to download.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public long ContentLength { get; private set; }
+
+        #endregion
+
+        #region Private Properties
+
+        private HttpWebRequest HttpRequest { get; set; }
+        private FileStream _writeFile { get; }
+        private FileStream _readFile { get; }
+        private Stream _networkStream { get; set; }
+        private bool hasBegunDownloading { get; set; }
+        private bool isCancelled { get; set; }
+        private bool finishedDownloading { get; set; }
+        private Action downloadThreadCompleteCallback { get; set; }
+
+        #endregion
+
+        #region Constants
+
+        //Download buffer size
+        private const int DOWNLOAD_BUFF_SZ = 4 * 1024;
+
+        //NetworkFileStream will flush all data in _writeFile to disk after every
+        //DATA_FLUSH_SZ bytes are written to the file stream.
+        private const int DATA_FLUSH_SZ = 1024 * 1024;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// A resumable, simultaneous file downloader and reader.
+        /// </summary>
+        /// <param name="saveFilePath">Path to a location on disk to save the downloaded data from <paramref name="uri"/></param>
+        /// <param name="uri">Http(s) address of the file to download.</param>
+        /// <param name="writePosition">The position in <paramref name="uri"/> to begin downloading.</param>
+        /// <param name="requestHeaders">Http headers to be sent to the server with the <see cref="HttpWebRequest"/>.</param>
+        /// <param name="cookies">A <see cref="SingleUriCookieContainer"/> with cookies to send with the <see cref="HttpWebRequest"/>. It will also be populated with any cookies set by the server. </param>
+        public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, WebHeaderCollection requestHeaders = null, SingleUriCookieContainer cookies = null)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(uri?.AbsoluteUri, nameof(uri));
+            ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
+
+            if (!Directory.Exists(Path.GetDirectoryName(saveFilePath)))
+                throw new ArgumentException($"Specified {nameof(saveFilePath)} directory \"{Path.GetDirectoryName(saveFilePath)}\" does not exist.");
+
+            SaveFilePath = saveFilePath;
+            Uri = uri;
+            WritePosition = writePosition;
+            RequestHeaders = requestHeaders ?? new WebHeaderCollection();
+            CookieContainer = cookies ?? new SingleUriCookieContainer { Uri = uri };
+            
+            _writeFile = new FileStream(SaveFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite)
+            {
+                Position = WritePosition
+            };
+
+            _readFile = new FileStream(SaveFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+            SetUriForSameFile(uri);
+        }
+
+        #endregion
+               
+        #region Downloader
+
+        /// <summary>
+        /// Update the <see cref="JsonFilePersister"/>.
+        /// </summary>
+        private void Update()
+        {
+            RequestHeaders = HttpRequest.Headers;
+            Updated?.Invoke(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Set a different <see cref="System.Uri"/> to the same file targeted by this instance of <see cref="NetworkFileStream"/>
+        /// </summary>
+        /// <param name="uriToSameFile">New <see cref="System.Uri"/> host must match existing host.</param>
+        public void SetUriForSameFile(Uri uriToSameFile)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(uriToSameFile?.AbsoluteUri, nameof(uriToSameFile));
+
+            if (uriToSameFile.Host != Uri.Host)
+                throw new ArgumentException($"New uri to the same file must have the same host.\r\n Old Host :{Uri.Host}\r\nNew Host: {uriToSameFile.Host}");
+            if (hasBegunDownloading && !finishedDownloading)
+                throw new Exception("Cannot change Uri during a download operation.");
+
+            Uri = uriToSameFile;
+            HttpRequest = WebRequest.CreateHttp(Uri);
+
+            HttpRequest.CookieContainer = CookieContainer;
+            HttpRequest.Headers = RequestHeaders;
+            //If NetworkFileStream is resuming, Header will already contain a range.
+            HttpRequest.Headers.Remove("Range");
+            HttpRequest.AddRange(WritePosition);
+        }
+
+        /// <summary>
+        /// Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread.
+        /// </summary>
+        public void BeginDownloading()
+        {
+            if (ContentLength != 0 && WritePosition == ContentLength)
+            {
+                hasBegunDownloading = true;
+                finishedDownloading = true;
+                return;
+            }
+
+            if (ContentLength != 0 && WritePosition > ContentLength)
+                throw new Exception($"Specified write position (0x{WritePosition:X10}) is larger than the file size.");
+
+            var response = HttpRequest.GetResponse() as HttpWebResponse;
+
+            if (response.StatusCode != HttpStatusCode.PartialContent)
+                throw new Exception($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
+
+            if (response.Headers.GetValues("Accept-Ranges").FirstOrDefault(r => r.EqualsInsensitive("bytes")) is null)
+                throw new Exception($"Server at {Uri.Host} does not support Http ranges");
+
+            //Content length is the length of the range request, and it is only equal
+            //to the complete file length if requesting Range: bytes=0-
+            if (WritePosition == 0)
+                ContentLength = response.ContentLength;
+
+            _networkStream = response.GetResponseStream();
+
+            //Download the file in the background.
+            Thread downloadThread = new Thread(() => DownloadFile());
+            downloadThread.Start();
+
+            hasBegunDownloading = true;
+            return;
+        }
+
+        /// <summary>
+        /// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
+        /// </summary>
+        private void DownloadFile()
+        {
+            long downloadPosition = WritePosition;
+            long nextFlush = downloadPosition + DATA_FLUSH_SZ;
+
+            byte[] buff = new byte[DOWNLOAD_BUFF_SZ];
+            do
+            {
+                int bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
+                _writeFile.Write(buff, 0, bytesRead);
+
+                downloadPosition += bytesRead;
+
+                if (downloadPosition > nextFlush)
+                {
+                    _writeFile.Flush();
+                    WritePosition = downloadPosition;
+                    Update();
+                    nextFlush = downloadPosition + DATA_FLUSH_SZ;
+                }
+
+            } while (downloadPosition < ContentLength && !isCancelled);
+
+            _writeFile.Close();
+            WritePosition = downloadPosition;
+            Update();
+            _networkStream.Close();
+
+            if (!isCancelled && WritePosition < ContentLength)
+                throw new Exception("File download ended before finishing.");
+
+            if (WritePosition > ContentLength)
+                throw new Exception("Downloaded file is larger than expected.");
+
+            finishedDownloading = true;
+            downloadThreadCompleteCallback?.Invoke();
+        }
+
+        #endregion
+
+        #region Json Connverters
+
+        public static JsonSerializerSettings GetJsonSerializerSettings()
+        {
+            var settings = new JsonSerializerSettings();
+            settings.Converters.Add(new CookieContainerConverter());
+            settings.Converters.Add(new WebHeaderCollectionConverter());
+            return settings;
+        }
+
+        internal class CookieContainerConverter : JsonConverter
+        {
+            public override bool CanConvert(Type objectType)
+                => objectType == typeof(SingleUriCookieContainer);
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                var jObj = JObject.Load(reader);
+
+                var result = new SingleUriCookieContainer()
+                {
+                    Uri = new Uri(jObj["Uri"].Value<string>()),
+                    Capacity = jObj["Capacity"].Value<int>(),
+                    MaxCookieSize = jObj["MaxCookieSize"].Value<int>(),
+                    PerDomainCapacity = jObj["PerDomainCapacity"].Value<int>()
+                };
+
+                var cookieList = jObj["Cookies"].ToList();
+
+                foreach (var cookie in cookieList)
+                {
+                    result.Add(
+                        new Cookie
+                        {
+                            Comment = cookie["Comment"].Value<string>(),
+                            HttpOnly = cookie["HttpOnly"].Value<bool>(),
+                            Discard = cookie["Discard"].Value<bool>(),
+                            Domain = cookie["Domain"].Value<string>(),
+                            Expired = cookie["Expired"].Value<bool>(),
+                            Expires = cookie["Expires"].Value<DateTime>(),
+                            Name = cookie["Name"].Value<string>(),
+                            Path = cookie["Path"].Value<string>(),
+                            Port = cookie["Port"].Value<string>(),
+                            Secure = cookie["Secure"].Value<bool>(),
+                            Value = cookie["Value"].Value<string>(),
+                            Version = cookie["Version"].Value<int>(),
+                        });
+                }
+
+                return result;
+            }
+
+            public override bool CanWrite => true;
+
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            {
+                var cookies = value as SingleUriCookieContainer;
+                var obj = (JObject)JToken.FromObject(value);
+                var container = cookies.GetCookies();
+                var propertyNames = container.Select(c => JToken.FromObject(c));
+                obj.AddFirst(new JProperty("Cookies", new JArray(propertyNames)));
+                obj.WriteTo(writer);
+            }
+        }
+
+        internal class WebHeaderCollectionConverter : JsonConverter
+        {
+            public override bool CanConvert(Type objectType)
+                => objectType == typeof(WebHeaderCollection);
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                var jObj = JObject.Load(reader);
+                var result = new WebHeaderCollection();
+
+                foreach (var kvp in jObj)
+                {
+                    result.Add(kvp.Key, kvp.Value.Value<string>());
+                }
+
+                return result;
+            }
+
+            public override bool CanWrite => true;
+
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            {
+                JObject jObj = new JObject();
+                Type type = value.GetType();
+                var headers = value as WebHeaderCollection;
+                var jHeaders = headers.AllKeys.Select(k => new JProperty(k, headers[k]));
+                jObj.Add(jHeaders);
+                jObj.WriteTo(writer);
+            }
+        }
+
+        #endregion
+
+        #region Download Stream Reader
+
+        [JsonIgnore]
+        public override bool CanRead => true;
+
+        [JsonIgnore]
+        public override bool CanSeek => true;
+
+        [JsonIgnore]
+        public override bool CanWrite => false;
+
+        [JsonIgnore]
+        public override long Length => ContentLength;
+
+        [JsonIgnore]
+        public override long Position { get => _readFile.Position; set => Seek(value, SeekOrigin.Begin); }
+
+        [JsonIgnore]
+        public override bool CanTimeout => base.CanTimeout;
+
+        [JsonIgnore]
+        public override int ReadTimeout { get => base.ReadTimeout; set => base.ReadTimeout = value; }
+
+        [JsonIgnore]
+        public override int WriteTimeout { get => base.WriteTimeout; set => base.WriteTimeout = value; }
+
+        public override void Flush() => throw new NotImplementedException();
+        public override void SetLength(long value) => throw new NotImplementedException();
+        public override void Write(byte[] buffer, int offset, int count) => throw new NotImplementedException();
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            if (!hasBegunDownloading)
+                BeginDownloading();
+
+            long toRead = Math.Min(count, Length - Position);
+            long requiredPosition = Position + toRead;
+
+            //read operation will block until file contains enough data
+            //to fulfil the request, or until cancelled.
+            while (requiredPosition > WritePosition && !isCancelled)
+                Thread.Sleep(2);
+
+            return _readFile.Read(buffer, offset, count);
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            long newPosition;
+
+            switch (origin)
+            {
+                case SeekOrigin.Current:
+                    newPosition = Position + offset;
+                    break;
+                case SeekOrigin.End:
+                    newPosition = ContentLength + offset;
+                    break;
+                default:
+                    newPosition = offset;
+                    break;
+            }
+            ReadToPosition(newPosition);
+
+            _readFile.Position = newPosition;
+            return newPosition;
+        }
+
+        /// <summary>
+        /// Ensures that the file has downloaded to at least <paramref name="neededPosition"/>, then returns.
+        /// </summary>
+        /// <param name="neededPosition">The minimum required data length in <see cref="SaveFilePath"/>.</param>
+        private void ReadToPosition(long neededPosition)
+        {
+            byte[] buff = new byte[DOWNLOAD_BUFF_SZ];
+            do
+            {
+                Read(buff, 0, DOWNLOAD_BUFF_SZ);
+            } while (neededPosition > WritePosition);
+        }
+        public override void Close()
+        {
+            isCancelled = true;
+            downloadThreadCompleteCallback = CloseAction;
+
+            //ensure that close will run even if called after callback was fired.
+            if (finishedDownloading)
+                CloseAction();
+
+        }
+        private void CloseAction()
+        {
+            _readFile.Close();
+            _writeFile.Close();
+            _networkStream?.Close();
+            Update();
+        }
+
+        #endregion
+    }
+}

AaxDecrypter/NetworkFileStreamPersister.cs

@@ -0,0 +1,23 @@
+using Dinah.Core.IO;
+using Newtonsoft.Json;
+
+namespace AaxDecrypter
+{
+    internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
+    {
+
+		/// <summary>Alias for Target </summary>
+		public NetworkFileStream NetworkFileStream => Target;
+
+		/// <summary>uses path. create file if doesn't yet exist</summary>
+		public NetworkFileStreamPersister(NetworkFileStream networkFileStream, string path, string jsonPath = null)
+			: base(networkFileStream, path, jsonPath) { }
+
+		/// <summary>load from existing file</summary>
+		public NetworkFileStreamPersister(string path, string jsonPath = null)
+			: base(path, jsonPath) { }
+
+		protected override JsonSerializerSettings GetSerializerSettings() => NetworkFileStream.GetJsonSerializerSettings();
+
+    }
+}

ApplicationServices/ApplicationServices.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.0.2" />
+    <PackageReference Include="CsvHelper" Version="27.1.1" />
     <PackageReference Include="NPOI" Version="2.5.3" />
   </ItemGroup>
 

ApplicationServices/LibraryCommands.cs

@@ -35,7 +35,7 @@ namespace ApplicationServices
 			}
 			catch (AudibleApi.Authentication.LoginFailedException lfEx)
 			{
-				lfEx.MoveResponseBodyFile(FileManager.Configuration.Instance.LibationFiles);
+				lfEx.SaveFiles(FileManager.Configuration.Instance.LibationFiles);
 
 				// nuget Serilog.Exceptions would automatically log custom properties
 				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
@@ -46,7 +46,7 @@ namespace ApplicationServices
 					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
 					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
 					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePath
+					lfEx.ResponseBodyFilePaths
 				});
 				throw;
 			}

DtoImporterService/BookImporter.cs

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

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

@@ -38,7 +38,7 @@ namespace FileLiberator
                 if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DecryptInProgress, libraryBook);
+                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
 
                 // decrypt failed
                 if (outputAudioFilename is null)
@@ -59,7 +59,7 @@ namespace FileLiberator
             }
         }
 
-        private async Task<string> aaxToM4bConverterDecryptAsync(string destinationDir, LibraryBook libraryBook)
+        private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
         {
             DecryptBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
 
@@ -81,24 +81,26 @@ namespace FileLiberator
 
                 if (Configuration.Instance.AllowLibationFixup)
                 {
-                    aaxcDecryptDlLic.ChapterInfo = new ChapterInfo();
+                    aaxcDecryptDlLic.ChapterInfo = new AAXClean.ChapterInfo();
 
                     foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        aaxcDecryptDlLic.ChapterInfo.AddChapter(
-                            new Chapter(
-                                chap.Title,
-                                chap.StartOffsetMs,
-                                chap.LengthMs
-                                ));
+                        aaxcDecryptDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
                 }
 
-                aaxcDownloader = AaxcDownloadConverter.Create(destinationDir, aaxcDecryptDlLic);
 
-                aaxcDownloader.AppName = "Libation";                              
+                var format = Configuration.Instance.DecryptToLossy ? OutputFormat.Mp3 : OutputFormat.Mp4a;
 
-                // override default which was set in CreateAsync
-                var proposedOutputFile = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].m4b");
-                aaxcDownloader.SetOutputFilename(proposedOutputFile);
+                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;
@@ -111,7 +113,7 @@ namespace FileLiberator
                 if (!success)
                     return null;
 
-                return aaxcDownloader.outputFileName;
+                return aaxcDownloader.OutputFileName;
             }
             finally
             {
@@ -132,7 +134,7 @@ namespace FileLiberator
             }
         }
 
-        private void aaxcDownloader_RetrievedTags(object sender, AaxcTagLibFile e)
+        private void aaxcDownloader_RetrievedTags(object sender, AAXClean.AppleTags e)
         {
             TitleDiscovered?.Invoke(this, e.TitleSansUnabridged);
             AuthorsDiscovered?.Invoke(this, e.FirstAuthor ?? "[unknown]");
@@ -213,12 +215,11 @@ namespace FileLiberator
 		}
 
         public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId)
-            && !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId);
+            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
 
         public void Cancel()
         {
-            aaxcDownloader.Cancel();
+            aaxcDownloader?.Cancel();
         }
     }
 }

FileLiberator/DownloadFile.cs

@@ -6,6 +6,7 @@ using Dinah.Core.Net.Http;
 namespace FileLiberator
 {
 	// frustratingly copy pasta from DownloadableBase and DownloadPdf
+	// currently only used to download the .zip flies for upgrade
 	public class DownloadFile : IDownloadable
 	{
 		public event EventHandler<string> DownloadBegin;

FileManager/AudibleFileStorage.cs

@@ -9,7 +9,7 @@ using Dinah.Core.Collections.Generic;
 namespace FileManager
 {
     // could add images here, but for now images are stored in a well-known location
-    public enum FileType { Unknown, Audio, AAX, PDF }
+    public enum FileType { Unknown, Audio, AAXC, PDF }
 
 	/// <summary>
 	/// Files are large. File contents are never read by app.
@@ -25,49 +25,19 @@ namespace FileManager
 
 		#region static
 		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-		public static AudibleFileStorage AAX { get; } = new AaxFileStorage();
+		public static AudibleFileStorage AAXC { get; } = new AaxcFileStorage();
 		public static AudibleFileStorage PDF { get; } = new PdfFileStorage();
 
-		public static string DownloadsInProgress
-        {
-            get
-            {
-                if (!Configuration.Instance.DownloadsInProgressEnum.In("WinTemp", "LibationFiles"))
-                    Configuration.Instance.DownloadsInProgressEnum = "WinTemp";
-                var AaxRootDir
-                    = Configuration.Instance.DownloadsInProgressEnum == "WinTemp"
-                    ? Configuration.WinTemp
-                    : Configuration.Instance.LibationFiles;
+		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
 
-                return Directory.CreateDirectory(Path.Combine(AaxRootDir, "DownloadsInProgress")).FullName;
-            }
-        }
-
-        public static string DecryptInProgress
-        {
-            get
-            {
-                if (!Configuration.Instance.DecryptInProgressEnum.In("WinTemp", "LibationFiles"))
-                    Configuration.Instance.DecryptInProgressEnum = "WinTemp";
-
-                var M4bRootDir
-                    = Configuration.Instance.DecryptInProgressEnum == "WinTemp"
-                    ? Configuration.WinTemp
-                    : Configuration.Instance.LibationFiles;
-
-                return Directory.CreateDirectory(Path.Combine(M4bRootDir, "DecryptInProgress")).FullName;
-            }
-        }
-
-        // not customizable. don't move to config
-        public static string DownloadsFinal => new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("DownloadsFinal").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;
             }
         }
@@ -77,7 +47,7 @@ namespace FileManager
         public FileType FileType => (FileType)Value;
 
 		private IEnumerable<string> extensions_noDots { get; }
-		private string extAggr { get; }
+        private string extAggr { get; }
 
         protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
 		{
@@ -153,16 +123,16 @@ namespace FileManager
         }
     }
 
-    public class AaxFileStorage : AudibleFileStorage
+    public class AaxcFileStorage : AudibleFileStorage
     {
-        public override string[] Extensions { get; } = new[] { "aax" };
+        public override string[] Extensions { get; } = new[] { "aaxc" };
 
         // we always want to use the latest config value, therefore
         // - DO use 'get' arrow "=>"
         // - do NOT use assign "="
-        public override string StorageDirectory => DownloadsFinal;
+        public override string StorageDirectory => DownloadsInProgress;
 
-        public AaxFileStorage() : base(FileType.AAX) { }
+        public AaxcFileStorage() : base(FileType.AAXC) { }
     }
 
     public class PdfFileStorage : AudibleFileStorage

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,118 +50,26 @@ namespace FileManager
         */
         #endregion
 
-        private PersistentDictionary persistentDictionary;
+        // settings will be persisted when all are true
+        // - property (not field)
+        // - string
+        // - public getter
+        // - public setter
 
-        public bool FilesExist
-            => File.Exists(APPSETTINGS_JSON)
-            && File.Exists(SettingsFilePath)
-            && Directory.Exists(LibationFiles)
-            && Directory.Exists(Books);
-
-        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
-
-        [Description("Location for book storage. Includes destination of newly liberated books")]
-        public string Books
-        {
-            get => persistentDictionary.GetString(nameof(Books));
-            set => persistentDictionary.Set(nameof(Books), value);
-        }
-
-        private const string APP_DIR = "AppDir";
-        public static string AppDir { get; } = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES));
-        public static string MyDocs { get; } = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), LIBATION_FILES));
-        public static string WinTemp { get; } = Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
-
-        private Dictionary<string, string> wellKnownPaths { get; } = new Dictionary<string, string>
-        {
-            [APP_DIR] = AppDir,
-            ["MyDocs"] = MyDocs,
-            ["WinTemp"] = WinTemp
-        };
-        private string libationFilesPathCache;
+        // 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
 
-        // temp/working dir(s) should be outside of dropbox
-        [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();
-        private Configuration() { }
-
-        private const string APPSETTINGS_JSON = "appsettings.json";
-        private const string LIBATION_FILES = "LibationFiles";
-
-        [Description("Location for storage of program-created files")]
-        public string LibationFiles => libationFilesPathCache ?? getLibationFiles();
-        private string getLibationFiles()
-        {
-            var value = getLiberationFilesSettingFromJson();
-
-            // this looks weird but is correct for translating wellKnownPaths
-            if (wellKnownPaths.ContainsKey(value))
-                value = wellKnownPaths[value];
-
-            // must write here before SettingsFilePath in next step reads cache
-            libationFilesPathCache = value;
-
-            // load json values into memory. create if not exists
-            persistentDictionary = new PersistentDictionary(SettingsFilePath);
-
-            return libationFilesPathCache;
-        }
-        private string getLiberationFilesSettingFromJson()
-        {
-            try
-            {
-                if (File.Exists(APPSETTINGS_JSON))
-                {
-                    var appSettingsContents = File.ReadAllText(APPSETTINGS_JSON);
-                    var jObj = JObject.Parse(appSettingsContents);
-
-                    if (jObj.ContainsKey(LIBATION_FILES))
-                    {
-                        var value = jObj[LIBATION_FILES].Value<string>();
-
-                        // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
-                        if (!string.IsNullOrWhiteSpace(value))
-                            return value;
-                    }
-                }
-            }
-            catch { }
-
-            File.WriteAllText(APPSETTINGS_JSON, new JObject { { LIBATION_FILES, APP_DIR } }.ToString(Formatting.Indented));
-            return APP_DIR;
-        }
+        private PersistentDictionary persistentDictionary;
 
         public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
         public void SetObject(string propertyName, object newValue) => persistentDictionary.Set(propertyName, newValue);
         public void SetWithJsonPath(string jsonPath, string propertyName, string newValue) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue);
 
+        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
+
         public static string GetDescription(string propertyName)
         {
             var attribute = typeof(Configuration)
@@ -156,34 +81,193 @@ namespace FileManager
             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
+        {
+            get => persistentDictionary.GetString(nameof(Books));
+            set => persistentDictionary.Set(nameof(Books), value);
+        }
+
+        // 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), "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"));
+
+        public enum KnownDirectories
+        {
+            None = 0,
+
+            [Description("My Users folder")]
+            UserProfile = 1,
+
+            [Description("The same folder that Libation is running from")]
+            AppDir = 2,
+
+            [Description("Windows temporary folder")]
+            WinTemp = 3,
+
+            [Description("My Documents")]
+            MyDocs = 4,
+
+            [Description("Your settings folder (aka: Libation Files)")]
+            LibationFiles = 5
+        }
+        // use func calls so we always get the latest value of LibationFiles
+        private static List<(KnownDirectories directory, Func<string> getPathFunc)> directoryOptionsPaths { get; } = new()
+        {
+            (KnownDirectories.None, () => null),
+            (KnownDirectories.UserProfile, () => UserProfile),
+            (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.
+            // also, keep this at bottom of this list
+            (KnownDirectories.LibationFiles, () => libationFilesPathCache)
+        };
+        public static string GetKnownDirectoryPath(KnownDirectories directory)
+        {
+            var dirFunc = directoryOptionsPaths.SingleOrDefault(dirFunc => dirFunc.directory == directory);
+            return dirFunc == default ? null : dirFunc.getPathFunc();
+        }
+        public static KnownDirectories GetKnownDirectory(string directory)
+        {
+            // especially important so a very early call doesn't match null => LibationFiles
+            if (string.IsNullOrWhiteSpace(directory))
+                return KnownDirectories.None;
+
+            // '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
+
+		#region singleton stuff
+		public static Configuration Instance { get; } = new Configuration();
+        private Configuration() { }
+		#endregion
+
+		#region LibationFiles
+
+		private const string APPSETTINGS_JSON = "appsettings.json";
+        private const string LIBATION_FILES_KEY = "LibationFiles";
+
+        [Description("Location for storage of program-created files")]
+        public string LibationFiles
+        {
+            get
+            {
+                if (libationFilesPathCache is not null)
+                    return libationFilesPathCache;
+
+                // must write here before SettingsFilePath in next step reads cache
+                libationFilesPathCache = getLiberationFilesSettingFromJson();
+
+                // load json values into memory. create settings if not exists
+                persistentDictionary = new PersistentDictionary(SettingsFilePath);
+
+                return libationFilesPathCache;
+            }
+        }
+
+        private static string libationFilesPathCache;
+
+        private string getLiberationFilesSettingFromJson()
+        {
+            string startingContents = null;
+            try
+            {
+                if (File.Exists(APPSETTINGS_JSON))
+                {
+                    startingContents = File.ReadAllText(APPSETTINGS_JSON);
+                    var startingJObj = JObject.Parse(startingContents);
+
+                    if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
+                    {
+                        var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
+                        if (!string.IsNullOrWhiteSpace(startingValue))
+                            return startingValue;
+                    }
+                }
+            }
+            catch { }
+
+            // not found. write to file. read from file
+            var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile } }.ToString(Formatting.Indented);
+            if (startingContents != endingContents)
+            {
+                File.WriteAllText(APPSETTINGS_JSON, endingContents);
+                System.Threading.Thread.Sleep(100);
+            }
+
+            // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
+            // verify from live file. no try/catch. want failures to be visible
+            var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
+            var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
+            return valueFinal;
+        }
+
         public bool TrySetLibationFiles(string directory)
         {
-            if (!Directory.Exists(directory) && !wellKnownPaths.ContainsKey(directory))
-                return false;
+            // this is WRONG. need to MOVE settings; not DELETE them
 
-            // if moving from default, delete old settings file and dir (if empty)
-            if (LibationFiles.EqualsInsensitive(AppDir))
-            {
-                File.Delete(SettingsFilePath);
-                System.Threading.Thread.Sleep(100);
-                if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-                    Directory.Delete(AppDir);
-            }
+            //// if moving from default, delete old settings file and dir (if empty)
+            //if (LibationFiles.EqualsInsensitive(AppDir))
+            //{
+            //    File.Delete(SettingsFilePath);
+            //    System.Threading.Thread.Sleep(100);
+            //    if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
+            //        Directory.Delete(AppDir);
+            //}
 
 
             libationFilesPathCache = null;
 
 
-            var contents = File.ReadAllText(APPSETTINGS_JSON);
-            var jObj = JObject.Parse(contents);
+            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+            var jObj = JObject.Parse(startingContents);
 
-            jObj[LIBATION_FILES] = directory;
+            jObj[LIBATION_FILES_KEY] = directory;
 
-            var output = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            File.WriteAllText(APPSETTINGS_JSON, output);
+            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/FileManager.csproj

@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>

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();
@@ -100,22 +114,33 @@ namespace FileManager
             lock (locker)
             {
                 var jObject = readFile();
+                var startContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
+
                 jObject[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                var endContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
+
+                if (startContents != endContents)
+                    File.WriteAllText(Filepath, endContents);
             }
         }
 
         // special case: no caching. no logging
         public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
         {
+            if (IsReadOnly)
+                return;
+
             lock (locker)
             {
                 var jObject = readFile();
                 var token = jObject.SelectToken(jsonPath);
-                var debug_oldValue = (string)token[propertyName];
+                var oldValue = (string)token[propertyName];
 
-                token[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                if (oldValue != newValue)
+                {
+                    token[propertyName] = newValue;
+                    File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                }
             }
         }
 

Libation.sln

@@ -86,6 +86,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore.Tests", "..\Dinah.Core\_Tests\Dinah.EntityFrameworkCore.Tests\Dinah.EntityFrameworkCore.Tests.csproj", "{6F5131A0-09AE-4707-B82B-5E53CB74688E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAXClean", "..\AAXClean\AAXClean.csproj", "{94BEB7CC-511D-45AB-9F09-09BE858EE486}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -208,6 +210,10 @@ Global
 		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -242,6 +248,7 @@ Global
 		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{6F5131A0-09AE-4707-B82B-5E53CB74688E} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
+		{94BEB7CC-511D-45AB-9F09-09BE858EE486} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationLauncher/LibationLauncher.csproj

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

LibationLauncher/Program.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using AudibleApi;
 using AudibleApi.Authorization;
+using Dinah.Core.Logging;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms;
@@ -24,200 +25,120 @@ namespace LibationLauncher
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
 
-			createSettings();
+			// must occur before access to Configuration instance
+			migrate_to_v5_2_0__pre_config();
+
+
+			//***********************************************//
+			//                                               //
+			//   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();
-			
-			ensureLoggingConfig();
-			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 ??= "WinTemp";
-				config.DecryptInProgressEnum ??= "WinTemp";
-				config.Books ??= Configuration.AppDir;
+				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 = AudibleApi.Authorization.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;
@@ -255,44 +176,57 @@ namespace LibationLauncher
                 }
 			}
 		}
-        #endregion
+		#endregion
 
-        private static string defaultLoggingLevel { get; } = "Information";
-		private static void ensureLoggingConfig()
+		#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 config = Configuration.Instance;
-
-			if (config.GetObject("Logging") != null)
-				return;
-
-			// "Logging": {
-			//   "LogLevel": {
-			//     "Default": "Debug"
-			//   }
-			// }
-			var loggingObj = new JObject
 			{
+				var settingsKey = "DownloadsInProgressEnum";
+				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
 				{
-					"LogLevel", new JObject { { "Default", defaultLoggingLevel } }
+					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
+					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
 				}
-			};
-			config.SetObject("Logging", loggingObj);
+			}
+
+			{
+				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
+			}
+
+			{ // appsettings.json
+				var appSettingsKey = UNSAFE_MigrationHelper.LIBATION_FILES_KEY;
+				if (UNSAFE_MigrationHelper.APPSETTINGS_TryGet(appSettingsKey, out var value))
+					UNSAFE_MigrationHelper.APPSETTINGS_Update(appSettingsKey, translatePath(value));
+			}
 		}
 
-		private static void ensureSerilogConfig()
-		{
-			var config = Configuration.Instance;
+		private static string translatePath(string path)
+			=> path switch
+			{
+				"AppDir" => @".\LibationFiles",
+				"MyDocs" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles")),
+				"UserProfile" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation")),
+				"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(Configuration config)
+		{
 			if (config.GetObject("Serilog") != null)
 				return;
 
-			// default. for reference. output example:
-			// 2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
-			var default_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}";
-			// with class and method info. output example:
-			// 2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
-			var code_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
-
 			// "Serilog": {
 			//   "MinimumLevel": "Information"
 			//   "WriteTo": [
@@ -312,7 +246,7 @@ namespace LibationLauncher
 			// }
 			var serilogObj = new JObject
 			{
-				{ "MinimumLevel", defaultLoggingLevel },
+				{ "MinimumLevel", "Information" },
 				{ "WriteTo", new JArray
 					{
 						new JObject { {"Name", "Console" } },
@@ -325,7 +259,12 @@ namespace LibationLauncher
 									// for this sink to work, a path must be provided. we override this below
 									{ "path", Path.Combine(Configuration.Instance.LibationFiles, "_Log.log") },
 									{ "rollingInterval", "Month" },
-									{ "outputTemplate", code_outputTemplate }
+									// Serilog template formatting examples
+									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
+									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
+									// - with class and method info: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
+									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
+									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}" }
 								}
 							}
 						}
@@ -337,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);
@@ -371,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);
+				// 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))
@@ -391,66 +330,95 @@ 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.DownloadFileAsync(zipUrl, selectedPath).GetAwaiter().GetResult();
-					MessageBox.Show("File downloaded");
-				}
-				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
 			{
 				Version = BuildVersion.ToString(),
 
+				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
+				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
+				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
+				LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
+				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
+				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
+
 				config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,
 
-				config.DownloadsInProgressEnum,
+				config.InProgress,
+
 				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
 				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
 
-				AudibleFileStorage.DownloadsFinal,
-				DownloadsFinalFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsFinal).Count(),
-
-				config.DecryptInProgressEnum,
 				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
 				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
 			});
+
+			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
+			if (Log.Logger.IsVerboseEnabled())
+				MessageBox.Show(@"
+Warning: verbose logging is enabled.
+
+This should be used for debugging only. It creates many
+more logs and debug files, neither of which are as
+strictly anonomous.
+
+When you are finished debugging, it's highly recommended
+to set your debug MinimumLevel to Information and restart
+Libation.
+".Trim(), "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 		}
 
 		private static Version BuildVersion => System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;

LibationLauncher/UNSAFE_MigrationHelper.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace LibationLauncher
+{
+	/// <summary>for migrations only. directly manipulatings settings files without going through domain logic</summary>
+	internal static class UNSAFE_MigrationHelper
+	{
+		#region appsettings.json
+		private const string APPSETTINGS_JSON = "appsettings.json";
+
+		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);
+
+		public static bool APPSETTINGS_TryGet(string key, out string value)
+		{
+			bool success = false;
+			JToken val = null;
+
+			process_APPSETTINGS_Json(jObj => success = jObj.TryGetValue(key, out val), false);
+
+			value = success ? val.Value<string>() : null;
+			return success;
+		}
+
+		/// <summary>only insert if not exists</summary>
+		public static void APPSETTINGS_Insert(string key, string value)
+			=> process_APPSETTINGS_Json(jObj => jObj.TryAdd(key, value));
+
+		/// <summary>only update if exists</summary>
+		public static void APPSETTINGS_Update(string key, string value)
+			=> process_APPSETTINGS_Json(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj[key] = value;
+			});
+
+		/// <summary>only delete if exists</summary>
+		public static void APPSETTINGS_Delete(string key)
+			=> process_APPSETTINGS_Json(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj.Remove(key);
+			});
+
+		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
+		private static void process_APPSETTINGS_Json(Action<JObject> action, bool save = true)
+		{
+			// only insert if not exists
+			if (!APPSETTINGS_Json_Exists)
+				return;
+
+			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+			var jObj = JObject.Parse(startingContents);
+
+			action(jObj);
+
+			if (!save)
+				return;
+
+			// only save if different
+			var endingContents_indented = jObj.ToString(Formatting.Indented);
+			var endingContents_compact = jObj.ToString(Formatting.None);
+			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
+				return;
+
+			File.WriteAllText(APPSETTINGS_JSON, endingContents_indented);
+			System.Threading.Thread.Sleep(100);
+		}
+		#endregion
+
+		#region Settings.json
+		public const string LIBATION_FILES_KEY = "LibationFiles";
+		private const string SETTINGS_JSON = "Settings.json";
+
+		public static string SettingsJsonPath
+		{
+			get
+			{
+				var success = APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value);
+				return !success || value is null ? null : Path.Combine(value, SETTINGS_JSON);
+			}
+		}
+		public static bool SettingsJson_Exists => SettingsJsonPath is not null && File.Exists(SettingsJsonPath);
+
+		public static bool Settings_TryGet(string key, out string value)
+		{
+			bool success = false;
+			JToken val = null;
+
+			process_SettingsJson(jObj => success = jObj.TryGetValue(key, out val), false);
+
+			value = success ? val.Value<string>() : null;
+			return success;
+		}
+
+		/// <summary>only insert if not exists</summary>
+		public static void Settings_Insert(string key, string value)
+			=> process_SettingsJson(jObj => jObj.TryAdd(key, value));
+
+		/// <summary>only update if exists</summary>
+		public static void Settings_Update(string key, string value)
+			=> process_SettingsJson(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj[key] = value;
+			});
+
+		/// <summary>only delete if exists</summary>
+		public static void Settings_Delete(string key)
+			=> process_SettingsJson(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj.Remove(key);
+			});
+
+		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
+		private static void process_SettingsJson(Action<JObject> action, bool save = true)
+		{
+			// only insert if not exists
+			if (!SettingsJson_Exists)
+				return;
+
+			var startingContents = File.ReadAllText(SettingsJsonPath);
+			var jObj = JObject.Parse(startingContents);
+
+			action(jObj);
+
+			if (!save)
+				return;
+
+			// only save if different
+			var endingContents_indented = jObj.ToString(Formatting.Indented);
+			var endingContents_compact = jObj.ToString(Formatting.None);
+			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
+				return;
+
+			File.WriteAllText(SettingsJsonPath, endingContents_indented);
+			System.Threading.Thread.Sleep(100);
+		}
+		#endregion
+	}
+}

LibationWinForms/BookLiberation/AutomatedBackupsForm.cs

@@ -6,31 +6,27 @@ namespace LibationWinForms.BookLiberation
 {
     public partial class AutomatedBackupsForm : Form
     {
-        public bool KeepGoingVisible
-        {
-            get => keepGoingCb.Visible;
-            set => keepGoingCb.Visible = value;
-        }
-
         public bool KeepGoingChecked => keepGoingCb.Checked;
 
-        public bool KeepGoing
-            => keepGoingCb.Visible
-            && keepGoingCb.Enabled
-            && keepGoingCb.Checked;
+        public bool KeepGoing => keepGoingCb.Enabled && keepGoingCb.Checked;
 
         public AutomatedBackupsForm()
         {
             InitializeComponent();
         }
 
-		public void WriteLine(string text)
-			=> logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
+        public void WriteLine(string text)
+        {
+            if (!IsDisposed)
+                logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
+        }
 
 		public void FinalizeUI()
         {
             keepGoingCb.Enabled = false;
-            logTb.AppendText("");
+
+            if (!IsDisposed)
+                logTb.AppendText("");
         }
 
         private void AutomatedBackupsForm_FormClosing(object sender, FormClosingEventArgs e) => keepGoingCb.Checked = false;

LibationWinForms/BookLiberation/DecryptForm.cs

@@ -64,14 +64,8 @@ namespace LibationWinForms.BookLiberation
             if (percentage == 0)
                 remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = "ETA:\r\n0 sec");
 
-            if (percentage == int.MaxValue)
-                progressBar1.UIThread(() => progressBar1.Style = ProgressBarStyle.Marquee);
             else
-                progressBar1.UIThread(() =>
-                {
-                    progressBar1.Value = percentage;
-                    progressBar1.Style = ProgressBarStyle.Blocks;
-                });
+                progressBar1.UIThread(() => progressBar1.Value = percentage);
         }
 
         public void UpdateRemainingTime(TimeSpan remaining)

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -43,14 +43,14 @@ namespace LibationWinForms.BookLiberation
         private void timer_Tick(object sender, EventArgs e)
         {
             // if no update in the last 30 seconds, display frozen label
-            lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now;
+            lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
             if (lastUpdateLbl.Visible)
             {
-                var diff = lastDownloadProgress - DateTime.Now;
+                var diff = DateTime.Now - lastDownloadProgress;
                 var min = (int)diff.TotalMinutes;
                 var minText = min > 0 ? $"{min}min " : "";
-                
-                lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago";
+
+                lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
             }
         }
         private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
+using Dinah.Core.Windows.Forms;
 using FileLiberator;
 
 namespace LibationWinForms.BookLiberation
@@ -15,21 +16,28 @@ namespace LibationWinForms.BookLiberation
         public event EventHandler<string> LogErrorString;
         public event EventHandler<(Exception, string)> LogError;
 
-        public static LogMe RegisterForm(AutomatedBackupsForm form)
+        private LogMe()
+        {
+            LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
+            LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
+            LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
+        }
+
+        public static LogMe RegisterForm(AutomatedBackupsForm form = null)
         {
             var logMe = new LogMe();
 
-            logMe.LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
-            logMe.LogInfo += (_, text) => form.WriteLine(text);
+            if (form is null)
+                return logMe;
 
-            logMe.LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
-            logMe.LogErrorString += (_, text) => form.WriteLine(text);
+            logMe.LogInfo += (_, text) => form?.WriteLine(text);
+
+            logMe.LogErrorString += (_, text) => form?.WriteLine(text);
 
-            logMe.LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
             logMe.LogError += (_, tuple) =>
             {
-                form.WriteLine(tuple.Item2 ?? "Automated backup: error");
-                form.WriteLine("ERROR: " + tuple.Item1.Message);
+                form?.WriteLine(tuple.Item2 ?? "Automated backup: error");
+                form?.WriteLine("ERROR: " + tuple.Item1.Message);
             };
 
             return logMe;
@@ -47,13 +55,14 @@ namespace LibationWinForms.BookLiberation
             Serilog.Log.Logger.Information("Begin " + nameof(BackupSingleBookAsync) + " {@DebugInfo}", new { productId });
 
             var backupBook = getWiredUpBackupBook(completedAction);
-
-            (AutomatedBackupsForm automatedBackupsForm, LogMe logMe) = attachToBackupsForm(backupBook);
-            automatedBackupsForm.KeepGoingVisible = false;
+           
+            (Action unsubscribeEvents, LogMe logMe) = attachToBackupsForm(backupBook);
 
             var libraryBook = IProcessableExt.GetSingleLibraryBook(productId);
             // continue even if libraryBook is null. we'll display even that in the processing box
-            await new BackupSingle(logMe, backupBook, automatedBackupsForm, libraryBook).RunBackupAsync();
+            await new BackupSingle(logMe, backupBook, libraryBook).RunBackupAsync();
+
+            unsubscribeEvents();
         }
 
         public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
@@ -61,9 +70,13 @@ namespace LibationWinForms.BookLiberation
             Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
 
             var backupBook = getWiredUpBackupBook(completedAction);
+            var automatedBackupsForm = new AutomatedBackupsForm();
+
+            (Action unsubscribeEvents, LogMe logMe) = attachToBackupsForm(backupBook, automatedBackupsForm);
 
-            (AutomatedBackupsForm automatedBackupsForm, LogMe logMe) = attachToBackupsForm(backupBook);
             await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
+
+            unsubscribeEvents();
         }
 
         private static BackupBook getWiredUpBackupBook(EventHandler<LibraryBook> completedAction)
@@ -93,10 +106,9 @@ namespace LibationWinForms.BookLiberation
 
         private static void updateIsLiberated(object sender, LibraryBook e) => ApplicationServices.SearchEngineCommands.UpdateIsLiberated(e.Book);
 
-        private static (AutomatedBackupsForm, LogMe) attachToBackupsForm(BackupBook backupBook)
+        private static (Action unsubscribeEvents, LogMe) attachToBackupsForm(BackupBook backupBook, AutomatedBackupsForm automatedBackupsForm = null)
         {
-            #region create form and logger
-            var automatedBackupsForm = new AutomatedBackupsForm();
+            #region create logger
             var logMe = LogMe.RegisterForm(automatedBackupsForm);
             #endregion
 
@@ -121,7 +133,7 @@ namespace LibationWinForms.BookLiberation
 
             #region when form closes, unsubscribe from model's events
             // unsubscribe so disposed forms aren't still trying to receive notifications
-            automatedBackupsForm.FormClosing += (_, __) =>
+            Action unsubscribe = () =>
             {
                 backupBook.DecryptBook.Begin -= decryptBookBegin;
                 backupBook.DecryptBook.StatusUpdate -= statusUpdate;
@@ -132,7 +144,7 @@ namespace LibationWinForms.BookLiberation
             };
             #endregion
 
-            return (automatedBackupsForm, logMe);
+            return (unsubscribe, logMe);
         }
 
         public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
@@ -157,21 +169,27 @@ namespace LibationWinForms.BookLiberation
             return downloadPdf;
         }
 
-        public static async Task DownloadFileAsync(string url, string destination)
+        public static void DownloadFile(string url, string destination, bool showDownloadCompletedDialog = false)
         {
-            var downloadFile = new DownloadFile();
-
-            // frustratingly copy pasta from wireUpEvents(IDownloadable downloadable) due to Completed being EventHandler<LibraryBook>
             var downloadDialog = new DownloadForm();
-            downloadFile.DownloadBegin += (_, str) =>
-            {
-                downloadDialog.UpdateFilename(str);
-                downloadDialog.Show();
-            };
-            downloadFile.DownloadProgressChanged += (_, progress) => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive);
-            downloadFile.DownloadCompleted += (_, __) => downloadDialog.Close();
+            downloadDialog.UpdateFilename(destination);
+            downloadDialog.Show();
 
-            await downloadFile.PerformDownloadFileAsync(url, destination);
+            new System.Threading.Thread(() => {
+                var downloadFile = new DownloadFile();
+
+                downloadFile.DownloadProgressChanged += (_, progress) => downloadDialog.UIThread(() =>
+                    downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive)
+                    );
+                downloadFile.DownloadCompleted += (_, __) => downloadDialog.UIThread(() =>
+                {
+                    downloadDialog.Close();
+                    if (showDownloadCompletedDialog)
+                        MessageBox.Show("File downloaded");
+                });
+
+                downloadFile.PerformDownloadFileAsync(url, destination).GetAwaiter().GetResult();
+            }).Start();
         }
 
         // subscribed to Begin event because a new form should be created+processed+closed on each iteration
@@ -367,7 +385,7 @@ namespace LibationWinForms.BookLiberation
         protected IProcessable Processable { get; }
         protected AutomatedBackupsForm AutomatedBackupsForm { get; }
 
-        protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
+        protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm = null)
         {
             LogMe = logMe;
             Processable = processable;
@@ -382,7 +400,7 @@ namespace LibationWinForms.BookLiberation
 
         public async Task RunBackupAsync()
         {
-            AutomatedBackupsForm.Show();
+            AutomatedBackupsForm?.Show();
 
             try
             {
@@ -393,7 +411,7 @@ namespace LibationWinForms.BookLiberation
                 LogMe.Error(ex);
             }
 
-            AutomatedBackupsForm.FinalizeUI();
+            AutomatedBackupsForm?.FinalizeUI();
             LogMe.Info("DONE");
         }
 
@@ -454,8 +472,8 @@ An error occurred while trying to process this book. Skip this book permanently?
         protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.YesNo;
         protected override DialogResult CreateSkipFileResult => DialogResult.Yes;
 
-        public BackupSingle(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm, LibraryBook libraryBook)
-            : base(logMe, processable, automatedBackupsForm)
+        public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
+            : base(logMe, processable)
         {
             _libraryBook = libraryBook;
         }
@@ -492,9 +510,12 @@ An error occurred while trying to process this book
                 if (!keepGoing)
                     return;
 
+                if (AutomatedBackupsForm.IsDisposed)
+                    break;
+
                 if (!AutomatedBackupsForm.KeepGoing)
                 {
-                    if (AutomatedBackupsForm.KeepGoingVisible && !AutomatedBackupsForm.KeepGoingChecked)
+                    if (!AutomatedBackupsForm.KeepGoingChecked)
                         LogMe.Info("'Keep going' is unchecked");
                     return;
                 }

LibationWinForms/Dialogs/AccountsDialog.cs

@@ -94,7 +94,11 @@ namespace LibationWinForms.Dialogs
 			}
 		}
 
-		private void cancelBtn_Click(object sender, EventArgs e) => this.Close();
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
 
 		class AccountDto
 		{
@@ -121,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.Designer.cs

@@ -0,0 +1,113 @@
+
+namespace LibationWinForms.Dialogs
+{
+	partial class DirectoryOrCustomSelectControl
+	{
+		/// <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 Component 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.knownDirectoryRb = new System.Windows.Forms.RadioButton();
+			this.customDirectoryRb = new System.Windows.Forms.RadioButton();
+			this.customTb = new System.Windows.Forms.TextBox();
+			this.customBtn = new System.Windows.Forms.Button();
+			this.directorySelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
+			this.SuspendLayout();
+			// 
+			// knownDirectoryRb
+			// 
+			this.knownDirectoryRb.AutoSize = true;
+			this.knownDirectoryRb.Location = new System.Drawing.Point(3, 3);
+			this.knownDirectoryRb.Name = "knownDirectoryRb";
+			this.knownDirectoryRb.Size = new System.Drawing.Size(14, 13);
+			this.knownDirectoryRb.TabIndex = 0;
+			this.knownDirectoryRb.UseVisualStyleBackColor = true;
+			this.knownDirectoryRb.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
+			// 
+			// customDirectoryRb
+			// 
+			this.customDirectoryRb.AutoSize = true;
+			this.customDirectoryRb.Location = new System.Drawing.Point(2, 56);
+			this.customDirectoryRb.Name = "customDirectoryRb";
+			this.customDirectoryRb.Size = new System.Drawing.Size(14, 13);
+			this.customDirectoryRb.TabIndex = 2;
+			this.customDirectoryRb.UseVisualStyleBackColor = true;
+			this.customDirectoryRb.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
+			// 
+			// customTb
+			// 
+			this.customTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.customTb.Location = new System.Drawing.Point(22, 52);
+			this.customTb.Name = "customTb";
+			this.customTb.Size = new System.Drawing.Size(588, 23);
+			this.customTb.TabIndex = 3;
+			// 
+			// customBtn
+			// 
+			this.customBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.customBtn.Location = new System.Drawing.Point(616, 52);
+			this.customBtn.Name = "customBtn";
+			this.customBtn.Size = new System.Drawing.Size(41, 27);
+			this.customBtn.TabIndex = 4;
+			this.customBtn.Text = "...";
+			this.customBtn.UseVisualStyleBackColor = true;
+			this.customBtn.Click += new System.EventHandler(this.customBtn_Click);
+			// 
+			// directorySelectControl
+			// 
+			this.directorySelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.directorySelectControl.Location = new System.Drawing.Point(23, 0);
+			this.directorySelectControl.Name = "directorySelectControl";
+			this.directorySelectControl.Size = new System.Drawing.Size(635, 46);
+			this.directorySelectControl.TabIndex = 5;
+			// 
+			// DirectoryOrCustomSelectControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.directorySelectControl);
+			this.Controls.Add(this.customBtn);
+			this.Controls.Add(this.customTb);
+			this.Controls.Add(this.customDirectoryRb);
+			this.Controls.Add(this.knownDirectoryRb);
+			this.Name = "DirectoryOrCustomSelectControl";
+			this.Size = new System.Drawing.Size(660, 81);
+			this.Load += new System.EventHandler(this.DirectoryOrCustomSelectControl_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.RadioButton knownDirectoryRb;
+		private System.Windows.Forms.RadioButton customDirectoryRb;
+		private System.Windows.Forms.TextBox customTb;
+		private System.Windows.Forms.Button customBtn;
+		private DirectorySelectControl directorySelectControl;
+	}
+}

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Dinah.Core;
+using FileManager;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class DirectoryOrCustomSelectControl : UserControl
+	{
+		public bool SelectedDirectoryIsKnown => knownDirectoryRb.Checked;
+		public bool SelectedDirectoryIsCustom => customDirectoryRb.Checked;
+		public string SelectedDirectory
+			=> SelectedDirectoryIsKnown ? directorySelectControl.SelectedDirectory
+			: SelectedDirectoryIsCustom ? customTb.Text.Trim()
+			: null;
+
+		public DirectoryOrCustomSelectControl()
+		{
+			InitializeComponent();
+
+			// doing this after InitializeComponent will fire event
+			this.knownDirectoryRb.Checked = true;
+		}
+
+		/// <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, string subDirectory = null)
+			=> this.directorySelectControl.SetDirectoryItems(knownDirectories, defaultDirectory, subDirectory);
+
+		/// <summary>set selection</summary>
+		/// <param name="directory"></param>
+		public void SelectDirectory(Configuration.KnownDirectories directory)
+		{
+			// if None: take no action
+			if (directory != Configuration.KnownDirectories.None)
+				selectDir(directory, null);
+		}
+
+		/// <summary>set selection</summary>
+		public void SelectDirectory(string directory)
+		{
+			directory = directory?.Trim() ?? "";
+
+			// 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)
+		{
+			var isKnown
+				= knownDir != Configuration.KnownDirectories.None
+				// this could be a well known dir which isn't an option in this particular dropdown. This will always be true of LibationFiles
+				&& this.directorySelectControl.SelectDirectory(knownDir);
+			
+			customDirectoryRb.Checked = !isKnown;
+			knownDirectoryRb.Checked = isKnown;
+			this.customTb.Text = isKnown ? "" : customDir;
+		}
+
+		private string dirSearchTitle;
+		public void SetSearchTitle(string dirSearchTitle) => this.dirSearchTitle = dirSearchTitle?.Trim();
+
+		private void customBtn_Click(object sender, EventArgs e)
+		{
+			using var dialog = new FolderBrowserDialog
+			{
+				Description = string.IsNullOrWhiteSpace(dirSearchTitle) ? "Search" : $"Search for {dirSearchTitle}",
+				SelectedPath = this.customTb.Text
+			};
+			dialog.ShowDialog();
+			if (!string.IsNullOrWhiteSpace(dialog.SelectedPath))
+				this.customTb.Text = dialog.SelectedPath;
+		}
+
+		private void radioButton_CheckedChanged(object sender, EventArgs e)
+		{
+			var isCustom = this.customDirectoryRb.Checked;
+
+			customTb.Enabled = isCustom;
+			customBtn.Enabled = isCustom;
+
+			directorySelectControl.Enabled = !isCustom;
+		}
+
+		private void DirectoryOrCustomSelectControl_Load(object sender, EventArgs e)
+		{
+			if (this.DesignMode)
+				return;
+
+		}
+	}
+}

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.resx

@@ -0,0 +1,60 @@
+<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">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/DirectorySelectControl.Designer.cs

@@ -0,0 +1,76 @@
+
+namespace LibationWinForms.Dialogs
+{
+	partial class DirectorySelectControl
+	{
+		/// <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 Component 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.directoryComboBox = new System.Windows.Forms.ComboBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// directoryComboBox
+			// 
+			this.directoryComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.directoryComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.directoryComboBox.FormattingEnabled = true;
+			this.directoryComboBox.Location = new System.Drawing.Point(0, 0);
+			this.directoryComboBox.Name = "directoryComboBox";
+			this.directoryComboBox.Size = new System.Drawing.Size(647, 23);
+			this.directoryComboBox.TabIndex = 0;
+			this.directoryComboBox.SelectedIndexChanged += new System.EventHandler(this.directoryComboBox_SelectedIndexChanged);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(0, 26);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(97, 15);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Select a directory";
+			// 
+			// DirectorySelectControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.directoryComboBox);
+			this.Name = "DirectorySelectControl";
+			this.Size = new System.Drawing.Size(647, 46);
+			this.Load += new System.EventHandler(this.DirectorySelectControl_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ComboBox directoryComboBox;
+		private System.Windows.Forms.Label label1;
+	}
+}

LibationWinForms/Dialogs/DirectorySelectControl.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Dinah.Core;
+using FileManager;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class DirectorySelectControl : UserControl
+	{
+		private class DirectoryComboBoxItem
+		{
+			public string Description { get; }
+			public Configuration.KnownDirectories Value { get; }
+			private DirectorySelectControl _parentControl;
+
+			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 ? _parentControl.AddSubDirectoryToPath(Configuration.AppDir_Absolute) : FullPath;
+
+			public DirectoryComboBoxItem(DirectorySelectControl parentControl, Configuration.KnownDirectories knownDirectory)
+			{
+				_parentControl = parentControl;
+
+				Value = knownDirectory;
+				Description = Value.GetDescription();
+			}
+
+			public override string ToString() => Description;
+		}
+
+		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, 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(this, dir));
+
+			SelectDirectory(defaultDirectory);
+		}
+
+		/// <summary>set selection</summary>
+		/// <param name="directory"></param>
+		/// <returns>True is there was a matching entry</returns>
+		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>
+		/// <returns>True is there was a matching entry</returns>
+		public bool SelectDirectory(Configuration.KnownDirectories? directory)
+		{
+			if (directory is null || directory == Configuration.KnownDirectories.None)
+				return false;
+
+			// set default
+			var item = this.directoryComboBox.Items.Cast<DirectoryComboBoxItem>().SingleOrDefault(item => item.Value == directory.Value);
+			if (item is null)
+				return false;
+
+			this.directoryComboBox.SelectedItem = item;
+			return true;
+		}
+
+		private void DirectorySelectControl_Load(object sender, EventArgs e)
+		{
+			if (this.DesignMode)
+				return;
+
+		}
+
+		private void directoryComboBox_SelectedIndexChanged(object sender, EventArgs e) => this.label1.Text = selectedItem.UiDisplayPath;
+	}
+}

LibationWinForms/Dialogs/DirectorySelectControl.resx

@@ -0,0 +1,60 @@
+<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">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -59,7 +59,11 @@ namespace LibationWinForms.Dialogs
             this.Close();
         }
 
-        private void cancelBtn_Click(object sender, EventArgs e) => this.Close();
+        private void cancelBtn_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
 
         private void DataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {

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

@@ -29,86 +29,30 @@
 		private void InitializeComponent()
 		{
 			this.libationFilesDescLbl = new System.Windows.Forms.Label();
-			this.libationFilesCustomBtn = new System.Windows.Forms.Button();
-			this.libationFilesCustomTb = new System.Windows.Forms.TextBox();
-			this.libationFilesCustomRb = new System.Windows.Forms.RadioButton();
-			this.libationFilesMyDocsRb = new System.Windows.Forms.RadioButton();
-			this.libationFilesRootRb = new System.Windows.Forms.RadioButton();
 			this.cancelBtn = new System.Windows.Forms.Button();
 			this.saveBtn = new System.Windows.Forms.Button();
+			this.libationFilesSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
 			this.SuspendLayout();
 			// 
 			// libationFilesDescLbl
 			// 
 			this.libationFilesDescLbl.AutoSize = true;
-			this.libationFilesDescLbl.Location = new System.Drawing.Point(12, 9);
+			this.libationFilesDescLbl.Location = new System.Drawing.Point(14, 10);
+			this.libationFilesDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.libationFilesDescLbl.Name = "libationFilesDescLbl";
-			this.libationFilesDescLbl.Size = new System.Drawing.Size(36, 13);
+			this.libationFilesDescLbl.Size = new System.Drawing.Size(39, 15);
 			this.libationFilesDescLbl.TabIndex = 0;
 			this.libationFilesDescLbl.Text = "[desc]";
 			// 
-			// libationFilesCustomBtn
-			// 
-			this.libationFilesCustomBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.libationFilesCustomBtn.Location = new System.Drawing.Point(753, 95);
-			this.libationFilesCustomBtn.Name = "libationFilesCustomBtn";
-			this.libationFilesCustomBtn.Size = new System.Drawing.Size(35, 23);
-			this.libationFilesCustomBtn.TabIndex = 5;
-			this.libationFilesCustomBtn.Text = "...";
-			this.libationFilesCustomBtn.UseVisualStyleBackColor = true;
-			this.libationFilesCustomBtn.Click += new System.EventHandler(this.libationFilesCustomBtn_Click);
-			// 
-			// libationFilesCustomTb
-			// 
-			this.libationFilesCustomTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.libationFilesCustomTb.Location = new System.Drawing.Point(35, 97);
-			this.libationFilesCustomTb.Name = "libationFilesCustomTb";
-			this.libationFilesCustomTb.Size = new System.Drawing.Size(712, 20);
-			this.libationFilesCustomTb.TabIndex = 4;
-			// 
-			// libationFilesCustomRb
-			// 
-			this.libationFilesCustomRb.AutoSize = true;
-			this.libationFilesCustomRb.Location = new System.Drawing.Point(15, 100);
-			this.libationFilesCustomRb.Name = "libationFilesCustomRb";
-			this.libationFilesCustomRb.Size = new System.Drawing.Size(14, 13);
-			this.libationFilesCustomRb.TabIndex = 3;
-			this.libationFilesCustomRb.TabStop = true;
-			this.libationFilesCustomRb.UseVisualStyleBackColor = true;
-			// 
-			// libationFilesMyDocsRb
-			// 
-			this.libationFilesMyDocsRb.AutoSize = true;
-			this.libationFilesMyDocsRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.libationFilesMyDocsRb.Location = new System.Drawing.Point(15, 61);
-			this.libationFilesMyDocsRb.Name = "libationFilesMyDocsRb";
-			this.libationFilesMyDocsRb.Size = new System.Drawing.Size(111, 30);
-			this.libationFilesMyDocsRb.TabIndex = 2;
-			this.libationFilesMyDocsRb.TabStop = true;
-			this.libationFilesMyDocsRb.Text = "[desc]\r\n[myDocs\\Libation]";
-			this.libationFilesMyDocsRb.UseVisualStyleBackColor = true;
-			// 
-			// libationFilesRootRb
-			// 
-			this.libationFilesRootRb.AutoSize = true;
-			this.libationFilesRootRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.libationFilesRootRb.Location = new System.Drawing.Point(15, 25);
-			this.libationFilesRootRb.Name = "libationFilesRootRb";
-			this.libationFilesRootRb.Size = new System.Drawing.Size(113, 30);
-			this.libationFilesRootRb.TabIndex = 1;
-			this.libationFilesRootRb.TabStop = true;
-			this.libationFilesRootRb.Text = "[desc]\r\n[appDir\\Libation]";
-			this.libationFilesRootRb.UseVisualStyleBackColor = true;
-			// 
 			// cancelBtn
 			// 
 			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(713, 124);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 118);
+			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
-			this.cancelBtn.Size = new System.Drawing.Size(75, 23);
-			this.cancelBtn.TabIndex = 10;
+			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
+			this.cancelBtn.TabIndex = 3;
 			this.cancelBtn.Text = "Cancel";
 			this.cancelBtn.UseVisualStyleBackColor = true;
 			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
@@ -116,28 +60,35 @@
 			// 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(612, 124);
+			this.saveBtn.Location = new System.Drawing.Point(714, 118);
+			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
-			this.saveBtn.Size = new System.Drawing.Size(75, 23);
-			this.saveBtn.TabIndex = 9;
+			this.saveBtn.Size = new System.Drawing.Size(88, 27);
+			this.saveBtn.TabIndex = 2;
 			this.saveBtn.Text = "Save";
 			this.saveBtn.UseVisualStyleBackColor = true;
 			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
 			// 
+			// libationFilesSelectControl
+			// 
+			this.libationFilesSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.libationFilesSelectControl.Location = new System.Drawing.Point(14, 28);
+			this.libationFilesSelectControl.Name = "libationFilesSelectControl";
+			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 81);
+			this.libationFilesSelectControl.TabIndex = 1;
+			// 
 			// LibationFilesDialog
 			// 
-			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(800, 159);
+			this.ClientSize = new System.Drawing.Size(933, 158);
+			this.Controls.Add(this.libationFilesSelectControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);
 			this.Controls.Add(this.libationFilesDescLbl);
-			this.Controls.Add(this.libationFilesCustomBtn);
-			this.Controls.Add(this.libationFilesCustomTb);
-			this.Controls.Add(this.libationFilesRootRb);
-			this.Controls.Add(this.libationFilesCustomRb);
-			this.Controls.Add(this.libationFilesMyDocsRb);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "LibationFilesDialog";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Libation Files location";
@@ -150,12 +101,8 @@
 		#endregion
 
 		private System.Windows.Forms.Label libationFilesDescLbl;
-		private System.Windows.Forms.Button libationFilesCustomBtn;
-		private System.Windows.Forms.TextBox libationFilesCustomTb;
-		private System.Windows.Forms.RadioButton libationFilesCustomRb;
-		private System.Windows.Forms.RadioButton libationFilesMyDocsRb;
-		private System.Windows.Forms.RadioButton libationFilesRootRb;
 		private System.Windows.Forms.Button cancelBtn;
 		private System.Windows.Forms.Button saveBtn;
+		private DirectoryOrCustomSelectControl libationFilesSelectControl;
 	}
 }

LibationWinForms/Dialogs/LibationFilesDialog.cs

@@ -6,62 +6,49 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class LibationFilesDialog : Form
 	{
-		Configuration config { get; } = Configuration.Instance;
-		Func<string, string> desc { get; } = Configuration.GetDescription;
+		public string SelectedDirectory { get; private set; }
 
-		public LibationFilesDialog()
-		{
-			InitializeComponent();
-
-			this.libationFilesCustomTb.TextChanged += (_, __) =>
-			{
-				if (!string.IsNullOrWhiteSpace(libationFilesCustomTb.Text))
-					this.libationFilesCustomRb.Checked = true;
-			};
-		}
+		public LibationFilesDialog() => InitializeComponent();
 
 		private void LibationFilesDialog_Load(object sender, EventArgs e)
 		{
-			libationFilesDescLbl.Text = desc(nameof(config.LibationFiles));
-			this.libationFilesRootRb.Text = "In the same folder that Libation is running from\r\n" + Configuration.AppDir;
-			this.libationFilesMyDocsRb.Text = "In My Documents\r\n" + Configuration.MyDocs;
-			if (config.LibationFiles == Configuration.AppDir)
-				libationFilesRootRb.Checked = true;
-			else if (config.LibationFiles == Configuration.MyDocs)
-				libationFilesMyDocsRb.Checked = true;
-			else
+			if (this.DesignMode)
+				return;
+
+			var config = Configuration.Instance;
+
+			libationFilesDescLbl.Text = Configuration.GetDescription(nameof(config.LibationFiles));
+
+			libationFilesSelectControl.SetSearchTitle("Libation Files");
+			libationFilesSelectControl.SetDirectoryItems(new()
 			{
-				libationFilesCustomRb.Checked = true;
-				libationFilesCustomTb.Text = config.LibationFiles;
-			}
-		}
-
-		private void libationFilesCustomBtn_Click(object sender, EventArgs e) => selectFolder("Search for Libation Files location", this.libationFilesCustomTb);
-
-		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;
+				Configuration.KnownDirectories.UserProfile,
+				Configuration.KnownDirectories.AppDir,
+				Configuration.KnownDirectories.MyDocs
+			}, Configuration.KnownDirectories.UserProfile);
+			libationFilesSelectControl.SelectDirectory(config.LibationFiles);
 		}
 
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
-			var libationDir
-				= libationFilesRootRb.Checked ? Configuration.AppDir
-				: libationFilesMyDocsRb.Checked ? Configuration.MyDocs
-				: libationFilesCustomTb.Text;
-			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();
 		}
 
-		private void cancelBtn_Click(object sender, EventArgs e) => this.Close();
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
 	}
 }

LibationWinForms/Dialogs/LibationFilesDialog.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/Dialogs/Login/ApprovalNeededDialog.Designer.cs

@@ -34,9 +34,11 @@
 			// 
 			// approvedBtn
 			// 
-			this.approvedBtn.Location = new System.Drawing.Point(15, 25);
+			this.approvedBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.approvedBtn.Location = new System.Drawing.Point(18, 75);
+			this.approvedBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.approvedBtn.Name = "approvedBtn";
-			this.approvedBtn.Size = new System.Drawing.Size(79, 23);
+			this.approvedBtn.Size = new System.Drawing.Size(92, 27);
 			this.approvedBtn.TabIndex = 1;
 			this.approvedBtn.Text = "Approved";
 			this.approvedBtn.UseVisualStyleBackColor = true;
@@ -45,27 +47,30 @@
 			// label1
 			// 
 			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 9);
+			this.label1.Location = new System.Drawing.Point(14, 10);
+			this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(104, 13);
+			this.label1.Size = new System.Drawing.Size(314, 45);
 			this.label1.TabIndex = 0;
-			this.label1.Text = "Click after approving";
+			this.label1.Text = "Amazon is sending you an email.\r\n\r\nPlease press this button after you approve the" +
+    " notification.";
 			// 
 			// ApprovalNeededDialog
 			// 
 			this.AcceptButton = this.approvedBtn;
-			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(149, 60);
+			this.ClientSize = new System.Drawing.Size(345, 115);
 			this.Controls.Add(this.label1);
 			this.Controls.Add(this.approvedBtn);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "ApprovalNeededDialog";
 			this.ShowIcon = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Approval Needed";
+			this.Text = "Approval Alert Detected";
 			this.ResumeLayout(false);
 			this.PerformLayout();
 

LibationWinForms/Dialogs/Login/ApprovalNeededDialog.resx

@@ -0,0 +1,60 @@
+<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">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/Login/MfaDialog.Designer.cs

@@ -0,0 +1,113 @@
+
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class MfaDialog
+	{
+		/// <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.submitBtn = new System.Windows.Forms.Button();
+			this.radioButton1 = new System.Windows.Forms.RadioButton();
+			this.radioButton2 = new System.Windows.Forms.RadioButton();
+			this.radioButton3 = new System.Windows.Forms.RadioButton();
+			this.SuspendLayout();
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Location = new System.Drawing.Point(14, 93);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 3;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// radioButton1
+			// 
+			this.radioButton1.AutoSize = true;
+			this.radioButton1.Checked = true;
+			this.radioButton1.Location = new System.Drawing.Point(14, 14);
+			this.radioButton1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.radioButton1.Name = "radioButton1";
+			this.radioButton1.Size = new System.Drawing.Size(242, 19);
+			this.radioButton1.TabIndex = 0;
+			this.radioButton1.TabStop = true;
+			this.radioButton1.Text = "Enter the OTP from the authenticator app";
+			this.radioButton1.UseVisualStyleBackColor = true;
+			// 
+			// radioButton2
+			// 
+			this.radioButton2.AutoSize = true;
+			this.radioButton2.Location = new System.Drawing.Point(14, 40);
+			this.radioButton2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.radioButton2.Name = "radioButton2";
+			this.radioButton2.Size = new System.Drawing.Size(172, 19);
+			this.radioButton2.TabIndex = 1;
+			this.radioButton2.Text = "Send an SMS to my number";
+			this.radioButton2.UseVisualStyleBackColor = true;
+			// 
+			// radioButton3
+			// 
+			this.radioButton3.AutoSize = true;
+			this.radioButton3.Location = new System.Drawing.Point(14, 67);
+			this.radioButton3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.radioButton3.Name = "radioButton3";
+			this.radioButton3.Size = new System.Drawing.Size(147, 19);
+			this.radioButton3.TabIndex = 2;
+			this.radioButton3.Text = "Call me on my number";
+			this.radioButton3.UseVisualStyleBackColor = true;
+			// 
+			// MfaDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(398, 129);
+			this.Controls.Add(this.radioButton3);
+			this.Controls.Add(this.radioButton2);
+			this.Controls.Add(this.radioButton1);
+			this.Controls.Add(this.submitBtn);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MfaDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Two-step verification";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.RadioButton radioButton1;
+		private System.Windows.Forms.RadioButton radioButton2;
+		private System.Windows.Forms.RadioButton radioButton3;
+	}
+}

LibationWinForms/Dialogs/Login/MfaDialog.cs

@@ -0,0 +1,68 @@
+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.Login
+{
+	public partial class MfaDialog : Form
+	{
+		private RadioButton[] radioButtons { get; }
+
+		public MfaDialog(AudibleApi.MfaConfig mfaConfig)
+		{
+			InitializeComponent();
+
+			radioButtons = new[] { this.radioButton1, this.radioButton2, this.radioButton3 };
+
+			// optional string settings
+			if (!string.IsNullOrWhiteSpace(mfaConfig.Title))
+				this.Text = mfaConfig.Title;
+			setOptional(this.radioButton1, mfaConfig.Button1Text);
+			setOptional(this.radioButton2, mfaConfig.Button2Text);
+			setOptional(this.radioButton3, mfaConfig.Button3Text);
+
+			// mandatory values
+			radioButton1.Name = mfaConfig.Button1Name;
+			radioButton1.Tag = mfaConfig.Button1Value;
+
+			radioButton2.Name = mfaConfig.Button2Name;
+			radioButton2.Tag = mfaConfig.Button2Value;
+
+			radioButton3.Name = mfaConfig.Button3Name;
+			radioButton3.Tag = mfaConfig.Button3Value;
+		}
+
+		private static void setOptional(RadioButton radioButton, string text)
+		{
+			if (!string.IsNullOrWhiteSpace(text))
+				radioButton.Text = text;
+		}
+
+		public string SelectedName { get; private set; }
+		public string SelectedValue { get; private set; }
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			Serilog.Log.Logger.Debug("RadioButton states: {@DebugInfo}", new {
+				rb1_checked = radioButton1.Checked,
+				r21_checked = radioButton2.Checked,
+				rb3_checked = radioButton3.Checked
+			});
+
+			var selected = radioButtons.Single(rb => rb.Checked);
+
+			Serilog.Log.Logger.Debug("Selected: {@DebugInfo}", new { isSelected = selected is not null, name = selected?.Name, value = selected?.Tag });
+
+			SelectedName = selected.Name;
+			SelectedValue = (string)selected.Tag;
+
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/MfaDialog.resx

@@ -0,0 +1,60 @@
+<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">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/Login/WinformResponder.cs

@@ -30,6 +30,14 @@ namespace LibationWinForms.Login
 			return null;
 		}
 
+		public (string name, string value) GetMfaChoice(MfaConfig mfaConfig)
+		{
+			using var dialog = new MfaDialog(mfaConfig);
+			if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+				return (dialog.SelectedName, dialog.SelectedValue);
+			return (null, null);
+		}
+
 		public (string email, string password) GetLogin()
 		{
 			using var dialog = new AudibleLoginDialog(_account);

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

@@ -0,0 +1,68 @@
+<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">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <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/ScanAccountsDialog.cs

@@ -64,6 +64,10 @@ namespace LibationWinForms.Dialogs
 			this.Close();
 		}
 
-		private void cancelBtn_Click(object sender, EventArgs e) => this.Close();
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
 	}
 }

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -28,262 +28,199 @@
 		/// </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.saveBtn = new System.Windows.Forms.Button();
-            this.cancelBtn = new System.Windows.Forms.Button();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
-            this.downloadsInProgressGb.SuspendLayout();
-            this.decryptInProgressGb.SuspendLayout();
-            this.groupBox1.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.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]";
-            // 
-            // downloadsInProgressGb
-            // 
-            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]";
-            // 
-            // 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.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.Text = "Save";
-            this.saveBtn.UseVisualStyleBackColor = true;
-            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
-            // 
-            // cancelBtn
-            // 
-            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.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.Text = "Cancel";
-            this.cancelBtn.UseVisualStyleBackColor = true;
-            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
-            // 
-            // groupBox1
-            // 
-            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";
-            // 
-            // downloadChaptersCbox
-            // 
-            this.allowLibationFixupCbox.AutoSize = true;
-            this.allowLibationFixupCbox.Location = new System.Drawing.Point(10, 24);
-            this.allowLibationFixupCbox.Name = "downloadChaptersCbox";
-            this.allowLibationFixupCbox.Size = new System.Drawing.Size(262, 19);
-            this.allowLibationFixupCbox.TabIndex = 6;
-            this.allowLibationFixupCbox.Text = "Allow Libation to fix up audiobook metadata";
-            this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
-            // 
-            // SettingsDialog
-            // 
-            this.AcceptButton = this.saveBtn;
-            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.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.ResumeLayout(false);
-            this.PerformLayout();
+			this.booksLocationDescLbl = 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.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.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();
+			// 
+			// booksLocationDescLbl
+			// 
+			this.booksLocationDescLbl.AutoSize = true;
+			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(69, 15);
+			this.booksLocationDescLbl.TabIndex = 2;
+			this.booksLocationDescLbl.Text = "[book desc]";
+			// 
+			// inProgressDescLbl
+			// 
+			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, 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 = 4;
+			this.saveBtn.Text = "Save";
+			this.saveBtn.UseVisualStyleBackColor = true;
+			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+			// 
+			// cancelBtn
+			// 
+			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancelBtn.Location = new System.Drawing.Point(832, 380);
+			this.cancelBtn.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 = 5;
+			this.cancelBtn.Text = "Cancel";
+			this.cancelBtn.UseVisualStyleBackColor = true;
+			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+			// 
+			// advancedSettingsGb
+			// 
+			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.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 = 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
+			// 
+			this.AcceptButton = this.saveBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.cancelBtn;
+			this.ClientSize = new System.Drawing.Size(933, 421);
+			this.Controls.Add(this.booksGb);
+			this.Controls.Add(this.advancedSettingsGb);
+			this.Controls.Add(this.cancelBtn);
+			this.Controls.Add(this.saveBtn);
+			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.advancedSettingsGb.ResumeLayout(false);
+			this.advancedSettingsGb.PerformLayout();
+			this.booksGb.ResumeLayout(false);
+			this.booksGb.PerformLayout();
+			this.ResumeLayout(false);
 
 		}
 
 		#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

@@ -3,7 +3,6 @@ using System.IO;
 using System.Windows.Forms;
 using Dinah.Core;
 using FileManager;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs
 {
@@ -12,84 +11,95 @@ namespace LibationWinForms.Dialogs
 		Configuration config { get; } = Configuration.Instance;
 		Func<string, string> desc { get; } = Configuration.GetDescription;
 
-		public SettingsDialog()
-		{
-			InitializeComponent();
-		}
+		public SettingsDialog() => InitializeComponent();
 
 		private void SettingsDialog_Load(object sender, EventArgs e)
 		{
+			if (this.DesignMode)
+				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 "LibationFiles":
-					downloadsInProgressLibationFilesRb.Checked = true;
-					break;
-				case "WinTemp":
-				default:
-					downloadsInProgressWinTempRb.Checked = true;
-					break;
-			}
+			allowLibationFixupCbox_CheckedChanged(this, e);
 
-			switch (config.DecryptInProgressEnum)
+			inProgressSelectControl.SetDirectoryItems(new()
 			{
-				case "LibationFiles":
-					decryptInProgressLibationFilesRb.Checked = true;
-					break;
-				case "WinTemp":
-				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 ? "LibationFiles" : "WinTemp";
-			config.DecryptInProgressEnum = decryptInProgressLibationFilesRb.Checked ? "LibationFiles" : "WinTemp";
+			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();
 		}
 
-		private void cancelBtn_Click(object sender, EventArgs e) => this.Close();
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
 	}
 }

LibationWinForms/Dialogs/SettingsDialog.resx

@@ -57,55 +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="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="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>
-  <metadata name="downloadChaptersCbox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="$this.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

@@ -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">
@@ -126,6 +66,6 @@ After you make your selections, get started by importing your library.
 Go to Import &gt; 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/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

@@ -37,6 +37,9 @@ namespace LibationWinForms
 
         private void Form1_Load(object sender, EventArgs e)
 		{
+            if (this.DesignMode)
+                return;
+
 			// load default/missing cover images. this will also initiate the background image downloader
 			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
 			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
@@ -117,7 +120,7 @@ namespace LibationWinForms
             {
                 if (AudibleFileStorage.Audio.Exists(productId))
                     return AudioFileState.full;
-                if (AudibleFileStorage.AAX.Exists(productId))
+                if (AudibleFileStorage.AAXC.Exists(productId))
                     return AudioFileState.aax;
                 return AudioFileState.none;
 			}
@@ -335,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
@@ -396,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/GridEntry.cs

@@ -26,11 +26,11 @@ namespace LibationWinForms
 		[Browsable(false)]
 		public IEnumerable<string> TagsEnumerated => book.UserDefinedItem.TagsEnumerated;
 
-		public enum LiberatedState { NotDownloaded, DRM, Liberated }
+		public enum LiberatedState { NotDownloaded, PartialDownload, Liberated }
 		[Browsable(false)]
 		public LiberatedState Liberated_Status
 			=> FileManager.AudibleFileStorage.Audio.Exists(book.AudibleProductId) ? LiberatedState.Liberated
-			: FileManager.AudibleFileStorage.AAX.Exists(book.AudibleProductId) ? LiberatedState.DRM
+			: FileManager.AudibleFileStorage.AAXC.Exists(book.AudibleProductId) ? LiberatedState.PartialDownload
 			: LiberatedState.NotDownloaded;
 
 		public enum PdfState { NoPdf, Downloaded, NotDownloaded }

LibationWinForms/LibationWinForms.csproj

@@ -22,30 +22,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Update="Dialogs\LibationFilesDialog.cs" />
-    <Compile Update="Dialogs\LibationFilesDialog.Designer.cs">
-      <DependentUpon>LibationFilesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Update="Dialogs\Login\ApprovalNeededDialog.cs" />
-    <Compile Update="Dialogs\Login\ApprovalNeededDialog.Designer.cs">
-      <DependentUpon>ApprovalNeededDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Update="Dialogs\ScanAccountsDialog.cs" />
-    <Compile Update="Dialogs\ScanAccountsDialog.Designer.cs">
-      <DependentUpon>ScanAccountsDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Update="Dialogs\SettingsDialog.cs" />
-    <Compile Update="Dialogs\SettingsDialog.Designer.cs">
-      <DependentUpon>SettingsDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Update="Dialogs\IndexLibraryDialog.cs" />
-    <Compile Update="Dialogs\IndexLibraryDialog.Designer.cs">
-      <DependentUpon>IndexLibraryDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Update="Dialogs\SetupDialog.cs" />
-    <Compile Update="Dialogs\SetupDialog.Designer.cs">
-      <DependentUpon>SetupDialog.cs</DependentUpon>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -53,18 +29,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Update="Dialogs\LibationFilesDialog.resx">
-      <DependentUpon>LibationFilesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Dialogs\ScanAccountsDialog.resx">
-      <DependentUpon>ScanAccountsDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Dialogs\SettingsDialog.resx">
-      <DependentUpon>SettingsDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Dialogs\SetupDialog.resx">
-      <DependentUpon>SetupDialog.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
 
 </Project>

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;
@@ -126,7 +127,7 @@ namespace LibationWinForms
                 var libState = liberatedStatus switch
                 {
                     GridEntry.LiberatedState.Liberated => "Liberated",
-                    GridEntry.LiberatedState.DRM => "Downloaded but needs DRM removed",
+                    GridEntry.LiberatedState.PartialDownload => "File has been at least\r\npartially downloaded",
                     GridEntry.LiberatedState.NotDownloaded => "Book NOT downloaded",
                     _ => throw new Exception("Unexpected liberation state")
                 };
@@ -142,7 +143,7 @@ namespace LibationWinForms
                 var text = libState + pdfState;
 
                 if (liberatedStatus == GridEntry.LiberatedState.NotDownloaded ||
-                    liberatedStatus == GridEntry.LiberatedState.DRM ||
+                    liberatedStatus == GridEntry.LiberatedState.PartialDownload ||
                     pdfStatus == GridEntry.PdfState.NotDownloaded)
                     text += "\r\nClick to complete";
 
@@ -154,7 +155,7 @@ namespace LibationWinForms
             {
                 var image_lib
                     = liberatedStatus == GridEntry.LiberatedState.NotDownloaded ? "red"
-                    : liberatedStatus == GridEntry.LiberatedState.DRM ? "yellow"
+                    : liberatedStatus == GridEntry.LiberatedState.PartialDownload ? "yellow"
                     : liberatedStatus == GridEntry.LiberatedState.Liberated ? "green"
                     : throw new Exception("Unexpected liberation state");
                 var image_pdf
@@ -178,19 +179,11 @@ 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;
             }
 
-            // not liberated: liberate
-            var msg
-                = "Liberate entire library instead?"
-                + "\r\n\r\nClick Yes to begin liberating your entire library"
-                + "\r\n\r\nClick No to liberate this book only";
-            if (MessageBox.Show(msg, "Liberate entire library?", MessageBoxButtons.YesNo) == DialogResult.Yes)
-                await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync((_, libraryBook) => RefreshRow(libraryBook.Book.AudibleProductId));
-            else
-                await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(productId, (_, __) => RefreshRow(productId));
+            await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(productId, (_, __) => RefreshRow(productId));
         }
         #endregion
 

WinFormsDesigner/BookLiberation/AutomatedBackupsForm.Designer.cs

@@ -1,92 +0,0 @@
-namespace WinFormsDesigner.BookLiberation
-{
-    partial class AutomatedBackupsForm
-    {
-        /// <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.keepGoingCb = new System.Windows.Forms.CheckBox();
-            this.logTb = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // keepGoingCb
-            // 
-            this.keepGoingCb.AutoSize = true;
-            this.keepGoingCb.Checked = true;
-            this.keepGoingCb.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.keepGoingCb.Location = new System.Drawing.Point(12, 12);
-            this.keepGoingCb.Name = "keepGoingCb";
-            this.keepGoingCb.Size = new System.Drawing.Size(325, 17);
-            this.keepGoingCb.TabIndex = 0;
-            this.keepGoingCb.Text = "Keep going. Uncheck to stop when current backup is complete";
-            this.keepGoingCb.UseVisualStyleBackColor = true;
-            // 
-            // logTb
-            // 
-            this.logTb.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.logTb.Location = new System.Drawing.Point(12, 48);
-            this.logTb.Multiline = true;
-            this.logTb.Name = "logTb";
-            this.logTb.ReadOnly = true;
-            this.logTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.logTb.Size = new System.Drawing.Size(960, 202);
-            this.logTb.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(9, 32);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(501, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "NOTE: if the working directories are inside of Dropbox, some book liberation acti" +
-    "ons may hang indefinitely";
-            // 
-            // AutomatedBackupsForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(984, 262);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.logTb);
-            this.Controls.Add(this.keepGoingCb);
-            this.Name = "AutomatedBackupsForm";
-            this.Text = "Automated Backups";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.CheckBox keepGoingCb;
-        private System.Windows.Forms.TextBox logTb;
-        private System.Windows.Forms.Label label1;
-    }
-}

WinFormsDesigner/BookLiberation/AutomatedBackupsForm.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace WinFormsDesigner.BookLiberation
-{
-    public partial class AutomatedBackupsForm : Form
-    {
-        public AutomatedBackupsForm()
-        {
-            InitializeComponent();
-        }
-    }
-}

WinFormsDesigner/BookLiberation/DecryptForm.Designer.cs

@@ -1,101 +0,0 @@
-namespace WinFormsDesigner.BookLiberation
-{
-    partial class DecryptForm
-    {
-        /// <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.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.bookInfoLbl = new System.Windows.Forms.Label();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.rtbLog = new System.Windows.Forms.RichTextBox();
-            ((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(100, 100);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            // 
-            // bookInfoLbl
-            // 
-            this.bookInfoLbl.AutoSize = true;
-            this.bookInfoLbl.Location = new System.Drawing.Point(118, 12);
-            this.bookInfoLbl.Name = "bookInfoLbl";
-            this.bookInfoLbl.Size = new System.Drawing.Size(100, 13);
-            this.bookInfoLbl.TabIndex = 0;
-            this.bookInfoLbl.Text = "[multi-line book info]";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(12, 526);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(582, 23);
-            this.progressBar1.TabIndex = 2;
-            // 
-            // rtbLog
-            // 
-            this.rtbLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.rtbLog.Location = new System.Drawing.Point(12, 118);
-            this.rtbLog.Name = "rtbLog";
-            this.rtbLog.Size = new System.Drawing.Size(582, 402);
-            this.rtbLog.TabIndex = 1;
-            this.rtbLog.Text = "";
-            // 
-            // DecryptForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(606, 561);
-            this.Controls.Add(this.rtbLog);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.bookInfoLbl);
-            this.Controls.Add(this.pictureBox1);
-            this.Name = "DecryptForm";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "DecryptForm";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.Label bookInfoLbl;
-        private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.RichTextBox rtbLog;
-    }
-}

WinFormsDesigner/BookLiberation/DecryptForm.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace WinFormsDesigner.BookLiberation
-{
-	public partial class DecryptForm : Form
-	{
-		public DecryptForm()
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/BookLiberation/DownloadForm.Designer.cs

@@ -1,103 +0,0 @@
-namespace WinFormsDesigner.BookLiberation
-{
-    partial class DownloadForm
-    {
-        /// <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.filenameLbl = new System.Windows.Forms.Label();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.progressLbl = new System.Windows.Forms.Label();
-            this.lastUpdateLbl = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // filenameLbl
-            // 
-            this.filenameLbl.AutoSize = true;
-            this.filenameLbl.Location = new System.Drawing.Point(12, 9);
-            this.filenameLbl.Name = "filenameLbl";
-            this.filenameLbl.Size = new System.Drawing.Size(52, 13);
-            this.filenameLbl.TabIndex = 0;
-            this.filenameLbl.Text = "[filename]";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(15, 67);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(877, 23);
-            this.progressBar1.TabIndex = 4;
-            // 
-            // progressLbl
-            // 
-            this.progressLbl.Location = new System.Drawing.Point(12, 36);
-            this.progressLbl.Name = "progressLbl";
-            this.progressLbl.Size = new System.Drawing.Size(173, 13);
-            this.progressLbl.TabIndex = 5;
-            this.progressLbl.Text = "[2,999,999,999] of [2,999,999,999]";
-            this.progressLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // lastUpdateLbl
-            // 
-            this.lastUpdateLbl.AutoSize = true;
-            this.lastUpdateLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lastUpdateLbl.ForeColor = System.Drawing.Color.DarkRed;
-            this.lastUpdateLbl.Location = new System.Drawing.Point(361, 36);
-            this.lastUpdateLbl.Name = "lastUpdateLbl";
-            this.lastUpdateLbl.Size = new System.Drawing.Size(81, 13);
-            this.lastUpdateLbl.TabIndex = 6;
-            this.lastUpdateLbl.Text = "Last updated";
-            this.lastUpdateLbl.Visible = false;
-            // 
-            // DownloadForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(904, 102);
-            this.Controls.Add(this.lastUpdateLbl);
-            this.Controls.Add(this.progressLbl);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.filenameLbl);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "DownloadForm";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Downloading";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label filenameLbl;
-        private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.Label progressLbl;
-        private System.Windows.Forms.Label lastUpdateLbl;
-    }
-}

WinFormsDesigner/BookLiberation/DownloadForm.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace WinFormsDesigner.BookLiberation
-{
-	public partial class DownloadForm : Form
-	{
-		public DownloadForm()
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/Dialogs/AccountsDialog.Designer.cs

@@ -1,142 +0,0 @@
-namespace WinFormsDesigner.Dialogs
-{
-	partial class AccountsDialog
-	{
-		/// <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.cancelBtn = new System.Windows.Forms.Button();
-			this.saveBtn = new System.Windows.Forms.Button();
-			this.dataGridView1 = new System.Windows.Forms.DataGridView();
-			this.DeleteAccount = new System.Windows.Forms.DataGridViewButtonColumn();
-			this.LibraryScan = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.AccountId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Locale = new System.Windows.Forms.DataGridViewComboBoxColumn();
-			this.AccountName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// cancelBtn
-			// 
-			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(713, 415);
-			this.cancelBtn.Name = "cancelBtn";
-			this.cancelBtn.Size = new System.Drawing.Size(75, 23);
-			this.cancelBtn.TabIndex = 2;
-			this.cancelBtn.Text = "Cancel";
-			this.cancelBtn.UseVisualStyleBackColor = true;
-			// 
-			// 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(612, 415);
-			this.saveBtn.Name = "saveBtn";
-			this.saveBtn.Size = new System.Drawing.Size(75, 23);
-			this.saveBtn.TabIndex = 1;
-			this.saveBtn.Text = "Save";
-			this.saveBtn.UseVisualStyleBackColor = true;
-			// 
-			// dataGridView1
-			// 
-			this.dataGridView1.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.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-			this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-			this.DeleteAccount,
-			this.LibraryScan,
-			this.AccountId,
-			this.Locale,
-			this.AccountName});
-			this.dataGridView1.Location = new System.Drawing.Point(12, 12);
-			this.dataGridView1.MultiSelect = false;
-			this.dataGridView1.Name = "dataGridView1";
-			this.dataGridView1.Size = new System.Drawing.Size(776, 397);
-			this.dataGridView1.TabIndex = 0;
-			// 
-			// DeleteAccount
-			// 
-			this.DeleteAccount.HeaderText = "Delete";
-			this.DeleteAccount.Name = "DeleteAccount";
-			this.DeleteAccount.ReadOnly = true;
-			this.DeleteAccount.Text = "x";
-			this.DeleteAccount.Width = 44;
-			// 
-			// LibraryScan
-			// 
-			this.LibraryScan.HeaderText = "Include in library scan?";
-			this.LibraryScan.Name = "LibraryScan";
-			this.LibraryScan.Width = 83;
-			// 
-			// AccountId
-			// 
-			this.AccountId.HeaderText = "Audible email/login";
-			this.AccountId.Name = "AccountId";
-			this.AccountId.Width = 111;
-			// 
-			// Locale
-			// 
-			this.Locale.HeaderText = "Locale";
-			this.Locale.Name = "Locale";
-			this.Locale.Width = 45;
-			// 
-			// AccountName
-			// 
-			this.AccountName.HeaderText = "Account nickname (optional)";
-			this.AccountName.Name = "AccountName";
-			this.AccountName.Width = 152;
-			// 
-			// AccountsDialog
-			// 
-			this.AcceptButton = this.saveBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(800, 450);
-			this.Controls.Add(this.dataGridView1);
-			this.Controls.Add(this.saveBtn);
-			this.Controls.Add(this.cancelBtn);
-			this.Name = "AccountsDialog";
-			this.Text = "Audible Accounts";
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button cancelBtn;
-		private System.Windows.Forms.Button saveBtn;
-		private System.Windows.Forms.DataGridView dataGridView1;
-		private System.Windows.Forms.DataGridViewButtonColumn DeleteAccount;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn LibraryScan;
-		private System.Windows.Forms.DataGridViewTextBoxColumn AccountId;
-		private System.Windows.Forms.DataGridViewComboBoxColumn Locale;
-		private System.Windows.Forms.DataGridViewTextBoxColumn AccountName;
-	}
-}

WinFormsDesigner/Dialogs/AccountsDialog.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace WinFormsDesigner.Dialogs
-{
-	public partial class AccountsDialog : Form
-	{
-		public AccountsDialog(Form1 parent)
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/Dialogs/AccountsDialog.resx

@@ -1,138 +0,0 @@
-<?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.
-    -->
-  <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">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="Original.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DeleteAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LibraryScan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="AccountId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="AccountName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Locale.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

WinFormsDesigner/Dialogs/EditQuickFilters.Designer.cs

@@ -1,149 +0,0 @@
-namespace WinFormsDesigner.Dialogs
-{
-    partial class EditQuickFilters
-    {
-        /// <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.cancelBtn = new System.Windows.Forms.Button();
-            this.saveBtn = new System.Windows.Forms.Button();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.Original = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Delete = new System.Windows.Forms.DataGridViewButtonColumn();
-            this.Filter = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MoveUp = new System.Windows.Forms.DataGridViewButtonColumn();
-            this.MoveDown = new System.Windows.Forms.DataGridViewButtonColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // cancelBtn
-            // 
-            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(713, 415);
-            this.cancelBtn.Name = "cancelBtn";
-            this.cancelBtn.Size = new System.Drawing.Size(75, 23);
-            this.cancelBtn.TabIndex = 2;
-            this.cancelBtn.Text = "Cancel";
-            this.cancelBtn.UseVisualStyleBackColor = true;
-            // 
-            // 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(612, 415);
-            this.saveBtn.Name = "saveBtn";
-            this.saveBtn.Size = new System.Drawing.Size(75, 23);
-            this.saveBtn.TabIndex = 1;
-            this.saveBtn.Text = "Save";
-            this.saveBtn.UseVisualStyleBackColor = true;
-            // 
-            // dataGridView1
-            // 
-            this.dataGridView1.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.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Original,
-            this.Delete,
-            this.Filter,
-            this.MoveUp,
-            this.MoveDown});
-            this.dataGridView1.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView1.MultiSelect = false;
-            this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.Size = new System.Drawing.Size(776, 397);
-            this.dataGridView1.TabIndex = 0;
-            // 
-            // Original
-            // 
-            this.Original.HeaderText = "Original";
-            this.Original.Name = "Original";
-            this.Original.ReadOnly = true;
-            this.Original.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Original.Visible = false;
-            this.Original.Width = 48;
-            // 
-            // Delete
-            // 
-            this.Delete.HeaderText = "Delete";
-            this.Delete.Name = "Delete";
-            this.Delete.ReadOnly = true;
-            this.Delete.Text = "x";
-            this.Delete.Width = 44;
-            // 
-            // Filter
-            // 
-            this.Filter.HeaderText = "Filter";
-            this.Filter.Name = "Filter";
-            this.Filter.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Filter.Width = 35;
-            // 
-            // MoveUp
-            // 
-            this.MoveUp.HeaderText = "Move Up";
-            this.MoveUp.Name = "MoveUp";
-            this.MoveUp.ReadOnly = true;
-            this.MoveUp.Text = "^";
-            this.MoveUp.Width = 57;
-            // 
-            // MoveDown
-            // 
-            this.MoveDown.HeaderText = "Move Down";
-            this.MoveDown.Name = "MoveDown";
-            this.MoveDown.ReadOnly = true;
-            this.MoveDown.Text = "v";
-            this.MoveDown.Width = 71;
-            // 
-            // EditQuickFilters
-            // 
-            this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelBtn;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.dataGridView1);
-            this.Controls.Add(this.cancelBtn);
-            this.Controls.Add(this.saveBtn);
-            this.Name = "EditQuickFilters";
-            this.Text = "Edit Quick Filters";
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Button cancelBtn;
-        private System.Windows.Forms.Button saveBtn;
-        private System.Windows.Forms.DataGridView dataGridView1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Original;
-        private System.Windows.Forms.DataGridViewButtonColumn Delete;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Filter;
-        private System.Windows.Forms.DataGridViewButtonColumn MoveUp;
-        private System.Windows.Forms.DataGridViewButtonColumn MoveDown;
-    }
-}

WinFormsDesigner/Dialogs/EditQuickFilters.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace WinFormsDesigner.Dialogs
-{
-	public partial class EditQuickFilters : Form
-	{
-		public EditQuickFilters(Form1 parent)
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/Dialogs/EditQuickFilters.resx

@@ -1,135 +0,0 @@
-<?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.
-    -->
-  <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">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="Original.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Delete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Filter.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="MoveUp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="MoveDown.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

WinFormsDesigner/Dialogs/EditTagsDialog.Designer.cs

@@ -1,90 +0,0 @@
-namespace WinFormsDesigner
-{
-    partial class EditTagsDialog
-    {
-        /// <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.SaveBtn = new System.Windows.Forms.Button();
-            this.newTagsTb = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // SaveBtn
-            // 
-            this.SaveBtn.Location = new System.Drawing.Point(396, 25);
-            this.SaveBtn.Name = "SaveBtn";
-            this.SaveBtn.Size = new System.Drawing.Size(75, 23);
-            this.SaveBtn.TabIndex = 1;
-            this.SaveBtn.Text = "Save";
-            this.SaveBtn.UseVisualStyleBackColor = true;
-            // 
-            // newTagsTb
-            // 
-            this.newTagsTb.Location = new System.Drawing.Point(12, 27);
-            this.newTagsTb.Name = "newTagsTb";
-            this.newTagsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.newTagsTb.Size = new System.Drawing.Size(375, 20);
-            this.newTagsTb.TabIndex = 0;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(424, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Tags are separated by a space. Each tag can contain letters, numbers, and undersc" +
-    "ores";
-            // 
-            // EditTagsDialog
-            // 
-            this.AcceptButton = this.SaveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(483, 60);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.newTagsTb);
-            this.Controls.Add(this.SaveBtn);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "EditTagsDialog";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Edit Tags";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Button SaveBtn;
-        private System.Windows.Forms.TextBox newTagsTb;
-        private System.Windows.Forms.Label label1;
-    }
-}

WinFormsDesigner/Dialogs/EditTagsDialog.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace WinFormsDesigner
-{
-	public partial class EditTagsDialog : Form
-	{
-		public string NewTags { get; private set; }
-
-		public EditTagsDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/Dialogs/EditTagsDialog.resx

@@ -1,120 +0,0 @@
-<?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.
-    -->
-  <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">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

WinFormsDesigner/Dialogs/IndexLibraryDialog.Designer.cs

@@ -1,65 +0,0 @@
-namespace WinFormsDesigner.Dialogs
-{
-	partial class IndexLibraryDialog
-	{
-		/// <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.label1 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(28, 24);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(263, 13);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Scanning Audible library. This may take a few minutes.";
-			// 
-			// IndexLibraryDialog
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(440, 63);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "IndexLibraryDialog";
-			this.ShowIcon = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Scan Library";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-	}
-}

WinFormsDesigner/Dialogs/IndexLibraryDialog.cs

@@ -1,20 +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 WinFormsDesigner.Dialogs
-{
-	public partial class IndexLibraryDialog : Form
-	{
-		public IndexLibraryDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/Dialogs/LibationFilesDialog.Designer.cs

@@ -1,156 +0,0 @@
-namespace WinFormsDesigner.Dialogs
-{
-	partial class LibationFilesDialog
-	{
-		/// <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.libationFilesDescLbl = new System.Windows.Forms.Label();
-			this.libationFilesCustomBtn = new System.Windows.Forms.Button();
-			this.libationFilesCustomTb = new System.Windows.Forms.TextBox();
-			this.libationFilesCustomRb = new System.Windows.Forms.RadioButton();
-			this.libationFilesMyDocsRb = new System.Windows.Forms.RadioButton();
-			this.libationFilesRootRb = new System.Windows.Forms.RadioButton();
-			this.cancelBtn = new System.Windows.Forms.Button();
-			this.saveBtn = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			// 
-			// libationFilesDescLbl
-			// 
-			this.libationFilesDescLbl.AutoSize = true;
-			this.libationFilesDescLbl.Location = new System.Drawing.Point(12, 9);
-			this.libationFilesDescLbl.Name = "libationFilesDescLbl";
-			this.libationFilesDescLbl.Size = new System.Drawing.Size(36, 13);
-			this.libationFilesDescLbl.TabIndex = 0;
-			this.libationFilesDescLbl.Text = "[desc]";
-			// 
-			// libationFilesCustomBtn
-			// 
-			this.libationFilesCustomBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.libationFilesCustomBtn.Location = new System.Drawing.Point(753, 95);
-			this.libationFilesCustomBtn.Name = "libationFilesCustomBtn";
-			this.libationFilesCustomBtn.Size = new System.Drawing.Size(35, 23);
-			this.libationFilesCustomBtn.TabIndex = 5;
-			this.libationFilesCustomBtn.Text = "...";
-			this.libationFilesCustomBtn.UseVisualStyleBackColor = true;
-			// 
-			// libationFilesCustomTb
-			// 
-			this.libationFilesCustomTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.libationFilesCustomTb.Location = new System.Drawing.Point(35, 97);
-			this.libationFilesCustomTb.Name = "libationFilesCustomTb";
-			this.libationFilesCustomTb.Size = new System.Drawing.Size(712, 20);
-			this.libationFilesCustomTb.TabIndex = 4;
-			// 
-			// libationFilesCustomRb
-			// 
-			this.libationFilesCustomRb.AutoSize = true;
-			this.libationFilesCustomRb.Location = new System.Drawing.Point(15, 100);
-			this.libationFilesCustomRb.Name = "libationFilesCustomRb";
-			this.libationFilesCustomRb.Size = new System.Drawing.Size(14, 13);
-			this.libationFilesCustomRb.TabIndex = 3;
-			this.libationFilesCustomRb.TabStop = true;
-			this.libationFilesCustomRb.UseVisualStyleBackColor = true;
-			// 
-			// libationFilesMyDocsRb
-			// 
-			this.libationFilesMyDocsRb.AutoSize = true;
-			this.libationFilesMyDocsRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.libationFilesMyDocsRb.Location = new System.Drawing.Point(15, 61);
-			this.libationFilesMyDocsRb.Name = "libationFilesMyDocsRb";
-			this.libationFilesMyDocsRb.Size = new System.Drawing.Size(111, 30);
-			this.libationFilesMyDocsRb.TabIndex = 2;
-			this.libationFilesMyDocsRb.TabStop = true;
-			this.libationFilesMyDocsRb.Text = "[desc]\r\n[myDocs\\Libation]";
-			this.libationFilesMyDocsRb.UseVisualStyleBackColor = true;
-			// 
-			// libationFilesRootRb
-			// 
-			this.libationFilesRootRb.AutoSize = true;
-			this.libationFilesRootRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-			this.libationFilesRootRb.Location = new System.Drawing.Point(15, 25);
-			this.libationFilesRootRb.Name = "libationFilesRootRb";
-			this.libationFilesRootRb.Size = new System.Drawing.Size(113, 30);
-			this.libationFilesRootRb.TabIndex = 1;
-			this.libationFilesRootRb.TabStop = true;
-			this.libationFilesRootRb.Text = "[desc]\r\n[appDir\\Libation]";
-			this.libationFilesRootRb.UseVisualStyleBackColor = true;
-			// 
-			// cancelBtn
-			// 
-			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(713, 124);
-			this.cancelBtn.Name = "cancelBtn";
-			this.cancelBtn.Size = new System.Drawing.Size(75, 23);
-			this.cancelBtn.TabIndex = 10;
-			this.cancelBtn.Text = "Cancel";
-			this.cancelBtn.UseVisualStyleBackColor = true;
-			// 
-			// 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(612, 124);
-			this.saveBtn.Name = "saveBtn";
-			this.saveBtn.Size = new System.Drawing.Size(75, 23);
-			this.saveBtn.TabIndex = 9;
-			this.saveBtn.Text = "Save";
-			this.saveBtn.UseVisualStyleBackColor = true;
-			// 
-			// LibationFilesDialog
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(800, 159);
-			this.Controls.Add(this.cancelBtn);
-			this.Controls.Add(this.saveBtn);
-			this.Controls.Add(this.libationFilesDescLbl);
-			this.Controls.Add(this.libationFilesCustomBtn);
-			this.Controls.Add(this.libationFilesCustomTb);
-			this.Controls.Add(this.libationFilesRootRb);
-			this.Controls.Add(this.libationFilesCustomRb);
-			this.Controls.Add(this.libationFilesMyDocsRb);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Name = "LibationFilesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Libation Files location";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.Label libationFilesDescLbl;
-		private System.Windows.Forms.Button libationFilesCustomBtn;
-		private System.Windows.Forms.TextBox libationFilesCustomTb;
-		private System.Windows.Forms.RadioButton libationFilesCustomRb;
-		private System.Windows.Forms.RadioButton libationFilesMyDocsRb;
-		private System.Windows.Forms.RadioButton libationFilesRootRb;
-		private System.Windows.Forms.Button cancelBtn;
-		private System.Windows.Forms.Button saveBtn;
-	}
-}

WinFormsDesigner/Dialogs/LibationFilesDialog.cs

@@ -1,20 +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 WinFormsDesigner.Dialogs
-{
-	public partial class LibationFilesDialog : Form
-	{
-		public LibationFilesDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}

WinFormsDesigner/Dialogs/LibationFilesDialog.resx

@@ -1,120 +0,0 @@
-<?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.
-    -->
-  <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">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

WinFormsDesigner/Dialogs/Login/ApprovalNeededDialog.Designer.cs

@@ -1,77 +0,0 @@
-namespace WinFormsDesigner.Dialogs.Login
-{
-	partial class ApprovalNeededDialog
-	{
-		/// <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.approvedBtn = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// approvedBtn
-			// 
-			this.approvedBtn.Location = new System.Drawing.Point(15, 25);
-			this.approvedBtn.Name = "approvedBtn";
-			this.approvedBtn.Size = new System.Drawing.Size(79, 23);
-			this.approvedBtn.TabIndex = 1;
-			this.approvedBtn.Text = "Approved";
-			this.approvedBtn.UseVisualStyleBackColor = true;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(104, 13);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Click after approving";
-			// 
-			// ApprovalNeededDialog
-			// 
-			this.AcceptButton = this.approvedBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(149, 60);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.approvedBtn);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "ApprovalNeededDialog";
-			this.ShowIcon = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Approval Needed";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.Button approvedBtn;
-		private System.Windows.Forms.Label label1;
-	}
-}