AudibleApi: Make exceptions more flexible so that less logic is needed inside catch

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,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.10" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using AAXClean;
-using Dinah.Core.StepRunner;
-using FileManager;
-
-namespace AaxDecrypter
-{
-	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
-	{
-		protected override StepSequence Steps { get; }
-
-        private Func<MultiConvertFileProperties, string> multipartFileNameCallback { get; }
-
-        private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
-		private List<string> multiPartFilePaths { get; } = new List<string>();
-
-        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat,
-            Func<MultiConvertFileProperties, string> multipartFileNameCallback = null)
-			: base(outFileName, cacheDirectory, dlLic, outputFormat)
-        {
-            Steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
-
-                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
-                ["Step 3: Cleanup"] = Step_Cleanup,
-            };
-            this.multipartFileNameCallback = multipartFileNameCallback ?? MultiConvertFileProperties.DefaultMultipartFilename;
-        }
-
-        /*
-https://github.com/rmcrackan/Libation/pull/127#issuecomment-939088489
-
-If the chapter truly is empty, that is, 0 audio frames in length, then yes it is ignored.
-If the chapter is shorter than 3 seconds long but still has some audio frames, those frames are combined with the following chapter and not split into a new file.
-
-I also implemented file naming by chapter title. When 2 or more consecutive chapters are combined, the first of the combined chapter's title is used in the file name. For example, given an audiobook with the following chapters:
-
-00:00:00 - 00:00:02 | Part 1
-00:00:02 - 00:35:00 | Chapter 1
-00:35:02 - 01:02:00 | Chapter 2
-01:02:00 - 01:02:02 | Part 2
-01:02:02 - 01:41:00 | Chapter 3
-01:41:00 - 02:05:00 | Chapter 4
-
-The book will be split into the following files:
-
-00:00:00 - 00:35:00 | Book - 01 - Part 1.m4b
-00:35:00 - 01:02:00 | Book - 02 - Chapter 2.m4b
-01:02:00 - 01:41:00 | Book - 03 - Part 2.m4b
-01:41:00 - 02:05:00 | Book - 04 - Chapter 4.m4b
-
-That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
-         */
-        private bool Step_DownloadAudiobookAsMultipleFilesPerChapter()
-        {
-            var zeroProgress = Step_DownloadAudiobook_Start();
-
-            var chapters = DownloadLicense.ChapterInfo.Chapters.ToList();
-
-            // Ensure split files are at least minChapterLength in duration.
-            var splitChapters = new ChapterInfo();
-
-            var runningTotal = TimeSpan.Zero;
-            string title = "";
-
-            for (int i = 0; i < chapters.Count; i++)
-            {
-                if (runningTotal == TimeSpan.Zero)
-                    title = chapters[i].Title;
-
-                runningTotal += chapters[i].Duration;
-
-                if (runningTotal >= minChapterLength)
-                {
-                    splitChapters.AddChapter(title, runningTotal);
-                    runningTotal = TimeSpan.Zero;
-                }
-            }
-
-            // reset, just in case
-            multiPartFilePaths.Clear();
-
-            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            if (OutputFormat == OutputFormat.M4b)
-                ConvertToMultiMp4a(splitChapters);
-            else
-                ConvertToMultiMp3(splitChapters);
-            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-            Step_DownloadAudiobook_End(zeroProgress);
-
-            var success = !IsCanceled;
-
-            if (success)
-                foreach (var path in multiPartFilePaths)
-                    OnFileCreated(path);
-
-            return success;
-        }
-
-        private void ConvertToMultiMp4a(ChapterInfo splitChapters)
-        {
-            var chapterCount = 0;
-            AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback)
-            );
-        }
-
-        private void ConvertToMultiMp3(ChapterInfo splitChapters)
-        {
-            var chapterCount = 0;
-            AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
-            {
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback);
-                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
-            });
-        }
-
-        private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
-        {
-            var fileName = multipartFileNameCallback(new()
-            {
-                OutputFileName = OutputFileName,
-                PartsPosition = currentChapter,
-                PartsTotal = splitChapters.Count,
-                Title = newSplitCallback?.Chapter?.Title
-            });
-            fileName = FileUtility.GetValidFilename(fileName);
-
-            multiPartFilePaths.Add(fileName);
-
-            FileUtility.SaferDelete(fileName);
-
-            newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
-        }
-    }
-}

AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using AAXClean;
-using Dinah.Core.StepRunner;
-using FileManager;
-
-namespace AaxDecrypter
-{
-	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
-	{
-		protected override StepSequence Steps { get; }
-
-        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
-			: base(outFileName, cacheDirectory, dlLic, outputFormat)
-        {
-            Steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
-
-                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-                ["Step 3: Create Cue"] = Step_CreateCue,
-                ["Step 4: Cleanup"] = Step_Cleanup,
-            };
-        }
-
-        private bool Step_DownloadAudiobookAsSingleFile()
-        {
-            var zeroProgress = Step_DownloadAudiobook_Start();
-
-            FileUtility.SaferDelete(OutputFileName);
-
-            var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-
-            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            var decryptionResult
-                = OutputFormat == OutputFormat.M4b
-                ? AaxFile.ConvertToMp4a(outputFile, DownloadLicense.ChapterInfo)
-                : AaxFile.ConvertToMp3(outputFile);
-            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-            DownloadLicense.ChapterInfo = AaxFile.Chapters;
-
-            Step_DownloadAudiobook_End(zeroProgress);
-
-            var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
-            if (success)
-                base.OnFileCreated(OutputFileName);
-
-            return success;
-        }
-    }
-}

AaxDecrypter/DownloadLicense.cs

@@ -1,24 +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)
-        {
-            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
-
-            // no null/empty check. unencrypted files do not have these
-            AudibleKey = audibleKey;
-            AudibleIV = audibleIV;
-        }
-    }
-}

AaxDecrypter/MultiConvertFileProperties.cs

@@ -1,25 +0,0 @@
-using System;
-using System.IO;
-using FileManager;
-
-namespace AaxDecrypter
-{
-    public class MultiConvertFileProperties
-    {
-        public string OutputFileName { get; set; }
-        public int PartsPosition { get; set; }
-        public int PartsTotal { get; set; }
-        public string Title { get; set; }
-
-        public static string DefaultMultipartFilename(MultiConvertFileProperties multiConvertFileProperties)
-        {
-            var template = Path.ChangeExtension(multiConvertFileProperties.OutputFileName, null) + " - <ch# 0> - <title>" + Path.GetExtension(multiConvertFileProperties.OutputFileName);
-
-            var fileNamingTemplate = new FileNamingTemplate(template) { IllegalCharacterReplacements = " " };
-            fileNamingTemplate.AddParameterReplacement("ch# 0", FileUtility.GetSequenceFormatted(multiConvertFileProperties.PartsPosition, multiConvertFileProperties.PartsTotal));
-            fileNamingTemplate.AddParameterReplacement("title", multiConvertFileProperties.Title ?? "");
-
-            return fileNamingTemplate.GetFilePath();
-        }
-    }
-}

AaxDecrypter/NetworkFileStream.cs

@@ -1,443 +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;
-
-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 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; }
-        public bool IsCancelled { get; private set; }
-        private EventWaitHandle downloadEnded { get; set; } 
-        private EventWaitHandle downloadedPiece { 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, EventArgs.Empty);
-        }
-
-        /// <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)
-                throw new InvalidOperationException("Cannot change Uri after download has started.");
-
-            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>
-        private void BeginDownloading()
-        {
-            downloadEnded = new EventWaitHandle(false, EventResetMode.ManualReset);
-
-            if (ContentLength != 0 && WritePosition == ContentLength)
-            {
-                hasBegunDownloading = true;
-                downloadEnded.Set();
-                return;
-            }
-
-            if (ContentLength != 0 && WritePosition > ContentLength)
-                throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
-
-            var response = HttpRequest.GetResponse() as HttpWebResponse;
-
-            if (response.StatusCode != HttpStatusCode.PartialContent)
-                throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
-
-            //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();
-            downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
-
-            //Download the file in the background.
-            new Thread(() => DownloadFile())
-            { IsBackground = true }
-            .Start();
-
-            hasBegunDownloading = true;
-            return;
-        }
-
-        /// <summary>
-        /// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
-        /// </summary>
-        private void DownloadFile()
-        {
-            var downloadPosition = WritePosition;
-            var nextFlush = downloadPosition + DATA_FLUSH_SZ;
-
-            var buff = new byte[DOWNLOAD_BUFF_SZ];
-            do
-            {
-                var 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;
-                    downloadedPiece.Set();
-                }
-
-            } while (downloadPosition < ContentLength && !IsCancelled);
-
-            _writeFile.Close();
-            _networkStream.Close();
-            WritePosition = downloadPosition;
-            Update();
-
-            downloadedPiece.Set();
-            downloadEnded.Set();
-
-            if (!IsCancelled && WritePosition < ContentLength)
-                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
-
-            if (WritePosition > ContentLength)
-                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
-
-        }
-
-        #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)
-            {
-                var jObj = new JObject();
-                var 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
-        {
-            get
-            {
-                if (!hasBegunDownloading)
-                    BeginDownloading();
-                return ContentLength;
-            }
-        }
-
-        [JsonIgnore]
-        public override long Position { get => _readFile.Position; set => Seek(value, SeekOrigin.Begin); }
-
-        [JsonIgnore]
-        public override bool CanTimeout => false;
-
-        [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();
-
-            var toRead = Math.Min(count, Length - Position);
-            WaitToPosition(Position + toRead);
-            return _readFile.Read(buffer, offset, count);
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            var newPosition = origin switch
-			{
-				SeekOrigin.Current => Position + offset,
-				SeekOrigin.End => ContentLength + offset,
-				_ => offset,
-			};
-
-            WaitToPosition(newPosition);
-            return _readFile.Position = newPosition;
-        }
-
-        /// <summary>
-        /// Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns.
-        /// </summary>
-        /// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
-        private void WaitToPosition(long requiredPosition)
-		{
-            while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
-        }
-
-        public override void Close()
-        {
-            IsCancelled = true;
-
-            while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
-
-            _readFile.Close();
-            _writeFile.Close();
-            _networkStream?.Close();
-            Update();
-        }
-
-        #endregion
-        ~NetworkFileStream()
-        {
-            downloadEnded?.Close();
-            downloadedPiece?.Close();
-        }
-    }
-}

AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Threading;
-using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
-using FileManager;
-
-namespace AaxDecrypter
-{
-	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
-	{
-		protected override StepSequence Steps { get; }
-
-		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadLicense dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download Mp3 Audiobook",
-
-				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
-				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step_CreateCue,
-				["Step 4: Cleanup"] = Step_Cleanup,
-			};
-		}
-
-		public override void Cancel()
-		{
-			IsCanceled = true;
-			CloseInputFileStream();
-		}
-
-		protected bool Step_GetMetadata()
-		{
-			OnRetrievedCoverArt(null);
-
-			return !IsCanceled;
-		}
-
-		private bool Step_DownloadAudiobookAsSingleFile()
-		{
-			DateTime startTime = DateTime.Now;
-
-			// MUST put InputFileStream.Length first, because it starts background downloader.
-
-			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
-			{
-				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
-
-				var estTimeRemaining = (InputFileStream.Length - InputFileStream.WritePosition) / rate;
-
-				if (double.IsNormal(estTimeRemaining))
-					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
-
-				OnDecryptProgressUpdate(
-					new DownloadProgress
-					{
-						ProgressPercentage = 100 * progressPercent,
-						BytesReceived = (long)(InputFileStream.Length * progressPercent),
-						TotalBytesToReceive = InputFileStream.Length
-					});
-				Thread.Sleep(200);
-			}
-
-			CloseInputFileStream();
-
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
-			SetOutputFileName(realOutputFileName);
-			OnFileCreated(realOutputFileName);
-
-			return !IsCanceled;
-		}
-	}
-}

AppScaffolding/.msbump

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

AppScaffolding/AppScaffolding.csproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>6.7.2.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="..\AudibleUtilities\AudibleUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

ApplicationServices/ApplicationServices.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.2.1" />
-    <PackageReference Include="NPOI" Version="2.5.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
-  </ItemGroup>
-
-</Project>

ApplicationServices/LibraryCommands.cs

@@ -1,286 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using AudibleUtilities;
-using DataLayer;
-using Dinah.Core;
-using DtoImporterService;
-using LibationFileManager;
-using Serilog;
-using static DtoImporterService.PerfLogger;
-
-namespace ApplicationServices
-{
-	public static class LibraryCommands
-	{
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
-		{
-			logRestart();
-
-			//These are the minimum response groups required for the
-			//library scanner to pass all validation and filtering.
-			var libraryResponseGroups =
-				LibraryOptions.ResponseGroupOptions.ProductAttrs |
-				LibraryOptions.ResponseGroupOptions.ProductDesc |
-				LibraryOptions.ResponseGroupOptions.Relationships;
-
-			if (accounts is null || accounts.Length == 0)
-				return new List<LibraryBook>();
-
-			try
-			{
-				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryResponseGroups);
-				logTime($"post {nameof(scanAccountsAsync)} all");
-
-				var totalCount = libraryItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
-
-				return missingBookList;
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(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 scanning 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 scanning library");
-				throw;
-			}
-			finally
-			{
-				stop();
-				var putBreakPointHere = logOutput;
-			}
-		}
-
-		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
-		{
-			logRestart();
-
-			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
-
-			try
-			{
-				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-				logTime($"post {nameof(scanAccountsAsync)} all");
-
-				var totalCount = importItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				Log.Logger.Information("Begin long-running import");
-				logTime($"pre {nameof(importIntoDbAsync)}");
-				var newCount = await importIntoDbAsync(importItems);
-				logTime($"post {nameof(importIntoDbAsync)}");
-				Log.Logger.Information($"Import complete. New count {newCount}");
-
-				return (totalCount, newCount);
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(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;
-			}
-			finally
-			{
-				stop();
-				var putBreakPointHere = logOutput;
-			}
-		}
-
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions.ResponseGroupOptions libraryResponseGroups)
-		{
-			var tasks = new List<Task<List<ImportItem>>>();
-			foreach (var account in accounts)
-			{
-				// get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
-				var apiExtended = await apiExtendedfunc(account);
-
-				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(apiExtended, account, libraryResponseGroups));
-			}
-
-			// 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(ApiExtended apiExtended, Account account, LibraryOptions.ResponseGroupOptions libraryResponseGroups)
-		{
-			ArgumentValidator.EnsureNotNull(account, nameof(account));
-
-			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]"
-			});
-
-			logTime($"pre scanAccountAsync {account.AccountName}");
-
-			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, Configuration.Instance.ImportEpisodes);
-
-			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
-
-			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)
-		{
-			logTime("importIntoDbAsync -- pre db");
-			using var context = DbContexts.GetContext();
-			var libraryBookImporter = new LibraryBookImporter(context);
-			var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
-			logTime("importIntoDbAsync -- post Import()");
-			var qtyChanges = context.SaveChanges();
-			logTime("importIntoDbAsync -- post SaveChanges");
-
-			if (qtyChanges > 0)
-				await Task.Run(() => finalizeLibrarySizeChange());
-			logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
-
-			return newCount;
-		}
-		#endregion
-
-		#region remove books
-		public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
-		private static List<LibraryBook> removeBooks(List<string> idsToRemove)
-		{
-			using var context = DbContexts.GetContext();
-			var libBooks = context.GetLibrary_Flat_NoTracking();
-
-			var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
-			context.LibraryBooks.RemoveRange(removeLibraryBooks);
-			context.Books.RemoveRange(removeLibraryBooks.Select(lb => lb.Book));
-
-			var qtyChanges = context.SaveChanges();
-			if (qtyChanges > 0)
-				finalizeLibrarySizeChange();
-
-			return removeLibraryBooks;
-		}
-		#endregion
-
-		// call this whenever books are added or removed from library
-		private static void finalizeLibrarySizeChange()
-		{
-			SearchEngineCommands.FullReIndex();
-			LibrarySizeChanged?.Invoke(null, null);
-		}
-
-		/// <summary>Occurs when books are added or removed from library</summary>
-		public static event EventHandler LibrarySizeChanged;
-
-		/// <summary>
-		/// Occurs when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/>
-		/// changed values are successfully persisted.
-		/// </summary>
-		public static event EventHandler<string> BookUserDefinedItemCommitted;
-
-		#region Update book details
-		public static int UpdateUserDefinedItem(Book book)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				// Attach() NoTracking entities before SaveChanges()
-				context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-				if (qtyChanges > 0)
-				{
-					SearchEngineCommands.UpdateLiberatedStatus(book);
-					SearchEngineCommands.UpdateBookTags(book);
-					BookUserDefinedItemCommitted?.Invoke(null, book.AudibleProductId);
-				}
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, $"Error updating {nameof(book.UserDefinedItem)}");
-				throw;
-			}
-		}
-		#endregion
-
-		// must be here instead of in db layer due to AaxcExists
-		public static LiberatedStatus Liberated_Status(Book book)
-			=> book.Audio_Exists ? book.UserDefinedItem.BookStatus
-			: AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
-			: LiberatedStatus.NotLiberated;
-
-		// exists here for feature predictability. It makes sense for this to be where Liberated_Status is
-		public static LiberatedStatus? Pdf_Status(Book book) => book.UserDefinedItem.PdfStatus;
-
-		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
-
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
-		public static LibraryStats GetCounts()
-		{
-			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
-
-			var results = libraryBooks
-				.AsParallel()
-				.Select(lb => Liberated_Status(lb.Book))
-				.ToList();
-			var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
-			var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
-			var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
-			var booksError = results.Count(r => r == LiberatedStatus.Error);
-
-			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
-
-			var boolResults = libraryBooks
-				.AsParallel()
-				.Where(lb => lb.Book.HasPdf)
-				.Select(lb => Pdf_Status(lb.Book))
-				.ToList();
-			var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
-			var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
-
-			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
-
-			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
-		}
-	}
-}

ApplicationServices/SearchEngineCommands.cs

@@ -1,57 +0,0 @@
-using System;
-using System.IO;
-using DataLayer;
-using LibationSearchEngine;
-
-namespace ApplicationServices
-{
-	public static class SearchEngineCommands
-	{
-		public static void FullReIndex(SearchEngine engine = null)
-		{
-			engine ??= new SearchEngine();
-			var library = DbContexts.GetLibrary_Flat_NoTracking();
-			engine.CreateNewIndex(library);
-		}
-
-		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 UpdateLiberatedStatus(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateLiberatedStatus(book)
-		);
-
-		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
-		{
-			var engine = new SearchEngine();
-			try
-			{
-				action(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex(engine);
-				action(engine);
-			}
-		}
-
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> func)
-		{
-			var engine = new SearchEngine();
-			try
-			{
-				return func(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex(engine);
-				return func(engine);
-			}
-		}
-	}
-}

AudibleUtilities/AudibleUtilities.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="2.7.2.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
-  </ItemGroup>
-
-</Project>

DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -1,44 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    // only library importing should use tracking. All else should be NoTracking.
-    // only library importing should directly query Book. All else should use LibraryBook
-    public static class LibraryBookQueries
-	{
-        //// tracking is a bad idea for main grid. it prevents anything else from updating entities unless getting them from the grid
-		//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
-                .LibraryBooks
-                .AsNoTrackingWithIdentityResolution()
-                .GetLibrary()
-                .ToList();
-
-        public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
-                .LibraryBooks
-                .AsNoTrackingWithIdentityResolution()
-                .GetLibraryBook(productId);
-
-        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == 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);
-    }
-}

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/ContributorImporter.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApi.Common;
-using AudibleUtilities;
-using DataLayer;
-
-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)
-		{
-			// must include default/empty/missing
-			contributorNames.Add(Contributor.GetEmpty().Name);
-
-			//// 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).ToList();
-			var remainingContribNames = contributorNames
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
-			// load existing => local
-			if (remainingContribNames.Any())
-				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name)).ToList();
-		}
-
-		// only use after loading contributors => local
-		private int upsertPeople(List<Person> people)
-		{
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
-			var newPeople = people
-				.Select(p => p.Name)
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
-			var groupby = people.GroupBy(
-				p => p.Name,
-				p => p,
-				(key, g) => new { Name = key, People = g.ToList() }
-				);
-			foreach (var name in newPeople)
-			{
-				// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive
-				var p = groupby.FirstOrDefault(g => g.Name == name).People.First();
-
-				try
-				{
-					DbContext.Contributors.Add(new Contributor(p.Name, p.Asin));
-				}
-				catch (Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Error adding person. {@DebugInfo}", new { p?.Name, p?.Asin });
-					throw;
-				}
-			}
-
-			return newPeople.Count;
-		}
-
-		// only use after loading contributors => local
-		private int upsertPublishers(List<string> publishers)
-		{
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
-			var newPublishers = publishers
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
-			foreach (var pub in newPublishers)
-			{
-				try
-				{
-					DbContext.Contributors.Add(new Contributor(pub));
-				}
-				catch (Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Error adding publisher. {@DebugInfo}", new { pub });
-					throw;
-				}
-			}
-
-			return newPublishers.Count;
-		}
-	}
-}

DtoImporterService/DtoImporterService.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-  </ItemGroup>
-
-</Project>

DtoImporterService/SeriesImporter.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApi.Common;
-using AudibleUtilities;
-using DataLayer;
-
-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<AudibleApi.Common.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<AudibleApi.Common.Series> requestedSeries)
-		{
-			var qtyNew = 0;
-
-			foreach (var s in requestedSeries)
-			{
-				var series = DbContext.Series.Local.FirstOrDefault(c => c.AudibleSeriesId == s.SeriesId);
-				if (series is null)
-				{
-					try
-					{
-						series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, "Error adding series. {@DebugInfo}", new { s?.SeriesId });
-						throw;
-					}
-					qtyNew++;
-				}
-				series.UpdateName(s.SeriesName);
-			}
-
-			return qtyNew;
-		}
-	}
-}

FileLiberator/AudioDecodable.cs

@@ -1,44 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public abstract class AudioDecodable : Processable
-    {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageDiscovered;
-        public abstract void Cancel();
-
-        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
-            RequestCoverArt?.Invoke(this, setCoverArtDel);
-        }
-
-        protected void OnTitleDiscovered(string title)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
-            TitleDiscovered?.Invoke(this, title);
-		}
-
-        protected void OnAuthorsDiscovered(string authors)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
-            AuthorsDiscovered?.Invoke(this, authors);
-		}
-
-        protected void OnNarratorsDiscovered(string narrators)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
-            NarratorsDiscovered?.Invoke(this, narrators);
-		}
-
-        protected void OnCoverImageDiscovered(byte[] coverImage)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = coverImage?.Length });
-            CoverImageDiscovered?.Invoke(this, coverImage);
-        }
-    }
-}

FileLiberator/AudioFileStorageExt.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using DataLayer;
-using Dinah.Core;
-using FileManager;
-using LibationFileManager;
-
-namespace FileLiberator
-{
-    public static class AudioFileStorageExt
-    {
-        private class MultipartRenamer
-        {
-            private LibraryBook libraryBook { get; }
-
-            internal MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
-
-            internal string MultipartFilename(AaxDecrypter.MultiConvertFileProperties props)
-                => Templates.ChapterFile.GetFilename(libraryBook.ToDto(), props);
-        }
-
-        public static Func<AaxDecrypter.MultiConvertFileProperties, string> CreateMultipartRenamerFunc(this AudioFileStorage _, LibraryBook libraryBook)
-            => new MultipartRenamer(libraryBook).MultipartFilename;
-
-        /// <summary>
-        /// DownloadDecryptBook:
-        /// File path for where to move files into.
-        /// Path: directory nested inside of Books directory
-        /// File name: n/a
-        /// </summary>
-        public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook)
-            => Templates.Folder.GetFilename(libraryBook.ToDto());
-
-        /// <summary>
-        /// DownloadDecryptBook:
-        /// Path: in progress directory.
-        /// File name: final file name.
-        /// </summary>
-        public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension);
-
-        /// <summary>
-        /// PDF: audio file does not exist
-        /// </summary>
-        public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension);
-
-        /// <summary>
-        /// PDF: audio file already exists
-        /// </summary>
-        public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension)
-            => Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension);
-    }
-}

FileLiberator/ConvertToMp3.cs

@@ -1,92 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using AAXClean;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-using FileManager;
-using LibationFileManager;
-
-namespace FileLiberator
-{
-    public class ConvertToMp3 : AudioDecodable
-    {
-        private Mp4File m4bBook;
-
-		private long fileSize;
-        private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
-
-        public override void Cancel() => m4bBook?.Cancel();
-
-        public override bool Validate(LibraryBook libraryBook)
-        {
-            var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-            return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
-        }
-
-        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            OnBegin(libraryBook);
-
-            OnStreamingBegin($"Begin converting {libraryBook} to mp3");
-
-            try
-            {
-                var m4bPath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-                m4bBook = new Mp4File(m4bPath, FileAccess.Read);
-                m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
-
-                fileSize = m4bBook.InputStream.Length;
-
-                OnTitleDiscovered(m4bBook.AppleTags.Title);
-                OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
-                OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
-                OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
-
-                using var mp3File = File.OpenWrite(Path.GetTempFileName());
-
-                var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File));
-                m4bBook.InputStream.Close();
-                mp3File.Close();
-
-                var proposedMp3Path = Mp3FileName(m4bPath);
-                var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
-                OnFileCreated(libraryBook, realMp3Path);
-
-                var statusHandler = new StatusHandler();
-
-                if (result == ConversionResult.Failed)
-                    statusHandler.AddError("Conversion failed");
-
-                return statusHandler;
-            }
-            finally
-            {
-                OnStreamingCompleted($"Completed converting to mp3: {libraryBook.Book.Title}");
-                OnCompleted(libraryBook);
-            }
-        }
-
-        private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-        {
-            var duration = m4bBook.Duration;
-            double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
-            double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
-            if (double.IsNormal(estTimeRemaining))
-                OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
-
-            OnStreamingProgressChanged(
-                new DownloadProgress
-                {
-                    ProgressPercentage = progressPercent,
-                    BytesReceived = (long)(fileSize * progressPercent),
-                    TotalBytesToReceive = fileSize
-                });
-        }
-    }
-}

