Bug fix #318: Audible changed their API, likely in conjunction with shutting down the Windows App. DownloadQuality.Extreme and DownloadQuality.Low now throw errors

Fixed hidden items being duplicated on library scan

.gitignore

@@ -184,7 +184,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to

AaxDecrypter/AaxDecrypter.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\AAXClean\AAXClean.csproj" />
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-</Project>

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,228 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-using Dinah.Core.IO;
-using Dinah.Core.StepRunner;
-using System;
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public enum OutputFormat
-    {
-        Mp4a,
-        Mp3
-    }
-    public class AaxcDownloadConverter
-    {
-        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 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 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 AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
-        {
-            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);
-
-            if (!Directory.Exists(cacheDirectory))
-                throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
-            cacheDir = cacheDirectory;
-
-            downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
-            OutputFormat = outputFormat;
-
-            steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + (outputFormat == OutputFormat.Mp4a ? "M4b" : "Mp3"),
-
-                ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step2_DownloadAndCombine,
-                ["Step 3: Create Cue"] = Step3_CreateCue,
-                ["Step 4: Create Nfo"] = Step4_CreateNfo,
-                ["Step 5: Cleanup"] = Step5_Cleanup,
-            };
-        }
-
-        public void SetCoverArt(byte[] coverArt)
-        {
-            if (coverArt is null) return;
-
-            this.coverArt = coverArt;
-            RetrievedCoverArt?.Invoke(this, coverArt);
-        }
-
-        public bool Run()
-        {
-            var (IsSuccess, Elapsed) = steps.Run();
-
-            if (!IsSuccess)
-            {
-                Console.WriteLine("WARNING-Conversion failed");
-                return false;
-            }
-
-            var speedup = (int)(aaxFile.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
-            Console.WriteLine("Speedup is " + speedup + "x realtime.");
-            Console.WriteLine("Done");
-            return true;
-        }
-
-        public bool Step1_GetMetadata()
-        {
-            //Get metadata from the file over http
-                       
-            if (File.Exists(jsonDownloadState))
-            {
-                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();
-
-            aaxFile = new AaxFile(nfsPersister.NetworkFileStream);
-            coverArt = aaxFile.AppleTags.Cover;
-
-            RetrievedTags?.Invoke(this, aaxFile.AppleTags);
-            RetrievedCoverArt?.Invoke(this, coverArt);
-
-            return !isCanceled;
-        }
-        private NetworkFileStreamPersister NewNetworkFilePersister()
-        {
-            var headers = new System.Net.WebHeaderCollection();
-            headers.Add("User-Agent", downloadLicense.UserAgent);
-
-            NetworkFileStream networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
-            return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
-        }
-
-        public bool Step2_DownloadAndCombine()
-        {
-
-            DecryptProgressUpdate?.Invoke(this, 0);
-
-            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 AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-        {
-            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 / duration.TotalSeconds;
-
-            DecryptProgressUpdate?.Invoke(this, (int)progressPercent);
-        }
-
-        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));
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step3_CreateCue)}. FAILED");
-            }
-            return !isCanceled;
-        }
-
-        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, aaxFile, downloadLicense.ChapterInfo));
-            }
-            catch (Exception ex)
-            {
-                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;
-            aaxFile?.Cancel();
-        }
-    }
-}

AaxDecrypter/DownloadLicense.cs

@@ -1,27 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class DownloadLicense
-    {
-        public string DownloadUrl { get; }
-        public string AudibleKey { get; }
-        public string AudibleIV { get; }
-        public string UserAgent { get; }
-        public ChapterInfo ChapterInfo { get; set; }
-
-        public DownloadLicense(string downloadUrl, string audibleKey, string audibleIV, string userAgent)
-        {
-            ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            ArgumentValidator.EnsureNotNullOrEmpty(audibleKey, nameof(audibleKey));
-            ArgumentValidator.EnsureNotNullOrEmpty(audibleIV, nameof(audibleIV));
-            ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
-
-            DownloadUrl = downloadUrl;
-            AudibleKey = audibleKey;
-            AudibleIV = audibleIV;
-            UserAgent = userAgent;
-        }
-    }
-}

AaxDecrypter/NFO.cs

@@ -1,54 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public static class NFO
-    {
-        public static string CreateContents(string ripper, AAXClean.Mp4File aaxcTagLib, ChapterInfo chapters)
-        {
-            var _hours = (int)aaxcTagLib.Duration.TotalHours;
-            var myDuration
-                = (_hours > 0 ? _hours + " hours, " : string.Empty)
-                + aaxcTagLib.Duration.Minutes + " minutes, "
-                + aaxcTagLib.Duration.Seconds + " seconds";
-
-            var nfoString
-                = "General Information\r\n"
-                + "======================\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"
-                + "\r\n"
-                + "Media Information\r\n"
-                + "======================\r\n"
-                + " Source Format:          Audible AAX\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.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.AppleTags.LongDescription) ? aaxcTagLib.AppleTags.LongDescription.UnicodeToAscii() : aaxcTagLib.AppleTags.Comment?.UnicodeToAscii());
-
-            return nfoString;
-        }
-    }
-}

AaxDecrypter/NetworkFileStream.cs

@@ -1,455 +0,0 @@
-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
-    }
-}

ApplicationServices/ApplicationServices.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-    <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
-  </ItemGroup>
-
-</Project>

ApplicationServices/DbContexts.cs

@@ -1,16 +0,0 @@
-using System;
-using DataLayer;
-using FileManager;
-
-namespace ApplicationServices
-{
-	public static class DbContexts
-	{
-		//// idea for future command/query separation
-		// public static LibationContext GetCommandContext() { }
-		// public static LibationContext GetQueryContext() { }
-
-		public static LibationContext GetContext()
-			=> LibationContext.Create(SqliteStorage.ConnectionString);
-	}
-}

ApplicationServices/LibraryCommands.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using DtoImporterService;
-using InternalUtilities;
-using Serilog;
-
-namespace ApplicationServices
-{
-	public static class LibraryCommands
-	{
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
-		{
-			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
-
-			try
-			{
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
-
-				var totalCount = importItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				var newCount = await importIntoDbAsync(importItems);
-				Log.Logger.Information($"Import: New count {newCount}");
-
-				await Task.Run(() => SearchEngineCommands.FullReIndex());
-				Log.Logger.Information("FullReIndex: success");
-
-				return (totalCount, newCount);
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				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:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new {
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error importing library");
-				throw;
-			}
-		}
-
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
-		{
-			var tasks = new List<Task<List<ImportItem>>>();
-			foreach (var account in accounts)
-			{
-				var callback = loginCallbackFactoryFunc(account);
-
-				// get APIs in serial, esp b/c of logins
-				var api = await AudibleApiActions.GetApiAsync(callback, account);
-
-				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(api, account));
-			}
-
-			// import library in parallel
-			var arrayOfLists = await Task.WhenAll(tasks);
-			var importItems = arrayOfLists.SelectMany(a => a).ToList();
-			return importItems;
-		}
-
-		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
-		{
-			ArgumentValidator.EnsureNotNull(account, nameof(account));
-
-			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]"
-			});
-
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
-			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
-		}
-
-		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
-		{
-			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryImporter(context);
-			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			context.SaveChanges();
-
-			return newCount;
-		}
-
-		public static int UpdateTags(this LibationContext context, Book book, string newTags)
-		{
-			try
-			{
-				book.UserDefinedItem.Tags = newTags;
-
-				var qtyChanges = context.SaveChanges();
-
-				if (qtyChanges > 0)
-					SearchEngineCommands.UpdateBookTags(book);
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-	}
-}

ApplicationServices/SearchEngineCommands.cs

@@ -1,56 +0,0 @@
-using System;
-using System.IO;
-using DataLayer;
-using LibationSearchEngine;
-
-namespace ApplicationServices
-{
-	public static class SearchEngineCommands
-	{
-		public static void FullReIndex()
-		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			engine.CreateNewIndex();
-		}
-
-		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
-			e.Search(searchString)
-		);
-
-		public static void UpdateBookTags(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
-		);
-
-		public static void UpdateIsLiberated(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateIsLiberated(book.AudibleProductId)
-		);
-
-		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
-		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			try
-			{
-				action(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex();
-				action(engine);
-			}
-		}
-
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> action)
-		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			try
-			{
-				return action(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex();
-				return action(engine);
-			}
-		}
-	}
-}

DataLayer/Configurations/LibraryBookConfig.cs

@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace DataLayer.Configurations
-{
-    internal class LibraryBookConfig : IEntityTypeConfiguration<LibraryBook>
-    {
-        public void Configure(EntityTypeBuilder<LibraryBook> entity)
-        {
-            entity.HasKey(b => b.BookId);
-
-            entity
-                .HasOne(le => le.Book)
-                .WithOne()
-                .HasForeignKey<LibraryBook>(le => le.BookId);
-        }
-    }
-}

DataLayer/EfClasses/Role.cs

@@ -1,4 +0,0 @@
-namespace DataLayer
-{
-    public enum Role { Author = 1, Narrator = 2, Publisher = 3 }
-}

DataLayer/EfClasses/SeriesBook.cs

@@ -1,40 +0,0 @@
-using Dinah.Core;
-
-namespace DataLayer
-{
-    public class SeriesBook
-    {
-        internal int SeriesId { get; private set; }
-        internal int BookId { get; private set; }
-
-        /// <summary>
-        /// <para>"index" not "order". This is both for sequence and display</para>
-        /// <para>Float allows for in-between books. eg: 2.5</para>
-        /// <para>To show 2 editions as the same book in a series, give them the same index</para>
-        /// <para>null IS NOT the same as 0. Some series call a book "book 0"</para>
-        /// </summary>
-        public float? Index { get; private set; }
-
-        public Series Series { get; private set; }
-        public Book Book { get; private set; }
-
-        private SeriesBook() { }
-        internal SeriesBook(Series series, Book book, float? index = null)
-        {
-            ArgumentValidator.EnsureNotNull(series, nameof(series));
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
-
-            Series = series;
-            Book = book;
-            Index = index;
-        }
-
-        public void UpdateIndex(float? index)
-        {
-            if (index.HasValue)
-                Index = index.Value;
-        }
-
-		public override string ToString() => $"Series={Series} Book={Book}";
-	}
-}

DataLayer/QueryObjects/GenericPaging.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-
-namespace DataLayer
-{
-    public static class GenericPaging
-    {
-        public static IQueryable<T> Page<T>(this IQueryable<T> query, int pageNumZeroStart, int pageSize)
-        {
-            if (pageSize < 1)
-                throw new ArgumentOutOfRangeException(nameof(pageSize), "pageSize must be at least 1");
-
-            if (pageNumZeroStart > 0)
-                query = query.Skip(pageNumZeroStart * pageSize);
-
-            return query.Take(pageSize);
-        }
-    }
-}

DataLayer/QueryObjects/LibraryQueries.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    public static class LibraryQueries
-	{
-		public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
-			=> context
-				.Library
-				.GetLibrary()
-				.ToList();
-
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
-            => context
-                .Library
-                .AsNoTracking()
-                .GetLibrary()
-                .ToList();
-
-        public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
-                .Library
-                .AsNoTracking()
-                .GetLibraryBook(productId);
-
-        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
-        public static IQueryable<LibraryBook> GetLibrary(this IQueryable<LibraryBook> library)
-            => library
-                // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
-                .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
-                .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
-                .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
-
-        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(le => le.Book.AudibleProductId == productId);
-    }
-}

DataLayer/Utilities/LocalDatabaseInfo.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DataLayer.Utilities
-{
-	public static class LocalDatabaseInfo
-	{
-		public static List<string> GetLocalDBInstances()
-		{
-			// Start the child process.
-			using var p = new System.Diagnostics.Process
-			{
-				StartInfo = new System.Diagnostics.ProcessStartInfo
-				{
-					UseShellExecute = false,
-					RedirectStandardOutput = true,
-					FileName = "cmd.exe",
-					Arguments = "/C sqllocaldb info",
-					CreateNoWindow = true,
-					WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
-				}
-			};
-			p.Start();
-			var output = p.StandardOutput.ReadToEnd();
-			p.WaitForExit();
-
-			// if LocalDb is not installed then it will return that 'sqllocaldb' is not recognized as an internal or external command operable program or batch file
-			return string.IsNullOrWhiteSpace(output) || output.Contains("not recognized")
-				? new List<string>()
-				: output
-					.Split(new string[] { Environment.NewLine }, StringSplitOptions.None)
-					.Select(i => i.Trim())
-					.Where(i => !string.IsNullOrEmpty(i))
-					.ToList();
-		}
-	}
-}

DataLayer/_HowTo- EF Core.txt