FileLiberator/DownloadDecryptBook.cs

@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AaxDecrypter;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using LibationFileManager;
-
-namespace FileLiberator
-{
-    public class DownloadDecryptBook : AudioDecodable
-    {
-        private AudiobookDownloadBase abDownloader;
-
-        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
-
-        public override void Cancel() => abDownloader?.Cancel();
-
-        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            var entries = new List<FilePathCache.CacheEntry>();
-            // these only work so minimally b/c CacheEntry is a record.
-            // in case of parallel decrypts, only capture the ones for this book id.
-            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
-            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
-            {
-                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-                    entries.Add(e);
-            }
-            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
-            {
-                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-                    entries.Remove(e);
-            }
-
-            OnBegin(libraryBook);
-
-            try
-            {
-                if (libraryBook.Book.Audio_Exists)
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                bool success = false;
-                try
-                {
-                    FilePathCache.Inserted += FilePathCache_Inserted;
-                    FilePathCache.Removed += FilePathCache_Removed;
-
-                    success = await downloadAudiobookAsync(libraryBook);
-                }
-                finally
-                {
-                    FilePathCache.Inserted -= FilePathCache_Inserted;
-                    FilePathCache.Removed -= FilePathCache_Removed;
-                }
-
-                // decrypt failed
-                if (!success)
-                    return new StatusHandler { "Decrypt failed" };
-
-                // moves new files from temp dir to final dest
-                var movedAudioFile = moveFilesToBooksDir(libraryBook, entries);
-
-                // decrypt failed
-                if (!movedAudioFile)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
-
-                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                OnCompleted(libraryBook);
-            }
-        }
-
-        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
-        {
-            OnStreamingBegin($"Begin decrypting {libraryBook}");
-
-            try
-            {
-                downloadValidation(libraryBook);
-
-                var api = await libraryBook.GetApiAsync();
-                var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-
-                var audiobookDlLic = new DownloadLicense
-                    (
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic?.Voucher?.Key,
-                    contentLic?.Voucher?.Iv,
-                    Resources.USER_AGENT
-                    );
-
-                //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-                //I also assume that if DrmType != Adrm, the file will be an mp3.
-                //These assumptions may be wrong, and only time and bug reports will tell.
-                var outputFormat = 
-                    contentLic.ContentMetadata.ContentReference.ContentFormat == "MPEG" ||
-                    (Configuration.Instance.AllowLibationFixup && Configuration.Instance.DecryptToLossy) ? 
-                    OutputFormat.Mp3 : OutputFormat.M4b;
-
-                if (Configuration.Instance.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
-                {
-                    audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo();
-
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        audiobookDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
-                }
-
-                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, outputFormat.ToString().ToLower());
-
-                var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
-
-                abDownloader
-                    = contentLic.DrmType != AudibleApi.Common.DrmType.Adrm ? new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic)
-                    : Configuration.Instance.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
-                        outFileName, cacheDir, audiobookDlLic, outputFormat,
-                        AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook)
-                        )
-                    : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic, outputFormat);
-                abDownloader.DecryptProgressUpdate += (_, progress) => OnStreamingProgressChanged(progress);
-                abDownloader.DecryptTimeRemaining += (_, remaining) => OnStreamingTimeRemaining(remaining);
-                abDownloader.RetrievedTitle += (_, title) => OnTitleDiscovered(title);
-                abDownloader.RetrievedAuthors += (_, authors) => OnAuthorsDiscovered(authors);
-                abDownloader.RetrievedNarrators += (_, narrators) => OnNarratorsDiscovered(narrators);
-                abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(abDownloader.Run);
-                return success;
-            }
-            finally
-            {
-                OnStreamingCompleted($"Completed downloading and decrypting {libraryBook.Book.Title}");
-            }
-        }
-
-        private static void downloadValidation(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"));
-        }
-
-        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
-        {
-            if (e is not null)
-                OnCoverImageDiscovered(e);
-            else if (Configuration.Instance.AllowLibationFixup)
-                OnRequestCoverArt(abDownloader.SetCoverArt);
-        }
-
-        /// <summary>Move new files to 'Books' directory</summary>
-        /// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
-        private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
-        {
-            // create final directory. move each file into it
-            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            Directory.CreateDirectory(destinationDir);
-
-            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
-
-			if (getFirstAudio() == default)
-				return false;
-
-			for (var i = 0; i < entries.Count; i++)
-			{
-				var entry = entries[i];
-
-				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)));
-				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
-
-				// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
-				entries[i] = entry with { Path = realDest };
-			}
-
-			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
-			if (cue != default)
-				Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
-
-			AudibleFileStorage.Audio.Refresh();
-
-			return true;
-		}
-	}
-}

FileLiberator/DownloadFile.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : Streamable
-	{
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
-
-			OnStreamingBegin(proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				OnFileCreated("Upgrade", actualDownloadedFilePath);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				OnStreamingCompleted(proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/FileLiberator.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

FileLiberator/Streamable.cs

@@ -1,45 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public abstract class Streamable
-    {
-        public event EventHandler<string> StreamingBegin;
-        public event EventHandler<DownloadProgress> StreamingProgressChanged;
-        public event EventHandler<TimeSpan> StreamingTimeRemaining;
-        public event EventHandler<string> StreamingCompleted;
-        /// <summary>Fired when a file is successfully saved to disk</summary>
-        public event EventHandler<(string id, string path)> FileCreated;
-
-        protected void OnStreamingBegin(string filePath)
-        {
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = filePath });
-            StreamingBegin?.Invoke(this, filePath);
-        }
-
-        protected void OnStreamingProgressChanged(DownloadProgress progress)
-        {
-            StreamingProgressChanged?.Invoke(this, progress);
-        }
-
-        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining)
-        {
-            StreamingTimeRemaining?.Invoke(this, timeRemaining);
-        }
-
-        protected void OnStreamingCompleted(string filePath)
-        {
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = filePath });
-            StreamingCompleted?.Invoke(this, filePath);
-        }
-
-        protected void OnFileCreated(DataLayer.LibraryBook libraryBook, string path) => OnFileCreated(libraryBook.Book.AudibleProductId, path);
-        protected void OnFileCreated(string id, string path)
-        {
-            Serilog.Log.Logger.Information("File created {@DebugInfo}", new { Name = nameof(FileCreated), id, path });
-            LibationFileManager.FilePathCache.Insert(id, path);
-            FileCreated?.Invoke(this, (id, path));
-        }
-    }
-}

FileManager/FileManager.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="4.0.4.1" />
-    <PackageReference Include="Polly" Version="7.2.3" />
-  </ItemGroup>
-
-</Project>

FileManager/FileNamingTemplate.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
-
-namespace FileManager
-{
-    /// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-    public class FileNamingTemplate
-    {
-        /// <summary>Proposed full file path. May contain optional html-styled template tags. Eg: &lt;name&gt;</summary>
-        public string Template { get; }
-
-        /// <param name="template">Proposed file name with optional html-styled template tags.</param>
-        public FileNamingTemplate(string template) => Template = ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
-
-        /// <summary>Optional step 1: Replace html-styled template tags with parameters. Eg {"name", "Bill Gates"} => /&lt;name&gt;/ => /Bill Gates/</summary>
-        public Dictionary<string, object> ParameterReplacements { get; } = new Dictionary<string, object>();
-
-        /// <summary>Convenience method</summary>
-        public void AddParameterReplacement(string key, object value)
-            // using .Add() instead of "[key] = value" will make unintended overwriting throw exception
-            => ParameterReplacements.Add(key, value);
-
-        /// <summary>If set, truncate each parameter replacement to this many characters. Default 50</summary>
-        public int? ParameterMaxSize { get; set; } = 50;
-
-        /// <summary>Optional step 2: Replace all illegal characters with this. Default=<see cref="string.Empty"/></summary>
-        public string IllegalCharacterReplacements { get; set; }
-
-        /// <summary>Generate a valid path for this file or directory</summary>
-        public string GetFilePath()
-        {
-            var filename = Template;
-
-            foreach (var r in ParameterReplacements)
-                filename = filename.Replace($"<{formatKey(r.Key)}>", formatValue(r.Value));
-
-            return FileUtility.GetValidFilename(filename, IllegalCharacterReplacements);
-        }
-
-        private static string formatKey(string key)
-            => key
-            .Replace("<", "")
-            .Replace(">", "");
-
-        private string formatValue(object value)
-        {
-            if (value is null)
-                return "";
-
-            // Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
-            // Esp important for file templates.
-            var val = value
-                .ToString()
-                .Replace($"{System.IO.Path.DirectorySeparatorChar}", IllegalCharacterReplacements)
-                .Replace($"{System.IO.Path.AltDirectorySeparatorChar}", IllegalCharacterReplacements);
-            return 
-                ParameterMaxSize.HasValue && ParameterMaxSize.Value > 0
-                ? val.Truncate(ParameterMaxSize.Value)
-                : val;
-        }
-    }
-}

FileManager/FileUtility.cs

@@ -1,220 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-using Polly;
-using Polly.Retry;
-
-namespace FileManager
-{
-    public static class FileUtility
-    {
-        /// <summary>
-        /// "txt" => ".txt"
-        /// <br />".txt" => ".txt"
-        /// <br />null or whitespace => ""
-        /// </summary>
-        public static string GetStandardizedExtension(string extension)
-            => string.IsNullOrWhiteSpace(extension)
-            ? (extension ?? "")?.Trim()
-            : '.' + extension.Trim().Trim('.');
-
-        /// <summary>
-        /// Return position with correct number of leading zeros.
-        /// <br />- 2 of 9 => "2"
-        /// <br />- 2 of 90 => "02"
-        /// <br />- 2 of 900 => "002"
-        /// </summary>
-        /// <param name="position">position in sequence. The 'x' in 'x of y'</param>
-        /// <param name="total">total qty in sequence. The 'y' in 'x of y'</param>
-        public static string GetSequenceFormatted(int position, int total)
-        {
-            ArgumentValidator.EnsureGreaterThan(position, nameof(position), 0);
-            ArgumentValidator.EnsureGreaterThan(total, nameof(total), 0);
-            if (position > total)
-                throw new ArgumentException($"{position} may not be greater than {total}");
-
-            return position.ToString().PadLeft(total.ToString().Length, '0');
-        }
-
-        private const int MAX_FILENAME_LENGTH = 255;
-        private const int MAX_DIRECTORY_LENGTH = 247;
-
-        /// <summary>
-        /// Ensure valid file name path: 
-        /// <br/>- remove invalid chars
-        /// <br/>- ensure uniqueness
-        /// <br/>- enforce max file length
-        /// </summary>
-        public static string GetValidFilename(string path, string illegalCharacterReplacements = "")
-        {
-            ArgumentValidator.EnsureNotNull(path, nameof(path));
-
-            // remove invalid chars
-            path = GetSafePath(path, illegalCharacterReplacements);
-
-            // ensure uniqueness and check lengths
-            var dir = Path.GetDirectoryName(path);
-            dir = dir.Truncate(MAX_DIRECTORY_LENGTH);
-
-            var filename = Path.GetFileNameWithoutExtension(path);
-            var fileStem = Path.Combine(dir, filename);
-
-            var extension = Path.GetExtension(path);
-
-            var fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - extension.Length) + extension;
-
-            fullfilename = removeInvalidWhitespace(fullfilename);
-
-            var i = 0;
-            while (File.Exists(fullfilename))
-            {
-                var increm = $" ({++i})";
-                fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - increm.Length - extension.Length) + increm + extension;
-            }
-
-            return fullfilename;
-        }
-
-        // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-
-        /// <summary>Use with file name, not full path. Valid path charaters which are invalid file name characters will be replaced: ':', '\\', '/'</summary>
-        public static string GetSafeFileName(string str, string illegalCharacterReplacements = "")
-            => string.Join(illegalCharacterReplacements ?? "", str.Split(Path.GetInvalidFileNameChars()));
-
-        /// <summary>Use with full path, not file name. Valid path charaters which are invalid file name characters will be retained: '\\', '/'</summary>
-        public static string GetSafePath(string path, string illegalCharacterReplacements = "")
-        {
-            ArgumentValidator.EnsureNotNull(path, nameof(path));
-
-            path = replaceInvalidChars(path, illegalCharacterReplacements);
-            path = standardizeSlashes(path);
-            path = replaceColons(path, illegalCharacterReplacements);
-            path = removeDoubleSlashes(path);
-
-            return path;
-        }
-
-        private static char[] invalidChars { get; } = Path.GetInvalidPathChars().Union(new[] {
-                '*', '?',
-                // these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
-                // In live code, Path.GetInvalidPathChars() does not include them
-                '"', '<', '>'
-            }).ToArray();
-        private static string replaceInvalidChars(string path, string illegalCharacterReplacements)
-            => string.Join(illegalCharacterReplacements ?? "", path.Split(invalidChars));
-
-        private static string standardizeSlashes(string path)
-            => path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-
-        private static string replaceColons(string path, string illegalCharacterReplacements)
-        {
-            // replace all colons except within the first 2 chars
-            var builder = new System.Text.StringBuilder();
-            for (var i = 0; i < path.Length; i++)
-            {
-                var c = path[i];
-                if (i >= 2 && c == ':')
-                    builder.Append(illegalCharacterReplacements);
-                else
-                    builder.Append(c);
-            }
-            return builder.ToString();
-        }
-
-        private static string removeDoubleSlashes(string path)
-        {
-            if (path.Length < 2)
-                return path;
-
-            // exception: don't try to condense the initial dbl bk slashes in a path. eg: \\192.168.0.1
-
-            var remainder = path[1..];
-            var dblSeparator = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-            while (remainder.Contains(dblSeparator))
-                remainder = remainder.Replace(dblSeparator, $"{Path.DirectorySeparatorChar}");
-
-            return path[0] + remainder;
-        }
-
-        private static string removeInvalidWhitespace_pattern { get; } = $@"\s*\{Path.DirectorySeparatorChar}\s*";
-        private static Regex removeInvalidWhitespace_regex { get; } = new(removeInvalidWhitespace_pattern, RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
-
-        /// <summary>no part of the path may begin or end in whitespace</summary>
-        private static string removeInvalidWhitespace(string fullfilename)
-        {
-            // no whitespace at beginning or end
-            // replace whitespace around path slashes
-            //    regex (with space added for clarity)
-            //    \s*  \\  \s*    =>    \
-            fullfilename = fullfilename.Trim();
-            
-            fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, @"\");
-
-            fullfilename = removeDoubleSlashes(fullfilename);
-            return fullfilename;
-        }
-
-        /// <summary>
-        /// Move file.
-        /// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
-        /// <br/>- Perform <see cref="SaferMove"/>
-        /// <br/>- Return valid path
-        /// </summary>
-        public static string SaferMoveToValidPath(string source, string destination)
-        {
-            destination = GetValidFilename(destination);
-            SaferMove(source, destination);
-            return destination;
-        }
-
-        private static int maxRetryAttempts { get; } = 3;
-        private static TimeSpan pauseBetweenFailures { get; } = TimeSpan.FromMilliseconds(100);
-        private static RetryPolicy retryPolicy { get; } =
-            Policy
-            .Handle<Exception>()
-            .WaitAndRetry(maxRetryAttempts, i => pauseBetweenFailures);
-
-        /// <summary>Delete file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
-        public static void SaferDelete(string source)
-            => retryPolicy.Execute(() =>
-            {
-                try
-                {
-                    if (File.Exists(source))
-                    {
-                        File.Delete(source);
-                        Serilog.Log.Logger.Information("File successfully deleted", new { source });
-                    }
-                }
-                catch (Exception e)
-                {
-                    Serilog.Log.Logger.Error(e, "Failed to delete file", new { source });
-                    throw;
-                }
-            });
-
-        /// <summary>Move file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
-		public static void SaferMove(string source, string destination)
-            => retryPolicy.Execute(() =>
-            {
-                try
-                {
-                    if (File.Exists(source))
-                    {
-                        SaferDelete(destination);
-                        Directory.CreateDirectory(Path.GetDirectoryName(destination));
-                        File.Move(source, destination);
-                        Serilog.Log.Logger.Information("File successfully moved", new { source, destination });
-                    }
-                }
-                catch (Exception e)
-                {
-                    Serilog.Log.Logger.Error(e, "Failed to move file", new { source, destination });
-                    throw;
-                }
-            });
-    }
-}

Hoopla/Hoopla.csproj

@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>

Hoopla/HooplaDownloader.newer.ps1