@@ -1,57 +0,0 @@
-FOR QUICK MIGRATION INSTRUCTIONS:
-_DB_NOTES.txt
-
-
-HOW TO CREATE: EF CORE PROJECT
-==============================
-example is for sqlite but the same works with MsSql
-
-
-nuget
-Microsoft.EntityFrameworkCore.Tools (needed for using Package Manager Console)
-Microsoft.EntityFrameworkCore.Sqlite
-
-MIGRATIONS
-  require core, not standard
-  this can be a problem b/c standard and framework can only reference standard, not core
-TO USE MIGRATIONS (core and/or standard)
-  add to csproj
-    <PropertyGroup>
-      <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    </PropertyGroup>
-TO USE MIGRATIONS AS *BOTH* CORE AND STANDARD
-  edit csproj
-    pluralize this xml tag
-      from: TargetFramework
-      to: TargetFrameworks
-    inside of TargetFrameworks
-      from: netstandard2.1
-      to: netcoreapp3.1;netstandard2.1
-
-run. error
-SQLite Error 1: 'no such table: Blogs'.
-
-set project "Set as StartUp Project"
-
-Tools >> Nuget Package Manager >> Package Manager Console
-default project: Examples\SQLite_NETCore2_0
-
-PM> add-migration InitialCreate
-PM> Update-Database
-
-if add-migration xyz throws and error, don't take the error msg at face value. try again with add-migration xyz -verbose
-
-new sqlite .db file created: Copy always/Copy if newer
-or copy .db file to destination
-
-relative:
-   optionsBuilder.UseSqlite("Data Source=blogging.db");
-absolute  (use fwd slashes):
-   optionsBuilder.UseSqlite("Data Source=C:/foo/bar/blogging.db");
-
-
-REFERENCE ARTICLES
-------------------
-https://docs.microsoft.com/en-us/ef/core/get-started/netcore/new-db-sqlite
-https://carlos.mendible.com/2016/07/11/step-by-step-dotnet-core-and-entity-framework-core/
-https://www.benday.com/2017/12/19/ef-core-2-0-migrations-without-hard-coded-connection-strings/

DataLayer/appsettings.json

@@ -1,6 +0,0 @@
-{
-  "ConnectionStrings": {
-    "// this connection string is ONLY used for DataLayer's Migrations. this appsettings.json file is NOT used at all by application; it is overwritten":  "",
-    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
-  }
-}

Documentation/Advanced.md

@@ -0,0 +1,79 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Advanced: Table of Contents
+
+- [Files and folders](#files-and-folders)
+- [Linux and Mac (unofficial)](#linux-and-mac)
+- [Settings](#settings)
+- [Custom File Naming](#custom-file-naming)
+- [Command Line Interface](#command-line-interface)
+
+
+
+### Files and folders
+
+To make upgrades and reinstalls easier, Libation separates all of its responsibilities to a few different folders. If you don't want to mess with this stuff: ignore it. Read on if you like a little more control over your files.
+
+* In Libation's initial folder are the files that make up the program. Since nothing else is here, just copy new files here to upgrade the program. Delete this folder to delete Libation.
+
+* In a separate folder, Libation keeps track of all of the files it creates like settings and downloaded images. After an upgrade, Libation might think that's its being run for the first time. Just click ADVANCED SETUP and point to this folder. Libation will reload your library and settings.
+
+* The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
+
+### Linux and Mac
+
+Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
+
+### Settings
+
+* Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
+
+### Custom File Naming
+
+In Settings, on the Download/Decrypt tab, you can specify the format in which you want your files to be named. As you edit these templates, a live example will be shown. Parameters are listed for folders, files, and files split by chapter including an explanation of what each naming option means. For instance: you can use template `<title short> - <ch# 0> of <ch count> - <ch title>` to create the file `A Study in Scarlet - 04 of 10 - A Flight for Life.m4b`.
+
+These templates apply to GUI and CLI.
+
+### Command Line Interface
+
+Libationcli.exe allows limited access to Libation's functionalities as a CLI.
+
+Warnings about relying solely on on the CLI:
+* CLI will not perform any upgrades.
+* It will show that there is an upgrade, but that will likely scroll by too fast to notice.
+* It will not perform all post-upgrade migrations. Some migrations are only be possible by launching GUI.
+
+```
+help
+  libationcli --help
+  
+verb-specific help
+  libationcli scan --help
+  
+scan all libraries
+  libationcli scan
+scan only libraries for specific accounts
+  libationcli scan nickname1 nickname2
+  
+convert all m4b files to mp3
+  libationcli convert
+  
+liberate all books and pdfs
+  libationcli liberate
+liberate pdfs only
+  libationcli liberate --pdf
+  libationcli liberate -p
+  
+export library to file
+  libationcli export --path "C:\foo\bar\my.json" --json
+  libationcli export -p "C:\foo\bar\my.json" -j
+  libationcli export -p "C:\foo\bar\my.csv" --csv
+  libationcli export -p "C:\foo\bar\my.csv" -c
+  libationcli export -p "C:\foo\bar\my.xlsx" --xlsx
+  libationcli export -p "C:\foo\bar\my.xlsx" -x
+```

Documentation/GettingStarted.md

@@ -0,0 +1,138 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Getting started: Table of Contents
+
+- [Download Libation](#download-libation-1)
+- [Installation](#installation)
+- [Create Accounts](#create-accounts)
+- [Import your library](#import-your-library)
+- [Download your books -- DRM-free!](#download-your-books----drm-free)
+- [Download PDF attachments](#download-pdf-attachments)
+- [Details of downloaded files](#details-of-downloaded-files)
+- [Export your library](#export-your-library)
+
+
+
+### [Download Libation](https://github.com/rmcrackan/Libation/releases)
+
+### Installation
+
+To install Libation, extract the zip file to a folder, for example `C:\Libation`, and then run Libation.exe from that folder to begin the configuration process and configure your account(s).
+
+### Create Accounts
+
+Create your account(s):
+
+![Create your accounts, menu](images/v40_accounts.png)
+
+New locale options include many more regions including old audible accounts which pre-date the amazon acquisition
+
+![Choose your account locales](images/v40_locales.png)
+
+### Import your library
+
+Be default, Libation will periodically scan the accounts you added above with a checkbox next to them. Nothing for you to do. You can also scan manually.
+
+Select Import > Scan Library:
+
+![Import step 1](images/Import1.png)
+
+Or if you have multiple accounts, you'll get to choose whether to scan all accounts or just the ones you select:
+
+![Import which accounts](images/v40_import.png)
+
+If this is a new installation, or you're scanning an account you haven't scanned before, you'll be prompted to enter your password for the Audible account.
+
+![Login password](images/alt-login1.png)
+
+Enter the password and click Submit. Audible will prompt you with a CAPTCHA image. 
+
+![Login captcha](images/alt-login2.png)
+
+Enter the CAPTCHA answer characters and click Submit. If all has gone well, Libation will start scanning the account. 
+
+In rare instances, the Captcha image/response will fail in an endless loop. If this happens, delete the problem account, and then click Save. Re-add the account and click Save again. Now try to scan the account again. This time, instead of typing your password, click the link that says "Or click here". This will open the Audible External Login dialog shown below.
+
+![Login alternative setup](images/alt-login3.png)
+
+You can either copy the URL shown and paste it into your browser or launch the browser directly by clicking Launch in Browser. Audible will display its standard login page. Login, including answering the CAPTCHA on the next page. In some cases, you might have to approve the login from the email account associated with that login, but once the login is successful, you'll see an error message.
+
+![Login alternative login result](images/alt-login4.png)
+
+This actually means you've successfully logged in. Copy the entire URL shown in your browser and return to Libation. Paste that URL into the text box at the bottom of the Audible External Login window and click Submit.
+
+You'll see this window while it's scanning:
+
+![Import step 2](images/Import2.png)
+
+Success! We see how many new titles are imported:
+
+![Import step 3](images/Import3.png)
+
+### Download your books -- DRM-free!
+
+Automatically download some or all of your audible books. This shows you how much of your library is not yet downloaded and decrypted:
+
+The stoplights will tell you a title's status:
+
+* Green: downloaded and decrypted
+* Yellow: downloaded but still encrypted with DRM
+* Red: not downloaded
+* PDF icon without arrow: downloaded
+* PDF with arrow: not downloaded
+
+Or hover over the button to see the status.
+
+![Liberate book step 1](images/LiberateBook1.png)
+
+Select Liberate > Begin Book Backups
+
+You can also click on the stop light to download only that title and its PDF
+
+![Liberate book step 2](images/LiberateBook2.png)
+
+First the original book with DRM is downloaded
+
+![Liberate book step 3](images/LiberateBook3.png)
+
+Then it's decrypted so you can use it on any device you choose. The very first time you decrypt a book, this step will take a while. Every other book will go much faster. The first time, Libation has to figure out the special decryption key which allows your personal books to be unlocked.
+
+![Liberate book step 4](images/LiberateBook4.png)
+
+And voila! If you have multiple books not yet liberated, Libation will automatically move on to the next.
+
+![Liberate book step 5](images/LiberateBook5.png)
+
+The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
+
+### Download PDF attachments
+
+For books which include PDF downloads, Libation can download these for you as well and will attempt to store them with the book. "Book backup" will already download an available PDF. This additional option is useful when Audible adds a PDF to your book after you've already backed it up.
+
+Select Liberate > Begin PDF Backups
+
+![PDF download step 2](images/PdfDownload2.png)
+
+The downloads work just like with books, only with no additional decryption needed.
+
+![PDF download step 3](images/PdfDownload3.png)
+
+### Details of downloaded files
+
+![Post download](images/PostDownload.png)
+
+When you set up Libation, you'll specify a Books directory. Libation looks inside that directory and all subdirectories to look for files or folders with each library book's audible id. This way, organization is completely up to you. When you download + decrypt a book, you get several files
+
+* .m4b: your audiobook in m4b format. This is the most pure version of your audiobook and retains the highest quality. Now that it's decrypted, you can play it on any audio player and put it on any device. If you'd like, you can also use 3rd party tools to turn it into an mp3. The freedom to do what you want with your files was the original inspiration for Libation.
+* .cue: this is a file which logs where chapter breaks occur. Many tools are able to use this if you want to split your book into files along chapter lines.
+
+### Export your library
+
+![Export](images/Export.png)
+
+Export your library to Excel, CSV, or JSON

Documentation/SearchingAndFiltering.md

@@ -0,0 +1,79 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Searching and filtering: Table of Contents
+
+- [Tags](#tags)
+- [Searches](#searches)
+- [Search examples](#search-examples)
+- [Filters](#filters)
+
+
+
+### Tags
+
+To add tags to a title, click the tags button
+
+![Tags step 1](images/Tags1.png)
+
+Add as many tags as you'd like. Tags are separated by a space. Each tag can contain letters, numbers, and underscores
+
+![Tags step 2](images/Tags2.png)
+
+Tags are saved non-case specific for easy search. There is one special tag "hidden" which will also grey-out the book
+
+![Tags step 3](images/Tags3.png)
+
+To edit tags, just click the button again.
+
+### Searches
+
+Libation's advanced searching is built on the powerful Lucene search engine. Simple searches are effortless and powerful searches are simple. To search, just type and click Filter or press enter
+
+* Type anything in the search box to search common fields: title, authors, narrators, and the book's audible id
+* Use Lucene's "Query Parser Syntax" for advanced searching.
+    * Easy tutorial: http://www.lucenetutorial.com/lucene-query-syntax.html
+    * Full official guide: https://lucene.apache.org/core/2_9_4/queryparsersyntax.html
+* Tons of search fields, specific to audiobooks
+* Synonyms so you don't have to memorize magic words. Eg: author and author**s** will both work
+* Click [?] button for a full list of search fields and synonyms ![Filter options](images/FilterOptionsButton.png)
+* Search by tag like \[this\]
+* When tags have an underscore you can use part of the tag. This is useful for quick categories. The below examples make this more clear.
+
+### Search examples
+
+Search for anything with the word potter
+
+![Search example: potter](images/SearchExamplePotter.png)
+
+If you only want to see Harry Potter
+
+![Search example: "harry potter"](images/SearchExampleHarryPotter.png)
+
+If you only want to see potter except for Harry Potter. You can also use "-" instead of "NOT"
+
+![Search example: "potter NOT harry"](images/SearchExamplePotterNotHarry.png)
+![Search example: "potter -harry"](images/SearchExamplePotterNotHarry2.png)
+
+To see only books written by Neil Gaiman where he also narrates his own book. (If you don't include AND, you'll see everything written by Neil Gaiman and also all books in your library which are self-narrated.)
+
+![Search example: author:gaiman AND authornarrated](images/SearchExampleGaimanAuthorNarrated.png)
+
+I tagged autobiographies as auto_bio and biographies written by someone else as bio. I can get only autobiographies with \[auto_bio\] or get both by searching \[bio\]
+
+![Search example: \[bio\]](images/SearchExampleBio.png)
+![Search example: \[auto_bio\]](images/SearchExampleAutoBio.png)
+
+### Filters
+
+If you have a search you want to save, click Add To Quick Filters to save it in your Quick Filters list. To use it again, select it from the Quick Filters list.
+
+To edit this list go to Quick Filters > Edit quick filters. Here you can re-order the list, delete filters, double-click a filter to edit it, or double-click the bottom blank box to add a new filter.
+
+Check "Quick Filters > Start Libation with 1st filter Default" to have your top filter automatically applied when Libation starts. In this top example, I want to always start without these: at books I've tagged hidden, books I've tagged as free_audible_originals, and books which I have rated.
+
+![default filters](images/FiltersDefault.png)

DtoImporterService/BookImporter.cs

@@ -1,169 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class BookImporter : ItemsImporterBase
-	{
-		public BookImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new BookValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// pre-req.s
-			new ContributorImporter(DbContext).Import(importItems);
-			new SeriesImporter(DbContext).Import(importItems);
-			new CategoryImporter(DbContext).Import(importItems);
-
-			// get distinct
-			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
-
-			// load db existing => .Local
-			loadLocal_books(productIds);
-
-			// upsert
-			var qtyNew = upsertBooks(importItems);
-			return qtyNew;
-		}
-
-		private void loadLocal_books(List<string> productIds)
-		{
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
-			var remainingProductIds = productIds
-				.Distinct()
-				.Except(localProductIds)
-				.ToList();
-
-			// GetBooks() eager loads Series, category, et al
-			if (remainingProductIds.Any())
-				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-		}
-
-		private int upsertBooks(IEnumerable<ImportItem> importItems)
-		{
-			var qtyNew = 0;
-
-			foreach (var item in importItems)
-			{
-				var book = DbContext.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
-				if (book is null)
-				{
-					book = createNewBook(item);
-					qtyNew++;
-				}
-
-				updateBook(item, book);
-			}
-
-			return qtyNew;
-		}
-
-		private Book createNewBook(ImportItem importItem)
-		{
-			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 } };
-
-			// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-			var authors = item
-				.Authors
-				.Select(a => DbContext.Contributors.Local.Single(c => a.Name == c.Name))
-				.ToList();
-
-			var narrators
-				= item.Narrators is null || !item.Narrators.Any()
-				// if no narrators listed, author is the narrator
-				? authors
-				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-				: item
-					.Narrators
-					.Select(n => DbContext.Contributors.Local.Single(c => n.Name == c.Name))
-					.ToList();
-
-			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
-			// absence of categories is also possible
-
-			// CATEGORY HACK: only use the 1st 2 categories
-			// (real impl: var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";)
-			var lastCategory
-				= item.Categories.Length == 0 ? ""
-				: item.Categories.Length == 1 ? item.Categories[0].CategoryId
-				// 2+
-				: item.Categories[1].CategoryId;
-
-			var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == lastCategory);
-
-			var book = DbContext.Books.Add(new Book(
-				new AudibleProductId(item.ProductId),
-				title,
-				item.Description,
-				item.LengthInMinutes,
-				authors,
-				narrators,
-				category,
-				importItem.LocaleName)
-			).Entity;
-
-			var publisherName = item.Publisher;
-			if (!string.IsNullOrWhiteSpace(publisherName))
-			{
-				var publisher = DbContext.Contributors.Local.Single(c => publisherName == c.Name);
-				book.ReplacePublisher(publisher);
-			}
-
-			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
-
-			if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-				book.AddSupplementDownloadUrl(item.SupplementUrl);
-
-			return book;
-		}
-
-		private void updateBook(ImportItem importItem, Book book)
-		{
-			var item = importItem.DtoItem;
-
-			// set/update book-specific info which may have changed
-			book.PictureId = item.PictureId;
-			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
-
-			// needed during v3 => v4 migration
-			book.UpdateLocale(importItem.LocaleName);
-
-			// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
-			book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);
-
-			// update series even for existing books. these are occasionally updated
-			// these will upsert over library-scraped series, but will not leave orphans
-			if (item.Series != null)
-			{
-				foreach (var seriesEntry in item.Series)
-				{
-					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-
-					var index = 0f;
-					try
-					{
-						index = seriesEntry.Index;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, $"Error parsing series index. Title: {item.Title}. ASIN: {item.Asin}. Series index: {seriesEntry.Sequence}");
-					}
-
-					book.UpsertSeries(series, index);
-				}
-			}
-		}
-	}
-}

DtoImporterService/ContributorImporter.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class ContributorImporter : ItemsImporterBase
-	{
-		public ContributorImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new ContributorValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// get distinct
-			var authors = importItems
-				.Select(i => i.DtoItem)
-				.GetAuthorsDistinct()
-				.ToList();
-			var narrators = importItems
-				.Select(i => i.DtoItem)
-				.GetNarratorsDistinct()
-				.ToList();
-			var publishers = importItems
-				.Select(i => i.DtoItem)
-				.GetPublishersDistinct()
-				.ToList();
-
-			// load db existing => .Local
-			var allNames = publishers
-				.Union(authors.Select(n => n.Name))
-				.Union(narrators.Select(n => n.Name))
-				.Where(name => !string.IsNullOrWhiteSpace(name))
-				.ToList();
-			loadLocal_contributors(allNames);
-
-			// upsert
-			var qtyNew = 0;
-			qtyNew += upsertPeople(authors);
-			qtyNew += upsertPeople(narrators);
-			qtyNew += upsertPublishers(publishers);
-			return qtyNew;
-		}
-
-		private void loadLocal_contributors(List<string> contributorNames)
-		{
-			//// BAD: very inefficient
-			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
-
-			// GOOD: Except() is efficient. Due to hashing, it's close to O(n)
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name);
-			var remainingContribNames = contributorNames
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
-			// load existing => local
-			// remember to include default/empty/missing
-			var emptyName = Contributor.GetEmpty().Name;
-			if (remainingContribNames.Any())
-				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name) || c.Name == emptyName).ToList();
-		}
-
-		// only use after loading contributors => local
-		private int upsertPeople(List<Person> people)
-		{
-			var qtyNew = 0;
-
-			foreach (var p in people)
-			{
-				// 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;
-					qtyNew++;
-				}
-			}
-
-			return qtyNew;
-		}
-
-		// only use after loading contributors => local
-		private int upsertPublishers(List<string> publishers)
-		{
-			var qtyNew = 0;
-
-			foreach (var publisherName in publishers)
-			{
-				if (DbContext.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
-				{
-					DbContext.Contributors.Add(new Contributor(publisherName));
-					qtyNew++;
-				}
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/DtoImporterService.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

DtoImporterService/LibraryImporter.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class LibraryImporter : ItemsImporterBase
-	{
-		public LibraryImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new LibraryValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			new BookImporter(DbContext).Import(importItems);
-
-			var qtyNew = upsertLibraryBooks(importItems);
-			return qtyNew;
-		}
-
-		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
-		{
-			// technically, we should be able to have duplicate books from separate accounts.
-			// this would violate the current pk and would be difficult to deal with elsewhere:
-			// - what to show in the grid
-			// - which to consider liberated
-			//
-			// sqlite cannot alter pk. the work around is an extensive headache. it'll be fixed in pre .net5/efcore5
-			//
-			// currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
-			//
-			// CURRENT SOLUTION: don't re-insert
-
-			var currentLibraryProductIds = DbContext.Library.Select(l => l.Book.AudibleProductId).ToList();
-			var newItems = importItems.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId)).ToList();
-
-			foreach (var newItem in newItems)
-			{
-				var libraryBook = new LibraryBook(
-					DbContext.Books.Local.Single(b => b.AudibleProductId == newItem.DtoItem.ProductId),
-					newItem.DtoItem.DateAdded,
-					newItem.AccountId);
-				DbContext.Library.Add(libraryBook);
-			}
-
-			// needed for v3 => v4 upgrade
-			var toUpdate = DbContext.Library.Where(l => l.Account == null);
-			foreach (var u in toUpdate)
-			{
-				var item = importItems.FirstOrDefault(ii => ii.DtoItem.ProductId == u.Book.AudibleProductId);
-				if (item != null)
-					u.UpdateAccount(item.AccountId);
-			}
-
-			var qtyNew = newItems.Count;
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/SeriesImporter.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class SeriesImporter : ItemsImporterBase
-	{
-		public SeriesImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new SeriesValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// get distinct
-			var series = importItems
-				.Select(i => i.DtoItem)
-				.GetSeriesDistinct()
-				.ToList();
-
-			// load db existing => .Local
-			loadLocal_series(series);
-
-			// upsert
-			var qtyNew = upsertSeries(series);
-			return qtyNew;
-		}
-
-		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
-		{
-			var seriesIds = series.Select(s => s.SeriesId).ToList();
-			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
-			var remainingSeriesIds = seriesIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
-
-			if (remainingSeriesIds.Any())
-				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
-		}
-
-		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
-		{
-			var qtyNew = 0;
-
-			foreach (var s in requestedSeries)
-			{
-				var series = DbContext.Series.Local.SingleOrDefault(c => c.AudibleSeriesId == s.SeriesId);
-				if (series is null)
-				{
-					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
-					qtyNew++;
-				}
-				series.UpdateName(s.SeriesName);
-			}
-
-			return qtyNew;
-		}
-	}
-}

FileLiberator/BackupBook.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Download DRM book and decrypt audiobook files
-    /// 
-    /// Processes:
-    /// Download: download aax file: the DRM encrypted audiobook
-    /// Decrypt: remove DRM encryption from audiobook. Store final book
-    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
-    /// </summary>
-    public class BackupBook : IProcessable
-    {
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<LibraryBook> Completed;
-
-        public DownloadDecryptBook DecryptBook { get; } = new DownloadDecryptBook();
-		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
-
-		public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-			{
-				{
-					var statusHandler = await DecryptBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				{
-					var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				return new StatusHandler();
-			}
-			finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-	}
-}

FileLiberator/DownloadDecryptBook.cs

@@ -1,225 +0,0 @@
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AaxDecrypter;
-using AudibleApi;
-
-namespace FileLiberator
-{
-    public class DownloadDecryptBook : IDecryptable
-    {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> DecryptBegin;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        public event EventHandler<int> UpdateProgress;
-        public event EventHandler<TimeSpan> UpdateRemainingTime;
-        public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Completed;
-        public event EventHandler<string> StatusUpdate;
-
-        private AaxcDownloadConverter aaxcDownloader;
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
-
-                // decrypt failed
-                if (outputAudioFilename is null)
-                    return new StatusHandler { "Decrypt failed" };
-
-                // moves files and returns dest dir
-                _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
-
-                var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-                if (!finalAudioExists)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-        private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
-        {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
-
-            try
-            {
-                validate(libraryBook);
-
-                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-                var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-
-                var aaxcDecryptDlLic = new DownloadLicense
-                    (
-                    contentLic.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic.Voucher?.Key,
-                    contentLic.Voucher?.Iv,
-                    Resources.UserAgent
-                    );
-
-                if (Configuration.Instance.AllowLibationFixup)
-                {
-                    aaxcDecryptDlLic.ChapterInfo = new AAXClean.ChapterInfo();
-
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        aaxcDecryptDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
-                }
-
-
-                var format = Configuration.Instance.DecryptToLossy ? OutputFormat.Mp3 : OutputFormat.Mp4a;
-
-                var extension = format switch
-                {
-                    OutputFormat.Mp4a => "m4b",
-                    OutputFormat.Mp3 => "mp3",
-                    _ => throw new NotImplementedException(),
-                };
-
-                 var proposedOutputFile = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
-
-
-                aaxcDownloader = new AaxcDownloadConverter(proposedOutputFile, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => UpdateRemainingTime?.Invoke(this, remaining);
-                aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(() => aaxcDownloader.Run());
-
-                // decrypt failed
-                if (!success)
-                    return null;
-
-                return aaxcDownloader.OutputFileName;
-            }
-            finally
-            {
-                DecryptCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
-            }
-        }
-
-        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
-        {
-            if (e is null && Configuration.Instance.AllowLibationFixup)
-            {
-                RequestCoverArt?.Invoke(this, aaxcDownloader.SetCoverArt);
-            }
-
-            if (e is not null)
-            {
-                CoverImageFilepathDiscovered?.Invoke(this, e);
-            }
-        }
-
-        private void aaxcDownloader_RetrievedTags(object sender, AAXClean.AppleTags e)
-        {
-            TitleDiscovered?.Invoke(this, e.TitleSansUnabridged);
-            AuthorsDiscovered?.Invoke(this, e.FirstAuthor ?? "[unknown]");
-            NarratorsDiscovered?.Invoke(this, e.Narrator ?? "[unknown]");           
-        }
-
-        private static string moveFilesToBooksDir(Book product, string outputAudioFilename)
-        {
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
-
-            var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
-            Directory.CreateDirectory(destinationDir);
-
-            var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
-
-            var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
-
-            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
-
-            foreach (var f in sortedFiles)
-            {
-                var dest
-                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    ? audioFileName
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
-                    : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
-
-                if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
-                    Cue.UpdateFileName(f, audioFileName);
-
-                File.Move(f.FullName, dest);
-            }
-
-            return destinationDir;
-        }
-
-        private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
-        {
-            // files are: temp path\author\[asin].ext
-            var m4bDir = new FileInfo(outputAudioFilename).Directory;
-            var files = m4bDir
-                .EnumerateFiles()
-                .Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
-                .ToList();
-
-            // move audio files to the end of the collection so these files are moved last
-            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-            var sortedFiles = files
-                .Except(musicFiles)
-                .Concat(musicFiles)
-                .ToList();
-
-            return sortedFiles;
-        }
-
-        private static void validate(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
-
-        public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-
-        public void Cancel()
-        {
-            aaxcDownloader?.Cancel();
-        }
-    }
-}

FileLiberator/DownloadFile.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-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;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
-
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
-
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/DownloadPdf.cs

@@ -1,61 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-using FileManager;
-
-namespace FileLiberator
-{
-	public class DownloadPdf : DownloadableBase
-	{
-		public override bool Validate(LibraryBook libraryBook)
-			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId);
-
-		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
-		{
-			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
-			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			return verifyDownload(libraryBook);
-		}
-
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
-
-		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
-		{
-			// if audio file exists, get it's dir. else return base Book dir
-			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
-			var file = getdownloadUrl(libraryBook);
-
-			if (existingPath != null)
-				return Path.Combine(existingPath, Path.GetFileName(file));
-
-			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
-				libraryBook.Book.Title,
-				Path.GetExtension(file),
-				libraryBook.Book.AudibleProductId);
-			return full;
-		}
-
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
-		{
-			var api = await GetApiAsync(libraryBook);
-			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
-
-			var client = new HttpClient();
-			var actualDownloadedFilePath = await PerformDownloadAsync(
-				proposedDownloadFilePath,
-				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
-		}
-
-		private static string getdownloadUrl(LibraryBook libraryBook)
-			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
-	}
-}

FileLiberator/DownloadableBase.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	public abstract class DownloadableBase : IDownloadableProcessable
-	{
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<LibraryBook> Completed;
-
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
-
-		public event EventHandler<string> StatusUpdate;
-		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
-
-        public abstract bool Validate(LibraryBook libraryBook);
-
-        public abstract Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                return await ProcessItemAsync(libraryBook);
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
-			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
-		{
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
-
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var result = await func(progress);
-				StatusUpdate?.Invoke(this, result);
-
-				return result;
-			}
-			finally
-			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/FileLiberator.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

FileLiberator/IDecryptable.cs

@@ -1,20 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IDecryptable : IProcessable
-    {
-        event EventHandler<string> DecryptBegin;
-
-        event EventHandler<Action<byte[]>> RequestCoverArt;
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        event EventHandler<int> UpdateProgress;
-        event EventHandler<TimeSpan> UpdateRemainingTime;
-
-        event EventHandler<string> DecryptCompleted;
-        void Cancel();
-    }
-}

FileLiberator/IDownloadable.cs

@@ -1,12 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public interface IDownloadable 
-    {
-        event EventHandler<string> DownloadBegin;
-        event EventHandler<DownloadProgress> DownloadProgressChanged;
-        event EventHandler<string> DownloadCompleted;
-    }
-}

FileLiberator/IDownloadableProcessable.cs

@@ -1,4 +0,0 @@
-namespace FileLiberator
-{
-    public interface IDownloadableProcessable : IDownloadable, IProcessable { }
-}

FileLiberator/IProcessable.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public interface IProcessable
-    {
-        event EventHandler<LibraryBook> Begin;
-
-        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
-        event EventHandler<string> StatusUpdate;
-
-        event EventHandler<LibraryBook> Completed;
-
-		/// <returns>True == Valid</returns>
-		bool Validate(LibraryBook libraryBook);
-
-        /// <returns>True == success</returns>
-        Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
-    }
-}

FileLiberator/IProcessableExt.cs

@@ -1,65 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public static class IProcessableExt
-    {
-        //
-        // DO NOT USE ConfigureAwait(false) WITH ProcessAsync() unless ensuring ProcessAsync() implementation is cross-thread compatible
-        // ProcessAsync() often does a lot with forms in the UI context
-        //
-
-
-        // when used in foreach: stateful. deferred execution
-        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable)
-            => DbContexts.GetContext()
-            .GetLibrary_Flat_NoTracking()
-            .Where(libraryBook => processable.Validate(libraryBook));
-
-        public static LibraryBook GetSingleLibraryBook(string productId)
-        {
-            using var context = DbContexts.GetContext();
-            var libraryBook = context
-                .Library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
-            return libraryBook;
-        }
-
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook)
-        {
-            if (!processable.Validate(libraryBook))
-                return new StatusHandler { "Validation failed" };
-
-            return await processable.ProcessBookAsync_NoValidation(libraryBook);
-        }
-
-        public static async Task<StatusHandler> ProcessBookAsync_NoValidation(this IProcessable processable, LibraryBook libraryBook)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(ProcessBookAsync_NoValidation) + " {@DebugInfo}", new
-            {
-                libraryBook.Book.Title,
-                libraryBook.Book.AudibleProductId,
-                libraryBook.Book.Locale,
-                Account = libraryBook.Account?.ToMask() ?? "[empty]"
-            });
-
-            var status
-                = (await processable.ProcessAsync(libraryBook))
-                ?? new StatusHandler { "Processable should never return a null status" };
-
-            return status;
-        }
-
-		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
-			=> processable.Validate(libraryBook)
-			? await processable.ProcessAsync(libraryBook)
-			: new StatusHandler();
-	}
-}

FileManager/AudibleFileStorage.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-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, AAXC, PDF }
-
-	/// <summary>
-	/// Files are large. File contents are never read by app.
-	/// Paths are varied.
-	/// Files are written during download/decrypt/backup/liberate.
-	/// Paths are read at app launch and during download/decrypt/backup/liberate.
-	/// Many files are often looked up at once
-	/// </summary>
-	public abstract class AudibleFileStorage : Enumeration<AudibleFileStorage>
-	{
-		public abstract string[] Extensions { get; }
-		public abstract string StorageDirectory { get; }
-
-		#region static
-		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-		public static AudibleFileStorage AAXC { get; } = new AaxcFileStorage();
-		public static AudibleFileStorage PDF { get; } = new PdfFileStorage();
-
-		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).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.UserProfile, "Books");
-                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
-            }
-        }
-        #endregion
-
-        #region instance
-        public FileType FileType => (FileType)Value;
-
-		private IEnumerable<string> extensions_noDots { get; }
-        private string extAggr { get; }
-
-        protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
-		{
-			extensions_noDots = Extensions.Select(ext => ext.Trim('.')).ToList();
-			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
-		}
-
-        /// <summary>
-        /// Example for full books:
-        /// Search recursively in _books directory. Full book exists if either are true
-        /// - a directory name has the product id and an audio file is immediately inside
-        /// - any audio filename contains the product id
-        /// </summary>
-        public bool Exists(string productId) => GetPath(productId) != null;
-
-		public string GetPath(string productId)
-        {
-            var cachedFile = FilePathCache.GetPath(productId, FileType);
-            if (cachedFile != null)
-                return cachedFile;
-
-            var firstOrNull =
-				Directory
-				.EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
-				.FirstOrDefault(s => Regex.IsMatch(s, $@"{productId}.*?\.({extAggr})$", RegexOptions.IgnoreCase));
-
-			if (firstOrNull is null)
-				return null;
-
-			FilePathCache.Upsert(productId, FileType, firstOrNull);
-			return firstOrNull;
-        }
-
-        public string GetDestDir(string title, string asin)
-        {
-            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
-            var underscoreIndex = title.IndexOf(':');
-            var titleDir
-                = underscoreIndex < 4
-                ? title
-                : title.Substring(0, underscoreIndex);
-            var finalDir = FileUtility.GetValidFilename(StorageDirectory, titleDir, null, asin);
-            return finalDir;
-        }
-
-        public bool IsFileTypeMatch(FileInfo fileInfo)
-            => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
-        #endregion
-    }
-
-    public class AudioFileStorage : AudibleFileStorage
-    {
-        public const string SKIP_FILE_EXT = "libhack";
-
-		public override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac", SKIP_FILE_EXT };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public AudioFileStorage() : base(FileType.Audio) { }
-
-        public string CreateSkipFile(string title, string asin, string contents = null)
-        {
-            var destinationDir = GetDestDir(title, asin);
-            Directory.CreateDirectory(destinationDir);
-
-            var path = FileUtility.GetValidFilename(destinationDir, title, SKIP_FILE_EXT, asin);
-            File.WriteAllText(path, contents ?? string.Empty);
-
-            return path;
-        }
-    }
-
-    public class AaxcFileStorage : AudibleFileStorage
-    {
-        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 => DownloadsInProgress;
-
-        public AaxcFileStorage() : base(FileType.AAXC) { }
-    }
-
-    public class PdfFileStorage : AudibleFileStorage
-    {
-		public override string[] Extensions { get; } = new[] { "pdf", "zip" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public PdfFileStorage() : base(FileType.PDF) { }
-    }
-}