@@ -1,847 +0,0 @@
-<#
-.SYNOPSIS
-    Downloads, decrypts and repackages content from Hoopla
-
-.DESCRIPTION
-    Uses a HooplaDigital.com account to download DRM-free copies of ebooks, comics,
-    and/or audiobooks available on the platform. Content that is not already borrowed
-    on the account will be borrowed if slots are available. Content that is not borrowed
-    cannot be downloaded.
-
-    * E-Books are downloaded to epub files (most) or cbz (rare, picture books).
-    * Comic books are downloaded to cbz files.
-    * Audiobooks are downloaded to m4a files. (single file, and very little metadata available
-      from Hoopla, such as chapters)
-
-.PARAMETER Credential
-    Credential to use for logging into Hoopla site.
-    (Cannot be used with Username and Password parameters)
-
-.PARAMETER Username
-    Username to use for logging into Hoopla site.
-    (Cannot be used with Credential parameter)
-
-.PARAMETER Password
-    Password to use for logging into Hoopla site.
-    (Cannot be used with Credential parameter)
-
-.PARAMETER TitleId
-    Specifies one or more title IDs of content to download.
-
-.PARAMETER OutputFolder
-    Sets the output folder for downloaded content. Defaults to current directory.
-
-.PARAMETER PatronId
-    Override default patron id for Hoopla. (This is rarely required as most user accounts are only tied
-    to a single patron).
-
-.PARAMETER EpubZipBin
-    Specifies path to epubzip binary. Else look for one beside script, or in system path.
-
-.PARAMETER FfmpegBin
-    Specifies path to ffmpeg binary. Else look for one beside script, or in system path.
-
-.PARAMETER KeepDecryptedData
-    If set, don't delete the intermediary data after decryption, before final output file.
-    For ebooks, this is xml, images, and the manifest. For comics, it is images. For audiobooks,
-    it is mp4 ts files. This is typically only useful for development or troubleshooting.
-
-.PARAMETER KeepEncryptedData
-    If set, don't delete the encrypted data as downloaded from Hoopla's servers. This is typically
-    only useful for development or troubleshooting.
-
-.PARAMETER AllBorrowed
-    This parameter is deprecated. If TitleId is not set, it is implied that all borrowed titles will
-    be downloaded.
-
-.PARAMETER AudioBookForceSingleFile
-    If set, leave audiobook as single file, as if chapter data is not present.
-
-.EXAMPLE
-    .\Invoke-HooplaDownload.ps1 123456
-    Downloads Hoopla content with title id 123456
-
-.NOTES
-    Author: kabutops728 - My Anonamouse
-    Version: 2.9
-#>
-
-[CmdletBinding(DefaultParameterSetName='CredentialSingleTitle')]
-param(
-    [int64[]]
-    $TitleId,
-
-    [Parameter(Mandatory,ParameterSetName='CredentialSingleTitle')]
-    [Management.Automation.PSCredential]
-    $Credential,
-
-    [Parameter(Mandatory,ParameterSetName='UserPassSingleTitle')]
-    [string]
-    $Username,
-
-    [Parameter(Mandatory,ParameterSetName='UserPassSingleTitle')]
-    [string]
-    $Password,
-
-    [ValidateScript({Test-Path -LiteralPath $_ -IsValid -PathType Container})]
-    [string]$OutputFolder = $PSScriptRoot,
-
-    [int64]$PatronId,
-
-    [string]$EpubZipBin,
-
-    [string]$FfmpegBin,
-
-    [switch]$KeepDecryptedData,
-
-    [switch]$KeepEncryptedData,
-
-    [switch]$AudioBookForceSingleFile,
-
-    # Deprecated
-    [switch]$AllBorrowed
-)
-
-$USER_AGENT = 'Hoopla Android/4.27'
-
-$HEADERS = @{
-    'app' = 'ANDROID'
-    'app-version' = '4.27.1'
-    'device-module' = 'KFKAWI'
-    'device-version' = ''
-    'hoopla-verson' = '4.27.1'
-    'kids-mode' = 'false'
-    'os' = 'ANDROID'
-    'os-version' = '6.0.1'
-    'ws-api' = '2.1'
-    'Host' = 'hoopla-ws.hoopladigital.com'
-}
-
-$URL_HOOPLA_WS_BASE = 'https://hoopla-ws.hoopladigital.com'
-$URL_HOOPLA_LIC_BASE = 'https://hoopla-license2.hoopladigital.com'
-
-$COMIC_IMAGE_EXTS = @('.jpg','.png','.jpeg','.gif','.bmp','.tif','.tiff')
-
-enum HooplaKind
-{
-    EBOOK = 5
-    MUSIC = 6
-    MOVIE = 7
-    AUDIOBOOK = 8
-    TELEVISION = 9
-    COMIC = 10
-}
-
-$SUPPORTED_KINDS = @([HooplaKind]::EBOOK, [HooplaKind]::COMIC, [HooplaKind]::AUDIOBOOK)
-
-Function Connect-Hoopla
-{
-    param(
-        [Parameter(Mandatory)][Management.Automation.PSCredential]$Credential
-    )
-
-    $username = $Credential.UserName
-    $password = $Credential.GetNetworkCredential().Password
-
-    $res = Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/tokens" -Method Post -Headers $HEADERS -UserAgent $USER_AGENT -Body @{username = $username; password = $password}
-
-    if ($res.tokenStatus -ne 'SUCCESS')
-    {
-        throw $res.message
-    }
-
-    $res.token
-}
-
-Function Get-HooplaUsers
-{
-    param(
-        [Parameter(Mandatory)][string]$Token
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-HooplaTitleInfo
-{
-    param(
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$TitleId
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/v2/titles/$TitleId" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-HooplaBorrowsRemaining
-{
-    param(
-        [Parameter(Mandatory)][string]$UserId,
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/patrons/$PatronId/borrows-remaining" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-HooplaBorrowedTitles
-{
-    param(
-        [Parameter(Mandatory)][string]$UserId,
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/borrowed-titles" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Invoke-HooplaBorrow
-{
-    param(
-        [Parameter(Mandatory)][string]$UserId,
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$TitleId
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/patrons/$PatronId/borrowed-titles/$TitleId" -Method Post -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Invoke-HooplaZipDownload
-{
-    param(
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$CircId,
-        [Parameter(Mandatory)][ValidateScript({Test-Path -LiteralPath $_ -IsValid -PathType Leaf})][string]$OutFile
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    $res = Invoke-WebRequest -Uri "$URL_HOOPLA_WS_BASE/patrons/downloads/$CircId/url" -Method Get -Headers $h -UserAgent $USER_AGENT -UseBasicParsing
-
-    if ($PSVersionTable.PSVersion.Major -ge 6)
-    {
-        Invoke-WebRequest -Uri $res.Headers['Location'][0] -Method Get -UseBasicParsing -OutFile $OutFile
-    }
-    else
-    {
-        Invoke-WebRequest -Uri $res.Headers['Location'] -Method Get -UseBasicParsing -OutFile $OutFile
-    }
-}
-
-Function Get-HooplaKey
-{
-    param(
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$CircId
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_LIC_BASE/downloads/$CircId/key" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-FileKeyKey
-{
-    param(
-        [Parameter(Mandatory)][int64]$CircId,
-        [Parameter(Mandatory)][DateTime]$Due,
-        [Parameter(Mandatory)][int64]$PatronId
-    )
-
-    $combined = '{0:yyyyMMddHHmmss}:{1}:{2}' -f $Due, $PatronId, $CircId
-
-    [Security.Cryptography.HashAlgorithm]::Create('SHA1').ComputeHash([Text.Encoding]::UTF8.GetBytes($combined)) | Select-Object -First 16
-}
-
-Function Decrypt-FileKey
-{
-    param(
-        [Parameter(Mandatory)][byte[]]$FileKeyEnc,
-        [Parameter(Mandatory)][byte[]]$FileKeyKey
-    )
-
-    $aesManaged = New-Object "System.Security.Cryptography.AesManaged"
-    $aesManaged.Mode = [Security.Cryptography.CipherMode]::ECB
-    $aesManaged.Padding = [Security.Cryptography.PaddingMode]::PKCS7
-    $aesManaged.BlockSize = 128
-    $aesManaged.KeySize = 128
-    $aesManaged.Key = $FileKeyKey
-
-    $decryptor = $aesManaged.CreateDecryptor();
-
-    $unencryptedData = $decryptor.TransformFinalBlock($FileKeyEnc, 0, $FileKeyEnc.Length);
-    $aesManaged.Dispose()
-
-    $unencryptedData
-}
-
-Function Decrypt-File
-{
-    param(
-        [Parameter(Mandatory)][byte[]]$FileKey,
-        [Parameter(Mandatory)][string]$MediaKey,
-        [Parameter(Mandatory)][string]$InputFileName,
-        [Parameter(Mandatory)][string]$OutputFileName
-    )
-
-    $aesManaged = New-Object "System.Security.Cryptography.AesManaged"
-    $aesManaged.Mode = [Security.Cryptography.CipherMode]::CBC
-    $aesManaged.Padding = [Security.Cryptography.PaddingMode]::PKCS7
-    $aesManaged.BlockSize = 128
-    $aesManaged.KeySize = 256
-    $aesManaged.Key = $FileKey
-    $aesManaged.IV = [Text.Encoding]::UTF8.GetBytes($MediaKey) | Select-Object -First 16
-
-
-    $fileStreamReader = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $InputFileName, ([IO.FileMode]::Open), ([IO.FileShare]::Read)
-    $fileStreamWriter = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $OutputFileName, ([IO.FileMode]::Create)
-
-    $FileStreamReader.Seek(0, [IO.SeekOrigin]::Begin) | Out-Null
-
-    $decryptor = $aesManaged.CreateDecryptor()
-    $cryptoStream = New-Object -TypeName 'System.Security.Cryptography.CryptoStream' -ArgumentList $fileStreamWriter, $decryptor, ([Security.Cryptography.CryptoStreamMode]::Write)
-    $fileStreamReader.CopyTo($cryptoStream)
-
-    $cryptoStream.FlushFinalBlock()
-    $cryptoStream.Close()
-    $fileStreamReader.Close()
-    $fileStreamWriter.Close()
-
-    $aesManaged.Dispose()
-}
-
-Function Test-Mp4
-{
-    param(
-        [Parameter(Mandatory, Position=0)]
-        [Alias('LiteralPath')]
-        [string]$Path
-    )
-
-    $fileStream = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $Path, ([IO.FileMode]::Open), ([IO.FileShare]::Read)
-    $fileReader = New-Object -TypeName 'System.IO.BinaryReader' -ArgumentList $fileStream -ErrorAction Stop
-    $head = $fileReader.ReadBytes(8)
-    
-    $fileReader.Dispose()
-    $fileStream.Dispose()
-
-    return [Text.Encoding]::ASCII.GetString(($head | Select-Object -Skip 4)) -eq 'ftyp'
-}
-
-Function Remove-InvalidFileNameChars
-{
-    param(
-        [Parameter(Mandatory,Position=0,
-        ValueFromPipeline=$true,
-        ValueFromPipelineByPropertyName=$true)]
-      [String]$Name
-    )
-
-    $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join ''
-    $re = "[{0}]" -f [RegEx]::Escape($invalidChars)
-    $Name -replace $re, '_'
-}
-
-Function Convert-HooplaDecryptedToEpub
-{
-    param(
-        [Parameter(Mandatory)][string]$InputFolder,
-        [Parameter(Mandatory)][string]$OutFolder
-    )
-
-    $container = [xml](Get-Content -LiteralPath (Join-Path -Path $InputFolder -ChildPath 'META-INF\container.xml') -Raw)
-    $rootFile = $container.container.rootfiles.rootfile | Select-Object -ExpandProperty Full-Path
-    $contentFile = (Join-Path -Path $InputFolder -ChildPath $rootFile).Trim()
-    $contentRoot = Get-Item -LiteralPath $contentFile | Select-Object -ExpandProperty Directory
-    $content = [xml](Get-Content -LiteralPath $contentFile)
-
-    $fileList = $content.package.manifest.item | Select-Object -ExpandProperty href | ForEach-Object -Process { (Join-Path -Path $contentRoot -ChildPath ([Web.HttpUtility]::UrlDecode($_))).Trim() }
-    $fileList += $contentFile
-    $fileList = $fileList | Sort-Object -Unique
-
-    $title = $content.package.metadata.title | Select-Object -First 1
-    if ($title.GetType() -ne [String])
-    {
-        $title = $content.package.metadata.title | Select-Object -First 1 | Select-Object -ExpandProperty '#text'
-    }
-
-    $author = $content.package.metadata.creator | Select-Object -First 1
-    if ($author.GetType() -ne [String])
-    {
-        $author = $content.package.metadata.creator | Select-Object -First 1 | Select-Object -ExpandProperty '#text'
-    }
-    
-    # Usually, content root is a subfolder of the input folder. But sometimes, they are the same. Make sure we declutter the input root if they differ, and always keep the mimetype file.
-    $mimeTypeFile = Join-Path -Path $InputFolder -ChildPath 'mimetype'
-
-    $extra = @(Get-ChildItem -LiteralPath $contentRoot -File -Recurse | Where-Object -FilterScript { ($_.FullName -notin $fileList) -and ($_.FullName -ne $mimeTypeFile) })
-    $extra += Get-ChildItem -LiteralPath $InputFolder -File | Where-Object -FilterScript { ($_.FullName -notin $fileList) -and ($_.FullName -ne $mimeTypeFile) }
-
-    $extra = $extra | Sort-Object -Property FullName -Unique
-    $extra | Remove-Item
-
-    $containerXmlFolder = Join-Path -Path $contentRoot.FullName -ChildPath 'META-INF'
-    $containerXmlPath = Join-Path -Path $containerXmlFolder -ChildPath 'container.xml'
-    if (!(Test-Path -LiteralPath $containerXmlPath -PathType Leaf))
-    {
-        New-Item -Path $containerXmlFolder -ItemType Directory -Force | Out-Null
-        $xml = @"
-<?xml version="1.0"?>
-<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-   <rootfiles>
-      <rootfile full-path="content.opf" media-type="application/oebps-package+xml"/>
-   </rootfiles>
-</container>
-
-"@
-        $xml | Out-File -LiteralPath $containerXmlPath -Encoding ascii
-    }
-
-    $finalFile = ('{0} - {1}.epub' -f $title, $author) | Remove-InvalidFileNameChars
-
-    Push-Location
-    Set-Location -LiteralPath $InputFolder
-
-    $finalFileFullPath = (Join-Path -Path $OutFolder -ChildPath $finalFile)
-    if ($VerbosePreference -eq 'Continue')
-    {
-        & $EpubZipBin $finalFileFullPath
-    }
-    else
-    {
-        & $EpubZipBin $finalFileFullPath >$null 2>&1
-    }
-    Pop-Location
-
-    Get-Item -LiteralPath $finalFileFullPath
-}
-
-Function Convert-HooplaDecryptedToCbz
-{
-    param(
-        [Parameter(Mandatory)][string]$InputFolder,
-        [Parameter(Mandatory)][string]$OutFolder,
-        [Parameter(Mandatory)][string]$Name
-    )
-
-    $fileName = $Name | Remove-InvalidFileNameChars
-    $tempOutFile = Join-Path -Path $OutFolder -ChildPath "$fileName.zip"
-    $finalOutFile = Join-Path -Path $OutFolder -ChildPath "$fileName.cbz"
-
-    Compress-Archive -Path (
-        Get-ChildItem -LiteralPath $InputFolder | Where-Object -FilterScript { $_.Extension -in $COMIC_IMAGE_EXTS } | Select-Object -ExpandProperty FullName
-    ) -CompressionLevel Fastest -DestinationPath $tempOutFile
-
-    Rename-Item -LiteralPath $tempOutFile -NewName $finalOutFile
-
-    Get-Item $finalOutFile
-}
-
-Function Convert-HooplaDecryptedToM4a
-{
-    param(
-        [Parameter(Mandatory)][string]$InputFolder,
-        [Parameter(Mandatory)][string]$OutFolder,
-        [Parameter(Mandatory)][string]$Name,
-        [Parameter(Mandatory)][string]$Title,
-        [Parameter(Mandatory)][string]$Author,
-        [Parameter(Mandatory)][int]$Year,
-        [string]$Subtitle,
-        [object]$ChapterData
-        
-    )
-
-    if ($Author)
-    {
-        $baseFileName = ('{0} - {1}' -f $Name, $Author) | Remove-InvalidFileNameChars
-    }
-    else
-    {
-        $baseFileName = $Name | Remove-InvalidFileNameChars
-    }
-
-    $finalOutFile = Join-Path -Path $OutFolder -ChildPath ('{0}.m4a' -f $baseFileName)
-    $inFile = Get-ChildItem -LiteralPath $InputFolder -Filter '*.m3u8' | Select-Object -First 1 | Select-Object -ExpandProperty FullName
-
-    Push-Location
-    Set-Location $InputFolder
-    $ffArgs = @(
-        '-y',
-        '-i', $infile,
-        '-metadata', ('title="{0}"' -f $Title),
-        '-metadata', ('year="{0}"'  -f $Year),
-        '-metadata', ('author="{0}"'  -f $Author),
-        '-metadata', 'genre="Audiobook"'
-    )
-
-    if ($Subtitle)
-    {
-        $ffArgs += '-metadata', ('subtitle="{0}"' -f $Subtitle)
-    }
-
-    $ffArgs += @(
-        '-c:a', 'copy',
-        $finalOutFile
-    )
-
-    if ($VerbosePreference -eq 'Continue')
-    {
-        & $FfmpegBin @ffArgs
-        #& $FfmpegBin -y -i $inFile -metadata "title=`"$Title`"" -metadata "year=`"$Year`"" -metadata "author=`"$Author`"" -metadata "genre=`"Audiobook`"" '-c:a' copy $finalOutFile
-    }
-    else
-    {
-        & $FfmpegBin @ffArgs >$null 2>&1
-        #& $FfmpegBin -y -i $inFile -metadata "title=`"$Title`"" -metadata "year=`"$Year`"" -metadata "author=`"$Author`"" -metadata "genre=`"Audiobook`"" '-c:a' copy $finalOutFile >$null 2>&1
-    }
-
-    if ($ChapterData -and (!$AudioBookForceSingleFile))
-    {
-        $outDir = New-Item -Path (Join-Path -Path $OutFolder -ChildPath $baseFileName) -ItemType Directory
-        $chapterCount = $ChapterData | Select-Object -ExpandProperty chapter | Measure-Object -Maximum | Select-Object -ExpandProperty Maximum
-        $ChapterData | ForEach-Object -Process {
-            $ffArgs = @(
-                '-y',
-                '-i', $finalOutFile,
-                '-ss', $_.start,
-                '-t', $_.duration,
-                '-metadata', ('title="{0}"' -f $_.title),
-                '-metadata', ('album="{0}"' -f $Title),
-                '-metadata', ('year="{0}"'  -f $Year),
-                '-metadata', ('author="{0}"'  -f $Author),
-                '-metadata', 'genre="Audiobook"'
-                '-metadata', ('track={0}/{1}' -f $_.ordinal, $chapterCount)
-            )
-
-            if ($Subtitle)
-            {
-                $ffArgs += '-metadata', ('subtitle="{0}"' -f $Subtitle)
-            }
-
-            $ffArgs += @(
-                '-c', 'copy',
-                (Join-Path -Path $outDir.FullName -ChildPath ('{0} - {1} - {2}.m4a' -f $baseFileName, $_.ordinal, ($_.title | Remove-InvalidFileNameChars)))
-            )
-
-            if ($VerbosePreference -eq 'Continue')
-            {
-                & $FfmpegBin @ffArgs
-            }
-            else
-            {
-                & $FfmpegBin @ffArgs >$null 2>&1
-            }
-        }
-
-        Remove-Item $finalOutFile
-        $finalOutFile = $outDir
-    }
-
-    Pop-Location
-
-    Get-Item $finalOutFile
-}
-
-if (!$Credential)
-{
-    $ssPassword = ConvertTo-SecureString $Password -AsPlainText -Force
-    $Credential = New-Object -TypeName 'System.Management.Automation.PSCredential' -ArgumentList $Username, $ssPassword
-}
-
-if ((!$AllBorrowed) -and ($null -eq $TitleId))
-{
-    Write-Warning 'No -TitleId specified. All currently-borrowed titles will be downloaded.'
-    $AllBorrowed = $true
-}
-
-$AppExtension = ''
-if (($PSVersionTable.PSVersion -lt '6.0') -or $IsWindows)
-{
-    $AppExtension = '.exe'
-}
-
-$cmd = ''
-if ($EpubZipBin)
-{
-    $cmd = Get-Command -Name $EpubZipBin -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        Write-Warning "Epubzip binary specified was not found ($EpubZipBin). Will try to use alternate version if available."
-    }
-}
-
-if (!$cmd)
-{
-    $cmd = Get-Command -Name (Join-Path -Path $PSScriptRoot -ChildPath "epubzip$AppExtension") -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        $cmd = Get-Command -Name "epubzip$AppExtension" -ErrorAction SilentlyContinue
-        if (!$cmd)
-        {
-            Write-Warning "Epubzip binary not found ($EpubZipBin). If you are downloading ebooks (rather than comics or audiobooks), you may wish to download the binary from https://github.com/dino-/epub-tools/releases, specify a different path with -EpubZipBin, or specify -KeepDecryptedData so that you can manually pack afterward."
-        }
-    }
-
-    $EpubZipBin = $cmd.Source
-}
-
-Write-Verbose ('Using epubzip bin: "{0}"' -f $EpubZipBin)
-
-$cmd = ''
-if ($FfmpegBin)
-{
-    $cmd = Get-Command -Name $FfmpegBin -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        Write-Warning "FFMpeg binary specified was not found ($FfmpegBin). Will try to use alternate version if available."
-    }
-}
-
-if (!$cmd)
-{
-    $cmd = Get-Command -Name (Join-Path -Path $PSScriptRoot -ChildPath "ffmpeg$AppExtension") -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        $cmd = Get-Command -Name "ffmpeg$AppExtension" -ErrorAction SilentlyContinue
-        if (!$cmd)
-        {
-            Write-Warning "FFmpeg binary not found. If you are downloading audiobooks (rather than ebooks or comics), you may wish to download the binary from https://ffmpeg.zeranoe.com/builds/, specify a different path with -FfmpegBin, or specify -KeepDecryptedData so that you can manually convert afterward."
-        }
-    }
-
-    $FfmpegBin = $cmd.Source
-}
-
-Write-Verbose ('Using ffpmeg bin: "{0}"' -f $FfmpegBin)
-
-if (!(Test-Path -LiteralPath $OutputFolder -PathType Container))
-{
-    Write-Warning "Output folder doesn't exist. Creating."
-    New-Item -Path $OutputFolder -ItemType Directory | Out-Null
-}
-
-$OutputFolder = Get-Item -LiteralPath $OutputFolder | Select-Object -ExpandProperty $_.FullName
-
-$token = Connect-Hoopla -Credential $Credential
-Write-Verbose "Logged in. Received token $($token -replace '\-.*', '-****-****-****-************')"
-
-$users = Get-HooplaUsers $token
-Write-Verbose "Found $($users.patrons.Count) patrons"
-
-$userId = $users.id
-if (!$PatronId)
-{
-    if ($users.patrons.Count -eq 0)
-    {
-        throw "No patrons found on account. Account may not be correctly set up with library."
-    }
-    elseif ($users.patrons.Count -gt 1)
-    {
-        Write-Warning (
-            "Multiple patrons found on account. Using first one, {0} ({1}). You can specify -PatronId to override" -f $users.patrons[0].id, $users.patrons[0].libraryName
-        )
-    }
-
-    $PatronId = $users.patrons[0].id
-    Write-Verbose "Using PatronId $PatronId"
-}
-
-$borrowedRaw = Get-HooplaBorrowedTitles -Token $token -UserId $userId -PatronId $PatronId
-$borrowed = $borrowedRaw | Where-Object -FilterScript { $_.kind.id -in $SUPPORTED_KINDS }
-Write-Verbose "Found $($borrowed.Count) ($($borrowedRaw.Count)) titles already borrowed"
-$toDownload = @()
-
-if ($AllBorrowed)
-{
-    $toDownload = $borrowed
-}
-else
-{
-    $toDownload = $borrowed | Where-Object -FilterScript { $_.id -in $TitleId }
-
-    $allBorrowedTitles = $borrowed | Select-Object -ExpandProperty id
-    $toBorrow = $TitleId | Where-Object -FilterScript { $_ -notin $allBorrowedTitles }
-    
-    if ($toBorrow)
-    {
-        $borrowsRemainingData = Get-HooplaBorrowsRemaining -UserId $userId -PatronId $PatronId -Token $token
-        Write-Host $borrowsRemainingData.borrowsRemainingMessage
-
-        $borrowsRemaining = $borrowsRemainingData.borrowsRemaining
-
-        $toBorrow | ForEach-Object -Process {
-            Write-Host "Title $_ is not already borrowed or is not a supported kind. Looking up data about it."
-            $titleInfo = Get-HooplaTitleInfo -PatronId $PatronId -Token $token -TitleId $_
-            if ($titleInfo.kind.id -in $SUPPORTED_KINDS)
-            {
-                if ((--$borrowsRemaining) -le 0)
-                {
-                    Write-Warning "Title $_ ($($titleInfo.Title)) not borrowed already, but we're out of remaining borrows allowed. Skipping..."
-                }
-                else
-                {
-                    Write-Host "Borrowing title $_ ($($titleInfo.Title))..."
-                    $res = Invoke-HooplaBorrow -UserId $userId -PatronId $PatronId -Token $token -TitleId $titleInfo.id
-                    Write-Host "Response: $($res.message)"
-                    $newToDownload = $res.titles | Where-Object -FilterScript { $_.id -eq $titleInfo.id }
-                    if ($newToDownload)
-                    {
-                        $toDownload += $newToDownload
-                    }
-                    else
-                    {
-                        Write-Warning "Failed to borrow title $_ ($($titleInfo.Title))..."
-                    }
-                }
-            }
-            else
-            {
-                Write-Warning "Title $_ is not a supported kind ($($titleInfo.kind.name)). Skipping..."
-            }
-        }
-    } 
-}
-
-$tempFolder = [IO.Path]::GetTempPath()
-
-$now = Get-Date
-
-$toDownload | ForEach-Object -Process {
-    $info = $_
-    $contentKind = [HooplaKind]$_.kind.id
-    if ($_.contents.mediaType)
-    {
-        $contentKind = [HooplaKind]$_.contents.mediaType
-    }
-    $contents = $info.contents
-    $circId = $contents.circId
-    $mediaKey = $contents.mediaKey
-    $dueUnix = [Math]::Truncate($info.contents.due / 1000)
-    $due = (New-Object DateTime 1970, 1, 1, 0, 0, 0, ([DateTimeKind]::Utc)).AddSeconds($dueUnix)
-
-    $circFileName = (Join-Path -Path $tempFolder -ChildPath "$($circId).zip")
-
-    Invoke-HooplaZipDownload -PatronId $patronId -Token $token -CircId $circId -OutFile $circFileName
-    $keyData = Get-HooplaKey -PatronId $patronId -Token $token -CircId $circId
-
-    $fileKeyKey = Get-FileKeyKey -CircId $circId -Due $due -PatronId $patronId
-    $fileKey = Decrypt-FileKey -FileKeyEnc ([Convert]::FromBase64String($keyData."$mediaKey")) -FileKeyKey $fileKeyKey
-
-    $encDir = Join-Path -Path $tempFolder -ChildPath ('enc-{0}-{1:yyyyMMddHHmmss}' -f $circId, $now)
-    New-Item -Path $encDir -ItemType Directory | Out-Null
-    Expand-Archive -LiteralPath $circFileName -DestinationPath $encDir
-
-    Remove-Item -LiteralPath $circFileName
-
-    $decDir = Join-Path -Path $tempFolder -ChildPath ('dec-{0}-{1:yyyyMMddHHmmss}' -f $circId, $now)
-    New-Item -Path $decDir -ItemType Directory | Out-Null
-
-    $activity = 'Decrypting Content ({0})' -f $_.title
-    Write-Progress -Activity $activity -PercentComplete 0
-    $zipFiles = Get-ChildItem $encDir -Recurse -File
-    $decDone = 0
-    $decTotal = $zipFiles.Count
-    $zipFiles | ForEach-Object -Process {
-        $outFile = $_.FullName.Replace($encDir, $decDir)
-        $outDir = $_.DirectoryName.Replace($encDir, $decDir)
-        
-        if (!(Test-Path -LiteralPath $outDir))
-        {
-            New-Item -Path $outDir -ItemType Directory -Force | Out-Null
-        }
-
-        if (($contentKind -eq [HooplaKind]::AUDIOBOOK) -and ($_.Extension -eq '.m3u8'))
-        {
-            $lines = Get-Content -LiteralPath $_.FullName | Where-Object -FilterScript {$_ -notmatch '^#EXT-X-KEY'}
-            # Out-File doesn't support utf8 w/o BOM
-            [IO.File]::WriteAllLines($outFile, $lines)
-            return
-        }
-
-        if ($_.Length)
-        {
-            # Hack. Some ebooks contain audio files that download as unencrypted
-            if (($_.Extension -eq '.m4a') -and (Test-Mp4 -LiteralPath $_.FullName))
-            {
-                Write-Verbose -Message ('Coping unencrypted {0}' -f $_.FullName)
-                Copy-Item -LiteralPath $_.FullName -Destination $outFile
-            }
-            else
-            {
-                Write-Verbose -Message ('Decrypting {0}' -f $_.FullName)
-                Decrypt-File -FileKey $fileKey -MediaKey $mediaKey -InputFileName $_.FullName -OutputFileName $outFile
-            }
-        }
-        else
-        {
-            Write-Verbose -Message ('Writing empty file {0}' -f $_.FullName)
-            '' | Out-File -LiteralPath $outFile
-        }
-
-        Write-Progress -Activity $activity -PercentComplete ((++$decDone) / $decTotal * 100)
-    }
-    Write-Progress -Activity $activity -Completed
-
-    switch ($contentKind)
-    {
-        ([HooplaKind]::EBOOK) {
-            Convert-HooplaDecryptedToEpub -InputFolder $decDir -OutFolder $OutputFolder
-        }
-
-        ([HooplaKind]::COMIC) {
-            $title = $contents.title
-            $subtitle = $contents.subtitle
-            $name = $title
-            if ($subtitle) {
-                $name += ", $subtitle"
-            }
-            Convert-HooplaDecryptedToCbz -InputFolder $decDir -OutFolder $OutputFolder -Name $name
-        }
-
-        ([HooplaKind]::AUDIOBOOK) {
-            Convert-HooplaDecryptedToM4a -InputFolder $decDir -OutFolder $OutputFolder -Name $info.title -Title $info.title `
-                -Year $info.year -Author $info.artist.name -Subtitle $contents.subtitle -ChapterData $contents.chapters
-        }
-    }    
-
-    if (!$KeepDecryptedData)
-    {
-        Remove-Item -LiteralPath $decDir -Recurse
-    }
-    else
-    {
-        Write-Host ('Decrypted data for {0} ({1}) stored in {2}' -f $_.id, $_.title, $decDir)
-    }
-
-    if (!$KeepEncryptedData)
-    {
-        Remove-Item -LiteralPath $encDir -Recurse
-    }
-}
-

Hoopla/_README.txt

@@ -1,13 +0,0 @@
-From a Libation user about possibility of integrating Hoopla:
-
-I have a powershell script.  I didn't write it, and neither did the person that gave it to me.  It works most of the time (98%).  Some titles, it doesn't play well with, but does allow to keep the downloaded data, whether the decrypt was successful, or not, and then you can mess with the data, from there.
-
-If you run the script with no parameters, then all the books in your library will download, and decrypt into the same directory as the script, into a folder named Completed.
-
-If you run the script with the command:
-  '.\HooplaDownloader.newer.ps1 -KeepDecryptedData'
-then it will, and will notify you, when complete, where it was stored.
-
-There is a parameter to download a specific titleID#, whether it's in your library, or not, but I've not played with it that far, as the method to accomplish it still reserves it to your library, and then proceeds as normal.  I can tell you, if it's a "trial and error concern", the title will not be removed from your library, after you run the script, whether it succeeds or not.  So, if it fails, you can retry, or try the  -KeepDecryptedData option.  I received no documentation for it, which is why I'm telling you as much as I know about using it.
-
-[ see HooplaDownloader.newer.ps1 ]

Hoopla/temp.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Hoopla
-{
-	public class temp
-	{
-		// placeholder
-	}
-}

LibationFileManager/Configuration.cs

@@ -1,391 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-using Dinah.Core.Logging;
-using FileManager;
-using Microsoft.Extensions.Configuration;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Serilog;
-using Serilog.Events;
-
-namespace LibationFileManager
-{
-    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
-
-        // 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 T GetNonString<T>(string propertyName) => persistentDictionary.GetNonString<T>(propertyName);
-        public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
-
-        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
-        {
-            var settingWasChanged = persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
-            if (settingWasChanged)
-                configuration?.Reload();
-        }
-
-        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.SetString(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.SetString(nameof(InProgress), value);
-        }
-
-        [Description("Allow Libation to fix up audiobook metadata")]
-        public bool AllowLibationFixup
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
-            set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
-        }
-
-        [Description("Decrypt to lossy format?")]
-        public bool DecryptToLossy
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
-            set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
-        }
-        
-        [Description("Split my books into multiple files by chapter")]
-        public bool SplitFilesByChapter
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(SplitFilesByChapter));
-            set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
-        }
-
-        public enum BadBookAction
-        {
-            [Description("Ask each time what action to take.")]
-            Ask = 0,
-            [Description("Stop processing books.")]
-            Abort = 1,
-            [Description("Retry book later. Skip for now. Continue processing books.")]
-            Retry = 2,
-            [Description("Permanently ignore book. Continue processing books. Do not try book again.")]
-            Ignore = 3
-        }
-
-        [Description("When liberating books and there is an error, Libation should:")]
-        public BadBookAction BadBook
-        {
-            get
-            {
-                var badBookStr = persistentDictionary.GetString(nameof(BadBook));
-				return Enum.TryParse<BadBookAction>(badBookStr, out var badBookEnum) ? badBookEnum : BadBookAction.Ask;
-            }
-            set => persistentDictionary.SetString(nameof(BadBook), value.ToString());
-        }
-
-        [Description("Show number of newly imported titles? When unchecked, no pop-up will appear after library scan.")]
-        public bool ShowImportedStats
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(ShowImportedStats));
-            set => persistentDictionary.SetNonString(nameof(ShowImportedStats), value);
-        }
-
-        [Description("Import episodes? (eg: podcasts) When unchecked, episodes will not be imported into Libation.")]
-        public bool ImportEpisodes
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(ImportEpisodes));
-            set => persistentDictionary.SetNonString(nameof(ImportEpisodes), value);
-        }
-
-        [Description("Download episodes? (eg: podcasts). When unchecked, episodes already in Libation will not be downloaded.")]
-        public bool DownloadEpisodes
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(DownloadEpisodes));
-            set => persistentDictionary.SetNonString(nameof(DownloadEpisodes), value);
-		}
-
-        #region templates: custom file naming
-
-        [Description("How to format the folders in which files will be saved")]
-		public string FolderTemplate
-        {
-            get => getTemplate(nameof(FolderTemplate), Templates.Folder);
-            set => setTemplate(nameof(FolderTemplate), Templates.Folder, value);
-        }
-
-        [Description("How to format the saved pdf and audio files")]
-		public string FileTemplate
-        {
-            get => getTemplate(nameof(FileTemplate), Templates.File);
-            set => setTemplate(nameof(FileTemplate), Templates.File, value);
-        }
-
-        [Description("How to format the saved audio files when split by chapters")]
-        public string ChapterFileTemplate
-        {
-            get => getTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile);
-            set => setTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile, value);
-        }
-
-        private string getTemplate(string settingName, Templates templ) => templ.GetValid(persistentDictionary.GetString(settingName));
-        private void setTemplate(string settingName, Templates templ, string newValue)
-        {
-            var template = newValue?.Trim();
-            if (templ.IsValid(template))
-                persistentDictionary.SetString(settingName, template);
-        }
-        #endregion
-
-        #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 logging
-        private IConfigurationRoot configuration;
-
-        public void ConfigureLogging()
-        {
-            configuration = new ConfigurationBuilder()
-                .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-                .ReadFrom.Configuration(configuration)
-                .CreateLogger();
-        }
-
-        [Description("The importance of a log event")]
-        public LogEventLevel LogLevel
-        {
-            get
-            {
-                var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
-                return Enum.TryParse<LogEventLevel>(logLevelStr, out var logLevelEnum) ? logLevelEnum : LogEventLevel.Information;
-            }
-            set
-            {
-                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
-                if (!valueWasChanged)
-                {
-                    Log.Logger.Debug("LogLevel.set attempt. No change");
-                    return;
-                }
-
-                configuration.Reload();
-
-                Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
-                {
-                    LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
-                    LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
-                    LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
-                    LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
-                    LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
-                    LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled()
-                });
-            }
-        }
-		#endregion
-
-		#region singleton stuff
-		public static Configuration Instance { get; } = new Configuration();
-        private Configuration() { }
-        #endregion
-
-        #region LibationFiles
-        private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "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;
-
-                // FIRST: must write here before SettingsFilePath in next step reads cache
-                libationFilesPathCache = getLiberationFilesSettingFromJson();
-
-                // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
-                persistentDictionary = new PersistentDictionary(SettingsFilePath);
-
-                // Config init in ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
-                // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
-                var logPath = Path.Combine(LibationFiles, "Log.log");
-
-                // BAD: Serilog.WriteTo[1].Args
-                //      "[1]" assumes ordinal position
-                // GOOD: Serilog.WriteTo[?(@.Name=='File')].Args
-                var jsonpath = "Serilog.WriteTo[?(@.Name=='File')].Args";
-
-                SetWithJsonPath(jsonpath, "path", logPath, true);
-
-                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 void SetLibationFiles(string directory)
-        {
-            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)
-                return;
-
-            // now it's set in the file again but no settings have moved yet
-            File.WriteAllText(APPSETTINGS_JSON, endingContents);
-
-            try
-            {
-                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
-            }
-            catch { }
-        }
-        #endregion
-    }
-}

LibationFileManager/Templates.cs

@@ -1,284 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-using FileManager;
-
-namespace LibationFileManager
-{
-    public abstract class Templates
-    {
-        protected static string[] Valid => Array.Empty<string>();
-        public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
-        public const string ERROR_FULL_PATH_IS_INVALID = @"No colons or full paths allowed. Eg: should not start with C:\";
-        public const string ERROR_INVALID_FILE_NAME_CHAR = @"Only file name friendly characters allowed. Eg: no colons or slashes";
-
-        public const string WARNING_EMPTY = "Template is empty.";
-        public const string WARNING_WHITE_SPACE = "Template is white space.";
-        public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
-        public const string WARNING_HAS_CHAPTER_TAGS = "Chapter tags should only be used in the template used for naming files which are split by chapter. Eg: <ch title>";
-        public const string WARNING_NO_CHAPTER_NUMBER_TAG = "Should include chapter number tag in template used for naming files which are split by chapter. Ie: <ch#> or <ch# 0>";
-
-        public static FolderTemplate Folder { get; } = new FolderTemplate();
-        public static FileTemplate File { get; } = new FileTemplate();
-        public static ChapterFileTemplate ChapterFile { get; } = new ChapterFileTemplate();
-
-        public abstract string Name { get; }
-        public abstract string Description { get; }
-        public abstract string DefaultTemplate { get; }
-        protected abstract bool IsChapterized { get; }
-
-        protected Templates() { }
-
-		#region validation
-		internal string GetValid(string configValue)
-        {
-            var value = configValue?.Trim();
-            return IsValid(value) ? value : DefaultTemplate;
-        }
-
-        public abstract IEnumerable<string> GetErrors(string template);
-        public bool IsValid(string template) => !GetErrors(template).Any();
-
-        public abstract IEnumerable<string> GetWarnings(string template);
-        public bool HasWarnings(string template) => GetWarnings(template).Any();
-
-        protected static string[] GetFileErrors(string template)
-        {
-            // File name only; not path. all other path chars are valid enough to pass this check and will be handled on final save.
-
-            // null is invalid. whitespace is valid but not recommended
-            if (template is null)
-                return new[] { ERROR_NULL_IS_INVALID };
-
-            if (template.Contains(':')
-                || template.Contains(Path.DirectorySeparatorChar)
-                || template.Contains(Path.AltDirectorySeparatorChar)
-                )
-                return new[] { ERROR_INVALID_FILE_NAME_CHAR };
-
-            return Valid;
-        }
-
-        protected IEnumerable<string> GetStandardWarnings(string template)
-        {
-            var warnings = GetErrors(template).ToList();
-            if (template is null)
-                return warnings;
-
-            if (string.IsNullOrEmpty(template))
-                warnings.Add(WARNING_EMPTY);
-            else if (string.IsNullOrWhiteSpace(template))
-                warnings.Add(WARNING_WHITE_SPACE);
-
-            if (TagCount(template) == 0)
-                warnings.Add(WARNING_NO_TAGS);
-
-            if (!IsChapterized && ContainsChapterOnlyTags(template))
-                warnings.Add(WARNING_HAS_CHAPTER_TAGS);
-
-            return warnings;
-        }
-
-        internal int TagCount(string template)
-            => GetTemplateTags()
-            // for <id><id> == 1, use:
-            //   .Count(t => template.Contains($"<{t.TagName}>"))
-            // .Sum() impl: <id><id> == 2
-            .Sum(t => template.Split($"<{t.TagName}>").Length - 1);
-
-        internal static bool ContainsChapterOnlyTags(string template)
-            => TemplateTags.GetAll()
-            .Where(t => t.IsChapterOnly)
-            .Any(t => ContainsTag(template, t.TagName));
-
-        internal static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
-        #endregion
-
-        #region to file name
-        /// <summary>
-        /// EditTemplateDialog: Get template generated filename for portion of path
-        /// </summary>
-        public string GetPortionFilename(LibraryBookDto libraryBookDto, string template)
-            => string.IsNullOrWhiteSpace(template)
-            ? ""
-            : getFileNamingTemplate(libraryBookDto, template, null, null)
-            .GetFilePath();
-
-        private static Regex ifSeriesRegex { get; } = new Regex("<if series->(.*?)<-if series>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        internal static FileNamingTemplate getFileNamingTemplate(LibraryBookDto libraryBookDto, string template, string dirFullPath, string extension)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
-            ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
-
-            dirFullPath = dirFullPath?.Trim() ?? "";
-
-            // for non-series, remove <if series-> and <-if series> tags and everything in between
-            // for series, remove <if series-> and <-if series> tags, what's in between will remain
-            template = ifSeriesRegex.Replace(
-                template,
-                string.IsNullOrWhiteSpace(libraryBookDto.SeriesName) ? "" : "$1");
-
-            var t = template + FileUtility.GetStandardizedExtension(extension);
-            var fullfilename = dirFullPath == "" ? t : Path.Combine(dirFullPath, t);
-
-            var fileNamingTemplate = new FileNamingTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
-
-            var title = libraryBookDto.Title ?? "";
-            var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
-
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Id, libraryBookDto.AudibleProductId);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Title, title);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.TitleShort, titleShort);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Author, libraryBookDto.AuthorNames);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstAuthor, libraryBookDto.FirstAuthor);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Narrator, libraryBookDto.NarratorNames);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBookDto.FirstNarrator);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, libraryBookDto.SeriesNumber);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Account, libraryBookDto.Account);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.Locale, libraryBookDto.Locale);
-
-            return fileNamingTemplate;
-        }
-        #endregion
-
-        public IEnumerable<TemplateTags> GetTemplateTags()
-            => TemplateTags.GetAll()
-            // yeah, this line is a little funky but it works when you think through it. also: trust the unit tests
-            .Where(t => IsChapterized || !t.IsChapterOnly);
-
-        public string Sanitize(string template)
-        {
-            var value = template ?? "";
-
-            // don't use alt slash
-            value = value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-
-            // don't allow double slashes
-            var sing = $"{Path.DirectorySeparatorChar}";
-            var dbl = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-            while (value.Contains(dbl))
-                value = value.Replace(dbl, sing);
-
-            // trim. don't start or end with slash
-            while (true)
-            {
-                var start = value.Length;
-                value = value
-                    .Trim()
-                    .Trim(Path.DirectorySeparatorChar);
-                var end = value.Length;
-                if (start == end)
-                    break;
-            }
-
-            return value;
-        }
-
-        public class FolderTemplate : Templates
-        {
-			public override string Name => "Folder Template";
-            public override string Description => Configuration.GetDescription(nameof(Configuration.FolderTemplate));
-			public override string DefaultTemplate { get; } = "<title short> [<id>]";
-            protected override bool IsChapterized { get; } = false;
-
-            internal FolderTemplate() : base() { }
-
-            #region validation
-            public override IEnumerable<string> GetErrors(string template)
-            {
-                // null is invalid. whitespace is valid but not recommended
-                if (template is null)
-                    return new[] { ERROR_NULL_IS_INVALID };
-
-                // must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
-                if (template.Contains(':'))
-                    return new[] { ERROR_FULL_PATH_IS_INVALID };
-
-                return Valid;
-            }
-            
-            public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
-            #endregion
-
-            #region to file name
-            /// <summary>USES LIVE CONFIGURATION VALUES</summary>
-            public string GetFilename(LibraryBookDto libraryBookDto)
-                => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, AudibleFileStorage.BooksDirectory, null)
-                .GetFilePath();
-            #endregion
-        }
-
-        public class FileTemplate : Templates
-        {
-            public override string Name => "File Template";
-            public override string Description => Configuration.GetDescription(nameof(Configuration.FileTemplate));
-            public override string DefaultTemplate { get; } = "<title> [<id>]";
-            protected override bool IsChapterized { get; } = false;
-
-            internal FileTemplate() : base() { }
-
-            #region validation
-            public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
-
-            public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
-            #endregion
-
-            #region to file name
-            /// <summary>USES LIVE CONFIGURATION VALUES</summary>
-            public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension)
-                => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FileTemplate, dirFullPath, extension)
-                .GetFilePath();
-            #endregion
-        }
-
-        public class ChapterFileTemplate : Templates
-        {
-            public override string Name => "Chapter File Template";
-            public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
-            public override string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
-            protected override bool IsChapterized { get; } = true;
-
-            internal ChapterFileTemplate() : base() { }
-
-            #region validation
-            public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
-
-            public override IEnumerable<string> GetWarnings(string template)
-            {
-                var warnings = GetStandardWarnings(template).ToList();
-                if (template is null)
-                    return warnings;
-
-                // recommended to incl. <ch#> or <ch# 0>
-                if (!ContainsTag(template, TemplateTags.ChNumber.TagName) && !ContainsTag(template, TemplateTags.ChNumber0.TagName))
-                    warnings.Add(WARNING_NO_CHAPTER_NUMBER_TAG);
-
-                return warnings;
-            }
-            #endregion
-
-            #region to file name
-            /// <summary>USES LIVE CONFIGURATION VALUES</summary>
-            public string GetFilename(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
-                => GetPortionFilename(libraryBookDto, Configuration.Instance.ChapterFileTemplate, props, AudibleFileStorage.DecryptInProgressDirectory);
-
-            public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props, string fullDirPath)
-            {
-                var fileNamingTemplate = getFileNamingTemplate(libraryBookDto, template, fullDirPath, Path.GetExtension(props.OutputFileName));
-
-                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
-                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber, props.PartsPosition);
-                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
-                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
-
-                return fileNamingTemplate.GetFilePath();
-            }
-            #endregion
-        }
-    }
-}

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -1,34 +0,0 @@
-using System;
-using DataLayer;
-using LibationFileManager;
-
-namespace LibationWinForms.BookLiberation
-{
-	class AudioConvertForm : AudioDecodeForm
-	{
-		public AudioConvertForm()
-		{
-			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
-			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-		}
-
-		#region AudioDecodeForm overrides
-		public override string DecodeActionName => "Converting";
-		#endregion
-
-		#region Processable event handler overrides
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			LogMe.Info($"Convert Step, Begin: {libraryBook.Book}");
-
-			base.Processable_Begin(sender, libraryBook);
-		}
-		public override void Processable_Completed(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Completed(sender, libraryBook);
-			LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-		}
-
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/AudioDecodeForm.Designer.cs

@@ -1,104 +0,0 @@
-namespace LibationWinForms.BookLiberation
-{
-    partial class AudioDecodeForm
-    {
-        /// <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.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, 143);
-			this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.progressBar1.Name = "progressBar1";
-			this.progressBar1.Size = new System.Drawing.Size(611, 27);
-			this.progressBar1.TabIndex = 2;
-			// 
-			// 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, 143);
-			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, 183);
-			this.Controls.Add(this.remainingTimeLbl);
-			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";
-			((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.Label remainingTimeLbl;
-    }
-}

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -1,117 +0,0 @@
-using System;
-using DataLayer;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using LibationFileManager;
-using LibationWinForms.BookLiberation.BaseForms;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class AudioDecodeForm : LiberationBaseForm
-	{
-		public virtual string DecodeActionName { get; } = "Decoding";
-		public AudioDecodeForm() => InitializeComponent();
-
-		private Func<byte[]> GetCoverArtDelegate;
-
-		// book info
-		private string title;
-		private string authorNames;
-		private string narratorNames;
-
-		#region Processable event handler overrides
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Begin(sender, libraryBook);
-
-			GetCoverArtDelegate = () => PictureStorage.GetPictureSynchronously(
-						new PictureDefinition(
-							libraryBook.Book.PictureId,
-							PictureSize._500x500));
-
-			//Set default values from library
-			AudioDecodable_TitleDiscovered(sender, libraryBook.Book.Title);
-			AudioDecodable_AuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
-			AudioDecodable_NarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
-			AudioDecodable_CoverImageDiscovered(sender,
-					PictureStorage.GetPicture(
-						new PictureDefinition(
-							libraryBook.Book.PictureId,
-							PictureSize._80x80)).bytes);
-		}
-		#endregion
-
-		#region Streamable event handler overrides
-		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
-		{
-			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
-			if (!downloadProgress.ProgressPercentage.HasValue)
-				return;
-
-			if (downloadProgress.ProgressPercentage == 0)
-				updateRemainingTime(0);
-			else
-				progressBar1.UIThreadAsync(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
-		}
-
-		public override void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining)
-		{
-			base.Streamable_StreamingTimeRemaining(sender, timeRemaining);
-			updateRemainingTime((int)timeRemaining.TotalSeconds);
-		}
-
-		#endregion
-
-		#region AudioDecodable event handlers
-		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-		{
-			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
-			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
-		}
-
-		public override void AudioDecodable_TitleDiscovered(object sender, string title)
-		{
-			base.AudioDecodable_TitleDiscovered(sender, title);
-			this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
-			this.title = title;
-			updateBookInfo();
-		}
-
-		public override void AudioDecodable_AuthorsDiscovered(object sender, string authors)
-		{
-			base.AudioDecodable_AuthorsDiscovered(sender, authors);
-			authorNames = authors;
-			updateBookInfo();
-		}
-
-		public override void AudioDecodable_NarratorsDiscovered(object sender, string narrators)
-		{
-			base.AudioDecodable_NarratorsDiscovered(sender, narrators);
-			narratorNames = narrators;
-			updateBookInfo();
-		}
-
-		public override void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
-		{
-			base.AudioDecodable_CoverImageDiscovered(sender, coverArt);
-			pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
-		}
-		#endregion
-
-		// thread-safe UI updates
-		private void updateBookInfo()
-			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
-
-		private void updateRemainingTime(int remaining)
-			=> remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{formatTime(remaining)}");
-
-		private string formatTime(int seconds)
-		{
-			var timeSpan = new TimeSpan(0, 0, seconds);
-			return
-				timeSpan.TotalHours >= 1 ? $"{timeSpan:%h}h {timeSpan:mm}m {timeSpan:ss}s"
-				: timeSpan.TotalMinutes >= 1 ? $"{timeSpan:%m}m {timeSpan:ss}s"
-				: $"{seconds} sec";
-		}
-	}
-}

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -1,34 +0,0 @@
-using System;
-using DataLayer;
-using LibationFileManager;
-
-namespace LibationWinForms.BookLiberation
-{
-	class AudioDecryptForm : AudioDecodeForm
-	{
-		public AudioDecryptForm()
-		{
-			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
-			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-		}
-
-		#region AudioDecodeForm overrides
-		public override string DecodeActionName => "Decrypting";
-		#endregion
-
-		#region Processable event handler overrides
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			LogMe.Info($"Download & Decrypt Step, Begin: {libraryBook.Book}");
-
-			base.Processable_Begin(sender, libraryBook);
-		}
-		public override void Processable_Completed(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Completed(sender, libraryBook);
-			LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-		}
-
-		#endregion
-	}
-}

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.Threading;
-
-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.UIThreadAsync(() => 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/BaseForms/LiberationBaseForm.cs

@@ -1,162 +0,0 @@
-using System;
-using System.Windows.Forms;
-using DataLayer;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using FileLiberator;
-
-namespace LibationWinForms.BookLiberation.BaseForms
-{
-	public class LiberationBaseForm : Form
-	{
-		protected Streamable Streamable { get; private set; }
-		protected LogMe LogMe { get; private set; }
-		private SynchronizeInvoker Invoker { get; init; } 
-
-		public LiberationBaseForm()
-		{
-			//SynchronizationContext.Current will be null until the process contains a Form.
-			//If this is the first form created, it will not exist until after execution
-			//reaches inside the constructor (after base class has been initialized).
-			Invoker = new SynchronizeInvoker();
-		}
-
-		public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null)
-		{
-			if (streamable is null) return;
-
-			Streamable = streamable;
-			LogMe = logMe;
-
-			Subscribe(streamable);
-
-			if (Streamable is Processable processable)
-				Subscribe(processable);
-			if (Streamable is AudioDecodable audioDecodable)
-				Subscribe(audioDecodable);
-		}
-
-		#region Event Subscribers and Unsubscribers
-		private void Subscribe(Streamable streamable)
-		{
-			UnsubscribeStreamable(this, EventArgs.Empty);
-
-			streamable.StreamingBegin += OnStreamingBeginShow;
-			streamable.StreamingBegin += Streamable_StreamingBegin;
-			streamable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
-			streamable.StreamingTimeRemaining += Streamable_StreamingTimeRemaining;
-			streamable.StreamingCompleted += Streamable_StreamingCompleted;
-			streamable.StreamingCompleted += OnStreamingCompletedClose;
-
-			Disposed += UnsubscribeStreamable;
-		}
-		private void Subscribe(Processable processable)
-		{
-			UnsubscribeProcessable(this, null);
-
-			processable.Begin += Processable_Begin;
-			processable.StatusUpdate += Processable_StatusUpdate;
-			processable.Completed += Processable_Completed;
-
-			//The form is created on Processable.Begin and we
-			//dispose of it on Processable.Completed
-			processable.Completed += OnCompletedDispose;
-
-			//Don't unsubscribe from Dispose because it fires when
-			//Streamable.StreamingCompleted closes the form, and
-			//the Processable events need to live past that event.
-			processable.Completed += UnsubscribeProcessable;
-		}
-		private void Subscribe(AudioDecodable audioDecodable)
-		{
-			UnsubscribeAudioDecodable(this, EventArgs.Empty);
-
-			audioDecodable.RequestCoverArt += AudioDecodable_RequestCoverArt;
-			audioDecodable.TitleDiscovered += AudioDecodable_TitleDiscovered;
-			audioDecodable.AuthorsDiscovered += AudioDecodable_AuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered += AudioDecodable_NarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered += AudioDecodable_CoverImageDiscovered;
-
-			Disposed += UnsubscribeAudioDecodable;
-		}
-		private void UnsubscribeStreamable(object sender, EventArgs e)
-		{
-			Disposed -= UnsubscribeStreamable;
-
-			Streamable.StreamingBegin -= OnStreamingBeginShow;
-			Streamable.StreamingBegin -= Streamable_StreamingBegin;
-			Streamable.StreamingProgressChanged -= Streamable_StreamingProgressChanged;
-			Streamable.StreamingTimeRemaining -= Streamable_StreamingTimeRemaining;
-			Streamable.StreamingCompleted -= Streamable_StreamingCompleted;
-			Streamable.StreamingCompleted -= OnStreamingCompletedClose;
-		}
-		private void UnsubscribeProcessable(object sender, LibraryBook e)
-		{
-			if (Streamable is not Processable processable)
-				return;
-
-			processable.Completed -= UnsubscribeProcessable;
-			processable.Completed -= OnCompletedDispose;
-			processable.Completed -= Processable_Completed;
-			processable.StatusUpdate -= Processable_StatusUpdate;
-			processable.Begin -= Processable_Begin;
-		}
-		private void UnsubscribeAudioDecodable(object sender, EventArgs e)
-		{
-			if (Streamable is not AudioDecodable audioDecodable)
-				return;
-
-			Disposed -= UnsubscribeAudioDecodable;
-			audioDecodable.RequestCoverArt -= AudioDecodable_RequestCoverArt;
-			audioDecodable.TitleDiscovered -= AudioDecodable_TitleDiscovered;
-			audioDecodable.AuthorsDiscovered -= AudioDecodable_AuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered -= AudioDecodable_NarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered -= AudioDecodable_CoverImageDiscovered;
-
-			audioDecodable.Cancel();
-		}
-		#endregion
-
-		#region Form creation and disposal handling
-
-		/// <summary>
-		/// If the form was shown using Show (not ShowDialog), Form.Close calls Form.Dispose
-		/// </summary>
-		private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThreadAsync(Close);
-		private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThreadAsync(Dispose);
-
-		/// <summary>
-		/// If StreamingBegin is fired from a worker thread, the window will be created on that
-		/// worker thread. We need to make certain that we show the window on the UI thread (same 
-		/// thread that created form), otherwise the renderer will be on a worker thread which 
-		/// could cause it to freeze. Form.BeginInvoke won't work until the form is created 
-		/// (ie. shown) because Control doesn't get a window handle until it is Shown.
-		/// </summary>
-		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThreadAsync(Show);
-
-		#endregion
-
-		#region Streamable event handlers
-		public virtual void Streamable_StreamingBegin(object sender, string beginString) { }
-		public virtual void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
-		public virtual void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
-		public virtual void Streamable_StreamingCompleted(object sender, string completedString) { }
-
-		#endregion
-
-		#region Processable event handlers
-		public virtual void Processable_Begin(object sender, LibraryBook libraryBook) { }
-		public virtual void Processable_StatusUpdate(object sender, string statusUpdate) { }
-		public virtual void Processable_Completed(object sender, LibraryBook libraryBook) { }
-
-		#endregion
-
-		#region AudioDecodable event handlers
-		public virtual void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
-		public virtual void AudioDecodable_TitleDiscovered(object sender, string title) { }
-		public virtual void AudioDecodable_AuthorsDiscovered(object sender, string authors) { }
-		public virtual void AudioDecodable_NarratorsDiscovered(object sender, string narrators) { }
-		public virtual void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt) { }
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/DownloadForm.Designer.cs

@@ -1,109 +0,0 @@
-using DataLayer;
-using System;
-
-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,67 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using LibationWinForms.BookLiberation.BaseForms;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class DownloadForm : LiberationBaseForm
-	{
-		public DownloadForm()
-		{
-			InitializeComponent();
-
-			progressLbl.Text = "";
-			filenameLbl.Text = "";
-		}
-
-
-		#region Streamable event handler overrides
-		public override void Streamable_StreamingBegin(object sender, string beginString)
-		{
-			base.Streamable_StreamingBegin(sender, beginString);
-			filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
-		}
-		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
-		{
-			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
-			// this won't happen with download file. it will happen with download string
-			if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
-				return;
-
-			progressLbl.UIThreadAsync(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
-
-			var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
-			var i = int.Parse(Math.Truncate(d).ToString());
-			progressBar1.UIThreadAsync(() => progressBar1.Value = i);
-
-			lastDownloadProgress = DateTime.Now;
-		}
-		#endregion
-
-		#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.UIThreadAsync(() => 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.UIThreadAsync(() => 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,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

LibationWinForms/BookLiberation/PdfDownloadForm.cs

@@ -1,18 +0,0 @@
-using DataLayer;
-
-namespace LibationWinForms.BookLiberation
-{
-	internal class PdfDownloadForm : DownloadForm
-	{
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Begin(sender, libraryBook);
-			LogMe.Info($"PDF Step, Begin: {libraryBook.Book}");
-		}
-		public override void Processable_Completed(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Completed(sender, libraryBook);
-			LogMe.Info($"PDF Step, Completed: {libraryBook.Book}");
-		}
-	}
-}

LibationWinForms/BookLiberation/PdfDownloadForm.resx

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root> 
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,336 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DataLayer;
-using Dinah.Core;
-using FileLiberator;
-using LibationFileManager;
-using LibationWinForms.BookLiberation.BaseForms;
-
-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(LibraryBook libraryBook)
-		{
-			Serilog.Log.Logger.Information($"Begin {nameof(BackupSingleBookAsync)} {{@DebugInfo}}", new { libraryBook?.Book?.AudibleProductId });
-
-			var logMe = LogMe.RegisterForm();
-			var backupBook = CreateBackupBook(logMe);
-
-			// continue even if libraryBook is null. we'll display even that in the processing box
-			await new BackupSingle(logMe, backupBook, libraryBook).RunBackupAsync();
-		}
-
-		public static async Task BackupAllBooksAsync()
-		{
-			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
-
-			var automatedBackupsForm = new AutomatedBackupsForm();
-			var logMe = LogMe.RegisterForm(automatedBackupsForm);
-			var backupBook = CreateBackupBook(logMe);
-
-			await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
-		}
-
-		public static async Task ConvertAllBooksAsync()
-		{
-			Serilog.Log.Logger.Information("Begin " + nameof(ConvertAllBooksAsync));
-
-			var automatedBackupsForm = new AutomatedBackupsForm();
-			var logMe = LogMe.RegisterForm(automatedBackupsForm);
-
-			var convertBook = CreateProcessable<ConvertToMp3, AudioConvertForm>(logMe);
-
-			await new BackupLoop(logMe, convertBook, automatedBackupsForm).RunBackupAsync();
-		}
-
-		public static async Task BackupAllPdfsAsync()
-		{
-			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
-
-			var automatedBackupsForm = new AutomatedBackupsForm();
-			var logMe = LogMe.RegisterForm(automatedBackupsForm);
-
-			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
-
-			await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
-		}
-
-		private static Processable CreateBackupBook(LogMe logMe)
-		{
-			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
-
-			//Chain pdf download on DownloadDecryptBook.Completed
-			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
-			{
-				await downloadPdf.TryProcessAsync(e);
-			}
-
-			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook, AudioDecryptForm>(logMe, onDownloadDecryptBookCompleted);
-			return downloadDecryptBook;
-		}
-
-		public static void DownloadFile(string url, string destination, bool showDownloadCompletedDialog = false)
-		{
-			Serilog.Log.Logger.Information($"Begin {nameof(DownloadFile)} for {url}");
-
-			void onDownloadFileStreamingCompleted(object sender, string savedFile)
-			{
-				Serilog.Log.Logger.Information($"Completed {nameof(DownloadFile)} for {url}. Saved to {savedFile}");
-
-				if (showDownloadCompletedDialog)
-					MessageBox.Show($"File downloaded to:{Environment.NewLine}{Environment.NewLine}{savedFile}");
-			}
-
-			var downloadFile = new DownloadFile();
-			var downloadForm = new DownloadForm();
-			downloadForm.RegisterFileLiberator(downloadFile);
-			downloadFile.StreamingCompleted += onDownloadFileStreamingCompleted;
-
-			async void runDownload() => await downloadFile.PerformDownloadFileAsync(url, destination);
-			new Task(runDownload).Start();
-		}
-
-		/// <summary>
-		/// Create a new <see cref="Processable"/> and links it to a new <see cref="LiberationBaseForm"/>.
-		/// </summary>
-		/// <typeparam name="TProcessable">The <see cref="Processable"/> derived type to create.</typeparam>
-		/// <typeparam name="TForm">The <see cref="LiberationBaseForm"/> derived Form to create on <see cref="Processable.Begin"/>, Show on <see cref="Streamable.StreamingBegin"/>, Close on <see cref="Streamable.StreamingCompleted"/>, and Dispose on <see cref="Processable.Completed"/> </typeparam>
-		/// <param name="logMe">The logger</param>
-		/// <param name="completedAction">An additional event handler to handle <see cref="Processable.Completed"/></param>
-		/// <returns>A new <see cref="Processable"/> of type <typeparamref name="TProcessable"/></returns>
-		private static TProcessable CreateProcessable<TProcessable, TForm>(LogMe logMe, EventHandler<LibraryBook> completedAction = null)
-			where TForm : LiberationBaseForm, new()
-			where TProcessable : Processable, new()
-		{
-			var strProc = new TProcessable();
-
-			strProc.Begin += (sender, libraryBook) =>
-			{
-				var processForm = new TForm();
-				processForm.RegisterFileLiberator(strProc, logMe);
-				processForm.Processable_Begin(sender, libraryBook);
-			};
-
-			strProc.Completed += completedAction;
-
-			return strProc;
-		}
-	}
-
-	internal abstract class BackupRunner
-	{
-		protected LogMe LogMe { get; }
-		protected Processable Processable { get; }
-		protected AutomatedBackupsForm AutomatedBackupsForm { get; }
-
-		protected BackupRunner(LogMe logMe, Processable 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 MessageBoxDefaultButton SkipDialogDefaultButton { get; }
-		protected abstract DialogResult SkipResult { 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(LibraryBook libraryBook, bool validate)
-		{
-			try
-			{
-				var statusHandler = await Processable.ProcessSingleAsync(libraryBook, validate);
-
-				if (statusHandler.IsSuccess)
-					return true;
-
-				foreach (var errorMessage in statusHandler.Errors)
-					LogMe.Error(errorMessage);
-			}
-			catch (Exception ex)
-			{
-				LogMe.Error(ex);
-			}
-
-			return showRetry(libraryBook);
-		}
-
-		private bool showRetry(LibraryBook libraryBook)
-		{
-			LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
-
-			DialogResult? dialogResult = Configuration.Instance.BadBook switch
-			{
-				Configuration.BadBookAction.Abort => DialogResult.Abort,
-				Configuration.BadBookAction.Retry => DialogResult.Retry,
-				Configuration.BadBookAction.Ignore => DialogResult.Ignore,
-				Configuration.BadBookAction.Ask => null,
-				_ => null
-			};
-
-			string details;
-			try
-			{
-				static string trunc(string str)
-					=> string.IsNullOrWhiteSpace(str) ? "[empty]"
-					: (str.Length > 50) ? $"{str.Truncate(47)}..."
-					: str;
-
-				details =
-$@"  Title: {libraryBook.Book.Title}
-  ID: {libraryBook.Book.AudibleProductId}
-  Author: {trunc(libraryBook.Book.AuthorNames)}
-  Narr: {trunc(libraryBook.Book.NarratorNames)}";
-			}
-			catch
-			{
-				details = "[Error retrieving details]";
-			}
-
-			// if null then ask user
-			dialogResult ??= MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
-
-			if (dialogResult == DialogResult.Abort)
-				return false;
-
-			if (dialogResult == SkipResult)
-			{
-				libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
-				LogMe.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
-			}
-
-			return true;
-		}
-	}
-
-	internal class BackupSingle : BackupRunner
-	{
-		private LibraryBook _libraryBook { get; }
-
-		protected override string SkipDialogText => @"
-An error occurred while trying to process this book. Skip this book permanently?
-{0}
-
-- Click YES to skip this book permanently.
-
-- Click NO to skip the book this time only. We'll try again later.
-".Trim();
-		protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.YesNo;
-		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button2;
-		protected override DialogResult SkipResult => DialogResult.Yes;
-
-		public BackupSingle(LogMe logMe, Processable processable, LibraryBook libraryBook)
-			: base(logMe, processable)
-		{
-			_libraryBook = libraryBook;
-		}
-
-		protected override async Task RunAsync()
-		{
-			if (_libraryBook is not null)
-				await ProcessOneAsync(_libraryBook, validate: true);
-		}
-	}
-
-	internal class BackupLoop : BackupRunner
-	{
-		protected override string SkipDialogText => @"
-An error occurred while trying to process this book.
-{0}
-
-- 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 MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
-		protected override DialogResult SkipResult => DialogResult.Ignore;
-
-		public BackupLoop(LogMe logMe, Processable 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(ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking()))
-			{
-				var keepGoing = await ProcessOneAsync(libraryBook, validate: false);
-				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/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 AudibleUtilities;
-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) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(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,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -1,189 +0,0 @@
-
-namespace LibationWinForms.Dialogs
-{
-    partial class RemoveBooksDialog
-    {
-        /// <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.components = new System.ComponentModel.Container();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-			this._dataGridView = new System.Windows.Forms.DataGridView();
-			this.removeDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.coverDataGridViewImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
-			this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
-			this.btnRemoveBooks = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// _dataGridView
-			// 
-			this._dataGridView.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._dataGridView.AutoGenerateColumns = false;
-			this._dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this._dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.removeDataGridViewCheckBoxColumn,
-            this.coverDataGridViewImageColumn,
-            this.titleDataGridViewTextBoxColumn,
-            this.authorsDataGridViewTextBoxColumn,
-            this.miscDataGridViewTextBoxColumn,
-            this.purchaseDateGridViewTextBoxColumn});
-			this._dataGridView.DataSource = this.gridEntryBindingSource;
-			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-			dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-			dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this._dataGridView.DefaultCellStyle = dataGridViewCellStyle1;
-			this._dataGridView.Location = new System.Drawing.Point(0, 0);
-			this._dataGridView.Name = "_dataGridView";
-			this._dataGridView.RowHeadersVisible = false;
-			this._dataGridView.RowTemplate.Height = 82;
-			this._dataGridView.Size = new System.Drawing.Size(730, 409);
-			this._dataGridView.TabIndex = 0;
-			// 
-			// removeDataGridViewCheckBoxColumn
-			// 
-			this.removeDataGridViewCheckBoxColumn.DataPropertyName = "Remove";
-			this.removeDataGridViewCheckBoxColumn.FalseValue = "False";
-			this.removeDataGridViewCheckBoxColumn.Frozen = true;
-			this.removeDataGridViewCheckBoxColumn.HeaderText = "Remove";
-			this.removeDataGridViewCheckBoxColumn.MinimumWidth = 80;
-			this.removeDataGridViewCheckBoxColumn.Name = "removeDataGridViewCheckBoxColumn";
-			this.removeDataGridViewCheckBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-			this.removeDataGridViewCheckBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.removeDataGridViewCheckBoxColumn.TrueValue = "True";
-			this.removeDataGridViewCheckBoxColumn.Width = 80;
-			// 
-			// coverDataGridViewImageColumn
-			// 
-			this.coverDataGridViewImageColumn.DataPropertyName = "Cover";
-			this.coverDataGridViewImageColumn.HeaderText = "Cover";
-			this.coverDataGridViewImageColumn.MinimumWidth = 80;
-			this.coverDataGridViewImageColumn.Name = "coverDataGridViewImageColumn";
-			this.coverDataGridViewImageColumn.ReadOnly = true;
-			this.coverDataGridViewImageColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-			this.coverDataGridViewImageColumn.Width = 80;
-			// 
-			// titleDataGridViewTextBoxColumn
-			// 
-			this.titleDataGridViewTextBoxColumn.DataPropertyName = "Title";
-			this.titleDataGridViewTextBoxColumn.HeaderText = "Title";
-			this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn";
-			this.titleDataGridViewTextBoxColumn.ReadOnly = true;
-			this.titleDataGridViewTextBoxColumn.Width = 200;
-			// 
-			// authorsDataGridViewTextBoxColumn
-			// 
-			this.authorsDataGridViewTextBoxColumn.DataPropertyName = "Authors";
-			this.authorsDataGridViewTextBoxColumn.HeaderText = "Authors";
-			this.authorsDataGridViewTextBoxColumn.Name = "authorsDataGridViewTextBoxColumn";
-			this.authorsDataGridViewTextBoxColumn.ReadOnly = true;
-			// 
-			// miscDataGridViewTextBoxColumn
-			// 
-			this.miscDataGridViewTextBoxColumn.DataPropertyName = "Misc";
-			this.miscDataGridViewTextBoxColumn.HeaderText = "Misc";
-			this.miscDataGridViewTextBoxColumn.Name = "miscDataGridViewTextBoxColumn";
-			this.miscDataGridViewTextBoxColumn.ReadOnly = true;
-			this.miscDataGridViewTextBoxColumn.Width = 150;
-			// 
-			// purchaseDateGridViewTextBoxColumn
-			// 
-			this.purchaseDateGridViewTextBoxColumn.DataPropertyName = "PurchaseDate";
-			this.purchaseDateGridViewTextBoxColumn.HeaderText = "Purchase Date";
-			this.purchaseDateGridViewTextBoxColumn.Name = "purchaseDateGridViewTextBoxColumn";
-			this.purchaseDateGridViewTextBoxColumn.ReadOnly = true;
-			this.purchaseDateGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-			// 
-			// gridEntryBindingSource
-			// 
-			this.gridEntryBindingSource.AllowNew = false;
-			this.gridEntryBindingSource.DataSource = typeof(LibationWinForms.Dialogs.RemovableGridEntry);
-			// 
-			// btnRemoveBooks
-			// 
-			this.btnRemoveBooks.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.btnRemoveBooks.Location = new System.Drawing.Point(500, 419);
-			this.btnRemoveBooks.Name = "btnRemoveBooks";
-			this.btnRemoveBooks.Size = new System.Drawing.Size(218, 23);
-			this.btnRemoveBooks.TabIndex = 1;
-			this.btnRemoveBooks.Text = "Remove Selected Books from Libation";
-			this.btnRemoveBooks.UseVisualStyleBackColor = true;
-			this.btnRemoveBooks.Click += new System.EventHandler(this.btnRemoveBooks_Click);
-			// 
-			// label1
-			// 
-			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 423);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(178, 15);
-			this.label1.TabIndex = 2;
-			this.label1.Text = "{0} book{1} selected for removal.";
-			// 
-			// RemoveBooksDialog
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(730, 450);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.btnRemoveBooks);
-			this.Controls.Add(this._dataGridView);
-			this.Name = "RemoveBooksDialog";
-			this.Text = "RemoveBooksDialog";
-			this.Shown += new System.EventHandler(this.RemoveBooksDialog_Shown);
-			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.DataGridView _dataGridView;
-        private LibationWinForms.SyncBindingSource gridEntryBindingSource;
-        private System.Windows.Forms.Button btnRemoveBooks;
-        private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;
-		private System.Windows.Forms.DataGridViewImageColumn coverDataGridViewImageColumn;
-		private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
-		private System.Windows.Forms.DataGridViewTextBoxColumn authorsDataGridViewTextBoxColumn;
-		private System.Windows.Forms.DataGridViewTextBoxColumn miscDataGridViewTextBoxColumn;
-		private System.Windows.Forms.DataGridViewTextBoxColumn purchaseDateGridViewTextBoxColumn;
-	}
-}

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -1,172 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Linq;
-using System.Windows.Forms;
-using ApplicationServices;
-using AudibleUtilities;
-using DataLayer;
-using Dinah.Core.DataBinding;
-using LibationFileManager;
-using LibationWinForms.Login;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class RemoveBooksDialog : Form
-	{
-		private Account[] _accounts { get; }
-		private readonly List<LibraryBook> _libraryBooks;
-		private readonly SortableBindingList<RemovableGridEntry> _removableGridEntries;
-		private readonly string _labelFormat;
-		private int SelectedCount => SelectedEntries?.Count() ?? 0;
-		private IEnumerable<RemovableGridEntry> SelectedEntries => _removableGridEntries?.Where(b => b.Remove);
-
-		public RemoveBooksDialog(params Account[] accounts)
-		{
-			_libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
-			_accounts = accounts;
-
-			InitializeComponent();
-
-			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
-			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-
-			_labelFormat = label1.Text;
-
-			_dataGridView.CellContentClick += (_, _) => _dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
-			_dataGridView.CellValueChanged += (_, _) => UpdateSelection();
-			_dataGridView.BindingContextChanged += _dataGridView_BindingContextChanged;
-
-			var orderedGridEntries = _libraryBooks
-				.Select(lb => new RemovableGridEntry(lb))
-				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
-				.ToList();
-
-			_removableGridEntries = new SortableBindingList<RemovableGridEntry>(orderedGridEntries);
-			gridEntryBindingSource.DataSource = _removableGridEntries;
-
-			_dataGridView.Enabled = false;
-		}
-
-		private void _dataGridView_BindingContextChanged(object sender, EventArgs e)
-		{
-			_dataGridView.Sort(_dataGridView.Columns[0], ListSortDirection.Descending);
-			UpdateSelection();
-		}
-
-		private async void RemoveBooksDialog_Shown(object sender, EventArgs e)
-		{
-			if (_accounts == null || _accounts.Length == 0)
-				return;
-			try
-			{
-				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _libraryBooks, _accounts);
-
-				var removable = _removableGridEntries.Where(rge => removedBooks.Any(rb => rb.Book.AudibleProductId == rge.AudibleProductId)).ToList();
-
-				if (!removable.Any())
-					return;
-
-				foreach (var r in removable)
-					r.Remove = true;
-
-				UpdateSelection();
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show(
-					"Error scanning library. You may still manually select books to remove from Libation's library.",
-					"Error scanning library",
-					ex);
-			}
-			finally
-			{
-				_dataGridView.Enabled = true;
-			}
-		}
-
-		private async void btnRemoveBooks_Click(object sender, EventArgs e)
-		{
-			var selectedBooks = SelectedEntries.ToList();
-
-			if (selectedBooks.Count == 0)
-				return;
-
-			var titles = selectedBooks.Select(rge => "- " + rge.Title).ToList();
-			var titlesAgg = titles.Take(5).Aggregate((a, b) => $"{a}\r\n{b}");
-			if (titles.Count == 6)
-				titlesAgg += $"\r\n\r\nand 1 other";
-			else if (titles.Count > 6)
-				titlesAgg += $"\r\n\r\nand {titles.Count - 5} others";
-
-			string thisThese = selectedBooks.Count > 1 ? "these" : "this";
-			string bookBooks = selectedBooks.Count > 1 ? "books" : "book";
-
-			var result = MessageBox.Show(
-				this,
-				$"Are you sure you want to remove {thisThese} {selectedBooks.Count} {bookBooks} from Libation's library?\r\n\r\n{titlesAgg}",
-				"Remove books from Libation?",
-				MessageBoxButtons.YesNo,
-				MessageBoxIcon.Question,
-				MessageBoxDefaultButton.Button1);
-
-			if (result == DialogResult.Yes)
-			{
-				var idsToRemove = selectedBooks.Select(rge => rge.AudibleProductId).ToList();
-				var removeLibraryBooks = await LibraryCommands.RemoveBooksAsync(idsToRemove);
-
-				foreach (var rEntry in selectedBooks)
-					_removableGridEntries.Remove(rEntry);
-
-				UpdateSelection();
-			}
-		}
-
-		private void UpdateSelection()
-		{
-			var selectedCount = SelectedCount;
-			label1.Text = string.Format(_labelFormat, selectedCount, selectedCount != 1 ? "s" : string.Empty);
-			btnRemoveBooks.Enabled = selectedCount > 0;
-		}
-	}
-
-	internal class RemovableGridEntry : GridEntry
-	{
-		private static readonly IComparer BoolComparer = new ObjectComparer<bool>();
-
-		private bool _remove = false;
-		public RemovableGridEntry(LibraryBook libraryBook) : base(libraryBook) { }
-
-		public bool Remove
-		{
-			get
-			{
-				return _remove;
-			}
-			set
-			{
-				if (_remove != value)
-				{
-					_remove = value;
-					NotifyPropertyChanged();
-				}
-			}
-		}
-
-		public override object GetMemberValue(string memberName)
-		{
-			if (memberName == nameof(Remove))
-				return Remove;
-			return base.GetMemberValue(memberName);
-		}
-
-		public override IComparer GetMemberComparer(Type memberType)
-		{
-			if (memberType == typeof(bool))
-				return BoolComparer;
-			return base.GetMemberComparer(memberType);
-		}
-	}
-}

LibationWinForms/Dialogs/RemoveBooksDialog.resx

@@ -1,63 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="gridEntryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -1,585 +0,0 @@
-namespace LibationWinForms.Dialogs
-{
-	partial class SettingsDialog
-	{
-		/// <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.booksLocationDescLbl = new System.Windows.Forms.Label();
-            this.inProgressDescLbl = new System.Windows.Forms.Label();
-            this.saveBtn = new System.Windows.Forms.Button();
-            this.cancelBtn = new System.Windows.Forms.Button();
-            this.importEpisodesCb = new System.Windows.Forms.CheckBox();
-            this.downloadEpisodesCb = new System.Windows.Forms.CheckBox();
-            this.badBookGb = new System.Windows.Forms.GroupBox();
-            this.badBookIgnoreRb = new System.Windows.Forms.RadioButton();
-            this.badBookRetryRb = new System.Windows.Forms.RadioButton();
-            this.badBookAbortRb = new System.Windows.Forms.RadioButton();
-            this.badBookAskRb = new System.Windows.Forms.RadioButton();
-            this.decryptAndConvertGb = new System.Windows.Forms.GroupBox();
-            this.splitFilesByChapterCbox = new System.Windows.Forms.CheckBox();
-            this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
-            this.convertLossyRb = new System.Windows.Forms.RadioButton();
-            this.convertLosslessRb = new System.Windows.Forms.RadioButton();
-            this.inProgressSelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
-            this.logsBtn = new System.Windows.Forms.Button();
-            this.booksSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
-            this.loggingLevelLbl = new System.Windows.Forms.Label();
-            this.loggingLevelCb = new System.Windows.Forms.ComboBox();
-            this.tabControl = new System.Windows.Forms.TabControl();
-            this.tab1ImportantSettings = new System.Windows.Forms.TabPage();
-            this.booksGb = new System.Windows.Forms.GroupBox();
-            this.tab2ImportLibrary = new System.Windows.Forms.TabPage();
-            this.tab3DownloadDecrypt = new System.Windows.Forms.TabPage();
-            this.inProgressFilesGb = new System.Windows.Forms.GroupBox();
-            this.customFileNamingGb = new System.Windows.Forms.GroupBox();
-            this.chapterFileTemplateBtn = new System.Windows.Forms.Button();
-            this.chapterFileTemplateTb = new System.Windows.Forms.TextBox();
-            this.chapterFileTemplateLbl = new System.Windows.Forms.Label();
-            this.fileTemplateBtn = new System.Windows.Forms.Button();
-            this.fileTemplateTb = new System.Windows.Forms.TextBox();
-            this.fileTemplateLbl = new System.Windows.Forms.Label();
-            this.folderTemplateBtn = new System.Windows.Forms.Button();
-            this.folderTemplateTb = new System.Windows.Forms.TextBox();
-            this.folderTemplateLbl = new System.Windows.Forms.Label();
-            this.showImportedStatsCb = new System.Windows.Forms.CheckBox();
-            this.badBookGb.SuspendLayout();
-            this.decryptAndConvertGb.SuspendLayout();
-            this.tabControl.SuspendLayout();
-            this.tab1ImportantSettings.SuspendLayout();
-            this.booksGb.SuspendLayout();
-            this.tab2ImportLibrary.SuspendLayout();
-            this.tab3DownloadDecrypt.SuspendLayout();
-            this.inProgressFilesGb.SuspendLayout();
-            this.customFileNamingGb.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // booksLocationDescLbl
-            // 
-            this.booksLocationDescLbl.AutoSize = true;
-            this.booksLocationDescLbl.Location = new System.Drawing.Point(7, 19);
-            this.booksLocationDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.booksLocationDescLbl.Name = "booksLocationDescLbl";
-            this.booksLocationDescLbl.Size = new System.Drawing.Size(69, 15);
-            this.booksLocationDescLbl.TabIndex = 1;
-            this.booksLocationDescLbl.Text = "[book desc]";
-            // 
-            // inProgressDescLbl
-            // 
-            this.inProgressDescLbl.AutoSize = true;
-            this.inProgressDescLbl.Location = new System.Drawing.Point(7, 19);
-            this.inProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.inProgressDescLbl.Name = "inProgressDescLbl";
-            this.inProgressDescLbl.Size = new System.Drawing.Size(100, 45);
-            this.inProgressDescLbl.TabIndex = 18;
-            this.inProgressDescLbl.Text = "[in progress desc]\r\n[line 2]\r\n[line 3]";
-            // 
-            // saveBtn
-            // 
-            this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.saveBtn.Location = new System.Drawing.Point(714, 496);
-            this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.saveBtn.Name = "saveBtn";
-            this.saveBtn.Size = new System.Drawing.Size(88, 27);
-            this.saveBtn.TabIndex = 98;
-            this.saveBtn.Text = "Save";
-            this.saveBtn.UseVisualStyleBackColor = true;
-            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
-            // 
-            // cancelBtn
-            // 
-            this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelBtn.Location = new System.Drawing.Point(832, 496);
-            this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.cancelBtn.Name = "cancelBtn";
-            this.cancelBtn.Size = new System.Drawing.Size(88, 27);
-            this.cancelBtn.TabIndex = 99;
-            this.cancelBtn.Text = "Cancel";
-            this.cancelBtn.UseVisualStyleBackColor = true;
-            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
-            // 
-            // importEpisodesCb
-            // 
-            this.importEpisodesCb.AutoSize = true;
-            this.importEpisodesCb.Location = new System.Drawing.Point(6, 31);
-            this.importEpisodesCb.Name = "importEpisodesCb";
-            this.importEpisodesCb.Size = new System.Drawing.Size(146, 19);
-            this.importEpisodesCb.TabIndex = 2;
-            this.importEpisodesCb.Text = "[import episodes desc]";
-            this.importEpisodesCb.UseVisualStyleBackColor = true;
-            // 
-            // downloadEpisodesCb
-            // 
-            this.downloadEpisodesCb.AutoSize = true;
-            this.downloadEpisodesCb.Location = new System.Drawing.Point(6, 56);
-            this.downloadEpisodesCb.Name = "downloadEpisodesCb";
-            this.downloadEpisodesCb.Size = new System.Drawing.Size(163, 19);
-            this.downloadEpisodesCb.TabIndex = 3;
-            this.downloadEpisodesCb.Text = "[download episodes desc]";
-            this.downloadEpisodesCb.UseVisualStyleBackColor = true;
-            // 
-            // badBookGb
-            // 
-            this.badBookGb.Controls.Add(this.badBookIgnoreRb);
-            this.badBookGb.Controls.Add(this.badBookRetryRb);
-            this.badBookGb.Controls.Add(this.badBookAbortRb);
-            this.badBookGb.Controls.Add(this.badBookAskRb);
-            this.badBookGb.Location = new System.Drawing.Point(371, 6);
-            this.badBookGb.Name = "badBookGb";
-            this.badBookGb.Size = new System.Drawing.Size(524, 124);
-            this.badBookGb.TabIndex = 13;
-            this.badBookGb.TabStop = false;
-            this.badBookGb.Text = "[bad book desc]";
-            // 
-            // badBookIgnoreRb
-            // 
-            this.badBookIgnoreRb.AutoSize = true;
-            this.badBookIgnoreRb.Location = new System.Drawing.Point(6, 97);
-            this.badBookIgnoreRb.Name = "badBookIgnoreRb";
-            this.badBookIgnoreRb.Size = new System.Drawing.Size(94, 19);
-            this.badBookIgnoreRb.TabIndex = 17;
-            this.badBookIgnoreRb.TabStop = true;
-            this.badBookIgnoreRb.Text = "[ignore desc]";
-            this.badBookIgnoreRb.UseVisualStyleBackColor = true;
-            // 
-            // badBookRetryRb
-            // 
-            this.badBookRetryRb.AutoSize = true;
-            this.badBookRetryRb.Location = new System.Drawing.Point(6, 72);
-            this.badBookRetryRb.Name = "badBookRetryRb";
-            this.badBookRetryRb.Size = new System.Drawing.Size(84, 19);
-            this.badBookRetryRb.TabIndex = 16;
-            this.badBookRetryRb.TabStop = true;
-            this.badBookRetryRb.Text = "[retry desc]";
-            this.badBookRetryRb.UseVisualStyleBackColor = true;
-            // 
-            // badBookAbortRb
-            // 
-            this.badBookAbortRb.AutoSize = true;
-            this.badBookAbortRb.Location = new System.Drawing.Point(6, 47);
-            this.badBookAbortRb.Name = "badBookAbortRb";
-            this.badBookAbortRb.Size = new System.Drawing.Size(88, 19);
-            this.badBookAbortRb.TabIndex = 15;
-            this.badBookAbortRb.TabStop = true;
-            this.badBookAbortRb.Text = "[abort desc]";
-            this.badBookAbortRb.UseVisualStyleBackColor = true;
-            // 
-            // badBookAskRb
-            // 
-            this.badBookAskRb.AutoSize = true;
-            this.badBookAskRb.Location = new System.Drawing.Point(6, 22);
-            this.badBookAskRb.Name = "badBookAskRb";
-            this.badBookAskRb.Size = new System.Drawing.Size(77, 19);
-            this.badBookAskRb.TabIndex = 14;
-            this.badBookAskRb.TabStop = true;
-            this.badBookAskRb.Text = "[ask desc]";
-            this.badBookAskRb.UseVisualStyleBackColor = true;
-            // 
-            // decryptAndConvertGb
-            // 
-            this.decryptAndConvertGb.Controls.Add(this.splitFilesByChapterCbox);
-            this.decryptAndConvertGb.Controls.Add(this.allowLibationFixupCbox);
-            this.decryptAndConvertGb.Controls.Add(this.convertLossyRb);
-            this.decryptAndConvertGb.Controls.Add(this.convertLosslessRb);
-            this.decryptAndConvertGb.Location = new System.Drawing.Point(6, 6);
-            this.decryptAndConvertGb.Name = "decryptAndConvertGb";
-            this.decryptAndConvertGb.Size = new System.Drawing.Size(359, 124);
-            this.decryptAndConvertGb.TabIndex = 9;
-            this.decryptAndConvertGb.TabStop = false;
-            this.decryptAndConvertGb.Text = "Decrypt and convert";
-            // 
-            // splitFilesByChapterCbox
-            // 
-            this.splitFilesByChapterCbox.AutoSize = true;
-            this.splitFilesByChapterCbox.Location = new System.Drawing.Point(6, 46);
-            this.splitFilesByChapterCbox.Name = "splitFilesByChapterCbox";
-            this.splitFilesByChapterCbox.Size = new System.Drawing.Size(162, 19);
-            this.splitFilesByChapterCbox.TabIndex = 13;
-            this.splitFilesByChapterCbox.Text = "[SplitFilesByChapter desc]";
-            this.splitFilesByChapterCbox.UseVisualStyleBackColor = true;
-            // 
-            // allowLibationFixupCbox
-            // 
-            this.allowLibationFixupCbox.AutoSize = true;
-            this.allowLibationFixupCbox.Checked = true;
-            this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.allowLibationFixupCbox.Location = new System.Drawing.Point(6, 22);
-            this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
-            this.allowLibationFixupCbox.Size = new System.Drawing.Size(163, 19);
-            this.allowLibationFixupCbox.TabIndex = 10;
-            this.allowLibationFixupCbox.Text = "[AllowLibationFixup desc]";
-            this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
-            this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
-            // 
-            // convertLossyRb
-            // 
-            this.convertLossyRb.AutoSize = true;
-            this.convertLossyRb.Location = new System.Drawing.Point(6, 101);
-            this.convertLossyRb.Name = "convertLossyRb";
-            this.convertLossyRb.Size = new System.Drawing.Size(329, 19);
-            this.convertLossyRb.TabIndex = 12;
-            this.convertLossyRb.Text = "Download my books as .MP3 files (transcode if necessary)";
-            this.convertLossyRb.UseVisualStyleBackColor = true;
-            // 
-            // convertLosslessRb
-            // 
-            this.convertLosslessRb.AutoSize = true;
-            this.convertLosslessRb.Checked = true;
-            this.convertLosslessRb.Location = new System.Drawing.Point(6, 76);
-            this.convertLosslessRb.Name = "convertLosslessRb";
-            this.convertLosslessRb.Size = new System.Drawing.Size(335, 19);
-            this.convertLosslessRb.TabIndex = 11;
-            this.convertLosslessRb.TabStop = true;
-            this.convertLosslessRb.Text = "Download my books in the original audio format (Lossless)";
-            this.convertLosslessRb.UseVisualStyleBackColor = true;
-            // 
-            // inProgressSelectControl
-            // 
-            this.inProgressSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.inProgressSelectControl.Location = new System.Drawing.Point(7, 68);
-            this.inProgressSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.inProgressSelectControl.Name = "inProgressSelectControl";
-            this.inProgressSelectControl.Size = new System.Drawing.Size(875, 52);
-            this.inProgressSelectControl.TabIndex = 19;
-            // 
-            // logsBtn
-            // 
-            this.logsBtn.Location = new System.Drawing.Point(256, 169);
-            this.logsBtn.Name = "logsBtn";
-            this.logsBtn.Size = new System.Drawing.Size(132, 23);
-            this.logsBtn.TabIndex = 5;
-            this.logsBtn.Text = "Open log folder";
-            this.logsBtn.UseVisualStyleBackColor = true;
-            this.logsBtn.Click += new System.EventHandler(this.logsBtn_Click);
-            // 
-            // booksSelectControl
-            // 
-            this.booksSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.booksSelectControl.Location = new System.Drawing.Point(7, 37);
-            this.booksSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.booksSelectControl.Name = "booksSelectControl";
-            this.booksSelectControl.Size = new System.Drawing.Size(876, 87);
-            this.booksSelectControl.TabIndex = 2;
-            // 
-            // loggingLevelLbl
-            // 
-            this.loggingLevelLbl.AutoSize = true;
-            this.loggingLevelLbl.Location = new System.Drawing.Point(6, 172);
-            this.loggingLevelLbl.Name = "loggingLevelLbl";
-            this.loggingLevelLbl.Size = new System.Drawing.Size(78, 15);
-            this.loggingLevelLbl.TabIndex = 3;
-            this.loggingLevelLbl.Text = "Logging level";
-            // 
-            // loggingLevelCb
-            // 
-            this.loggingLevelCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.loggingLevelCb.FormattingEnabled = true;
-            this.loggingLevelCb.Location = new System.Drawing.Point(90, 169);
-            this.loggingLevelCb.Name = "loggingLevelCb";
-            this.loggingLevelCb.Size = new System.Drawing.Size(129, 23);
-            this.loggingLevelCb.TabIndex = 4;
-            // 
-            // tabControl
-            // 
-            this.tabControl.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.tabControl.Controls.Add(this.tab1ImportantSettings);
-            this.tabControl.Controls.Add(this.tab2ImportLibrary);
-            this.tabControl.Controls.Add(this.tab3DownloadDecrypt);
-            this.tabControl.Location = new System.Drawing.Point(12, 12);
-            this.tabControl.Name = "tabControl";
-            this.tabControl.SelectedIndex = 0;
-            this.tabControl.Size = new System.Drawing.Size(909, 478);
-            this.tabControl.TabIndex = 100;
-            // 
-            // tab1ImportantSettings
-            // 
-            this.tab1ImportantSettings.Controls.Add(this.booksGb);
-            this.tab1ImportantSettings.Controls.Add(this.logsBtn);
-            this.tab1ImportantSettings.Controls.Add(this.loggingLevelCb);
-            this.tab1ImportantSettings.Controls.Add(this.loggingLevelLbl);
-            this.tab1ImportantSettings.Location = new System.Drawing.Point(4, 24);
-            this.tab1ImportantSettings.Name = "tab1ImportantSettings";
-            this.tab1ImportantSettings.Padding = new System.Windows.Forms.Padding(3);
-            this.tab1ImportantSettings.Size = new System.Drawing.Size(901, 450);
-            this.tab1ImportantSettings.TabIndex = 0;
-            this.tab1ImportantSettings.Text = "Important settings";
-            this.tab1ImportantSettings.UseVisualStyleBackColor = true;
-            // 
-            // booksGb
-            // 
-            this.booksGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.booksGb.Controls.Add(this.booksSelectControl);
-            this.booksGb.Controls.Add(this.booksLocationDescLbl);
-            this.booksGb.Location = new System.Drawing.Point(6, 6);
-            this.booksGb.Name = "booksGb";
-            this.booksGb.Size = new System.Drawing.Size(889, 129);
-            this.booksGb.TabIndex = 0;
-            this.booksGb.TabStop = false;
-            this.booksGb.Text = "Books location";
-            // 
-            // tab2ImportLibrary
-            // 
-            this.tab2ImportLibrary.Controls.Add(this.showImportedStatsCb);
-            this.tab2ImportLibrary.Controls.Add(this.importEpisodesCb);
-            this.tab2ImportLibrary.Controls.Add(this.downloadEpisodesCb);
-            this.tab2ImportLibrary.Location = new System.Drawing.Point(4, 24);
-            this.tab2ImportLibrary.Name = "tab2ImportLibrary";
-            this.tab2ImportLibrary.Padding = new System.Windows.Forms.Padding(3);
-            this.tab2ImportLibrary.Size = new System.Drawing.Size(901, 450);
-            this.tab2ImportLibrary.TabIndex = 1;
-            this.tab2ImportLibrary.Text = "Import library";
-            this.tab2ImportLibrary.UseVisualStyleBackColor = true;
-            // 
-            // tab3DownloadDecrypt
-            // 
-            this.tab3DownloadDecrypt.Controls.Add(this.inProgressFilesGb);
-            this.tab3DownloadDecrypt.Controls.Add(this.customFileNamingGb);
-            this.tab3DownloadDecrypt.Controls.Add(this.decryptAndConvertGb);
-            this.tab3DownloadDecrypt.Controls.Add(this.badBookGb);
-            this.tab3DownloadDecrypt.Location = new System.Drawing.Point(4, 24);
-            this.tab3DownloadDecrypt.Name = "tab3DownloadDecrypt";
-            this.tab3DownloadDecrypt.Padding = new System.Windows.Forms.Padding(3);
-            this.tab3DownloadDecrypt.Size = new System.Drawing.Size(901, 450);
-            this.tab3DownloadDecrypt.TabIndex = 2;
-            this.tab3DownloadDecrypt.Text = "Download/Decrypt";
-            this.tab3DownloadDecrypt.UseVisualStyleBackColor = true;
-            // 
-            // inProgressFilesGb
-            // 
-            this.inProgressFilesGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.inProgressFilesGb.Controls.Add(this.inProgressDescLbl);
-            this.inProgressFilesGb.Controls.Add(this.inProgressSelectControl);
-            this.inProgressFilesGb.Location = new System.Drawing.Point(7, 299);
-            this.inProgressFilesGb.Name = "inProgressFilesGb";
-            this.inProgressFilesGb.Size = new System.Drawing.Size(888, 128);
-            this.inProgressFilesGb.TabIndex = 21;
-            this.inProgressFilesGb.TabStop = false;
-            this.inProgressFilesGb.Text = "In progress files";
-            // 
-            // customFileNamingGb
-            // 
-            this.customFileNamingGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.customFileNamingGb.Controls.Add(this.chapterFileTemplateBtn);
-            this.customFileNamingGb.Controls.Add(this.chapterFileTemplateTb);
-            this.customFileNamingGb.Controls.Add(this.chapterFileTemplateLbl);
-            this.customFileNamingGb.Controls.Add(this.fileTemplateBtn);
-            this.customFileNamingGb.Controls.Add(this.fileTemplateTb);
-            this.customFileNamingGb.Controls.Add(this.fileTemplateLbl);
-            this.customFileNamingGb.Controls.Add(this.folderTemplateBtn);
-            this.customFileNamingGb.Controls.Add(this.folderTemplateTb);
-            this.customFileNamingGb.Controls.Add(this.folderTemplateLbl);
-            this.customFileNamingGb.Location = new System.Drawing.Point(7, 136);
-            this.customFileNamingGb.Name = "customFileNamingGb";
-            this.customFileNamingGb.Size = new System.Drawing.Size(888, 157);
-            this.customFileNamingGb.TabIndex = 20;
-            this.customFileNamingGb.TabStop = false;
-            this.customFileNamingGb.Text = "Custom file naming";
-            // 
-            // chapterFileTemplateBtn
-            // 
-            this.chapterFileTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chapterFileTemplateBtn.Location = new System.Drawing.Point(808, 124);
-            this.chapterFileTemplateBtn.Name = "chapterFileTemplateBtn";
-            this.chapterFileTemplateBtn.Size = new System.Drawing.Size(75, 23);
-            this.chapterFileTemplateBtn.TabIndex = 8;
-            this.chapterFileTemplateBtn.Text = "Edit...";
-            this.chapterFileTemplateBtn.UseVisualStyleBackColor = true;
-            this.chapterFileTemplateBtn.Click += new System.EventHandler(this.chapterFileTemplateBtn_Click);
-            // 
-            // chapterFileTemplateTb
-            // 
-            this.chapterFileTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.chapterFileTemplateTb.Location = new System.Drawing.Point(6, 125);
-            this.chapterFileTemplateTb.Name = "chapterFileTemplateTb";
-            this.chapterFileTemplateTb.ReadOnly = true;
-            this.chapterFileTemplateTb.Size = new System.Drawing.Size(796, 23);
-            this.chapterFileTemplateTb.TabIndex = 7;
-            // 
-            // chapterFileTemplateLbl
-            // 
-            this.chapterFileTemplateLbl.AutoSize = true;
-            this.chapterFileTemplateLbl.Location = new System.Drawing.Point(6, 107);
-            this.chapterFileTemplateLbl.Name = "chapterFileTemplateLbl";
-            this.chapterFileTemplateLbl.Size = new System.Drawing.Size(123, 15);
-            this.chapterFileTemplateLbl.TabIndex = 6;
-            this.chapterFileTemplateLbl.Text = "[folder template desc]";
-            // 
-            // fileTemplateBtn
-            // 
-            this.fileTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.fileTemplateBtn.Location = new System.Drawing.Point(808, 80);
-            this.fileTemplateBtn.Name = "fileTemplateBtn";
-            this.fileTemplateBtn.Size = new System.Drawing.Size(75, 23);
-            this.fileTemplateBtn.TabIndex = 5;
-            this.fileTemplateBtn.Text = "Edit...";
-            this.fileTemplateBtn.UseVisualStyleBackColor = true;
-            this.fileTemplateBtn.Click += new System.EventHandler(this.fileTemplateBtn_Click);
-            // 
-            // fileTemplateTb
-            // 
-            this.fileTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.fileTemplateTb.Location = new System.Drawing.Point(6, 81);
-            this.fileTemplateTb.Name = "fileTemplateTb";
-            this.fileTemplateTb.ReadOnly = true;
-            this.fileTemplateTb.Size = new System.Drawing.Size(796, 23);
-            this.fileTemplateTb.TabIndex = 4;
-            // 
-            // fileTemplateLbl
-            // 
-            this.fileTemplateLbl.AutoSize = true;
-            this.fileTemplateLbl.Location = new System.Drawing.Point(6, 63);
-            this.fileTemplateLbl.Name = "fileTemplateLbl";
-            this.fileTemplateLbl.Size = new System.Drawing.Size(123, 15);
-            this.fileTemplateLbl.TabIndex = 3;
-            this.fileTemplateLbl.Text = "[folder template desc]";
-            // 
-            // folderTemplateBtn
-            // 
-            this.folderTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.folderTemplateBtn.Location = new System.Drawing.Point(807, 36);
-            this.folderTemplateBtn.Name = "folderTemplateBtn";
-            this.folderTemplateBtn.Size = new System.Drawing.Size(75, 23);
-            this.folderTemplateBtn.TabIndex = 2;
-            this.folderTemplateBtn.Text = "Edit...";
-            this.folderTemplateBtn.UseVisualStyleBackColor = true;
-            this.folderTemplateBtn.Click += new System.EventHandler(this.folderTemplateBtn_Click);
-            // 
-            // folderTemplateTb
-            // 
-            this.folderTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.folderTemplateTb.Location = new System.Drawing.Point(5, 37);
-            this.folderTemplateTb.Name = "folderTemplateTb";
-            this.folderTemplateTb.ReadOnly = true;
-            this.folderTemplateTb.Size = new System.Drawing.Size(796, 23);
-            this.folderTemplateTb.TabIndex = 1;
-            // 
-            // folderTemplateLbl
-            // 
-            this.folderTemplateLbl.AutoSize = true;
-            this.folderTemplateLbl.Location = new System.Drawing.Point(5, 19);
-            this.folderTemplateLbl.Name = "folderTemplateLbl";
-            this.folderTemplateLbl.Size = new System.Drawing.Size(123, 15);
-            this.folderTemplateLbl.TabIndex = 0;
-            this.folderTemplateLbl.Text = "[folder template desc]";
-            // 
-            // showImportedStatsCb
-            // 
-            this.showImportedStatsCb.AutoSize = true;
-            this.showImportedStatsCb.Location = new System.Drawing.Point(6, 6);
-            this.showImportedStatsCb.Name = "showImportedStatsCb";
-            this.showImportedStatsCb.Size = new System.Drawing.Size(168, 19);
-            this.showImportedStatsCb.TabIndex = 1;
-            this.showImportedStatsCb.Text = "[show imported stats desc]";
-            this.showImportedStatsCb.UseVisualStyleBackColor = true;
-            // 
-            // SettingsDialog
-            // 
-            this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelBtn;
-            this.ClientSize = new System.Drawing.Size(933, 539);
-            this.Controls.Add(this.tabControl);
-            this.Controls.Add(this.cancelBtn);
-            this.Controls.Add(this.saveBtn);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "SettingsDialog";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Edit Settings";
-            this.Load += new System.EventHandler(this.SettingsDialog_Load);
-            this.badBookGb.ResumeLayout(false);
-            this.badBookGb.PerformLayout();
-            this.decryptAndConvertGb.ResumeLayout(false);
-            this.decryptAndConvertGb.PerformLayout();
-            this.tabControl.ResumeLayout(false);
-            this.tab1ImportantSettings.ResumeLayout(false);
-            this.tab1ImportantSettings.PerformLayout();
-            this.booksGb.ResumeLayout(false);
-            this.booksGb.PerformLayout();
-            this.tab2ImportLibrary.ResumeLayout(false);
-            this.tab2ImportLibrary.PerformLayout();
-            this.tab3DownloadDecrypt.ResumeLayout(false);
-            this.inProgressFilesGb.ResumeLayout(false);
-            this.inProgressFilesGb.PerformLayout();
-            this.customFileNamingGb.ResumeLayout(false);
-            this.customFileNamingGb.PerformLayout();
-            this.ResumeLayout(false);
-
-		}
-
-		#endregion
-		private System.Windows.Forms.Label booksLocationDescLbl;
-		private System.Windows.Forms.Label inProgressDescLbl;
-		private System.Windows.Forms.Button saveBtn;
-		private System.Windows.Forms.Button cancelBtn;
-        private System.Windows.Forms.CheckBox allowLibationFixupCbox;
-		private DirectoryOrCustomSelectControl booksSelectControl;
-		private DirectorySelectControl inProgressSelectControl;
-        private System.Windows.Forms.RadioButton convertLossyRb;
-        private System.Windows.Forms.RadioButton convertLosslessRb;
-		private System.Windows.Forms.Button logsBtn;
-		private System.Windows.Forms.Label loggingLevelLbl;
-		private System.Windows.Forms.ComboBox loggingLevelCb;
-		private System.Windows.Forms.GroupBox decryptAndConvertGb;
-		private System.Windows.Forms.GroupBox badBookGb;
-		private System.Windows.Forms.RadioButton badBookRetryRb;
-		private System.Windows.Forms.RadioButton badBookAbortRb;
-		private System.Windows.Forms.RadioButton badBookAskRb;
-		private System.Windows.Forms.RadioButton badBookIgnoreRb;
-		private System.Windows.Forms.CheckBox downloadEpisodesCb;
-		private System.Windows.Forms.CheckBox importEpisodesCb;
-        private System.Windows.Forms.CheckBox splitFilesByChapterCbox;
-		private System.Windows.Forms.TabControl tabControl;
-		private System.Windows.Forms.TabPage tab1ImportantSettings;
-		private System.Windows.Forms.GroupBox booksGb;
-		private System.Windows.Forms.TabPage tab2ImportLibrary;
-		private System.Windows.Forms.TabPage tab3DownloadDecrypt;
-		private System.Windows.Forms.GroupBox inProgressFilesGb;
-		private System.Windows.Forms.GroupBox customFileNamingGb;
-		private System.Windows.Forms.Button chapterFileTemplateBtn;
-		private System.Windows.Forms.TextBox chapterFileTemplateTb;
-		private System.Windows.Forms.Label chapterFileTemplateLbl;
-		private System.Windows.Forms.Button fileTemplateBtn;
-		private System.Windows.Forms.TextBox fileTemplateTb;
-		private System.Windows.Forms.Label fileTemplateLbl;
-		private System.Windows.Forms.Button folderTemplateBtn;
-		private System.Windows.Forms.TextBox folderTemplateTb;
-		private System.Windows.Forms.Label folderTemplateLbl;
-        private System.Windows.Forms.CheckBox showImportedStatsCb;
-    }
-}

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -1,201 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Windows.Forms;
-using Dinah.Core;
-using LibationFileManager;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class SettingsDialog : Form
-	{
-		private Configuration config { get; } = Configuration.Instance;
-		private Func<string, string> desc { get; } = Configuration.GetDescription;
-
-		public SettingsDialog() => InitializeComponent();
-
-		private void SettingsDialog_Load(object sender, EventArgs e)
-		{
-			if (this.DesignMode)
-				return;
-
-			{
-				loggingLevelCb.Items.Clear();
-				foreach (var level in Enum<Serilog.Events.LogEventLevel>.GetValues())
-					loggingLevelCb.Items.Add(level);
-				loggingLevelCb.SelectedItem = config.LogLevel;
-			}
-
-			this.showImportedStatsCb.Text = desc(nameof(config.ShowImportedStats));
-			this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
-			this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
-			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
-			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
-			this.allowLibationFixupCbox.Text = desc(nameof(config.AllowLibationFixup));
-			this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
-
-			booksSelectControl.SetSearchTitle("books location");
-			booksSelectControl.SetDirectoryItems(
-				new()
-				{
-					Configuration.KnownDirectories.UserProfile,
-					Configuration.KnownDirectories.AppDir,
-					Configuration.KnownDirectories.MyDocs
-				},
-				Configuration.KnownDirectories.UserProfile,
-				"Books");
-			booksSelectControl.SelectDirectory(config.Books);
-
-			showImportedStatsCb.Checked = config.ShowImportedStats;
-			importEpisodesCb.Checked = config.ImportEpisodes;
-			downloadEpisodesCb.Checked = config.DownloadEpisodes;
-			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
-			convertLosslessRb.Checked = !config.DecryptToLossy;
-			convertLossyRb.Checked = config.DecryptToLossy;
-			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
-
-			allowLibationFixupCbox_CheckedChanged(this, e);
-
-			inProgressSelectControl.SetDirectoryItems(new()
-			{
-				Configuration.KnownDirectories.WinTemp,
-				Configuration.KnownDirectories.UserProfile,
-				Configuration.KnownDirectories.AppDir,
-				Configuration.KnownDirectories.MyDocs,
-				Configuration.KnownDirectories.LibationFiles
-			}, Configuration.KnownDirectories.WinTemp);
-			inProgressSelectControl.SelectDirectory(config.InProgress);
-
-			badBookGb.Text = desc(nameof(config.BadBook));
-			badBookAskRb.Text = Configuration.BadBookAction.Ask.GetDescription();
-			badBookAbortRb.Text = Configuration.BadBookAction.Abort.GetDescription();
-			badBookRetryRb.Text = Configuration.BadBookAction.Retry.GetDescription();
-			badBookIgnoreRb.Text = Configuration.BadBookAction.Ignore.GetDescription();
-			var rb = config.BadBook switch
-			{
-				Configuration.BadBookAction.Ask => this.badBookAskRb,
-				Configuration.BadBookAction.Abort => this.badBookAbortRb,
-				Configuration.BadBookAction.Retry => this.badBookRetryRb,
-				Configuration.BadBookAction.Ignore => this.badBookIgnoreRb,
-				_ => this.badBookAskRb
-			};
-			rb.Checked = true;
-
-			folderTemplateLbl.Text = desc(nameof(config.FolderTemplate));
-			fileTemplateLbl.Text = desc(nameof(config.FileTemplate));
-			chapterFileTemplateLbl.Text = desc(nameof(config.ChapterFileTemplate));
-			folderTemplateTb.Text = config.FolderTemplate;
-			fileTemplateTb.Text = config.FileTemplate;
-			chapterFileTemplateTb.Text = config.ChapterFileTemplate;
-		}
-
-		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
-		{
-			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
-			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
-			splitFilesByChapterCbox.Enabled = allowLibationFixupCbox.Checked;
-
-			if (!allowLibationFixupCbox.Checked)
-			{
-				convertLosslessRb.Checked = true;
-				splitFilesByChapterCbox.Checked = false;
-			}
-		}
-
-		private void logsBtn_Click(object sender, EventArgs e) => Go.To.Folder(Configuration.Instance.LibationFiles);
-
-		private void folderTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.Folder, folderTemplateTb);
-		private void fileTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.File, fileTemplateTb);
-		private void chapterFileTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.ChapterFile, chapterFileTemplateTb);
-		private static void editTemplate(Templates template, TextBox textBox)
-		{
-			var form = new EditTemplateDialog(template, textBox.Text);
-			if (form.ShowDialog() == DialogResult.OK)
-				textBox.Text = form.TemplateText;
-		}
-
-		private void saveBtn_Click(object sender, EventArgs e)
-		{
-			var newBooks = booksSelectControl.SelectedDirectory;
-
-			#region validation
-			static void validationError(string text, string caption)
-				=> MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
-			if (string.IsNullOrWhiteSpace(newBooks))
-			{
-				validationError("Cannot set Books Location to blank", "Location is blank");
-				return;
-			}
-
-			if (!Directory.Exists(newBooks) && booksSelectControl.SelectedDirectoryIsCustom)
-			{
-				validationError($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}", "Folder does not exist");
-				return;
-			}
-
-			// these 3 should do nothing. Configuration will only init these with a valid value. EditTemplateDialog ensures valid before returning
-			if (!Templates.Folder.IsValid(folderTemplateTb.Text))
-			{
-				validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
-				return;
-			}
-			if (!Templates.File.IsValid(fileTemplateTb.Text))
-			{
-				validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
-				return;
-			}
-			if (!Templates.ChapterFile.IsValid(chapterFileTemplateTb.Text))
-			{
-				validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
-				return;
-			}
-			#endregion
-
-			if (!Directory.Exists(newBooks) && booksSelectControl.SelectedDirectoryIsKnown)
-				Directory.CreateDirectory(newBooks);
-
-			config.Books = newBooks;
-
-			{
-				var logLevelOld = config.LogLevel;
-				var logLevelNew = (Serilog.Events.LogEventLevel)loggingLevelCb.SelectedItem;
-
-				config.LogLevel = logLevelNew;
-
-				// only warn if changed during this time. don't want to warn every time user happens to change settings while level is verbose
-				if (logLevelOld != logLevelNew)
-					MessageBoxVerboseLoggingWarning.ShowIfTrue();
-			}
-
-			config.ShowImportedStats = showImportedStatsCb.Checked;
-			config.ImportEpisodes = importEpisodesCb.Checked;
-			config.DownloadEpisodes = downloadEpisodesCb.Checked;
-			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
-			config.DecryptToLossy = convertLossyRb.Checked;
-			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
-
-			config.InProgress = inProgressSelectControl.SelectedDirectory;
-
-			config.BadBook
-				= badBookAskRb.Checked ? Configuration.BadBookAction.Ask
-				: badBookAbortRb.Checked ? Configuration.BadBookAction.Abort
-				: badBookRetryRb.Checked ? Configuration.BadBookAction.Retry
-				: badBookIgnoreRb.Checked ? Configuration.BadBookAction.Ignore
-				: Configuration.BadBookAction.Ask;
-
-			config.FolderTemplate = folderTemplateTb.Text;
-			config.FileTemplate = fileTemplateTb.Text;
-			config.ChapterFileTemplate = chapterFileTemplateTb.Text;
-
-			this.DialogResult = DialogResult.OK;
-			this.Close();
-		}
-
-		private void cancelBtn_Click(object sender, EventArgs e)
-		{
-			this.DialogResult = DialogResult.Cancel;
-			this.Close();
-		}
-	}
-}

LibationWinForms/Form1.cs

@@ -1,457 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-using ApplicationServices;
-using AudibleUtilities;
-using Dinah.Core;
-using Dinah.Core.Drawing;
-using Dinah.Core.Threading;
-using LibationFileManager;
-using LibationWinForms.Dialogs;
-
-namespace LibationWinForms
-{
-	public partial class Form1 : Form
-	{
-		private string beginBookBackupsToolStripMenuItem_format { get; }
-		private string beginPdfBackupsToolStripMenuItem_format { get; }
-
-		public Form1()
-		{
-			InitializeComponent();
-
-			// back up string formats
-			beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
-			beginPdfBackupsToolStripMenuItem_format = beginPdfBackupsToolStripMenuItem.Text;
-
-			if (this.DesignMode)
-				return;
-
-			// independent UI updates
-			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
-			this.Load += RefreshImportMenu;
-			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-			LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers;
-			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
-			// used by async migrations to update ui when complete
-			DataLayer.UserDefinedItem.Batch_ItemChanged += reloadGridAndUpdateBottomNumbers;
-
-			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
-			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
-		}
-
-		private void Form1_Load(object sender, EventArgs e)
-		{
-			if (this.DesignMode)
-				return;
-
-			// can't refactor into "this.Load => reloadGridAndUpdateBottomNumbers"
-			// because loadInitialQuickFilterState must follow it
-			reloadGridAndUpdateBottomNumbers();
-
-			// also applies filter. ONLY call AFTER loading grid
-			loadInitialQuickFilterState();
-		}
-
-		private void reloadGridAndUpdateBottomNumbers(object _ = null, object __ = null)
-		{
-			// suppressed filter while init'ing UI
-			var prev_isProcessingGridSelect = isProcessingGridSelect;
-			isProcessingGridSelect = true;
-			this.UIThreadSync(() => setGrid());
-			isProcessingGridSelect = prev_isProcessingGridSelect;
-
-			// UI init complete. now we can apply filter
-			this.UIThreadAsync(() => doFilter(lastGoodFilter));
-
-			setBackupCounts(null, null);
-		}
-
-		#region reload grid
-		private ProductsGrid currProductsGrid;
-		private void setGrid()
-		{
-			SuspendLayout();
-			{
-				if (currProductsGrid != null)
-				{
-					gridPanel.Controls.Remove(currProductsGrid);
-					currProductsGrid.VisibleCountChanged -= setVisibleCount;
-					currProductsGrid.Dispose();
-				}
-
-				currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
-				currProductsGrid.VisibleCountChanged += setVisibleCount;
-				gridPanel.UIThreadSync(() => gridPanel.Controls.Add(currProductsGrid));
-				currProductsGrid.Display();
-			}
-			ResumeLayout();
-		}
-		#endregion
-
-		#region bottom: qty books visible
-		private void setVisibleCount(object _, int qty) => visibleCountLbl.Text = string.Format("Visible: {0}", qty);
-		#endregion
-
-		#region bottom: backup counts
-		private System.ComponentModel.BackgroundWorker updateCountsBw;
-		private bool runBackupCountsAgain;
-
-		private void setBackupCounts(object _, object __)
-		{
-			runBackupCountsAgain = true;
-
-			if (updateCountsBw is not null)
-				return;
-
-			updateCountsBw = new System.ComponentModel.BackgroundWorker();
-			updateCountsBw.DoWork += UpdateCountsBw_DoWork;
-			updateCountsBw.RunWorkerCompleted += UpdateCountsBw_RunWorkerCompleted;
-			updateCountsBw.RunWorkerAsync();
-		}
-
-		private void UpdateCountsBw_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
-		{
-			while (runBackupCountsAgain)
-			{
-				runBackupCountsAgain = false;
-
-				var libraryStats = LibraryCommands.GetCounts();
-				e.Result = libraryStats;
-			}
-			updateCountsBw = null;
-		}
-
-		private void UpdateCountsBw_RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerCompletedEventArgs e)
-		{
-			var libraryStats = e.Result as LibraryCommands.LibraryStats;
-
-			setBookBackupCounts(libraryStats);
-			setPdfBackupCounts(libraryStats);
-		}
-
-		private void setBookBackupCounts(LibraryCommands.LibraryStats libraryStats)
-		{
-			var backupsCountsLbl_Format = "BACKUPS: No progress: {0}  In process: {1}  Fully backed up: {2}";
-
-			// enable/disable export
-			var hasResults = 0 < (libraryStats.booksFullyBackedUp + libraryStats.booksDownloadedOnly + libraryStats.booksNoProgress + libraryStats.booksError);
-			exportLibraryToolStripMenuItem.Enabled = hasResults;
-
-			// update bottom numbers
-			var pending = libraryStats.booksNoProgress + libraryStats.booksDownloadedOnly;
-			var statusStripText
-				= !hasResults ? "No books. Begin by importing your library"
-				: libraryStats.booksError > 0 ? string.Format(backupsCountsLbl_Format + "  Errors: {3}", libraryStats.booksNoProgress, libraryStats.booksDownloadedOnly, libraryStats.booksFullyBackedUp, libraryStats.booksError)
-				: pending > 0 ? string.Format(backupsCountsLbl_Format, libraryStats.booksNoProgress, libraryStats.booksDownloadedOnly, libraryStats.booksFullyBackedUp)
-				: $"All {"book".PluralizeWithCount(libraryStats.booksFullyBackedUp)} backed up";
-
-			// update menu item
-			var menuItemText
-				= pending > 0
-				? $"{pending} remaining"
-				: "All books have been liberated";
-
-			// update UI
-			statusStrip1.UIThreadAsync(() => backupsCountsLbl.Text = statusStripText);
-			menuStrip1.UIThreadAsync(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
-			menuStrip1.UIThreadAsync(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
-		}
-		private void setPdfBackupCounts(LibraryCommands.LibraryStats libraryStats)
-		{
-			var pdfsCountsLbl_Format = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
-
-			// update bottom numbers
-			var hasResults = 0 < (libraryStats.pdfsNotDownloaded + libraryStats.pdfsDownloaded);
-			var statusStripText
-				= !hasResults ? ""
-				: libraryStats.pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, libraryStats.pdfsNotDownloaded, libraryStats.pdfsDownloaded)
-				: $"|  All {libraryStats.pdfsDownloaded} PDFs downloaded";
-
-			// update menu item
-			var menuItemText
-				= libraryStats.pdfsNotDownloaded > 0
-				? $"{libraryStats.pdfsNotDownloaded} remaining"
-				: "All PDFs have been downloaded";
-
-			// update UI
-			statusStrip1.UIThreadAsync(() => pdfsCountsLbl.Text = statusStripText);
-			menuStrip1.UIThreadAsync(() => beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0);
-			menuStrip1.UIThreadAsync(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
-		}
-		#endregion
-
-		#region filter
-		private void filterHelpBtn_Click(object sender, EventArgs e) => new SearchSyntaxDialog().ShowDialog();
-
-		private void AddFilterBtn_Click(object sender, EventArgs e)
-		{
-			QuickFilters.Add(this.filterSearchTb.Text);
-			UpdateFilterDropDown();
-		}
-
-		private void filterSearchTb_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == (char)Keys.Return)
-			{
-				doFilter();
-
-				// silence the 'ding'
-				e.Handled = true;
-			}
-		}
-		private void filterBtn_Click(object sender, EventArgs e) => doFilter();
-
-		private bool isProcessingGridSelect = false;
-		private string lastGoodFilter = "";
-		private void doFilter(string filterString)
-		{
-			this.filterSearchTb.Text = filterString;
-			doFilter();
-		}
-		private void doFilter()
-		{
-			if (isProcessingGridSelect || currProductsGrid == null)
-				return;
-
-			try
-			{
-				currProductsGrid.Filter(filterSearchTb.Text);
-				lastGoodFilter = filterSearchTb.Text;
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-				// re-apply last good filter
-				doFilter(lastGoodFilter);
-			}
-		}
-		#endregion
-
-		#region Import menu
-		public void RefreshImportMenu(object _ = null, EventArgs __ = null)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var count = persister.AccountsSettings.Accounts.Count;
-
-			noAccountsYetAddAccountToolStripMenuItem.Visible = count == 0;
-			scanLibraryToolStripMenuItem.Visible = count == 1;
-			scanLibraryOfAllAccountsToolStripMenuItem.Visible = count > 1;
-			scanLibraryOfSomeAccountsToolStripMenuItem.Visible = count > 1;
-
-			removeLibraryBooksToolStripMenuItem.Visible = count != 0;
-
-			removeSomeAccountsToolStripMenuItem.Visible = count > 1;
-			removeAllAccountsToolStripMenuItem.Visible = count > 1;
-		}
-
-		private void noAccountsYetAddAccountToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
-			new AccountsDialog(this).ShowDialog();
-		}
-
-		private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-			scanLibraries(firstAccount);
-		}
-
-		private void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var allAccounts = persister.AccountsSettings.GetAll();
-			scanLibraries(allAccounts);
-		}
-
-		private void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var scanAccountsDialog = new ScanAccountsDialog(this);
-
-			if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
-				return;
-
-			if (!scanAccountsDialog.CheckedAccounts.Any())
-				return;
-
-			scanLibraries(scanAccountsDialog.CheckedAccounts);
-		}
-
-		private void removeLibraryBooksToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			// if 0 accounts, this will not be visible
-			// if 1 account, run scanLibrariesRemovedBooks() on this account
-			// if multiple accounts, another menu set will open. do not run scanLibrariesRemovedBooks()
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var accounts = persister.AccountsSettings.GetAll();
-
-			if (accounts.Count != 1)
-				return;
-
-			var firstAccount = accounts.Single();
-			scanLibrariesRemovedBooks(firstAccount);
-		}
-
-		// selectively remove books from all accounts
-		private void removeAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var allAccounts = persister.AccountsSettings.GetAll();
-			scanLibrariesRemovedBooks(allAccounts.ToArray());
-		}
-
-		// selectively remove books from some accounts
-		private void removeSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var scanAccountsDialog = new ScanAccountsDialog(this);
-
-			if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
-				return;
-
-			if (!scanAccountsDialog.CheckedAccounts.Any())
-				return;
-
-			scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
-		}
-
-		private void scanLibrariesRemovedBooks(params Account[] accounts)
-		{
-			using var dialog = new RemoveBooksDialog(accounts);
-			dialog.ShowDialog();
-		}
-
-		private void scanLibraries(IEnumerable<Account> accounts) => scanLibraries(accounts.ToArray());
-		private void scanLibraries(params Account[] accounts)
-		{
-			using var dialog = new IndexLibraryDialog(accounts);
-			dialog.ShowDialog();
-
-			var totalProcessed = dialog.TotalBooksProcessed;
-			var newAdded = dialog.NewBooksAdded;
-
-			if (Configuration.Instance.ShowImportedStats)
-				MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
-		}
-		#endregion
-
-		#region liberate menu
-		private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync();
-
-		private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.BackupAllPdfsAsync();
-
-		private async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var result = MessageBox.Show(
-				"This converts all m4b titles in your library to mp3 files. Original files are not deleted."
-				+ "\r\nFor large libraries this will take a long time and will take up more disk space."
-				+ "\r\n\r\nContinue?"
-				+ "\r\n\r\n(To always download titles as mp3 instead of m4b, go to Settings: Download my books as .MP3 files)",
-				"Convert all M4b => Mp3?",
-				MessageBoxButtons.YesNo,
-				MessageBoxIcon.Warning);
-			if (result == DialogResult.Yes)
-				await BookLiberation.ProcessorAutomationController.ConvertAllBooksAsync();
-		}
-
-		#endregion
-
-		#region Export menu
-		private void exportLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				var saveFileDialog = new SaveFileDialog
-				{
-					Title = "Where to export Library",
-					Filter = "Excel Workbook (*.xlsx)|*.xlsx|CSV files (*.csv)|*.csv|JSON files (*.json)|*.json" // + "|All files (*.*)|*.*"
-				};
-
-				if (saveFileDialog.ShowDialog() != DialogResult.OK)
-					return;
-
-				// FilterIndex is 1-based, NOT 0-based
-				switch (saveFileDialog.FilterIndex)
-				{
-					case 1: // xlsx
-					default:
-						LibraryExporter.ToXlsx(saveFileDialog.FileName);
-						break;
-					case 2: // csv
-						LibraryExporter.ToCsv(saveFileDialog.FileName);
-						break;
-					case 3: // json
-						LibraryExporter.ToJson(saveFileDialog.FileName);
-						break;
-				}
-
-				MessageBox.Show("Library exported to:\r\n" + saveFileDialog.FileName);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error attempting to export your library.", "Error exporting", ex);
-			}
-		}
-		#endregion
-
-		#region quick filters menu
-		private void loadInitialQuickFilterState()
-		{
-			// set inital state. do once only
-			firstFilterIsDefaultToolStripMenuItem.Checked = QuickFilters.UseDefault;
-
-			// load default filter. do once only
-			if (QuickFilters.UseDefault)
-				doFilter(QuickFilters.Filters.FirstOrDefault());
-
-			// do after every save
-			UpdateFilterDropDown();
-		}
-
-		private void FirstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			firstFilterIsDefaultToolStripMenuItem.Checked = !firstFilterIsDefaultToolStripMenuItem.Checked;
-			QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
-		}
-
-		private object quickFilterTag { get; } = new object();
-		public void UpdateFilterDropDown()
-		{
-			// remove old
-			for (var i = quickFiltersToolStripMenuItem.DropDownItems.Count - 1; i >= 0; i--)
-			{
-				var menuItem = quickFiltersToolStripMenuItem.DropDownItems[i];
-				if (menuItem.Tag == quickFilterTag)
-					quickFiltersToolStripMenuItem.DropDownItems.Remove(menuItem);
-			}
-
-			// re-populate
-			var index = 0;
-			foreach (var filter in QuickFilters.Filters)
-			{
-				var menuItem = new ToolStripMenuItem
-				{
-					Tag = quickFilterTag,
-					Text = $"&{++index}: {filter}"
-				};
-				menuItem.Click += (_, __) => doFilter(filter);
-				quickFiltersToolStripMenuItem.DropDownItems.Add(menuItem);
-			}
-		}
-
-		private void EditQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters(this).ShowDialog();
-		#endregion
-
-		#region settings menu
-		private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
-
-		private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
-		#endregion
-	}
-}

LibationWinForms/GridEntry.cs

@@ -1,300 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core.DataBinding;
-using Dinah.Core;
-using Dinah.Core.Drawing;
-using LibationFileManager;
-
-namespace LibationWinForms
-{
-	/// <summary>
-	/// The View Model for a LibraryBook
-	/// </summary>
-	internal class GridEntry : AsyncNotifyPropertyChanged, IMemberComparable
-	{
-		#region implementation properties NOT exposed to the view
-		// hide from public fields from Data Source GUI with [Browsable(false)]
-
-		[Browsable(false)]
-		public string AudibleProductId => Book.AudibleProductId;
-		[Browsable(false)]
-		public LibraryBook LibraryBook { get; }
-
-		#endregion
-
-		#region Model properties exposed to the view
-		private Image _cover;
-		public Image Cover
-		{
-			get => _cover;
-			private set
-			{
-				_cover = value;
-				NotifyPropertyChanged();
-			}
-		}
-
-		public string ProductRating { get; }
-		public string PurchaseDate { get; }
-		public string MyRating { get; }
-		public string Series { get; }
-		public string Title { get; }
-		public string Length { get; }
-		public string Authors { get; }
-		public string Narrators { get; }
-		public string Category { get; }
-		public string Misc { get; }
-		public string Description { get; }
-		public string DisplayTags
-		{
-			get => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
-			set => Book.UserDefinedItem.Tags = value;
-		}
-
-		// these 2 values being in 1 field is the trick behind getting the liberated+pdf 'stoplight' icon to draw. See: LiberateDataGridViewImageButtonCell.Paint
-		public (LiberatedStatus BookStatus, LiberatedStatus? PdfStatus) Liberate
-		{
-			get => (LibraryCommands.Liberated_Status(LibraryBook.Book), LibraryCommands.Pdf_Status(LibraryBook.Book));
-			
-			set
-			{
-				LibraryBook.Book.UserDefinedItem.BookStatus = value.BookStatus;
-				LibraryBook.Book.UserDefinedItem.PdfStatus = value.PdfStatus;
-			}
-		}
-
-		#endregion
-
-		public event EventHandler Committed;
-
-		private Book Book => LibraryBook.Book;
-
-		public GridEntry(LibraryBook libraryBook)
-		{
-			LibraryBook = libraryBook;
-			_memberValues = CreateMemberValueDictionary();
-
-			//Get cover art. If it's default, subscribe to PictureCached
-			{
-				(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
-
-				if (isDefault)
-					PictureStorage.PictureCached += PictureStorage_PictureCached;
-
-				//Mutable property. Set the field so PropertyChanged isn't fired.
-				_cover = ImageReader.ToImage(picture);
-			}
-
-			//Immutable properties
-			{
-				Title = Book.Title;
-				Series = Book.SeriesNames;
-				Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min";
-				MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
-				PurchaseDate = libraryBook.DateAdded.ToString("d");
-				ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
-				Authors = Book.AuthorNames;
-				Narrators = Book.NarratorNames;
-				Category = string.Join(" > ", Book.CategoriesNames);
-				Misc = GetMiscDisplay(libraryBook);
-				Description = GetDescriptionDisplay(Book);
-			}
-
-			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
-		}
-
-		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
-		{
-			if (e.Definition.PictureId == Book.PictureId)
-			{
-				Cover = ImageReader.ToImage(e.Picture);
-				PictureStorage.PictureCached -= PictureStorage_PictureCached;
-			}
-		}
-
-		#region detect changes to the model, update the view, and save to database.
-
-		/// <summary>
-		/// This event handler receives notifications from the model that it has changed.
-		/// Save to the database and notify the view that it's changed.
-		/// </summary>
-		private void UserDefinedItem_ItemChanged(object sender, string itemName)
-		{
-			var udi = sender as UserDefinedItem;
-
-			if (udi.Book.AudibleProductId != Book.AudibleProductId)
-				return;
-
-			switch (itemName)
-			{
-				case nameof(udi.Tags):
-					{
-						Book.UserDefinedItem.Tags = udi.Tags;
-						NotifyPropertyChanged(nameof(DisplayTags));
-					}
-					break;
-				case nameof(udi.BookStatus):
-					{
-						Book.UserDefinedItem.BookStatus = udi.BookStatus;
-						NotifyPropertyChanged(nameof(Liberate));
-					}
-					break;
-				case nameof(udi.PdfStatus):
-					{
-						Book.UserDefinedItem.PdfStatus = udi.PdfStatus;
-						NotifyPropertyChanged(nameof(Liberate));
-					}
-					break;
-			}
-
-			if (!suspendCommit)
-				Commit();
-		}
-		private bool suspendCommit = false;
-
-		/// <summary>
-		/// Begin editing the model, suspending commits until <see cref="EndEdit"/> is called.
-		/// </summary>
-		public void BeginEdit() => suspendCommit = true;
-
-		/// <summary>
-		/// Save all edits to the database.
-		/// </summary>
-		public void EndEdit()
-		{
-			Commit();
-			suspendCommit = false;
-		}
-
-		private void Commit()
-		{
-			// We don't want LiberatedStatus.PartialDownload to be a persistent status.
-			// If display/icon status is PartialDownload then save NotLiberated to db then restore PartialDownload for display
-			var displayStatus = Book.UserDefinedItem.BookStatus;
-			var saveStatus = displayStatus == LiberatedStatus.PartialDownload ? LiberatedStatus.NotLiberated : displayStatus;
-			Book.UserDefinedItem.BookStatus = saveStatus;
-
-			LibraryCommands.UpdateUserDefinedItem(Book);
-
-			Book.UserDefinedItem.BookStatus = displayStatus;
-
-			Committed?.Invoke(this, null);
-		}
-
-		#endregion
-
-		#region Data Sorting
-		// These methods are implementation of Dinah.Core.DataBinding.IMemberComparable
-		// Used by Dinah.Core.DataBinding.SortableBindingList<T> for all sorting
-		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
-		public virtual IComparer GetMemberComparer(Type memberType) => _memberTypeComparers[memberType];
-
-		private Dictionary<string, Func<object>> _memberValues { get; }
-
-		/// <summary>
-		/// Create getters for all member object values by name
-		/// </summary>
-		private Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
-		{
-			{ nameof(Title), () => GetSortName(Book.Title) },
-			{ nameof(Series), () => GetSortName(Book.SeriesNames) },
-			{ nameof(Length), () => Book.LengthInMinutes },
-			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore },
-			{ nameof(PurchaseDate), () => LibraryBook.DateAdded },
-			{ nameof(ProductRating), () => Book.Rating.FirstScore },
-			{ nameof(Authors), () => Authors },
-			{ nameof(Narrators), () => Narrators },
-			{ nameof(Description), () => Description },
-			{ nameof(Category), () => Category },
-			{ nameof(Misc), () => Misc },
-			{ nameof(DisplayTags), () => DisplayTags },
-			{ nameof(Liberate), () => Liberate.BookStatus }
-		};
-
-		// Instantiate comparers for every exposed member object type.
-		private static readonly Dictionary<Type, IComparer> _memberTypeComparers = new()
-		{
-			{ typeof(string), new ObjectComparer<string>() },
-			{ typeof(int), new ObjectComparer<int>() },
-			{ typeof(float), new ObjectComparer<float>() },
-			{ typeof(DateTime), new ObjectComparer<DateTime>() },
-			{ typeof(LiberatedStatus), new ObjectComparer<LiberatedStatus>() },
-		};
-
-		private static readonly string[] _sortPrefixIgnores = { "the", "a", "an" };
-		private static string GetSortName(string unformattedName)
-		{
-			var sortName = unformattedName
-				.Replace("|", "")
-				.Replace(":", "")
-				.ToLowerInvariant()
-				.Trim();
-
-			if (_sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
-				sortName = sortName.Substring(sortName.IndexOf(" ") + 1).TrimStart();
-
-			return sortName;
-		}
-
-		#endregion
-
-		#region Static library display functions
-		
-		/// <summary>
-		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
-		/// </summary>
-		private static string GetDescriptionDisplay(Book book)
-		{
-			var doc = new HtmlAgilityPack.HtmlDocument();
-			doc.LoadHtml(book?.Description ?? "");
-			var noHtml = doc.DocumentNode.InnerText;
-			return
-				noHtml.Length < 63 ?
-				noHtml :
-				noHtml.Substring(0, 60) + "...";
-		}
-
-		/// <summary>
-		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
-		/// Maximum of 5 text rows will fit in 80-pixel row height.
-		/// </summary>
-		private static string GetMiscDisplay(LibraryBook libraryBook)
-		{
-			var details = new List<string>();
-
-			var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
-			var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
-
-			details.Add($"Account: {locale} - {acct}");
-
-			if (libraryBook.Book.HasPdf)
-				details.Add("Has PDF");
-			if (libraryBook.Book.IsAbridged)
-				details.Add("Abridged");
-			if (libraryBook.Book.DatePublished.HasValue)
-				details.Add($"Date pub'd: {libraryBook.Book.DatePublished.Value:MM/dd/yyyy}");
-			// this goes last since it's most likely to have a line-break
-			if (!string.IsNullOrWhiteSpace(libraryBook.Book.Publisher))
-				details.Add($"Pub: {libraryBook.Book.Publisher.Trim()}");
-
-			if (!details.Any())
-				return "[details not imported]";
-
-			return string.Join("\r\n", details);
-		}
-
-		#endregion
-
-		~GridEntry()
-		{
-			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
-			PictureStorage.PictureCached -= PictureStorage_PictureCached;
-		}
-	}
-}

LibationWinForms/MessageBoxAlertAdmin.cs

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

LibationWinForms/MessageBoxWarnIfVerboseLogging.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Linq;
-using Dinah.Core.Logging;
-using Serilog;
-using System.Windows.Forms;
-
-namespace LibationWinForms
-{
-	public static class MessageBoxVerboseLoggingWarning
-	{
-		public static void ShowIfTrue()
-		{
-			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
-			if (Log.Logger.IsVerboseEnabled())
-				MessageBox.Show(@"
-Warning: verbose logging is enabled.
-
-This should be used for debugging only. It creates many
-more logs and debug files, neither of which are as
-strictly anonymous.
-
-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);
-		}
-	}
-}

LibationWinForms/ProductsGrid.Designer.cs

@@ -1,242 +0,0 @@
-namespace LibationWinForms
-{
-	partial class ProductsGrid
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
-            this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
-            this.dataGridViewImageButtonBoxColumn1 = new LibationWinForms.LiberateDataGridViewImageButtonColumn();
-            this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewImageButtonBoxColumn2 = new LibationWinForms.EditTagsDataGridViewImageButtonColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gridEntryBindingSource
-            // 
-            this.gridEntryBindingSource.DataSource = typeof(LibationWinForms.GridEntry);
-            // 
-            // gridEntryDataGridView
-            // 
-            this.gridEntryDataGridView.AllowUserToAddRows = false;
-            this.gridEntryDataGridView.AllowUserToDeleteRows = false;
-            this.gridEntryDataGridView.AllowUserToResizeRows = false;
-            this.gridEntryDataGridView.AutoGenerateColumns = false;
-            this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewImageButtonBoxColumn1,
-            this.dataGridViewImageColumn1,
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn4,
-            this.dataGridViewTextBoxColumn5,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7,
-            this.dataGridViewTextBoxColumn8,
-            this.dataGridViewTextBoxColumn9,
-            this.dataGridViewTextBoxColumn10,
-            this.dataGridViewTextBoxColumn11,
-            this.dataGridViewImageButtonBoxColumn2});
-            this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.gridEntryDataGridView.DefaultCellStyle = dataGridViewCellStyle1;
-            this.gridEntryDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridEntryDataGridView.Location = new System.Drawing.Point(0, 0);
-            this.gridEntryDataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.gridEntryDataGridView.Name = "gridEntryDataGridView";
-            this.gridEntryDataGridView.ReadOnly = true;
-            this.gridEntryDataGridView.RowHeadersVisible = false;
-            this.gridEntryDataGridView.RowTemplate.Height = 82;
-            this.gridEntryDataGridView.Size = new System.Drawing.Size(1510, 380);
-            this.gridEntryDataGridView.TabIndex = 0;
-            // 
-            // dataGridViewImageButtonBoxColumn1
-            // 
-            this.dataGridViewImageButtonBoxColumn1.DataPropertyName = "Liberate";
-            this.dataGridViewImageButtonBoxColumn1.HeaderText = "Liberate";
-            this.dataGridViewImageButtonBoxColumn1.Name = "dataGridViewImageButtonBoxColumn1";
-            this.dataGridViewImageButtonBoxColumn1.ReadOnly = true;
-            this.dataGridViewImageButtonBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewImageButtonBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.dataGridViewImageButtonBoxColumn1.Width = 75;
-            // 
-            // dataGridViewImageColumn1
-            // 
-            this.dataGridViewImageColumn1.DataPropertyName = "Cover";
-            this.dataGridViewImageColumn1.HeaderText = "Cover";
-            this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";
-            this.dataGridViewImageColumn1.ReadOnly = true;
-            this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewImageColumn1.ToolTipText = "Cover Art";
-            this.dataGridViewImageColumn1.Width = 80;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "Title";
-            this.dataGridViewTextBoxColumn1.HeaderText = "Title";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Width = 200;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "Authors";
-            this.dataGridViewTextBoxColumn2.HeaderText = "Authors";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "Narrators";
-            this.dataGridViewTextBoxColumn3.HeaderText = "Narrators";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "Length";
-            this.dataGridViewTextBoxColumn4.HeaderText = "Length";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            this.dataGridViewTextBoxColumn4.ToolTipText = "Recording Length";
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "Series";
-            this.dataGridViewTextBoxColumn5.HeaderText = "Series";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "Description";
-            this.dataGridViewTextBoxColumn6.HeaderText = "Description";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "Category";
-            this.dataGridViewTextBoxColumn7.HeaderText = "Category";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            // 
-            // ProductRating
-            // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "ProductRating";
-            this.dataGridViewTextBoxColumn8.HeaderText = "Product Rating";
-            this.dataGridViewTextBoxColumn8.Name = "ProductRating";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            this.dataGridViewTextBoxColumn8.Width = 108;
-            // 
-            // PurchaseDate
-            // 
-            this.dataGridViewTextBoxColumn9.DataPropertyName = "PurchaseDate";
-            this.dataGridViewTextBoxColumn9.HeaderText = "Purchase Date";
-            this.dataGridViewTextBoxColumn9.Name = "PurchaseDate";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            // 
-            // MyRating
-            // 
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "MyRating";
-            this.dataGridViewTextBoxColumn10.HeaderText = "My Rating";
-            this.dataGridViewTextBoxColumn10.Name = "MyRating";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            this.dataGridViewTextBoxColumn10.Width = 108;
-            // 
-            // dataGridViewTextBoxColumn11
-            // 
-            this.dataGridViewTextBoxColumn11.DataPropertyName = "Misc";
-            this.dataGridViewTextBoxColumn11.HeaderText = "Misc";
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
-            this.dataGridViewTextBoxColumn11.Width = 135;
-            // 
-            // dataGridViewImageButtonBoxColumn2
-            // 
-            this.dataGridViewImageButtonBoxColumn2.DataPropertyName = "DisplayTags";
-            this.dataGridViewImageButtonBoxColumn2.HeaderText = "Tags and Details";
-            this.dataGridViewImageButtonBoxColumn2.Name = "dataGridViewImageButtonBoxColumn2";
-            this.dataGridViewImageButtonBoxColumn2.ReadOnly = true;
-            this.dataGridViewImageButtonBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewImageButtonBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            // 
-            // ProductsGrid
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gridEntryDataGridView);
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "ProductsGrid";
-            this.Size = new System.Drawing.Size(1510, 380);
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private LibationWinForms.SyncBindingSource gridEntryBindingSource;
-		private System.Windows.Forms.DataGridView gridEntryDataGridView;
-        private LiberateDataGridViewImageButtonColumn dataGridViewImageButtonBoxColumn1;
-        private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
-        private EditTagsDataGridViewImageButtonColumn dataGridViewImageButtonBoxColumn2;
-    }
-}

LibationWinForms/ProductsGrid.cs

@@ -1,192 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ApplicationServices;
-using Dinah.Core;
-using Dinah.Core.DataBinding;
-using Dinah.Core.Threading;
-using Dinah.Core.Windows.Forms;
-using LibationWinForms.Dialogs;
-
-namespace LibationWinForms
-{
-	// INSTRUCTIONS TO UPDATE DATA_GRID_VIEW
-	// - delete current DataGridView
-	// - view > other windows > data sources
-	// - refresh
-	// OR
-	// - Add New Data Source
-	//   Object. Next
-	//   LibationWinForms
-	//     AudibleDTO
-	//       GridEntry
-	// - go to Design view
-	// - click on Data Sources > ProductItem. dropdown: DataGridView
-	// - drag/drop ProductItem on design surface
-	// AS OF AUGUST 2021 THIS DOES NOT WORK IN VS2019 WITH .NET-5 PROJECTS 
-
-	public partial class ProductsGrid : UserControl
-	{
-		public event EventHandler<int> VisibleCountChanged;
-
-		// alias
-		private DataGridView _dataGridView => gridEntryDataGridView;
-
-		public ProductsGrid()
-		{
-			InitializeComponent();
-
-			// sorting breaks filters. must reapply filters after sorting
-			_dataGridView.Sorted += (_, __) => Filter();
-			_dataGridView.CellContentClick += DataGridView_CellContentClick;
-
-			EnableDoubleBuffering();
-		}
-		private void EnableDoubleBuffering()
-		{
-			var propertyInfo = _dataGridView.GetType().GetProperty("DoubleBuffered", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
-
-			propertyInfo.SetValue(_dataGridView, true, null);
-		}
-
-		#region Button controls
-
-		private async void DataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
-		{
-			// handle grid button click: https://stackoverflow.com/a/13687844
-			if (e.RowIndex < 0 || _dataGridView.Columns[e.ColumnIndex] is not DataGridViewButtonColumn)
-				return;
-
-			var liveGridEntry = getGridEntry(e.RowIndex);
-
-			switch (_dataGridView.Columns[e.ColumnIndex].DataPropertyName)
-			{
-				case nameof(liveGridEntry.Liberate):
-					await Liberate_Click(liveGridEntry);
-					break;
-				case nameof(liveGridEntry.DisplayTags):
-					Details_Click(liveGridEntry);
-					break;
-			}
-		}
-
-		private static async Task Liberate_Click(GridEntry liveGridEntry)
-		{
-			var libraryBook = liveGridEntry.LibraryBook;
-
-			// liberated: open explorer to file
-			if (libraryBook.Book.Audio_Exists)
-			{
-				var filePath = LibationFileManager.AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-				if (!Go.To.File(filePath))
-				{
-					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
-					MessageBox.Show($"File not found" + suffix);
-				}
-				return;
-			}
-
-			// else: liberate
-			await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(libraryBook);
-		}
-
-		private static void Details_Click(GridEntry liveGridEntry)
-		{
-			var bookDetailsForm = new BookDetailsDialog(liveGridEntry.LibraryBook);
-			if (bookDetailsForm.ShowDialog() != DialogResult.OK)
-				return;
-
-			liveGridEntry.BeginEdit();
-
-			liveGridEntry.DisplayTags = bookDetailsForm.NewTags;
-			liveGridEntry.Liberate = (bookDetailsForm.BookLiberatedStatus, bookDetailsForm.PdfLiberatedStatus);
-
-			liveGridEntry.EndEdit();
-		}
-
-		#endregion
-
-		#region UI display functions
-
-		private bool hasBeenDisplayed = false;
-		public void Display()
-		{
-			if (hasBeenDisplayed)
-				return;
-			hasBeenDisplayed = true;
-
-			//
-			// transform into sorted GridEntry.s BEFORE binding
-			//
-			var lib = DbContexts.GetLibrary_Flat_NoTracking();
-
-			// if no data. hide all columns. return
-			if (!lib.Any())
-			{
-				for (var i = _dataGridView.ColumnCount - 1; i >= 0; i--)
-					_dataGridView.Columns.RemoveAt(i);
-				return;
-			}
-
-			var orderedGridEntries = lib
-				.Select(lb =>
-				{
-					var entry = new GridEntry(lb);
-					entry.Committed += (_, __) => Filter();
-					return entry;
-				}).ToList()
-				// default load order
-				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
-				//// more advanced example: sort by author, then series, then title
-				//.OrderBy(ge => ge.Authors)
-				//    .ThenBy(ge => ge.Series)
-				//    .ThenBy(ge => ge.Title)
-				.ToList();
-
-			// BIND
-			gridEntryBindingSource.DataSource = new SortableBindingList<GridEntry>(orderedGridEntries);
-
-			// FILTER
-			Filter();
-		}
-
-		#endregion
-
-		#region Filter
-
-		private string _filterSearchString;
-		private void Filter() => Filter(_filterSearchString);
-		public void Filter(string searchString)
-		{
-			_filterSearchString = searchString;
-
-			if (_dataGridView.Rows.Count == 0)
-				return;
-
-			var searchResults = SearchEngineCommands.Search(searchString);
-			var productIds = searchResults.Docs.Select(d => d.ProductId).ToList();
-
-			// https://stackoverflow.com/a/18942430
-			var bindingContext = BindingContext[_dataGridView.DataSource];
-			bindingContext.SuspendBinding();
-			{
-				this.UIThreadSync(() =>
-				{
-					for (var r = _dataGridView.RowCount - 1; r >= 0; r--)
-						_dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).AudibleProductId);
-				});
-			}
-
-			//Causes repainting of the DataGridView
-			bindingContext.ResumeBinding();
-			VisibleCountChanged?.Invoke(this, _dataGridView.AsEnumerable().Count(r => r.Visible));
-		}
-
-		#endregion
-
-		#region DataGridView Macro
-		private GridEntry getGridEntry(int rowIndex) => _dataGridView.GetBoundItem<GridEntry>(rowIndex);
-		#endregion
-	}
-}

LibationWinForms/Program.cs

@@ -1,335 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using AudibleApi.Authorization;
-using AudibleUtilities;
-using DataLayer;
-using Dinah.Core;
-using LibationFileManager;
-using LibationWinForms.Dialogs;
-using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json.Linq;
-using Serilog;
-
-namespace LibationWinForms
-{
-	static class Program
-	{
-		[System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError = true)]
-		[return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
-		static extern bool AllocConsole();
-
-		[STAThread]
-		static void Main()
-		{
-			try
-			{
-				//// Uncomment to see Console. Must be called before anything writes to Console.
-				//// Only use while debugging. Acts erratically in the wild
-				//AllocConsole();
-
-				ApplicationConfiguration.Initialize();
-
-				//***********************************************//
-				//                                               //
-				//   do not use Configuration before this line   //
-				//                                               //
-				//***********************************************//
-				// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
-				var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
-
-				// do this as soon as possible (post-config)
-				RunInstaller(config);
-
-				// most migrations go in here
-				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
-
-				// migrations which require Forms or are long-running
-				RunWindowsOnlyMigrations(config);
-
-				MessageBoxVerboseLoggingWarning.ShowIfTrue();
-
-#if !DEBUG
-				checkForUpdate();
-#endif
-
-				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
-			}
-			catch (Exception ex)
-			{
-				var title = "Fatal error, pre-logging";
-				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
-				try
-				{
-					MessageBoxAlertAdmin.Show(body, title, ex);
-				}
-				catch
-				{
-					MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-				return;
-			}
-
-			Application.Run(new Form1());
-		}
-
-		private static void RunInstaller(Configuration config)
-		{
-			// all returns should be preceded by either:
-			// - if config.LibationSettingsAreValid
-			// - error message, Exit()
-
-			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.SetLibationFiles(defaultLibationFilesDir);
-
-			if (config.LibationSettingsAreValid)
-				return;
-
-			static void CancelInstallation()
-			{
-				MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				Application.Exit();
-				Environment.Exit(0);
-			}
-
-			var setupDialog = new SetupDialog();
-			if (setupDialog.ShowDialog() != DialogResult.OK)
-			{
-				CancelInstallation();
-				return;
-			}
-
-			if (setupDialog.IsNewUser)
-				config.SetLibationFiles(defaultLibationFilesDir);
-			else if (setupDialog.IsReturningUser)
-			{
-				var libationFilesDialog = new LibationFilesDialog();
-
-				if (libationFilesDialog.ShowDialog() != DialogResult.OK)
-				{
-					CancelInstallation();
-					return;
-				}
-
-				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
-				if (config.LibationSettingsAreValid)
-					return;
-
-				// path did not result in valid settings
-				var continueResult = 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 (continueResult != DialogResult.Yes)
-				{
-					CancelInstallation();
-					return;
-				}
-			}
-
-			// INIT DEFAULT SETTINGS
-			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
-			config.Books ??= Path.Combine(defaultLibationFilesDir, "Books");
-			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
-
-			if (new SettingsDialog().ShowDialog() != DialogResult.OK)
-			{
-				CancelInstallation();
-				return;
-			}
-
-			if (config.LibationSettingsAreValid)
-				return;
-
-			CancelInstallation();
-		}
-
-		/// <summary>migrations which require Forms or are long-running</summary>
-		private static void RunWindowsOnlyMigrations(Configuration config)
-		{
-			// only supported in winforms. don't move to app scaffolding
-			migrate_to_v5_0_0(config);
-
-			// long running. won't get a chance to finish in cli. don't move to app scaffolding
-			migrate_to_v5_5_0(config);
-		}
-
-		#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 (!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();
-
-					// re-registers device
-					ApiExtended.CreateAsync(account, new Login.WinformLoginChoiceEager(account)).GetAwaiter().GetResult();
-				}
-                catch
-                {
-					// Don't care if it fails
-                }
-			}
-		}
-		#endregion
-
-		#region migrate to v5.5.0. FilePaths.json => db. long running. fire and forget
-		private static void migrate_to_v5_5_0(Configuration config)
-			=> new System.Threading.Thread(() => migrate_to_v5_5_0_thread(config)) { IsBackground = true }.Start();
-		private static void migrate_to_v5_5_0_thread(Configuration config)
-		{
-			try
-			{
-				var filePaths = Path.Combine(config.LibationFiles, "FilePaths.json");
-				if (!File.Exists(filePaths))
-					return;
-
-				var fileLocations = Path.Combine(config.LibationFiles, "FileLocations.json");
-				if (!File.Exists(fileLocations))
-					File.Copy(filePaths, fileLocations);
-
-				// files to be deleted at the end
-				var libhackFilesToDelete = new List<string>();
-				// .libhack files => errors
-				var libhackFiles = Directory.EnumerateDirectories(config.Books, "*.libhack", SearchOption.AllDirectories);
-
-				using var context = ApplicationServices.DbContexts.GetContext();
-				context.Books.Load();
-
-				var jArr = JArray.Parse(File.ReadAllText(filePaths));
-
-				foreach (var jToken in jArr)
-				{
-					var asinToken = jToken["Id"];
-					var fileTypeToken = jToken["FileType"];
-					var pathToken = jToken["Path"];
-					if (asinToken is null || fileTypeToken is null || pathToken is null ||
-						asinToken.Type != JTokenType.String || fileTypeToken.Type != JTokenType.Integer || pathToken.Type != JTokenType.String)
-						continue;
-
-					var asin = asinToken.Value<string>();
-					var fileType = (FileType)fileTypeToken.Value<int>();
-					var path = pathToken.Value<string>();
-
-					if (fileType == FileType.Unknown || fileType == FileType.AAXC)
-						continue;
-
-					var book = context.Books.Local.FirstOrDefault(b => b.AudibleProductId == asin);
-					if (book is null)
-						continue;
-
-					// assign these strings and enums/ints unconditionally. EFCore will only update if changed
-					if (fileType == FileType.PDF)
-						book.UserDefinedItem.BatchMode_UpdatePdfStatus(LiberatedStatus.Liberated);
-
-					if (fileType == FileType.Audio)
-					{
-						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
-						if (lhack is null)
-							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Liberated);
-						else
-						{
-							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Error);
-							libhackFilesToDelete.Add(lhack);
-						}
-					}
-				}
-
-				// in order: save to db, full reindex from db, refresh ui
-				var changed = context.SaveChanges();
-				if (changed > 0)
-					ApplicationServices.SearchEngineCommands.FullReIndex();
-				UserDefinedItem.BatchMode_Finalize();
-
-				// only do this after save changes
-				foreach (var libhackFile in libhackFilesToDelete)
-					File.Delete(libhackFile);
-
-				File.Delete(filePaths);
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error attempting to insert FilePaths into db");
-			}
-		}
-		#endregion
-
-		private static void checkForUpdate()
-		{
-			string zipUrl;
-			string htmlUrl;
-			string zipName;
-			try
-			{
-				bool hasUpgrade;
-				(hasUpgrade, zipUrl, htmlUrl, zipName) = AppScaffolding.LibationScaffolding.GetLatestRelease();
-
-				if (!hasUpgrade)
-					return;
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);
-				return;
-			}
-
-			if (zipUrl is null)
-			{
-				MessageBox.Show(htmlUrl, "New version available");
-				return;
-			}
-
-			var result = MessageBox.Show($"New version available @ {htmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-			if (result != DialogResult.Yes)
-				return;
-
-			try
-			{
-				using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-				if (fileSelector.ShowDialog() != DialogResult.OK)
-					return;
-				var selectedPath = fileSelector.FileName;
-
-				BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error downloading update", "Error downloading update", ex);
-			}
-		}
-	}
-}

LibationWinForms/Properties/DataSources/LibationWinForm.RemovableGridEntry.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="RemovableGridEntry" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>LibationWinForms.Dialogs.RemovableGridEntry, LibationWinForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>