FileManager/Configuration.cs

@@ -1,273 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace FileManager
-{
-    public class Configuration
-    {
-        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
-        /*
-        // field should NOT be populated
-        public string TestField;
-        // int should NOT be populated
-        public int TestInt { get; set; }
-        // read-only should NOT be populated
-        public string TestGet { get; } // get only: should NOT get auto-populated
-        // set-only should NOT be populated
-        public string TestSet { private get; set; }
-
-        // get and set: SHOULD be auto-populated
-        public string TestGetSet { get; set; }
-        */
-        #endregion
-
-        // settings will be persisted when all are true
-        // - property (not field)
-        // - string
-        // - public getter
-        // - public setter
-
-        // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
-
-        // default setting and directory creation occur in class responsible for files.
-        // config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
-        // exceptions: appsettings.json, LibationFiles dir, Settings.json
-
-        private PersistentDictionary persistentDictionary;
-
-        public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.Set(propertyName, newValue);
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue);
-
-        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
-
-        public static string GetDescription(string propertyName)
-        {
-            var attribute = typeof(Configuration)
-                .GetProperty(propertyName)
-                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
-                .SingleOrDefault()
-                as DescriptionAttribute;
-
-            return attribute?.Description;
-        }
-
-        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
-
-        [Description("Location for book storage. Includes destination of newly liberated books")]
-        public string Books
-        {
-            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)
-        {
-            // this is WRONG. need to MOVE settings; not DELETE them
-
-            //// if moving from default, delete old settings file and dir (if empty)
-            //if (LibationFiles.EqualsInsensitive(AppDir))
-            //{
-            //    File.Delete(SettingsFilePath);
-            //    System.Threading.Thread.Sleep(100);
-            //    if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-            //        Directory.Delete(AppDir);
-            //}
-
-
-            libationFilesPathCache = null;
-
-
-            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
-            var jObj = JObject.Parse(startingContents);
-
-            jObj[LIBATION_FILES_KEY] = directory;
-
-            var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            if (startingContents != endingContents)
-            {
-                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

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Octokit" Version="0.50.0" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-</Project>

FileManager/FilePathCache.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Dinah.Core.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace FileManager
-{
-	public static class FilePathCache
-    {
-        internal class CacheEntry
-        {
-            public string Id { get; set; }
-            public FileType FileType { get; set; }
-            public string Path { get; set; }
-        }
-
-        static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
-
-        public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
-
-        static FilePathCache()
-        {
-			// load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-			if (File.Exists(JsonFile))
-			{
-				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(JsonFile));
-				cache = new Cache<CacheEntry>(list);
-			}
-        }
-
-        public static bool Exists(string id, FileType type) => GetPath(id, type) != null;
-
-        public static string GetPath(string id, FileType type)
-        {
-            var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-
-            if (entry == null)
-                return null;
-
-            if (!File.Exists(entry.Path))
-            {
-                remove(entry);
-                return null;
-            }
-
-            return entry.Path;
-        }
-
-        private static void remove(CacheEntry entry)
-		{
-			cache.Remove(entry);
-			save();
-		}
-
-        public static void Upsert(string id, FileType type, string path)
-        {
-            if (!File.Exists(path))
-                throw new FileNotFoundException("Cannot add path to cache. File not found");
-
-			var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-
-			if (entry is null)
-				cache.Add(new CacheEntry { Id = id, FileType = type, Path = path });
-			else
-				entry.Path = path;
-
-			save();
-		}
-
-		// cache is thread-safe and lock free. but file saving is not
-		private static object locker { get; } = new object();
-		private static void save()
-		{
-			// create json if not exists
-			static void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(cache.ToList(), Formatting.Indented));
-
-			lock (locker)
-			{
-				try { resave(); }
-				catch (IOException)
-				{
-					try { resave(); }
-					catch (IOException ex)
-					{
-						Serilog.Log.Logger.Error(ex, "Error saving FilePaths.json");
-						throw;
-					}
-				}
-			}
-        }
-    }
-}

FileManager/FileUtility.cs

@@ -1,52 +0,0 @@
-using System;
-using System.IO;
-
-namespace FileManager
-{
-    public static class FileUtility
-    {
-        public static string GetValidFilename(string dirFullPath, string filename, string extension, params string[] metadataSuffixes)
-        {
-            if (string.IsNullOrWhiteSpace(dirFullPath))
-                throw new ArgumentException($"{nameof(dirFullPath)} may not be null or whitespace", nameof(dirFullPath));
-
-            // file max length = 255. dir max len = 247
-
-            // sanitize
-            filename = GetAsciiTag(filename);
-            // manage length
-            if (filename.Length > 50)
-                filename = filename.Substring(0, 50) + "[...]";
-
-            // append id. it is 10 or 14 char in the common cases
-            if (metadataSuffixes != null && metadataSuffixes.Length > 0)
-                filename += " [" + string.Join("][", metadataSuffixes) + "]";
-
-            // this method may also be used for directory names, so no guarantee of extension
-            if (!string.IsNullOrWhiteSpace(extension))
-                extension = '.' + extension.Trim('.');
-
-            // ensure uniqueness
-            var fullfilename = Path.Combine(dirFullPath, filename + extension);
-            var i = 0;
-            while (File.Exists(fullfilename))
-                fullfilename = Path.Combine(dirFullPath, filename + $" ({++i})" + extension);
-
-            return fullfilename;
-        }
-
-        public static string GetAsciiTag(string property)
-        {
-            if (property == null)
-                return "";
-
-            // omit characters which are invalid. EXCEPTION: change colon to underscore
-            property = property.Replace(':', '_');
-
-            // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-            foreach (var ch in Path.GetInvalidFileNameChars())
-                property = property.Replace(ch.ToString(), "");
-            return property;
-        }
-    }
-}

FileManager/PersistentDictionary.cs

@@ -1,154 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-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, bool isReadOnly = false)
-        {
-            Filepath = filepath;
-            IsReadOnly = isReadOnly;
-
-            if (File.Exists(Filepath))
-                return;
-
-            // 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);
-        }
-
-        public string GetString(string propertyName)
-        {
-            if (!stringCache.ContainsKey(propertyName))
-            {
-                var jObject = readFile();
-                if (!jObject.ContainsKey(propertyName))
-                    return null;
-                stringCache[propertyName] = jObject[propertyName].Value<string>();
-            }
-
-            return stringCache[propertyName];
-        }
-
-        public T Get<T>(string propertyName)
-        {
-            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)
-        {
-            if (!objectCache.ContainsKey(propertyName))
-            {
-                var jObject = readFile();
-                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.ContainsKey(propertyName) && stringCache[propertyName] == newValue)
-                return;
-
-            // set cache
-            stringCache[propertyName] = newValue;
-
-            writeFile(propertyName, newValue);
-        }
-
-        public void Set(string propertyName, object newValue)
-        {
-            // set cache
-            objectCache[propertyName] = newValue;
-
-            var parsedNewValue = JToken.Parse(JsonConvert.SerializeObject(newValue));
-            writeFile(propertyName, parsedNewValue);
-        }
-
-        private void writeFile(string propertyName, JToken newValue)
-        {
-            if (IsReadOnly)
-                return;
-
-            try
-            {
-                var str = newValue?.ToString();
-                var formattedValue
-                    = str is null ? "[null]"
-                    : string.IsNullOrEmpty(str) ? "[empty]"
-                    : string.IsNullOrWhiteSpace(str) ? $"[whitespace. Length={str.Length}]"
-                    : str.Length > 100 ? $"[Length={str.Length}] {str[0..50]}...{str[^50..^0]}"
-                    : str;
-                Serilog.Log.Logger.Information($"Config changed. {propertyName}={formattedValue}");
-            }
-            catch { }
-
-            // write new setting to file
-            lock (locker)
-            {
-                var jObject = readFile();
-                var startContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
-
-                jObject[propertyName] = newValue;
-                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 oldValue = (string)token[propertyName];
-
-                if (oldValue != newValue)
-                {
-                    token[propertyName] = newValue;
-                    File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
-                }
-            }
-        }
-
-        private JObject readFile()
-        {
-            var settingsJsonContents = File.ReadAllText(Filepath);
-            var jObject = JsonConvert.DeserializeObject<JObject>(settingsJsonContents);
-            return jObject;
-        }
-    }
-}

FileManager/PictureStorage.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace FileManager
-{
-	public enum PictureSize { _80x80, _300x300, _500x500 }
-	public struct PictureDefinition
-	{
-		public string PictureId { get; }
-		public PictureSize Size { get; }
-
-		public PictureDefinition(string pictureId, PictureSize pictureSize)
-		{
-			PictureId = pictureId;
-			Size = pictureSize;
-		}
-	}
-    public static class PictureStorage
-    {
-        // not customizable. don't move to config
-        private static string ImagesDirectory { get; }
-            = new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("Images").FullName;
-
-		private static string getPath(PictureDefinition def)
-			=> Path.Combine(ImagesDirectory, $"{def.PictureId}{def.Size}.jpg");
-
-		private static System.Timers.Timer timer { get; }
-		static PictureStorage()
-		{
-			timer = new System.Timers.Timer(700)
-			{
-				AutoReset = true,
-				Enabled = true
-			};
-			timer.Elapsed += (_, __) => timerDownload();
-		}
-
-		public static event EventHandler<string> PictureCached;
-
-		private static Dictionary<PictureDefinition, byte[]> cache { get; } = new Dictionary<PictureDefinition, byte[]>();
-		public static (bool isDefault, byte[] bytes) GetPicture(PictureDefinition def)
-		{
-			if (!cache.ContainsKey(def))
-			{
-				var path = getPath(def);
-				cache[def]
-					= File.Exists(path)
-					? File.ReadAllBytes(path)
-					: null;
-			}
-			return (cache[def] == null, cache[def] ?? getDefaultImage(def.Size));
-		}
-
-		private static Dictionary<PictureSize, byte[]> defaultImages { get; } = new Dictionary<PictureSize, byte[]>();
-		public static void SetDefaultImage(PictureSize pictureSize, byte[] bytes)
-			=> defaultImages[pictureSize] = bytes;
-		private static byte[] getDefaultImage(PictureSize size)
-			=> defaultImages.ContainsKey(size)
-			? defaultImages[size]
-			: new byte[0];
-
-		// necessary to avoid IO errors. ReadAllBytes and WriteAllBytes can conflict in some cases, esp when debugging
-		private static bool isProcessing;
-		private static void timerDownload()
-		{
-			// must live outside try-catch, else 'finally' can reset another thread's lock
-			if (isProcessing)
-				return;
-
-			try
-			{
-				isProcessing = true;
-
-				var def = cache
-					.Where(kvp => kvp.Value is null)
-					.Select(kvp => kvp.Key)
-					// 80x80 should be 1st since it's enum value == 0
-					.OrderBy(d => d.PictureId)
-					.FirstOrDefault();
-
-				// no more null entries. all requsted images are cached
-				if (string.IsNullOrWhiteSpace(def.PictureId))
-					return;
-
-				var bytes = downloadBytes(def);
-				saveFile(def, bytes);
-				cache[def] = bytes;
-
-				PictureCached?.Invoke(nameof(PictureStorage), def.PictureId);
-			}
-			finally
-			{
-				isProcessing = false;
-			}
-		}
-
-		private static HttpClient imageDownloadClient { get; } = new HttpClient();
-		private static byte[] downloadBytes(PictureDefinition def)
-		{
-			var sz = def.Size.ToString().Split('x')[1];
-			return imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}._SL{sz}_.jpg").Result;
-		}
-
-		private static void saveFile(PictureDefinition def, byte[] bytes)
-		{
-			var path = getPath(def);
-			File.WriteAllBytes(path, bytes);
-		}
-	}
-}

InternalUtilities/AudibleApiActions.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using AudibleApiDTOs;
-using Dinah.Core;
-using Polly;
-using Polly.Retry;
-
-namespace InternalUtilities
-{
-	public static class AudibleApiActions
-	{
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(string username, string localeName, ILoginCallback loginCallback = null)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
-			{
-				Username = username.ToMask(),
-				LocaleName = localeName,
-			});
-			return EzApiCreator.GetApiAsync(
-				Localization.Get(localeName),
-				AudibleApiStorage.AccountsSettingsFile,
-				AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName),
-				loginCallback);
-		}
-
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(ILoginCallback loginCallback, Account account)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-			return EzApiCreator.GetApiAsync(
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath(),
-				loginCallback);
-		}
-
-		private static AsyncRetryPolicy policy { get; }
-			= Policy.Handle<Exception>()
-			// 2 retries == 3 total
-			.RetryAsync(2);
-
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api)
-		{
-			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or tokens are refreshed
-			// worse, this 1st dummy call doesn't seem to help:
-			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
-			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-			return policy.ExecuteAsync(() => getItemsAsync(api));
-		}
-
-		private static async Task<List<Item>> getItemsAsync(Api api)
-		{
-			var items = await api.GetAllLibraryItemsAsync();
-
-			// remove episode parents
-			items.RemoveAll(i => i.IsEpisodes);
-
-			#region // episode handling. doesn't quite work
-			//				// add individual/children episodes
-			//				var childIds = items
-			//					.Where(i => i.Episodes)
-			//					.SelectMany(ep => ep.Relationships)
-			//					.Where(r => r.RelationshipToProduct == AudibleApiDTOs.RelationshipToProduct.Child && r.RelationshipType == AudibleApiDTOs.RelationshipType.Episode)
-			//					.Select(c => c.Asin)
-			//					.ToList();
-			//				foreach (var childId in childIds)
-			//				{
-			//					var bookResult = await api.GetLibraryBookAsync(childId, AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-			//					var bookItem = AudibleApiDTOs.LibraryDtoV10.FromJson(bookResult.ToString()).Item;
-			//					items.Add(bookItem);
-			//				}
-			#endregion
-
-			var validators = new List<IValidator>();
-			validators.AddRange(getValidators());
-			foreach (var v in validators)
-			{
-				var exceptions = v.Validate(items);
-				if (exceptions != null && exceptions.Any())
-					throw new AggregateException(exceptions);
-			}
-
-			return items;
-		}
-
-		private static List<IValidator> getValidators()
-		{
-			var type = typeof(IValidator);
-			var types = AppDomain.CurrentDomain.GetAssemblies()
-				.SelectMany(s => s.GetTypes())
-				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
-
-			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
-		}
-	}
-}

InternalUtilities/InternalUtilities.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

Libation.sln

@@ -1,256 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.156
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
-	ProjectSection(SolutionItems) = preProject
-		__TODO.txt = __TODO.txt
-		_DB_NOTES.txt = _DB_NOTES.txt
-		REFERENCE.txt = REFERENCE.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 Domain Utilities (db aware)", "5 Domain Utilities (db aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6 Application", "6 Application", "{8679CAC8-9164-4007-BDD2-F004810EDA14}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 Core Libraries", "1 Core Libraries", "{43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 Domain (db)", "4 Domain (db)", "{751093DD-5DBA-463E-ADBE-E05FAFB6983E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 Utilities (domain ignorant)", "2 Utilities (domain ignorant)", "{7FBBB086-0807-4998-85BF-6D1A49C8AD05}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AaxDecrypter", "AaxDecrypter\AaxDecrypter.csproj", "{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\FileManager.csproj", "{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\DataLayer.csproj", "{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLiberator\FileLiberator.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities", "InternalUtilities\InternalUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities (db ignorant)", "3 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Tests", "0 Tests", "{38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Demos and Examples", "0 Demos and Examples", "{F61184E7-2426-4A13-ACEF-5689928E2CE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Demos", "..\Dinah.Core\_Demos\Dinah.Core.Demos\Dinah.Core.Demos.csproj", "{9F1AA3DE-962F-469B-82B2-46F93491389B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Tests", "..\Dinah.Core\_Tests\Dinah.Core.Tests\Dinah.Core.Tests.csproj", "{E874D000-AD3A-4629-AC65-7219C2C7C1F0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCommon", "..\Dinah.Core\_Tests\TestCommon\TestCommon.csproj", "{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitAllRepos", "..\GitAllRepos\GitAllRepos\GitAllRepos.csproj", "{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi", "..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj", "{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi.Tests", "..\audible api\AudibleApi\_Tests\AudibleApi.Tests\AudibleApi.Tests.csproj", "{111420E2-D4F0-4068-B46A-C4B6DCC823DC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsDesigner", "WinFormsDesigner\WinFormsDesigner.csproj", "{0807616A-A77A-4B08-A65A-1582B09E114B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core", "..\Dinah.Core\Dinah.Core\Dinah.Core.csproj", "{9E951521-2587-4FC6-AD26-FAA9179FB6C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore", "..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj", "{1255D9BA-CE6E-42E4-A253-6376540B9661}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2", "..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj", "{35803735-B669-4090-9681-CC7F7FABDC71}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2.Tests", "..\LuceneNet303r2\LuceneNet303r2.Tests\LuceneNet303r2.Tests.csproj", "{5A7681A5-60D9-480B-9AC7-63E0812A2548}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiDTOs", "..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj", "{C03C5D65-3B7F-453B-972F-23950B7E0604}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiDTOs.Tests", "..\audible api\AudibleApi\_Tests\AudibleApiDTOs.Tests\AudibleApiDTOs.Tests.csproj", "{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiClientExample", "..\audible api\AudibleApi\_Demos\AudibleApiClientExample\AudibleApiClientExample.csproj", "{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "ApplicationServices\ApplicationServices.csproj", "{B95650EA-25F0-449E-BA5D-99126BC5D730}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.WindowsDesktop", "..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj", "{059CE32C-9AD6-45E9-A166-790DFFB0B730}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsDesktopUtilities", "WindowsDesktopUtilities\WindowsDesktopUtilities.csproj", "{E7EFD64D-6630-4426-B09C-B6862A92E3FD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationLauncher", "LibationLauncher\LibationLauncher.csproj", "{F3B04A3A-20C8-4582-A54A-715AF6A5D859}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Libation Tests", "0 Libation Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
-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
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Release|Any CPU.Build.0 = Release|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{9F1AA3DE-962F-469B-82B2-46F93491389B} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{0807616A-A77A-4B08-A65A-1582B09E114B} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{1255D9BA-CE6E-42E4-A253-6376540B9661} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{35803735-B669-4090-9681-CC7F7FABDC71} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{C03C5D65-3B7F-453B-972F-23950B7E0604} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
-		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{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}
-	EndGlobalSection
-EndGlobal

LibationLauncher/.msbump

@@ -1,4 +0,0 @@
-{
-  "//": "https://github.com/BalassaMarton/MSBump",
-  BumpRevision: true
-}

LibationLauncher/LibationLauncher.csproj

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationIcon>libation.ico</ApplicationIcon>
-    <AssemblyName>Libation</AssemblyName>
-
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <!-- <PublishSingleFile>true</PublishSingleFile> -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-
-    <Version>5.2.1.1</Version>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSBump" Version="2.3.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Octokit" Version="0.50.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LibationWinForms\LibationWinForms.csproj" />
-  </ItemGroup>
-
-</Project>

LibationLauncher/Program.cs

@@ -1,426 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using AudibleApi;
-using AudibleApi.Authorization;
-using Dinah.Core.Logging;
-using FileManager;
-using InternalUtilities;
-using LibationWinForms;
-using LibationWinForms.Dialogs;
-using Microsoft.Extensions.Configuration;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Serilog;
-
-namespace LibationLauncher
-{
-	static class Program
-	{
-		[STAThread]
-		static void Main()
-		{
-			Application.SetHighDpiMode(HighDpiMode.SystemAware);
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			// 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_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(Configuration config)
-		{
-			// all returns should be preceded by either:
-			// - if config.LibationSettingsAreValid
-			// - error message, Exit()
-
-			static void CancelInstallation()
-			{
-				MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				Application.Exit();
-				Environment.Exit(0);
-			}
-
-			if (config.LibationSettingsAreValid)
-				return;
-
-			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();
-			if (setupDialog.ShowDialog() != DialogResult.OK)
-			{
-				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;
-
-			if (!File.Exists(AudibleApiStorage.AccountsSettingsFile))
-				return;
-
-			var accountsPersister = AudibleApiStorage.GetAccountsSettingsPersister();
-
-			var accounts = accountsPersister?.AccountsSettings?.Accounts;
-			if (accounts is null)
-				return;
-
-			foreach (var account in accounts)
-			{
-				var identity = account?.IdentityTokens;
-
-				if (identity is null)
-					continue;
-
-				if (!string.IsNullOrWhiteSpace(identity.DeviceType) &&
-					!string.IsNullOrWhiteSpace(identity.DeviceSerialNumber) &&
-					!string.IsNullOrWhiteSpace(identity.AmazonAccountId))
-					continue;
-
-				var authorize = new Authorize(identity.Locale);
-
-				try
-				{
-					authorize.DeregisterAsync(identity.ExistingAccessToken, identity.Cookies.ToKeyValuePair()).GetAwaiter().GetResult();
-					identity.Invalidate();
-
-					var api = AudibleApiActions.GetApiAsync(new LibationWinForms.Login.WinformResponder(account), account).GetAwaiter().GetResult();
-				}
-                catch
-                {
-					// Don't care if it fails
-                }
-			}
-		}
-		#endregion
-
-		#region migrate to v5.2.0
-		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
-		private static void migrate_to_v5_2_0__pre_config()
-		{
-			{
-				var settingsKey = "DownloadsInProgressEnum";
-				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-				{
-					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
-					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
-				}
-			}
-
-			{
-				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 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;
-
-			// "Serilog": {
-			//   "MinimumLevel": "Information"
-			//   "WriteTo": [
-			//     {
-			//       "Name": "Console"
-			//     },
-			//     {
-			//       "Name": "File",
-			//       "Args": {
-			//         "rollingInterval": "Day",
-			//         "outputTemplate": ...
-			//       }
-			//     }
-			//   ],
-			//   "Using": [ "Dinah.Core" ],
-			//   "Enrich": [ "WithCaller" ]
-			// }
-			var serilogObj = new JObject
-			{
-				{ "MinimumLevel", "Information" },
-				{ "WriteTo", new JArray
-					{
-						new JObject { {"Name", "Console" } },
-						new JObject
-						{
-							{ "Name", "File" },
-							{ "Args",
-								new JObject
-								{
-									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(Configuration.Instance.LibationFiles, "_Log.log") },
-									{ "rollingInterval", "Month" },
-									// Serilog template formatting examples
-									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
-									//   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}" }
-								}
-							}
-						}
-					}
-				},
-				{ "Using", new JArray{ "Dinah.Core" } }, // dll's name, NOT namespace
-				{ "Enrich", new JArray{ "WithCaller" } },
-			};
-			config.SetObject("Serilog", serilogObj);
-		}
-
-		private static void configureLogging(Configuration config)
-		{
-			// override path. always use current libation files
-			var logPath = Path.Combine(Configuration.Instance.LibationFiles, "Log.log");
-			config.SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath);
-
-			//// hack which achieves the same
-			//configuration["Serilog:WriteTo:1:Args:path"] = logPath;
-
-			// CONFIGURATION-DRIVEN (json)
-			var configuration = new ConfigurationBuilder()
-				.AddJsonFile(config.SettingsFilePath)
-				.Build();
-			Log.Logger = new LoggerConfiguration()
-				.ReadFrom.Configuration(configuration)
-				.CreateLogger();
-
-			//// MANUAL HARD CODED
-			//Log.Logger = new LoggerConfiguration()
-			//  // requires: using Dinah.Core.Logging;
-			//	.Enrich.WithCaller()
-			//	.MinimumLevel.Information()
-			//	.WriteTo.File(logPath,
-			//		rollingInterval: RollingInterval.Month,
-			//		outputTemplate: code_outputTemplate)
-			//	.CreateLogger();
-
-			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
-			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
-			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
-		}
-
-		private static void checkForUpdate(Configuration config)
-		{
-			string zipUrl;
-			string selectedPath;
-
-			try
-			{
-				// timed out
-				var latest = getLatestRelease(TimeSpan.FromSeconds(30));
-				if (latest is null)
-					return;
-
-				var latestVersionString = latest.TagName.Trim('v');
-				if (!Version.TryParse(latestVersionString, out var latestRelease))
-					return;
-
-				// we're up to date
-				if (latestRelease <= BuildVersion)
-					return;
-
-				// we have an update
-				var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
-				zipUrl = zip?.BrowserDownloadUrl;
-				if (zipUrl is null)
-				{
-					MessageBox.Show(latest.HtmlUrl, "New version available");
-					return;
-				}
-
-				var result = MessageBox.Show($"New version available @ {latest.HtmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-				if (result != DialogResult.Yes)
-					return;
-
-				using var fileSelector = new SaveFileDialog { FileName = zip.Name, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-				if (fileSelector.ShowDialog() != DialogResult.OK)
-					return;
-				selectedPath = fileSelector.FileName;
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);
-				return;
-			}
-
-			try
-			{
-				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error downloading update", "Error downloading update", ex);
-			}
-		}
-
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
-		{
-			var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
-			if (task.Wait(timeout))
-				return task.Result;
-			return null;
-		}
-		private static Octokit.Release getLatestRelease()
-		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
-
-			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
-		}
-
-		private static void logStartupState(Configuration config)
-		{
-			// begin logging session with a form feed
-			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.InProgress,
-
-				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
-				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
-
-				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;
-	}
-}

LibationSearchEngine/LibationSearchEngine.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="_lucene resources.txt" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

LibationWinForms/BookLiberation/AutomatedBackupsForm.Designer.cs

@@ -1,93 +0,0 @@
-namespace LibationWinForms.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.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AutomatedBackupsForm_FormClosing);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.CheckBox keepGoingCb;
-        private System.Windows.Forms.TextBox logTb;
-        private System.Windows.Forms.Label label1;
-    }
-}

LibationWinForms/BookLiberation/AutomatedBackupsForm.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
-
-namespace LibationWinForms.BookLiberation
-{
-    public partial class AutomatedBackupsForm : Form
-    {
-        public bool KeepGoingChecked => keepGoingCb.Checked;
-
-        public bool KeepGoing => keepGoingCb.Enabled && keepGoingCb.Checked;
-
-        public AutomatedBackupsForm()
-        {
-            InitializeComponent();
-        }
-
-        public void WriteLine(string text)
-        {
-            if (!IsDisposed)
-                logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
-        }
-
-		public void FinalizeUI()
-        {
-            keepGoingCb.Enabled = false;
-
-            if (!IsDisposed)
-                logTb.AppendText("");
-        }
-
-        private void AutomatedBackupsForm_FormClosing(object sender, FormClosingEventArgs e) => keepGoingCb.Checked = false;
-    }
-}

LibationWinForms/BookLiberation/AutomatedBackupsForm.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>

LibationWinForms/BookLiberation/DecryptForm.Designer.cs

@@ -1,121 +0,0 @@
-namespace LibationWinForms.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();
-			this.remainingTimeLbl = new System.Windows.Forms.Label();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// pictureBox1
-			// 
-			this.pictureBox1.Location = new System.Drawing.Point(14, 14);
-			this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(117, 115);
-			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(138, 14);
-			this.bookInfoLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.bookInfoLbl.Name = "bookInfoLbl";
-			this.bookInfoLbl.Size = new System.Drawing.Size(121, 15);
-			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(14, 607);
-			this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.progressBar1.Name = "progressBar1";
-			this.progressBar1.Size = new System.Drawing.Size(611, 27);
-			this.progressBar1.TabIndex = 2;
-			// 
-			// rtbLog
-			// 
-			this.rtbLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.rtbLog.Location = new System.Drawing.Point(14, 136);
-			this.rtbLog.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.rtbLog.Name = "rtbLog";
-			this.rtbLog.Size = new System.Drawing.Size(678, 463);
-			this.rtbLog.TabIndex = 1;
-			this.rtbLog.Text = "";
-			// 
-			// remainingTimeLbl
-			// 
-			this.remainingTimeLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.remainingTimeLbl.Location = new System.Drawing.Point(632, 607);
-			this.remainingTimeLbl.Name = "remainingTimeLbl";
-			this.remainingTimeLbl.Size = new System.Drawing.Size(60, 31);
-			this.remainingTimeLbl.TabIndex = 3;
-			this.remainingTimeLbl.Text = "ETA:\r\n";
-			this.remainingTimeLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
-			// 
-			// DecryptForm
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(707, 647);
-			this.Controls.Add(this.remainingTimeLbl);
-			this.Controls.Add(this.rtbLog);
-			this.Controls.Add(this.progressBar1);
-			this.Controls.Add(this.bookInfoLbl);
-			this.Controls.Add(this.pictureBox1);
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.Name = "DecryptForm";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "DecryptForm";
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DecryptForm_FormClosing);
-			this.Load += new System.EventHandler(this.DecryptForm_Load);
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-        }
-
-        #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;
-        private System.Windows.Forms.Label remainingTimeLbl;
-    }
-}

LibationWinForms/BookLiberation/DecryptForm.cs

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

LibationWinForms/BookLiberation/DownloadForm.Designer.cs

@@ -1,105 +0,0 @@
-namespace LibationWinForms.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.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DownloadForm_FormClosing);
-            this.Load += new System.EventHandler(this.DownloadForm_Load);
-            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;
-    }
-}

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
-
-namespace LibationWinForms.BookLiberation
-{
-    public partial class DownloadForm : Form
-    {
-        public DownloadForm()
-        {
-            InitializeComponent();
-
-            progressLbl.Text = "";
-            filenameLbl.Text = "";
-        }
-
-        // thread-safe UI updates
-        public void UpdateFilename(string title) => filenameLbl.UIThread(() => filenameLbl.Text = title);
-
-        public void DownloadProgressChanged(long BytesReceived, long? TotalBytesToReceive)
-        {
-            // this won't happen with download file. it will happen with download string
-            if (!TotalBytesToReceive.HasValue || TotalBytesToReceive.Value <= 0)
-                return;
-
-            progressLbl.UIThread(() => progressLbl.Text = $"{BytesReceived:#,##0} of {TotalBytesToReceive.Value:#,##0}");
-
-            var d = double.Parse(BytesReceived.ToString()) / double.Parse(TotalBytesToReceive.Value.ToString()) * 100.0;
-            var i = int.Parse(Math.Truncate(d).ToString());
-            progressBar1.UIThread(() => progressBar1.Value = i);
-
-            lastDownloadProgress = DateTime.Now;
-        }
-
-        #region timer
-        private Timer timer { get; } = new Timer { Interval = 1000 };
-        private void DownloadForm_Load(object sender, EventArgs e)
-        {
-            timer.Tick += new EventHandler(timer_Tick);
-            timer.Start();
-        }
-        private DateTime lastDownloadProgress = DateTime.Now;
-        private void timer_Tick(object sender, EventArgs e)
-        {
-            // if no update in the last 30 seconds, display frozen label
-            lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
-            if (lastUpdateLbl.Visible)
-            {
-                var diff = DateTime.Now - lastDownloadProgress;
-                var min = (int)diff.TotalMinutes;
-                var minText = min > 0 ? $"{min}min " : "";
-
-                lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
-            }
-        }
-        private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();
-        #endregion
-    }
-}

LibationWinForms/BookLiberation/DownloadForm.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>

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,527 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Windows.Forms;
-using FileLiberator;
-
-namespace LibationWinForms.BookLiberation
-{
-    // decouple serilog and form. include convenience factory method
-    public class LogMe
-    {
-        public event EventHandler<string> LogInfo;
-        public event EventHandler<string> LogErrorString;
-        public event EventHandler<(Exception, string)> LogError;
-
-        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();
-
-            if (form is null)
-                return logMe;
-
-            logMe.LogInfo += (_, text) => form?.WriteLine(text);
-
-            logMe.LogErrorString += (_, text) => form?.WriteLine(text);
-
-            logMe.LogError += (_, tuple) =>
-            {
-                form?.WriteLine(tuple.Item2 ?? "Automated backup: error");
-                form?.WriteLine("ERROR: " + tuple.Item1.Message);
-            };
-
-            return logMe;
-        }
-
-        public void Info(string text) => LogInfo?.Invoke(this, text);
-        public void Error(string text) => LogErrorString?.Invoke(this, text);
-        public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
-    }
-
-    public static class ProcessorAutomationController
-    {
-        public static async Task BackupSingleBookAsync(string productId, EventHandler<LibraryBook> completedAction = null)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(BackupSingleBookAsync) + " {@DebugInfo}", new { productId });
-
-            var backupBook = getWiredUpBackupBook(completedAction);
-           
-            (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, libraryBook).RunBackupAsync();
-
-            unsubscribeEvents();
-        }
-
-        public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
-
-            var backupBook = getWiredUpBackupBook(completedAction);
-            var automatedBackupsForm = new AutomatedBackupsForm();
-
-            (Action unsubscribeEvents, LogMe logMe) = attachToBackupsForm(backupBook, automatedBackupsForm);
-
-            await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
-
-            unsubscribeEvents();
-        }
-
-        private static BackupBook getWiredUpBackupBook(EventHandler<LibraryBook> completedAction)
-        {
-            var backupBook = new BackupBook();
-
-            backupBook.DecryptBook.Begin += (_, l) => wireUpEvents(backupBook.DecryptBook, l);
-            backupBook.DownloadPdf.Begin += (_, __) => wireUpEvents(backupBook.DownloadPdf);
-
-            // must occur before completedAction. A common use case is:
-            // - filter by -liberated
-            // - liberate only that book
-            //   completedAction is to refresh grid
-            // - want to see that book disappear from grid
-            // also for this to work, updateIsLiberated can NOT be async
-            backupBook.DecryptBook.Completed += updateIsLiberated;
-            backupBook.DownloadPdf.Completed += updateIsLiberated;
-
-            if (completedAction != null)
-            {
-                backupBook.DecryptBook.Completed += completedAction;
-                backupBook.DownloadPdf.Completed += completedAction;
-            }
-
-            return backupBook;
-        }
-
-        private static void updateIsLiberated(object sender, LibraryBook e) => ApplicationServices.SearchEngineCommands.UpdateIsLiberated(e.Book);
-
-        private static (Action unsubscribeEvents, LogMe) attachToBackupsForm(BackupBook backupBook, AutomatedBackupsForm automatedBackupsForm = null)
-        {
-            #region create logger
-            var logMe = LogMe.RegisterForm(automatedBackupsForm);
-            #endregion
-
-            #region define how model actions will affect form behavior
-            void statusUpdate(object _, string str) => logMe.Info("- " + str);
-            void decryptBookBegin(object _, LibraryBook libraryBook) => logMe.Info($"Decrypt Step, Begin: {libraryBook.Book}");
-            // extra line after book is completely finished
-            void decryptBookCompleted(object _, LibraryBook libraryBook) => logMe.Info($"Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-            void downloadPdfBegin(object _, LibraryBook libraryBook) => logMe.Info($"PDF Step, Begin: {libraryBook.Book}");
-            // extra line after book is completely finished
-            void downloadPdfCompleted(object _, LibraryBook libraryBook) => logMe.Info($"PDF Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-            #endregion
-
-            #region subscribe new form to model's events
-            backupBook.DecryptBook.Begin += decryptBookBegin;
-            backupBook.DecryptBook.StatusUpdate += statusUpdate;
-            backupBook.DecryptBook.Completed += decryptBookCompleted;
-            backupBook.DownloadPdf.Begin += downloadPdfBegin;
-            backupBook.DownloadPdf.StatusUpdate += statusUpdate;
-            backupBook.DownloadPdf.Completed += downloadPdfCompleted;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            Action unsubscribe = () =>
-            {
-                backupBook.DecryptBook.Begin -= decryptBookBegin;
-                backupBook.DecryptBook.StatusUpdate -= statusUpdate;
-                backupBook.DecryptBook.Completed -= decryptBookCompleted;
-                backupBook.DownloadPdf.Begin -= downloadPdfBegin;
-                backupBook.DownloadPdf.StatusUpdate -= statusUpdate;
-                backupBook.DownloadPdf.Completed -= downloadPdfCompleted;
-            };
-            #endregion
-
-            return (unsubscribe, logMe);
-        }
-
-        public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
-
-            var downloadPdf = getWiredUpDownloadPdf(completedAction);
-
-            (AutomatedBackupsForm automatedBackupsForm, LogMe logMe) = attachToBackupsForm(downloadPdf);
-            await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
-        }
-
-        private static DownloadPdf getWiredUpDownloadPdf(EventHandler<LibraryBook> completedAction)
-        {
-            var downloadPdf = new DownloadPdf();
-
-            downloadPdf.Begin += (_, __) => wireUpEvents(downloadPdf);
-
-            if (completedAction != null)
-                downloadPdf.Completed += completedAction;
-
-            return downloadPdf;
-        }
-
-        public static void DownloadFile(string url, string destination, bool showDownloadCompletedDialog = false)
-        {
-            var downloadDialog = new DownloadForm();
-            downloadDialog.UpdateFilename(destination);
-            downloadDialog.Show();
-
-            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
-        private static void wireUpEvents(IDownloadableProcessable downloadable)
-        {
-            #region create form
-            var downloadDialog = new DownloadForm();
-            #endregion
-
-            // extra complexity for wiring up download form:
-            // case 1: download is needed
-            //   dialog created. subscribe to events
-            //   downloadable.DownloadBegin fires. shows dialog
-            //   downloadable.DownloadCompleted fires. closes dialog. which fires FormClosing, FormClosed, Disposed
-            //   Disposed unsubscribe from events
-            // case 2: download is not needed
-            //   dialog created. subscribe to events
-            //   dialog is never shown nor closed
-            //   downloadable.Completed fires. disposes dialog and unsubscribes from events
-
-            #region define how model actions will affect form behavior
-            void downloadBegin(object _, string str)
-            {
-                downloadDialog.UpdateFilename(str);
-                downloadDialog.Show();
-            }
-
-            // close form on DOWNLOAD completed, not final Completed. Else for BackupBook this form won't close until DECRYPT is also complete
-            void fileDownloadCompleted(object _, string __) => downloadDialog.Close();
-
-            void downloadProgressChanged(object _, Dinah.Core.Net.Http.DownloadProgress progress)
-                => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive);
-
-            void unsubscribe(object _ = null, EventArgs __ = null)
-            {
-                downloadable.DownloadBegin -= downloadBegin;
-                downloadable.DownloadCompleted -= fileDownloadCompleted;
-                downloadable.DownloadProgressChanged -= downloadProgressChanged;
-                downloadable.Completed -= dialogDispose;
-            }
-
-            // unless we dispose, if the form is created but un-used/never-shown then weird UI stuff can happen
-            // also, since event unsubscribe occurs on FormClosing and an unused form is never closed, then the events will never be unsubscribed
-            void dialogDispose(object _, object __)
-            {
-                if (!downloadDialog.IsDisposed)
-                    downloadDialog.Dispose();
-            }
-            #endregion
-
-            #region subscribe new form to model's events
-            downloadable.DownloadBegin += downloadBegin;
-            downloadable.DownloadCompleted += fileDownloadCompleted;
-            downloadable.DownloadProgressChanged += downloadProgressChanged;
-            downloadable.Completed += dialogDispose;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            // FormClosing is more UI safe but won't fire unless the form is shown and closed
-            //   if form was shown, Disposed will fire for FormClosing, FormClosed, and Disposed
-            //   if not shown, it will still fire for Disposed
-            downloadDialog.Disposed += unsubscribe;
-            #endregion
-        }
-
-        // subscribed to Begin event because a new form should be created+processed+closed on each iteration
-        private static void wireUpEvents(IDecryptable decryptBook, LibraryBook libraryBook)
-        {
-            #region create form
-            var decryptDialog = new DecryptForm();
-            #endregion
-
-            #region Set initially displayed book properties from library info.
-            decryptDialog.SetTitle(libraryBook.Book.Title);
-            decryptDialog.SetAuthorNames(string.Join(", ", libraryBook.Book.Authors));
-            decryptDialog.SetNarratorNames(string.Join(", ", libraryBook.Book.NarratorNames));
-            decryptDialog.SetCoverImage(
-                WindowsDesktopUtilities.WinAudibleImageServer.GetImage(
-                    libraryBook.Book.PictureId,
-                    FileManager.PictureSize._80x80
-                    ));
-            #endregion
-
-            #region define how model actions will affect form behavior
-            void decryptBegin(object _, string __) => decryptDialog.Show();
-
-            void titleDiscovered(object _, string title) => decryptDialog.SetTitle(title);
-            void authorsDiscovered(object _, string authors) => decryptDialog.SetAuthorNames(authors);
-            void narratorsDiscovered(object _, string narrators) => decryptDialog.SetNarratorNames(narrators);
-            void coverImageFilepathDiscovered(object _, byte[] coverBytes) => decryptDialog.SetCoverImage(Dinah.Core.Drawing.ImageReader.ToImage(coverBytes));
-            void updateProgress(object _, int percentage) => decryptDialog.UpdateProgress(percentage);
-            void updateRemainingTime(object _, TimeSpan remaining) => decryptDialog.UpdateRemainingTime(remaining);
-            void decryptCompleted(object _, string __) => decryptDialog.Close();
-           
-            void requestCoverArt(object _, Action<byte[]> setCoverArtDelegate)
-            {
-                var picDef = new FileManager.PictureDefinition(libraryBook.Book.PictureId, FileManager.PictureSize._500x500);
-                (bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(picDef);
-
-                if (isDefault)
-                {
-                    void pictureCached(object _, string pictureId)
-                    {
-                        if (pictureId == libraryBook.Book.PictureId)
-                        {
-                            FileManager.PictureStorage.PictureCached -= pictureCached;
-
-                            var picDef = new FileManager.PictureDefinition(libraryBook.Book.PictureId, FileManager.PictureSize._500x500);
-                            (_, picture) = FileManager.PictureStorage.GetPicture(picDef);
-
-                            setCoverArtDelegate(picture);
-                        }
-                    };
-                    FileManager.PictureStorage.PictureCached += pictureCached;
-                }
-                else
-                    setCoverArtDelegate(picture);
-            }
-            #endregion
-
-            #region subscribe new form to model's events
-            decryptBook.DecryptBegin += decryptBegin;
-
-            decryptBook.TitleDiscovered += titleDiscovered;
-            decryptBook.AuthorsDiscovered += authorsDiscovered;
-            decryptBook.NarratorsDiscovered += narratorsDiscovered;
-            decryptBook.CoverImageFilepathDiscovered += coverImageFilepathDiscovered;
-            decryptBook.UpdateProgress += updateProgress;
-            decryptBook.UpdateRemainingTime += updateRemainingTime;
-            decryptBook.RequestCoverArt += requestCoverArt;
-
-            decryptBook.DecryptCompleted += decryptCompleted;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            decryptDialog.FormClosing += (_, __) =>
-            {
-                decryptBook.DecryptBegin -= decryptBegin;
-
-                decryptBook.TitleDiscovered -= titleDiscovered;
-                decryptBook.AuthorsDiscovered -= authorsDiscovered;
-                decryptBook.NarratorsDiscovered -= narratorsDiscovered;
-                decryptBook.CoverImageFilepathDiscovered -= coverImageFilepathDiscovered;
-                decryptBook.UpdateProgress -= updateProgress;
-                decryptBook.UpdateRemainingTime -= updateRemainingTime;
-                decryptBook.RequestCoverArt -= requestCoverArt;
-
-                decryptBook.DecryptCompleted -= decryptCompleted;
-                decryptBook.Cancel();
-            };
-            #endregion
-        }
-        
-        private static (AutomatedBackupsForm, LogMe) attachToBackupsForm(IDownloadableProcessable downloadable)
-        {
-            #region create form and logger
-            var automatedBackupsForm = new AutomatedBackupsForm();
-            var logMe = LogMe.RegisterForm(automatedBackupsForm);
-            #endregion
-
-            #region define how model actions will affect form behavior
-            void begin(object _, LibraryBook libraryBook) => logMe.Info($"Begin: {libraryBook.Book}");
-            void statusUpdate(object _, string str) => logMe.Info("- " + str);
-            // extra line after book is completely finished
-            void completed(object _, LibraryBook libraryBook) => logMe.Info($"Completed: {libraryBook.Book}{Environment.NewLine}");
-            #endregion
-
-            #region subscribe new form to model's events
-            downloadable.Begin += begin;
-            downloadable.StatusUpdate += statusUpdate;
-            downloadable.Completed += completed;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            automatedBackupsForm.FormClosing += (_, __) =>
-            {
-                downloadable.Begin -= begin;
-                downloadable.StatusUpdate -= statusUpdate;
-                downloadable.Completed -= completed;
-            };
-            #endregion
-
-            return (automatedBackupsForm, logMe);
-        }
-    }
-
-    abstract class BackupRunner
-    {
-        protected LogMe LogMe { get; }
-        protected IProcessable Processable { get; }
-        protected AutomatedBackupsForm AutomatedBackupsForm { get; }
-
-        protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm = null)
-        {
-            LogMe = logMe;
-            Processable = processable;
-            AutomatedBackupsForm = automatedBackupsForm;
-        }
-
-        protected abstract Task RunAsync();
-
-        protected abstract string SkipDialogText { get; }
-        protected abstract MessageBoxButtons SkipDialogButtons { get; }
-        protected abstract DialogResult CreateSkipFileResult { get; }
-
-        public async Task RunBackupAsync()
-        {
-            AutomatedBackupsForm?.Show();
-
-            try
-            {
-                await RunAsync();
-            }
-            catch (Exception ex)
-            {
-                LogMe.Error(ex);
-            }
-
-            AutomatedBackupsForm?.FinalizeUI();
-            LogMe.Info("DONE");
-        }
-
-        protected async Task<bool> ProcessOneAsync(Func<LibraryBook, Task<StatusHandler>> func, LibraryBook libraryBook)
-        {
-            string logMessage;
-
-            try
-            {
-                var statusHandler = await func(libraryBook);
-
-                if (statusHandler.IsSuccess)
-                    return true;
-
-                foreach (var errorMessage in statusHandler.Errors)
-                    LogMe.Error(errorMessage);
-
-                logMessage = statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}");
-            }
-            catch (Exception ex)
-            {
-                LogMe.Error(ex);
-
-                logMessage = ex.Message + "\r\n|\r\n" + ex.StackTrace;
-            }
-
-            LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
-
-            var dialogResult = MessageBox.Show(SkipDialogText, "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question);
-
-            if (dialogResult == DialogResult.Abort)
-                return false;
-
-            if (dialogResult == CreateSkipFileResult)
-            {
-                var path = FileManager.AudibleFileStorage.Audio.CreateSkipFile(libraryBook.Book.Title, libraryBook.Book.AudibleProductId, logMessage);
-                LogMe.Info($@"
-Created new 'skip' file
-  [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}
-  {path}
-".Trim());
-            }
-
-            return true;
-        }
-    }
-    class BackupSingle : BackupRunner
-    {
-        private LibraryBook _libraryBook { get; }
-
-        protected override string SkipDialogText => @"
-An error occurred while trying to process this book. Skip this book permanently?
-
-- Click YES to skip this book permanently.
-
-- Click NO to skip the book this time only. We'll try again later.
-".Trim();
-        protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.YesNo;
-        protected override DialogResult CreateSkipFileResult => DialogResult.Yes;
-
-        public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
-            : base(logMe, processable)
-        {
-            _libraryBook = libraryBook;
-        }
-
-        protected override async Task RunAsync()
-        {
-            if (_libraryBook is not null)
-                await ProcessOneAsync(Processable.ProcessSingleAsync, _libraryBook);
-        }
-    }
-    class BackupLoop : BackupRunner
-    {
-        protected override string SkipDialogText => @"
-An error occurred while trying to process this book
-
-- ABORT: stop processing books.
-
-- RETRY: retry this book later. Just skip it for now. Continue processing books. (Will try this book again later.)
-
-- IGNORE: Permanently ignore this book. Continue processing books. (Will not try this book again later.)
-".Trim();
-        protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
-        protected override DialogResult CreateSkipFileResult => DialogResult.Ignore;
-
-        public BackupLoop(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
-            : base(logMe, processable, automatedBackupsForm) { }
-
-        protected override async Task RunAsync()
-        {
-            // support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here
-            foreach (var libraryBook in Processable.GetValidLibraryBooks())
-            {
-                var keepGoing = await ProcessOneAsync(Processable.ProcessBookAsync_NoValidation, libraryBook);
-                if (!keepGoing)
-                    return;
-
-                if (AutomatedBackupsForm.IsDisposed)
-                    break;
-
-                if (!AutomatedBackupsForm.KeepGoing)
-                {
-                    if (!AutomatedBackupsForm.KeepGoingChecked)
-                        LogMe.Info("'Keep going' is unchecked");
-                    return;
-                }
-            }
-
-            LogMe.Info("Done. All books have been processed");
-        }
-    }
-}

LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -1,101 +0,0 @@
-using System;
-using System.Linq;
-using System.Windows.Forms;
-using FileManager;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class EditQuickFilters : Form
-    {
-        const string BLACK_UP_POINTING_TRIANGLE = "\u25B2";
-        const string BLACK_DOWN_POINTING_TRIANGLE = "\u25BC";
-
-        const string COL_Original = nameof(Original);
-        const string COL_Delete = nameof(Delete);
-        const string COL_Filter = nameof(Filter);
-        const string COL_MoveUp = nameof(MoveUp);
-        const string COL_MoveDown = nameof(MoveDown);
-
-        Form1 _parent { get; }
-
-        public EditQuickFilters(Form1 parent)
-        {
-            _parent = parent;
-
-            InitializeComponent();
-
-            dataGridView1.Columns[COL_Filter].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-
-            populateGridValues();
-        }
-
-        private void populateGridValues()
-        {
-            var filters = QuickFilters.Filters;
-            if (!filters.Any())
-                return;
-
-            foreach (var filter in filters)
-                dataGridView1.Rows.Add(filter, "X", filter, BLACK_UP_POINTING_TRIANGLE, BLACK_DOWN_POINTING_TRIANGLE);
-        }
-
-        private void dataGridView1_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
-        {
-            e.Row.Cells[COL_Delete].Value = "X";
-            e.Row.Cells[COL_MoveUp].Value = BLACK_UP_POINTING_TRIANGLE;
-            e.Row.Cells[COL_MoveDown].Value = BLACK_DOWN_POINTING_TRIANGLE;
-        }
-
-        private void saveBtn_Click(object sender, EventArgs e)
-        {
-            var list = dataGridView1.Rows
-                .OfType<DataGridViewRow>()
-                .Select(r => r.Cells[COL_Filter].Value?.ToString())
-                .ToList();
-            QuickFilters.ReplaceAll(list);
-
-            _parent.UpdateFilterDropDown();
-            this.DialogResult = DialogResult.OK;
-            this.Close();
-        }
-
-        private void cancelBtn_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-            this.Close();
-        }
-
-        private void DataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-            var dgv = (DataGridView)sender;
-
-            var col = dgv.Columns[e.ColumnIndex];
-            if (col is DataGridViewButtonColumn && e.RowIndex >= 0)
-            {
-                var row = dgv.Rows[e.RowIndex];
-                switch (col.Name)
-                {
-                    case COL_Delete:
-                        // if final/edit row: do nothing
-                        if (e.RowIndex < dgv.RowCount - 1)
-                            dgv.Rows.Remove(row);
-                        break;
-                    case COL_MoveUp:
-                        // if top: do nothing
-                        if (e.RowIndex < 1)
-                            break;
-                        dgv.Rows.Remove(row);
-                        dgv.Rows.Insert(e.RowIndex - 1, row);
-                        break;
-                    case COL_MoveDown:
-                        // if final/edit row or bottom filter row: do nothing
-                        if (e.RowIndex >= dgv.RowCount - 2)
-                            break;
-                        dgv.Rows.Remove(row);
-                        dgv.Rows.Insert(e.RowIndex + 1, row);
-                        break;
-                }
-            }
-        }
-    }
-}

LibationWinForms/Dialogs/EditTagsDialog.Designer.cs

@@ -1,91 +0,0 @@
-namespace LibationWinForms.Dialogs
-{
-    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;
-            this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click);
-            // 
-            // 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;
-    }
-}

LibationWinForms/Dialogs/EditTagsDialog.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace LibationWinForms.Dialogs
-{
-    public partial class EditTagsDialog : Form
-    {
-        public string NewTags { get; private set; }
-
-        public EditTagsDialog()
-        {
-            InitializeComponent();
-        }
-        public EditTagsDialog(string title, string rawTags) : this()
-        {
-            this.Text = $"Edit Tags - {title}";
-
-            this.newTagsTb.Text = rawTags;
-        }
-
-        private void SaveBtn_Click(object sender, EventArgs e)
-        {
-            NewTags = this.newTagsTb.Text;
-            DialogResult = DialogResult.OK;
-        }
-    }
-}

LibationWinForms/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>

LibationWinForms/Dialogs/IndexLibraryDialog.Designer.cs

@@ -1,65 +0,0 @@
-namespace LibationWinForms.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;
-	}
-}

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Windows.Forms;
-using ApplicationServices;
-using InternalUtilities;
-using LibationWinForms.Login;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class IndexLibraryDialog : Form
-	{
-		private Account[] _accounts { get; }
-
-		public int NewBooksAdded { get; private set; }
-		public int TotalBooksProcessed { get; private set; }
-
-		public IndexLibraryDialog(params Account[] accounts)
-		{
-			_accounts = accounts;
-			InitializeComponent();
-			this.Shown += IndexLibraryDialog_Shown;
-		}
-
-		private async void IndexLibraryDialog_Shown(object sender, EventArgs e)
-		{
-			if (_accounts != null && _accounts.Length > 0)
-			{
-				this.label1.Text
-					= (_accounts.Length == 1)
-					? "Scanning Audible library. This may take a few minutes."
-					: $"Scanning Audible library: {_accounts.Length} accounts. This may take a few minutes per account.";
-
-				try
-				{
-					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
-				}
-				catch (Exception ex)
-				{
-					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);
-				}
-			}
-
-			this.Close();
-		}
-	}
-}

LibationWinForms/Dialogs/IndexLibraryDialog.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>

LibationWinForms/Dialogs/Login/AudibleLoginDialog.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>

LibationWinForms/Dialogs/Login/CaptchaDialog.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>