Bug fix ( #276 ): x-thread error on fresh install

Fix spelling error

Documentation/SearchingAndFiltering.md

@@ -40,7 +40,7 @@ Libation's advanced searching is built on the powerful Lucene search engine. Sim
     * 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/FilterOptions.png)
+* 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.
 

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.4.6" />
+    <PackageReference Include="AAXClean" Version="0.4.7" />
     <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
   </ItemGroup>
 

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -20,7 +20,7 @@ namespace AaxDecrypter
 		public event EventHandler<TimeSpan> DecryptTimeRemaining;
 		public event EventHandler<string> FileCreated;
 
-		protected bool IsCanceled { get; set; }
+		public bool IsCanceled { get; set; }
 		
 		protected string OutputFileName { get; private set; }
 		protected DownloadOptions DownloadOptions { get; }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -9,435 +9,443 @@ 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
+	/// <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 = 32 * 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];
+
+			try
+			{
+				int bytesRead;
+				do
+				{
+					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 && bytesRead > 0);
+
+				_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}).");
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "An error was encountered while downloading {Uri}", Uri);
+				IsCancelled = true;
+			}
+		}
+
+		#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;
-        }
+			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)
+		/// <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)) ;
-        }
+			while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
+		}
 
-        public override void Close()
-        {
-            IsCancelled = true;
+		public override void Close()
+		{
+			IsCancelled = true;
 
-            while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
+			while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
 
-            _readFile.Close();
-            _writeFile.Close();
-            _networkStream?.Close();
-            Update();
-        }
+			_readFile.Close();
+			_writeFile.Close();
+			_networkStream?.Close();
+			Update();
+		}
 
-        #endregion
-        ~NetworkFileStream()
-        {
-            downloadEnded?.Close();
-            downloadedPiece?.Close();
-        }
-    }
+		#endregion
+		~NetworkFileStream()
+		{
+			downloadEnded?.Close();
+			downloadedPiece?.Close();
+		}
+	}
 }

Source/AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>7.4.0.1</Version>
+    <Version>8.0.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 

Source/AppScaffolding/LibationScaffolding.cs

@@ -3,11 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using ApplicationServices;
 using AudibleUtilities;
-using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using LibationFileManager;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json.Linq;
 using Serilog;
 
@@ -36,7 +37,8 @@ namespace AppScaffolding
 		public static Configuration RunPreConfigMigrations()
 		{
 			// must occur before access to Configuration instance
-			Migrations.migrate_to_v5_2_0__pre_config();
+			// // outdated. kept here as an example of what belongs in this area
+			// // Migrations.migrate_to_v5_2_0__pre_config();
 
 			//***********************************************//
 			//                                               //
@@ -57,6 +59,7 @@ namespace AppScaffolding
 			//
 
 			Migrations.migrate_to_v6_6_9(config);
+			Migrations.migrate_from_7_10_1(config);
 		}
 
 		public static void PopulateMissingConfigValues(Configuration config)
@@ -134,14 +137,22 @@ namespace AppScaffolding
 
 			if (!config.Exists(nameof(config.GridColumnsWidths)))
 				config.GridColumnsWidths = new Dictionary<string, int>();
+
+			if (!config.Exists(nameof(config.DownloadCoverArt)))
+				config.DownloadCoverArt = true;
+
+			if (!config.Exists(nameof(config.AutoDownloadEpisodes)))
+				config.AutoDownloadEpisodes = false;
 		}
 
-		/// <summary>Initialize logging. Run after migration</summary>
+		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
 		public static void RunPostMigrationScaffolding(Configuration config)
 		{
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
+
+			wireUpSystemEvents(config);
 		}
 
 		private static void ensureSerilogConfig(Configuration config)
@@ -247,18 +258,21 @@ namespace AppScaffolding
 
 		private static void logStartupState(Configuration config)
 		{
+#if DEBUG
+			var mode = "Debug";
+#else
+			var mode = "Release";
+#endif
+			if (System.Diagnostics.Debugger.IsAttached)
+				mode += " (Debugger attached)";
+
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
-#if DEBUG
-				Mode = "Debug",
-#else
-				Mode = "Release",
-#endif
-
+				Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
 				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
 				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
@@ -279,22 +293,26 @@ namespace AppScaffolding
 			});
 		}
 
-		public static (bool hasUpgrade, string zipUrl, string htmlUrl, string zipName) GetLatestRelease()
+		private static void wireUpSystemEvents(Configuration configuration)
 		{
-			(bool, string, string, string) isFalse = (false, null, null, null);
+			LibraryCommands.LibrarySizeChanged += (_, __) => SearchEngineCommands.FullReIndex();
+			LibraryCommands.BookUserDefinedItemCommitted += (_, books) => SearchEngineCommands.UpdateBooks(books);
+		}
 
+		public static UpgradeProperties GetLatestRelease()
+		{
 			// timed out
 			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
 			if (latest is null)
-				return isFalse;
+				return null;
 
 			var latestVersionString = latest.TagName.Trim('v');
 			if (!Version.TryParse(latestVersionString, out var latestRelease))
-				return isFalse;
+				return null;
 
 			// we're up to date
 			if (latestRelease <= BuildVersion)
-				return isFalse;
+				return null;
 
 			// we have an update
 			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
@@ -307,7 +325,7 @@ namespace AppScaffolding
 				zipUrl
 			});
 
-			return (true, zipUrl, latest.HtmlUrl, zip.Name);
+			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
 		private static Octokit.Release getLatestRelease(TimeSpan timeout)
 		{
@@ -338,41 +356,6 @@ namespace AppScaffolding
 
 	internal static class Migrations
 	{
-		#region migrate to v5.2.0
-		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
-		public static void migrate_to_v5_2_0__pre_config()
-		{
-			{
-				var settingsKey = "DownloadsInProgressEnum";
-				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-				{
-					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
-					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
-				}
-			}
-
-			{
-				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
-			}
-
-			{ // appsettings.json
-				var appSettingsKey = UNSAFE_MigrationHelper.LIBATION_FILES_KEY;
-				if (UNSAFE_MigrationHelper.APPSETTINGS_TryGet(appSettingsKey, out var value))
-					UNSAFE_MigrationHelper.APPSETTINGS_Update(appSettingsKey, translatePath(value));
-			}
-		}
-
-		private static string translatePath(string path)
-			=> path switch
-			{
-				"AppDir" => @".\LibationFiles",
-				"MyDocs" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles")),
-				"UserProfile" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation")),
-				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
-				_ => path
-			};
-		#endregion
-
 		public static void migrate_to_v6_6_9(Configuration config)
 		{
 			var writeToPath = $"Serilog.WriteTo";
@@ -419,5 +402,74 @@ namespace AppScaffolding
 				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
 			}
 		}
+
+		public static void migrate_from_7_10_1(Configuration config)
+		{
+			var lastNigrationThres = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
+
+			if (lastNigrationThres) return;
+
+			try
+			{
+
+				//https://github.com/rmcrackan/Libation/issues/270#issuecomment-1152863629
+				//This migration helps fix databases contaminated with the 7.10.1 hack workaround
+				//and those with improperly identified or missing series. This does not solve cases
+				//where individual episodes are in the db with a valid series link, but said series'
+				//parents have not been imported into the database.  For those cases, Libation will
+				//attempt fixup by retrieving parents from the catalog endpoint
+
+				using var context = DbContexts.GetContext();
+
+				//This migration removes books and series with SERIES_ prefix that were created
+				//as a hack workaround in 7.10.1. Said workaround was removed in 7.10.2
+				string removeHackSeries = "delete " +
+										  "from series " +
+										  "where AudibleSeriesId like 'SERIES%'";
+
+				string removeHackBooks = "delete " +
+										 "from books " +
+										 "where AudibleProductId like 'SERIES%'";
+
+				//Detect series parents that were added to the database as books with ContentType.Episode,
+				//and change them to ContentType.Parent
+				string updateContentType =
+					"UPDATE books " +
+					"SET contenttype = 4 " +
+					"WHERE audibleproductid IN (SELECT books.audibleproductid " +
+												"FROM books " +
+													"INNER JOIN series " +
+														"ON ( books.audibleproductid = " +
+															"series.audibleseriesid) " +
+												"WHERE books.contenttype = 2)";
+
+				//Then detect series parents that were added to the database as books with ContentType.Parent
+				//but are missing a series link, and add the link (don't know how this happened)
+				string addMissingSeriesLink =
+					"INSERT INTO seriesbook " +
+					"SELECT series.seriesid, " +
+							"books.bookid, " +
+							"'- 1' " +
+					"FROM books " +
+						"LEFT OUTER JOIN seriesbook " +
+									"ON books.bookid = seriesbook.bookid " +
+						"INNER JOIN series " +
+									"ON books.audibleproductid = series.audibleseriesid " +
+					"WHERE books.contenttype = 4 " +
+							"AND seriesbook.seriesid IS NULL";
+
+				context.Database.ExecuteSqlRaw(removeHackSeries);
+				context.Database.ExecuteSqlRaw(removeHackBooks);
+				context.Database.ExecuteSqlRaw(updateContentType);
+				context.Database.ExecuteSqlRaw(addMissingSeriesLink);
+
+				LibraryCommands.SaveContext(context);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occured while running database migrations in {0}", nameof(migrate_from_7_10_1));
+				config.SetObject($"{nameof(migrate_from_7_10_1)}_ThrewError", true);
+			}
+		}
 	}
 }

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -17,8 +17,13 @@ namespace AppScaffolding
 	/// 
 	/// 
 	/// </summary>
-	internal static class UNSAFE_MigrationHelper
+	public static class UNSAFE_MigrationHelper
 	{
+		public static string SettingsDirectory
+			=> !APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value) || value is null
+			? null
+			: value;
+
 		#region appsettings.json
 		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
 
@@ -87,19 +92,11 @@ namespace AppScaffolding
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion
-
 		#region Settings.json
 		public const string LIBATION_FILES_KEY = "LibationFiles";
 		private const string SETTINGS_JSON = "Settings.json";
 
-		public static string SettingsJsonPath
-		{
-			get
-			{
-				var success = APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value);
-				return !success || value is null ? null : Path.Combine(value, SETTINGS_JSON);
-			}
-		}
+		public static string SettingsJsonPath => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, SETTINGS_JSON);
 		public static bool SettingsJson_Exists => SettingsJsonPath is not null && File.Exists(SettingsJsonPath);
 
 		public static bool Settings_TryGet(string key, out string value)
@@ -267,5 +264,10 @@ namespace AppScaffolding
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion
+		#region LibationContext.db
+		public const string LIBATION_CONTEXT = "LibationContext.db";
+		public static string DatabaseFile => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, LIBATION_CONTEXT);
+		public static bool DatabaseFile_Exists => DatabaseFile is not null && File.Exists(DatabaseFile);
+		#endregion
 	}
 }

Source/AppScaffolding/UpgradeProperties.cs

@@ -0,0 +1,6 @@
+using System;
+
+namespace AppScaffolding
+{
+    public record UpgradeProperties(string ZipUrl, string HtmlUrl, string ZipName, Version LatestRelease);
+}

Source/ApplicationServices/DbContexts.cs

@@ -12,10 +12,10 @@ namespace ApplicationServices
 			=> LibationContext.Create(SqliteStorage.ConnectionString);
 
 		/// <summary>Use for full library querying. No lazy loading</summary>
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking()
+		public static List<LibraryBook> GetLibrary_Flat_NoTracking(bool includeParents = false)
 		{
 			using var context = GetContext();
-			return context.GetLibrary_Flat_NoTracking();
+			return context.GetLibrary_Flat_NoTracking(includeParents);
 		}
 	}
 }

Source/ApplicationServices/LibraryCommands.cs

@@ -27,10 +27,17 @@ namespace ApplicationServices
 			ScanEnd += (_, __) => Scanning = false;
 		}
 
-        public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+        public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, IEnumerable<LibraryBook> existingLibrary, params Account[] accounts)
 		{
 			logRestart();
 
+			lock (_lock)
+			{
+				if (Scanning)
+					return new();
+			}
+			ScanBegin?.Invoke(null, accounts.Length);
+
 			//These are the minimum response groups required for the
 			//library scanner to pass all validation and filtering.
 			var libraryOptions = new LibraryOptions
@@ -83,6 +90,7 @@ namespace ApplicationServices
 			{
 				stop();
 				var putBreakPointHere = logOutput;
+				ScanEnd?.Invoke(null, null);
 			}
 		}
 
@@ -100,8 +108,8 @@ namespace ApplicationServices
                 {
 					if (Scanning)
 						return (0, 0);
-					ScanBegin?.Invoke(null, accounts.Length);
 				}
+				ScanBegin?.Invoke(null, accounts.Length);
 
 				logTime($"pre {nameof(scanAccountsAsync)} all");
 				var libraryOptions = new LibraryOptions
@@ -118,6 +126,22 @@ namespace ApplicationServices
 				if (totalCount == 0)
 					return default;
 
+
+				Log.Logger.Information("Begin scan for orphaned episode parents");
+				var newParents = await findAndAddMissingParents(apiExtendedfunc, accounts);
+				Log.Logger.Information($"Orphan episode scan complete. New parents count {newParents}");
+
+				if (newParents >= 0)
+				{
+					//If any episodes are still orphaned, their series have been
+					//removed from the catalog and wel'll never be able to find them.
+
+					//only do this if findAndAddMissingParents returned >= 0. If it
+					//returned < 0, an error happened and there's still a chance that
+					//a future successful run will find missing parents.
+					removedOrphanedEpisodes();
+				}
+
 				Log.Logger.Information("Begin long-running import");
 				logTime($"pre {nameof(importIntoDbAsync)}");
 				var newCount = await importIntoDbAsync(importItems);
@@ -199,8 +223,8 @@ namespace ApplicationServices
             using var context = DbContexts.GetContext();
             var libraryBookImporter = new LibraryBookImporter(context);
             var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
-            logTime("importIntoDbAsync -- post Import()");
-            int qtyChanges = saveChanges(context);
+			logTime("importIntoDbAsync -- post Import()");
+            int qtyChanges = SaveContext(context);
             logTime("importIntoDbAsync -- post SaveChanges");
 
 			// this is any changes at all to the database, not just new books
@@ -211,7 +235,85 @@ namespace ApplicationServices
             return newCount;
         }
 
-        private static int saveChanges(LibationContext context)
+		static void removedOrphanedEpisodes()
+		{
+			using var context = DbContexts.GetContext();
+			try
+			{
+				var orphanedEpisodes =
+					context
+					.GetLibrary_Flat_NoTracking(includeParents: true)
+					.FindOrphanedEpisodes();
+
+				context.LibraryBooks.RemoveRange(orphanedEpisodes);
+				context.Books.RemoveRange(orphanedEpisodes.Select(lb => lb.Book));
+
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occured while trying to remove orphaned episodes from the database");
+			}
+		}
+
+		static async Task<int> findAndAddMissingParents(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts)
+		{
+			using var context = DbContexts.GetContext();
+
+			var library = context.GetLibrary_Flat_NoTracking(includeParents: true);
+
+			try
+			{
+				var orphanedEpisodes = library.FindOrphanedEpisodes().ToList();
+
+				if (!orphanedEpisodes.Any())
+					return -1;
+
+				var orphanedSeries =
+					orphanedEpisodes
+					.SelectMany(lb => lb.Book.SeriesLink)
+					.DistinctBy(s => s.Series.AudibleSeriesId)
+					.ToList();
+
+				// We're only calling the Catalog endpoint, so it doesn't matter which account we use.
+				var apiExtended = await apiExtendedfunc(accounts[0]);
+
+				var seriesParents = orphanedSeries.Select(o => o.Series.AudibleSeriesId).ToList();
+				var items = await apiExtended.Api.GetCatalogProductsAsync(seriesParents, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+
+				List<ImportItem> newParentsImportItems = new();
+				foreach (var sp in orphanedSeries)
+				{
+					var seriesItem = items.First(i => i.Asin == sp.Series.AudibleSeriesId);
+
+					if (seriesItem.Relationships is null)
+						continue;
+
+					var episode = orphanedEpisodes.First(l => l.Book.AudibleProductId == sp.Book.AudibleProductId);
+
+					seriesItem.PurchaseDate = new DateTimeOffset(episode.DateAdded);
+					seriesItem.Series = new AudibleApi.Common.Series[]
+					{
+						new AudibleApi.Common.Series{ Asin = seriesItem.Asin, Title = seriesItem.TitleWithSubtitle, Sequence = "-1"}
+					};
+
+					newParentsImportItems.Add(new ImportItem { DtoItem = seriesItem, AccountId = episode.Account, LocaleName = episode.Book.Locale });
+				}
+
+				var newCoutn = new LibraryBookImporter(context)
+					.Import(newParentsImportItems);
+
+				await context.SaveChangesAsync();
+
+				return newCoutn;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occured while trying to scan for orphaned episode parents.");
+				return -1;
+			}
+		}
+
+		public static int SaveContext(LibationContext context)
 		{
 			try
 			{
@@ -253,22 +355,55 @@ namespace ApplicationServices
 		#endregion
 
 		// call this whenever books are added or removed from library
-		private static void finalizeLibrarySizeChange()
-		{
-			SearchEngineCommands.FullReIndex();
-			LibrarySizeChanged?.Invoke(null, null);
-		}
+		private static void finalizeLibrarySizeChange() => LibrarySizeChanged?.Invoke(null, null);
 
-		/// <summary>Occurs when books are added or removed from library</summary>
+		/// <summary>Occurs when the size of the library changes. ie: books are added or removed</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.
+		/// Occurs when the size of the library does not change but book(s) details do. Especially when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/> changed values are successfully persisted.
 		/// </summary>
-		public static event EventHandler BookUserDefinedItemCommitted;
+		public static event EventHandler<IEnumerable<Book>> BookUserDefinedItemCommitted;
 
 		#region Update book details
+		public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
+		{
+			book.UserDefinedItem.BookStatus = bookStatus;
+			return UpdateUserDefinedItem(book);
+		}
+		public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
+		{
+			book.UserDefinedItem.PdfStatus = pdfStatus;
+			return UpdateUserDefinedItem(book);
+		}
+		public static int UpdateBook(
+			this Book book,
+			string tags = null,
+			LiberatedStatus? bookStatus = null,
+			LiberatedStatus? pdfStatus = null)
+			=> UpdateBooks(tags, bookStatus, pdfStatus, book);
+		public static int UpdateBooks(
+			string tags = null,
+			LiberatedStatus? bookStatus = null,
+			LiberatedStatus? pdfStatus = null,
+			params Book[] books)
+        {
+			foreach (var book in books)
+			{
+				// blank tags are expected. null tags are not
+				if (tags is not null && book.UserDefinedItem.Tags != tags)
+					book.UserDefinedItem.Tags = tags;
+
+				if (bookStatus is not null && book.UserDefinedItem.BookStatus != bookStatus.Value)
+					book.UserDefinedItem.BookStatus = bookStatus.Value;
+
+				// even though PdfStatus is nullable, there's no case where we'd actually overwrite with null
+				if (pdfStatus is not null && book.UserDefinedItem.PdfStatus != pdfStatus.Value)
+					book.UserDefinedItem.PdfStatus = pdfStatus.Value;
+			}
+
+			return UpdateUserDefinedItem(books);
+		}
 		public static int UpdateUserDefinedItem(params Book[] books) => UpdateUserDefinedItem(books.ToList());
 		public static int UpdateUserDefinedItem(IEnumerable<Book> books)
 		{
@@ -284,23 +419,8 @@ namespace ApplicationServices
 					context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 
 				var qtyChanges = context.SaveChanges();
-				if (qtyChanges == 0)
-					return 0;
-
-				// semi-arbitrary. At some point it's more worth it to do a full re-index than to do one offs.
-				// I did not benchmark before choosing the number here
-				if (qtyChanges > 15)
-					SearchEngineCommands.FullReIndex();
-				else
-				{
-					foreach (var book in books)
-					{
-						SearchEngineCommands.UpdateLiberatedStatus(book);
-						SearchEngineCommands.UpdateBookTags(book);
-					}
-				}
-
-				BookUserDefinedItemCommitted?.Invoke(null, null);
+				if (qtyChanges > 0)
+					BookUserDefinedItemCommitted?.Invoke(null, books);
 
 				return qtyChanges;
 			}
@@ -314,7 +434,7 @@ namespace ApplicationServices
 
 		// must be here instead of in db layer due to AaxcExists
 		public static LiberatedStatus Liberated_Status(Book book)
-			=> book.Audio_Exists ? book.UserDefinedItem.BookStatus
+			=> book.Audio_Exists() ? book.UserDefinedItem.BookStatus
 			: AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
 			: LiberatedStatus.NotLiberated;
 
@@ -323,7 +443,14 @@ namespace ApplicationServices
 
 		// 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 record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded)
+		{
+			public int PendingBooks => booksNoProgress + booksDownloadedOnly;
+			public bool HasPendingBooks => PendingBooks > 0;
+
+			public bool HasBookResults => 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress + booksError);
+			public bool HasPdfResults => 0 < (pdfsNotDownloaded + pdfsDownloaded);
+		}
 		public static LibraryStats GetCounts()
 		{
 			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
@@ -341,7 +468,7 @@ namespace ApplicationServices
 
 			var boolResults = libraryBooks
 				.AsParallel()
-				.Where(lb => lb.Book.HasPdf)
+				.Where(lb => lb.Book.HasPdf())
 				.Select(lb => Pdf_Status(lb.Book))
 				.ToList();
 			var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);

Source/ApplicationServices/LibraryExporter.cs

@@ -111,13 +111,13 @@ namespace ApplicationServices
 				AudibleProductId = a.Book.AudibleProductId,
 				Locale = a.Book.Locale,
 				Title = a.Book.Title,
-				AuthorNames = a.Book.AuthorNames,
-				NarratorNames = a.Book.NarratorNames,
+				AuthorNames = a.Book.AuthorNames(),
+				NarratorNames = a.Book.NarratorNames(),
 				LengthInMinutes = a.Book.LengthInMinutes,
 				Description = a.Book.Description,
 				Publisher = a.Book.Publisher,
-				HasPdf = a.Book.HasPdf,
-				SeriesNames = a.Book.SeriesNames,
+				HasPdf = a.Book.HasPdf(),
+				SeriesNames = a.Book.SeriesNames(),
 				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Order} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
 				CommunityRatingOverall = a.Book.Rating?.OverallRating,
 				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
@@ -125,7 +125,7 @@ namespace ApplicationServices
 				PictureId = a.Book.PictureId,
 				IsAbridged = a.Book.IsAbridged,
 				DatePublished = a.Book.DatePublished,
-				CategoriesNames = a.Book.CategoriesNames.Any() ? a.Book.CategoriesNames.Aggregate((a, b) => $"{a}, {b}") : "",
+				CategoriesNames = a.Book.CategoriesNames().Any() ? a.Book.CategoriesNames().Aggregate((a, b) => $"{a}, {b}") : "",
 				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
 				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
 				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,

Source/ApplicationServices/SearchEngineCommands.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using DataLayer;
 using LibationSearchEngine;
 
@@ -7,51 +9,99 @@ 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 =>
+		#region Search
+		public static SearchResultSet Search(string searchString) => performSafeQuery(e =>
 			e.Search(searchString)
 		);
 
-		public static void UpdateBookTags(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
+		private static T performSafeQuery<T>(Func<SearchEngine, T> func)
+		{
+			var engine = new SearchEngine();
+			try
+			{
+				return func(engine);
+			}
+			catch (FileNotFoundException)
+			{
+				fullReIndex(engine);
+				return func(engine);
+			}
+		}
+		#endregion
+
+		public static event EventHandler SearchEngineUpdated;
+
+		#region Update
+		private static bool isUpdating;
+
+		public static void UpdateBooks(IEnumerable<Book> books)
+		{
+			// Semi-arbitrary. At some point it's more worth it to do a full re-index than to do one offs.
+			// I did not benchmark before choosing the number here
+			if (books.Count() > 15)
+				FullReIndex();
+			else
+			{
+				foreach (var book in books)
+				{
+					UpdateLiberatedStatus(book);
+					UpdateBookTags(book);
+				}
+			}
+		}
+
+		public static void FullReIndex() => performSafeCommand(e =>
+			fullReIndex(e)
 		);
 
-		public static void UpdateLiberatedStatus(Book book) => performSearchEngineAction_safe(e =>
+		internal static void UpdateLiberatedStatus(Book book) => performSafeCommand(e =>
 			e.UpdateLiberatedStatus(book)
 		);
 
-		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
+		internal static void UpdateBookTags(Book book) => performSafeCommand(e =>
+			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
+		);
+
+		private static void performSafeCommand(Action<SearchEngine> action)
 		{
-			var engine = new SearchEngine();
 			try
 			{
-				action(engine);
+				update(action);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex(engine);
-				action(engine);
+				fullReIndex(new SearchEngine());
+				update(action);
 			}
 		}
 
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> func)
+		private static void update(Action<SearchEngine> action)
 		{
-			var engine = new SearchEngine();
+			if (action is null)
+				return;
+
+			// support nesting incl recursion
+			var prevIsUpdating = isUpdating;
 			try
 			{
-				return func(engine);
+				isUpdating = true;
+
+				action(new SearchEngine());
+
+				if (!prevIsUpdating)
+					SearchEngineUpdated?.Invoke(null, null);
 			}
-			catch (FileNotFoundException)
+			finally
 			{
-				FullReIndex(engine);
-				return func(engine);
+				isUpdating = prevIsUpdating;
 			}
 		}
+
+		private static void fullReIndex(SearchEngine engine)
+		{
+			var library = DbContexts.GetLibrary_Flat_NoTracking();
+			engine.CreateNewIndex(library);
+		}
+		#endregion
 	}
 }

Source/AudibleUtilities/ApiExtended.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApi.Common;
 using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Polly;
 using Polly.Retry;
 
@@ -118,31 +122,38 @@ namespace AudibleUtilities
 		private async Task<List<Item>> getItemsAsync(LibraryOptions libraryOptions, bool importEpisodes)
 		{
 			var items = new List<Item>();
-#if DEBUG
-//// this will not work for multi accounts
-//var library_json = "library.json";
-//library_json = System.IO.Path.GetFullPath(library_json);
-//if (System.IO.File.Exists(library_json))
-//{
-//    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
-//}
-#endif
 
-			Serilog.Log.Logger.Debug("Begin initial library scan");
+			Serilog.Log.Logger.Debug("Beginning library scan.");
 
-			if (!items.Any())
-				items = await Api.GetAllLibraryItemsAsync(libraryOptions);
+			List<Task<List<Item>>> getChildEpisodesTasks = new();
 
-			Serilog.Log.Logger.Debug("Initial library scan complete. Begin episode scan");
+			int count = 0, maxConcurrentEpisodeScans = 5;
+			using SemaphoreSlim concurrencySemaphore = new(maxConcurrentEpisodeScans);
 
-			await manageEpisodesAsync(items, importEpisodes);
+			await foreach (var item in Api.GetLibraryItemAsyncEnumerable(libraryOptions))
+			{
+				if ((item.IsEpisodes || item.IsSeriesParent) && importEpisodes)
+				{
+					//Get child episodes asynchronously and await all at the end
+					getChildEpisodesTasks.Add(getChildEpisodesAsync(concurrencySemaphore, item));
+				}
+				else if (!item.IsEpisodes)
+					items.Add(item);
 
-			Serilog.Log.Logger.Debug("Episode scan complete");
+				count++;
+			}
+
+			Serilog.Log.Logger.Debug("Library scan complete. Found {count} books and series. Waiting on {getChildEpisodesTasksCount} series episode scans to complete.", count, getChildEpisodesTasks.Count);
+
+			//await and add all episides from all parents
+			foreach (var epList in await Task.WhenAll(getChildEpisodesTasks))
+				items.AddRange(epList);
+
+			Serilog.Log.Logger.Debug("Completed library scan.");
 
 #if DEBUG
-//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
+			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
-
 			var validators = new List<IValidator>();
 			validators.AddRange(getValidators());
 			foreach (var v in validators)
@@ -156,56 +167,75 @@ namespace AudibleUtilities
 		}
 
 		#region episodes and podcasts
-		private async Task manageEpisodesAsync(List<Item> items, bool importEpisodes)
+
+		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)
 		{
-			// add podcasts and episodes to list. If fail, don't let it de-rail the rest of the import
+			await concurrencySemaphore.WaitAsync();
+
 			try
 			{
-				// get parents
-				var parents = items.Where(i => i.IsEpisodes).ToList();
-#if DEBUG
-//var parentsDebug = parents.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-//System.IO.File.WriteAllText("parents.json", parentsDebug);
-#endif
+				Serilog.Log.Logger.Debug("Beginning episode scan for {parent}", parent);
 
-				if (!parents.Any())
-					return;
+				List<Item> children;
 
-				Serilog.Log.Logger.Information($"{parents.Count} series of shows/podcasts found");
-
-				// remove episode parents. even if the following stuff fails, these will still be removed from the collection
-				items.RemoveAll(i => i.IsEpisodes);
-
-				if (importEpisodes)
+				if (parent.IsEpisodes)
 				{
-					// add children
-					var children = await getEpisodesAsync(parents);
-					Serilog.Log.Logger.Information($"{children.Count} episodes of shows/podcasts found");
-					items.AddRange(children);
+					//The 'parent' is a single episode that was added to the library.
+					//Get the episode's parent and add it to the database.
+
+					Serilog.Log.Logger.Debug("Supplied Parent is an episode. Beginning parent scan for {parent}", parent);
+
+					children = new() { parent };
+
+					var parentAsins = parent.Relationships
+						.Where(r => r.RelationshipToProduct == RelationshipToProduct.Parent)
+						.Select(p => p.Asin);
+
+					var seriesParents = await Api.GetCatalogProductsAsync(parentAsins, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+
+					int numSeriesParents = seriesParents.Count(p => p.IsSeriesParent);
+					if (numSeriesParents != 1)
+					{
+						//There should only ever be 1 top-level parent per episode. If not, log
+						//and throw so we can figure out what to do about those special cases.
+						JsonSerializerSettings Settings = new()
+						{
+							MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+							DateParseHandling = DateParseHandling.None,
+							Converters =
+							{
+								new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
+							},
+						};
+						var ex = new ApplicationException($"Found {numSeriesParents} parents for {parent.Asin}");
+						Serilog.Log.Logger.Error(ex, $"Episode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
+						throw ex;
+					}
+
+					var realParent = seriesParents.Single(p => p.IsSeriesParent);
+					realParent.PurchaseDate = parent.PurchaseDate;
+
+					Serilog.Log.Logger.Debug("Completed parent scan for {parent}", parent); 
+					parent = realParent;
 				}
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "Error adding podcasts and episodes");
-			}
-		}
-
-		private async Task<List<Item>> getEpisodesAsync(List<Item> parents)
-		{
-			var results = new List<Item>();
-
-			foreach (var parent in parents)
-			{
-				var children = await getEpisodeChildrenAsync(parent);
-
-				// actual individual episode, not the parent of a series.
-				// for now I'm keeping it inside this method since it fits the work flow, incl. importEpisodes logic
-				if (!children.Any())
+				else
 				{
-					results.Add(parent);
-					continue;
+					children = await getEpisodeChildrenAsync(parent);
+					if (!children.Any())
+						return new();
 				}
 
+				//A series parent will always have exactly 1 Series
+				parent.Series = new Series[]
+				{
+					new Series
+					{
+						Asin = parent.Asin,
+						Sequence = "-1",
+						Title = parent.TitleWithSubtitle
+					}
+				};
+
 				foreach (var child in children)
 				{
 					// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
@@ -217,25 +247,22 @@ namespace AudibleUtilities
 						{
 							Asin = parent.Asin,
 							// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
-							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin).Sort.ToString(),
+							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0",
 							Title = parent.TitleWithSubtitle
 						}
 					};
-					// overload (read: abuse) IsEpisodes flag
-					child.Relationships = new Relationship[]
-					{
-						new Relationship
-						{
-							RelationshipToProduct = RelationshipToProduct.Child,
-							RelationshipType = RelationshipType.Episode
-						}
-					};
 				}
 
-				results.AddRange(children);
-			}
+				children.Add(parent);
 
-			return results;
+				Serilog.Log.Logger.Debug("Completed episode scan for {parent}", parent);
+
+				return children;
+			}
+			finally
+			{
+				concurrencySemaphore.Release();
+			}
 		}
 
 		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
@@ -261,8 +288,8 @@ namespace AudibleUtilities
 				{
 					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 #if DEBUG
-//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
+					//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
+					//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
 #endif
 				}
 				catch (Exception ex)
@@ -277,7 +304,7 @@ namespace AudibleUtilities
 					throw;
 				}
 
-				Serilog.Log.Logger.Debug($"Batch {i}: {childrenBatch.Count} results");
+				Serilog.Log.Logger.Debug($"Batch {i}: {childrenBatch.Count} results\t({{parent}})", parent);
 				// the service returned no results. probably indicates an error. stop running batches
 				if (!childrenBatch.Any())
 					break;
@@ -295,7 +322,7 @@ namespace AudibleUtilities
 			if (childrenIds.Count != results.Count)
 			{
 				var ex = new ApplicationException($"Mis-match: Children defined by parent={childrenIds.Count}. Children returned by batches={results.Count}");
-				Serilog.Log.Logger.Error(ex, "Quantity of series episodes defined by parent does not match quantity returned by batch fetching.");
+				Serilog.Log.Logger.Error(ex, "{parent} - Quantity of series episodes defined by parent does not match quantity returned by batch fetching.", parent);
 				throw ex;
 			}
 

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="2.8.1.1" />
+    <PackageReference Include="AudibleApi" Version="4.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/AudibleUtilities/Mkb79Auth.cs

@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AudibleApi;
+using AudibleApi.Authorization;
+using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace AudibleUtilities
+{
+	public partial class Mkb79Auth : IIdentityMaintainer
+	{
+		[JsonProperty("website_cookies")]
+		private JObject _websiteCookies { get; set; }
+	   
+		[JsonProperty("adp_token")]
+		public string AdpToken { get; private set; }
+
+		[JsonProperty("access_token")]
+		public string AccessToken { get; private set; }
+
+		[JsonProperty("refresh_token")]
+		public string RefreshToken { get; private set; }
+
+		[JsonProperty("device_private_key")]
+		public string DevicePrivateKey { get; private set; }
+
+		[JsonProperty("store_authentication_cookie")]
+		private JObject _storeAuthenticationCookie { get; set; }
+
+		[JsonProperty("device_info")]
+		public DeviceInfo DeviceInfo { get; private set; }
+
+		[JsonProperty("customer_info")]
+		public CustomerInfo CustomerInfo { get; private set; }
+
+		[JsonProperty("expires")]
+		private double _expires { get; set; }
+
+		[JsonProperty("locale_code")]
+		public string LocaleCode { get; private set; }
+
+		[JsonProperty("activation_bytes")]
+		public string ActivationBytes { get; private set; }
+
+		[JsonIgnore]
+		public Dictionary<string, string> WebsiteCookies
+		{
+			get => _websiteCookies.ToObject<Dictionary<string, string>>();
+			private set => _websiteCookies = JObject.Parse(JsonConvert.SerializeObject(value, Converter.Settings));
+		}
+
+		[JsonIgnore]
+		public string StoreAuthenticationCookie
+		{
+			get => _storeAuthenticationCookie.ToObject<Dictionary<string, string>>()["cookie"];
+			private set => _storeAuthenticationCookie = JObject.Parse(JsonConvert.SerializeObject(new Dictionary<string, string>() { { "cookie", value } }, Converter.Settings));
+		}
+
+		[JsonIgnore]
+		public DateTime AccessTokenExpires
+		{
+			get => DateTimeOffset.FromUnixTimeMilliseconds((long)(_expires * 1000)).DateTime;
+			private set => _expires = new DateTimeOffset(value).ToUnixTimeMilliseconds() / 1000d;
+		}
+
+		[JsonIgnore] public ISystemDateTime SystemDateTime { get; } = new SystemDateTime();
+		[JsonIgnore] public Locale Locale => Localization.Get(LocaleCode);
+		[JsonIgnore] public string DeviceSerialNumber => DeviceInfo.DeviceSerialNumber;
+		[JsonIgnore] public string DeviceType => DeviceInfo.DeviceType;
+		[JsonIgnore] public string AmazonAccountId => CustomerInfo.UserId;
+
+		public Task<AccessToken> GetAccessTokenAsync()
+			=> Task.FromResult(new AccessToken(AccessToken, AccessTokenExpires));
+
+		public Task<AdpToken> GetAdpTokenAsync() 
+			=> Task.FromResult(new AdpToken(AdpToken));
+
+		public Task<PrivateKey> GetPrivateKeyAsync() 
+			=> Task.FromResult(new PrivateKey(DevicePrivateKey));
+	}
+
+	public partial class CustomerInfo
+	{
+		[JsonProperty("account_pool")]
+		public string AccountPool { get; set; }
+
+		[JsonProperty("user_id")]
+		public string UserId { get; set; }
+
+		[JsonProperty("home_region")]
+		public string HomeRegion { get; set; }
+
+		[JsonProperty("name")]
+		public string Name { get; set; }
+
+		[JsonProperty("given_name")]
+		public string GivenName { get; set; }
+	}
+
+	public partial class DeviceInfo
+	{
+		[JsonProperty("device_name")]
+		public string DeviceName { get; set; }
+
+		[JsonProperty("device_serial_number")]
+		public string DeviceSerialNumber { get; set; }
+
+		[JsonProperty("device_type")]
+		public string DeviceType { get; set; }
+	}
+
+	public partial class Mkb79Auth
+	{
+		public static Mkb79Auth FromJson(string json)
+			=> JsonConvert.DeserializeObject<Mkb79Auth>(json, Converter.Settings);
+
+		public string ToJson()
+			=> JObject.Parse(JsonConvert.SerializeObject(this, Converter.Settings)).ToString(Formatting.Indented);
+
+		public async Task<Account> ToAccountAsync()
+		{
+			var refreshToken = new RefreshToken(RefreshToken);
+
+			var authorize = new Authorize(Locale);
+			var newToken = await authorize.RefreshAccessTokenAsync(refreshToken);
+			AccessToken = newToken.TokenValue;
+			AccessTokenExpires = newToken.Expires;
+
+			var api = new Api(this);
+			var email = await api.GetEmailAsync();
+			var account = new Account(email)
+			{
+				DecryptKey = ActivationBytes,
+				AccountName = $"{email} - {Locale.Name}",
+				IdentityTokens = new Identity(Locale)
+			};
+
+			account.IdentityTokens.Update(
+				await GetPrivateKeyAsync(),
+				await GetAdpTokenAsync(),
+				await GetAccessTokenAsync(),
+				refreshToken,
+				WebsiteCookies.Select(c => new KeyValuePair<string, string>(c.Key, c.Value)),
+				DeviceSerialNumber,
+				DeviceType,
+				AmazonAccountId,
+				DeviceInfo.DeviceName,
+				StoreAuthenticationCookie);
+
+			return account;
+		}
+
+		public static Mkb79Auth FromAccount(Account account)
+			=> new()
+			{
+				AccessToken = account.IdentityTokens.ExistingAccessToken.TokenValue,
+				ActivationBytes = string.IsNullOrEmpty(account.DecryptKey) ? null : account.DecryptKey,
+				AdpToken = account.IdentityTokens.AdpToken.Value,
+				CustomerInfo = new CustomerInfo
+				{
+					AccountPool = "Amazon",
+					GivenName = string.Empty,
+					HomeRegion = "NA",
+					Name = string.Empty,
+					UserId = account.IdentityTokens.AmazonAccountId
+				},
+				DeviceInfo = new DeviceInfo
+				{
+					DeviceName = account.IdentityTokens.DeviceName,
+					DeviceSerialNumber = account.IdentityTokens.DeviceSerialNumber,
+					DeviceType = account.IdentityTokens.DeviceType,
+				},
+				DevicePrivateKey = account.IdentityTokens.PrivateKey,
+				AccessTokenExpires = account.IdentityTokens.ExistingAccessToken.Expires,
+				LocaleCode = account.Locale.CountryCode,
+				RefreshToken = account.IdentityTokens.RefreshToken.Value,				
+				StoreAuthenticationCookie = account.IdentityTokens.StoreAuthenticationCookie,
+				WebsiteCookies = new(account.IdentityTokens.Cookies.ToKeyValuePair()),
+			};
+	}
+
+	public static class Serialize
+	{
+		public static string ToJson(this Mkb79Auth self) 
+			=> JObject.Parse(JsonConvert.SerializeObject(self, Converter.Settings)).ToString(Formatting.Indented);
+	}
+
+	internal static class Converter
+	{
+		public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
+		{
+			MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+			DateParseHandling = DateParseHandling.None,
+		};
+	}
+}

Source/DataLayer/DataLayer.csproj

@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.0.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -29,7 +29,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <None Update="appsettings.json">
+    <None Update="migrate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Source/DataLayer/EfClasses/Book.cs

@@ -16,8 +16,14 @@ namespace DataLayer
         }
     }
 
-    // enum will be easier than bool to extend later
-    public enum ContentType { Unknown = 0, Product = 1, Episode = 2 }
+    // enum will be easier than bool to extend later. 
+    public enum ContentType 
+    { 
+        Unknown = 0,
+        Product = 1,
+        Episode = 2,
+        Parent = 4,
+    }
 
     public class Book
     {
@@ -43,27 +49,10 @@ namespace DataLayer
         // non-null. use "empty pattern"
         internal int CategoryId { get; private set; }
         public Category Category { get; private set; }
-        public string[] CategoriesNames
-            => Category is null ? new string[0]
-            : Category.ParentCategory is null ? new[] { Category.Name }
-            : new[] { Category.ParentCategory.Name, Category.Name };
-        public string[] CategoriesIds
-            => Category is null ? null
-            : Category.ParentCategory is null ? new[] { Category.AudibleCategoryId }
-            : new[] { Category.ParentCategory.AudibleCategoryId, Category.AudibleCategoryId };
-
-        public string TitleSortable => Formatters.GetSortName(Title);
-        public string SeriesSortable => Formatters.GetSortName(SeriesNames);
 
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
-        // UserDefinedItem convenience properties
-        /// <summary>True if IsLiberated or Error. False if NotLiberated</summary>
-        public bool Audio_Exists => UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated;
-        /// <summary>True if exists and IsLiberated. Else false</summary>
-        public bool PDF_Exists => UserDefinedItem.PdfStatus == LiberatedStatus.Liberated;
-
         // is owned, not optional 1:1
         /// <summary>The product's aggregate community rating</summary>
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);
@@ -125,11 +114,7 @@ namespace DataLayer
                 .ToList();
 
         public IEnumerable<Contributor> Authors => getContributions(Role.Author).Select(bc => bc.Contributor).ToList();
-        public string AuthorNames => string.Join(", ", Authors.Select(a => a.Name));
-
         public IEnumerable<Contributor> Narrators => getContributions(Role.Narrator).Select(bc => bc.Contributor).ToList();
-        public string NarratorNames => string.Join(", ", Narrators.Select(n => n.Name));
-
         public string Publisher => getContributions(Role.Publisher).SingleOrDefault()?.Contributor.Name;
 
         public void ReplaceAuthors(IEnumerable<Contributor> authors, DbContext context = null)
@@ -185,30 +170,6 @@ namespace DataLayer
         #region series
         private HashSet<SeriesBook> _seriesLink;
         public IEnumerable<SeriesBook> SeriesLink => _seriesLink?.ToList();
-        public string SeriesNames
-        {
-            get
-            {
-                if (_seriesLink is null)
-                    return "";
-
-                // first: alphabetical by name
-                var withNames = _seriesLink
-                    .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
-                    .Select(s => s.Series.Name)
-                    .OrderBy(a => a)
-                    .ToList();
-                // then un-named are alpha by series id
-                var nullNames = _seriesLink
-                    .Where(s => string.IsNullOrWhiteSpace(s.Series.Name))
-                    .Select(s => s.Series.AudibleSeriesId)
-                    .OrderBy(a => a)
-                    .ToList();
-
-                var all = withNames.Union(nullNames).ToList();
-                return string.Join(", ", all);
-            }
-        }
 
         public void UpsertSeries(Series series, string order, DbContext context = null)
         {
@@ -230,7 +191,6 @@ namespace DataLayer
         #region supplements
         private HashSet<Supplement> _supplements;
         public IEnumerable<Supplement> Supplements => _supplements?.ToList();
-        public bool HasPdf => Supplements.Any();
 
         public void AddSupplementDownloadUrl(string url)
         {

Source/DataLayer/EfClasses/Rating.cs

@@ -12,7 +12,7 @@ namespace DataLayer
         public float StoryRating { get; private set; }
 
         private Rating() { }
-        internal Rating(float overallRating, float performanceRating, float storyRating)
+        public Rating(float overallRating, float performanceRating, float storyRating)
         {
             OverallRating = overallRating;
             PerformanceRating = performanceRating;
@@ -38,41 +38,6 @@ namespace DataLayer
             yield return StoryRating;
         }
 
-        public float FirstScore
-            => OverallRating > 0 ? OverallRating
-            : PerformanceRating > 0 ? PerformanceRating
-            : StoryRating;
-
-        /// <summary>character: ★</summary>
-        const char STAR = '\u2605';
-        /// <summary>character: ½</summary>
-        const char HALF = '\u00BD';
-        string getStars(float score)
-        {
-            var fullStars = (int)Math.Floor(score);
-
-            var starString = "".PadLeft(fullStars, STAR);
-
-            if (score - fullStars == 0.5f)
-                starString += HALF;
-
-            return starString;
-        }
-
-        public string ToStarString()
-        {
-            var items = new List<string>();
-
-            if (OverallRating > 0)
-                items.Add($"Overall:   {getStars(OverallRating)}");
-            if (PerformanceRating > 0)
-                items.Add($"Perform: {getStars(PerformanceRating)}");
-            if (StoryRating > 0)
-                items.Add($"Story:      {getStars(StoryRating)}");
-
-            return string.Join("\r\n", items);
-        }
-
 		public override string ToString() => $"Overall={OverallRating} Perf={PerformanceRating} Story={StoryRating}";
 	}
 }

Source/DataLayer/EntityExtensions.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataLayer
+{
+    public static class EntityExtensions
+    {
+        public static string TitleSortable(this Book book) => Formatters.GetSortName(book.Title);
+
+        public static string AuthorNames(this Book book) => string.Join(", ", book.Authors.Select(a => a.Name));
+        public static string NarratorNames(this Book book) => string.Join(", ", book.Narrators.Select(n => n.Name));
+
+        /// <summary>True if IsLiberated or Error. False if NotLiberated</summary>
+        public static bool Audio_Exists(this Book book) => book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated;
+        /// <summary>True if exists and IsLiberated. Else false</summary>
+        public static bool PDF_Exists(this Book book) => book.UserDefinedItem.PdfStatus == LiberatedStatus.Liberated;
+
+        public static string SeriesSortable(this Book book) => Formatters.GetSortName(book.SeriesNames());
+		public static bool HasPdf(this Book book) => book.Supplements.Any();
+        public static string SeriesNames(this Book book)
+        {
+            if (book.SeriesLink is null)
+                return "";
+
+            // first: alphabetical by name
+            var withNames = book.SeriesLink
+                .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
+                .Select(s => s.Series.Name)
+                .OrderBy(a => a)
+                .ToList();
+            // then un-named are alpha by series id
+            var nullNames = book.SeriesLink
+                .Where(s => string.IsNullOrWhiteSpace(s.Series.Name))
+                .Select(s => s.Series.AudibleSeriesId)
+                .OrderBy(a => a)
+                .ToList();
+
+            var all = withNames.Union(nullNames).ToList();
+            return string.Join(", ", all);
+        }
+        public static string[] CategoriesNames(this Book book)
+            => book.Category is null ? new string[0]
+            : book.Category.ParentCategory is null ? new[] { book.Category.Name }
+            : new[] { book.Category.ParentCategory.Name, book.Category.Name };
+        public static string[] CategoriesIds(this Book book)
+            => book.Category is null ? null
+            : book.Category.ParentCategory is null ? new[] { book.Category.AudibleCategoryId }
+            : new[] { book.Category.ParentCategory.AudibleCategoryId, book.Category.AudibleCategoryId };
+
+        public static string AggregateTitles(this IEnumerable<LibraryBook> libraryBooks, int max = 5)
+		{
+			if (libraryBooks is null || !libraryBooks.Any())
+				return "";
+
+			max = Math.Max(max, 1);
+
+			var titles = libraryBooks.Select(lb => "- " + lb.Book.Title).ToList();
+			var titlesAgg = titles.Take(max).Aggregate((a, b) => $"{a}\r\n{b}");
+			if (titles.Count == max + 1)
+				titlesAgg += $"\r\n\r\nand 1 other";
+			else if (titles.Count > max + 1)
+				titlesAgg += $"\r\n\r\nand {titles.Count - max } others";
+			return titlesAgg;
+		}
+
+        public static float FirstScore(this Rating rating)
+            => rating.OverallRating > 0 ? rating.OverallRating
+            : rating.PerformanceRating > 0 ? rating.PerformanceRating
+            : rating.StoryRating;
+        public static string ToStarString(this Rating rating)
+        {
+            var items = new List<string>();
+
+            if (rating.OverallRating > 0)
+                items.Add($"Overall:   {getStars(rating.OverallRating)}");
+            if (rating.PerformanceRating > 0)
+                items.Add($"Perform: {getStars(rating.PerformanceRating)}");
+            if (rating.StoryRating > 0)
+                items.Add($"Story:      {getStars(rating.StoryRating)}");
+
+            return string.Join("\r\n", items);
+        }
+        /// <summary>character: ★</summary>
+        const char STAR = '\u2605';
+        /// <summary>character: ½</summary>
+        const char HALF = '\u00BD';
+        private static string getStars(float score)
+        {
+            var fullStars = (int)Math.Floor(score);
+
+            var starString = new string(STAR, fullStars);
+
+            if (score - fullStars >= 0.25f)
+                starString += HALF;
+
+            return starString;
+        }
+    }
+}

Source/DataLayer/LibationContext.cs

@@ -10,7 +10,7 @@ namespace DataLayer
         // ========================
         // these run against the db. linq queries against these MUST be translatable to sql. primatives only. no POCOs or this error occurs:
         //     Unable to create a constant value of type 'DataLayer.Contributor'. Only primitive types or enumeration types are supported in this context.
-        // to use full object-linq, load and use local
+        // to use full object-linq, load and use Local. HOWEVER, Local is only hashed/indexed on PK. All other searches are very slow
         // load full table:
         //     List<Contributor> contributors = ...;
         //     Contributors.Load();

Source/DataLayer/QueryObjects/BookQueries.cs

@@ -35,5 +35,17 @@ namespace DataLayer
                 .Include(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
                 .Include(b => b.Category).ThenInclude(c => c.ParentCategory);
+
+        public static bool IsProduct(this Book book)
+            => book.ContentType is not ContentType.Episode and not ContentType.Parent;
+
+        public static bool IsEpisodeChild(this Book book)
+            => book.ContentType is ContentType.Episode;
+
+        public static bool IsEpisodeParent(this Book book)
+            => book.ContentType is ContentType.Parent;
+        public static bool HasLiberated(this Book book)
+            => book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated ||
+            book.UserDefinedItem.PdfStatus is not null and LiberatedStatus.Liberated;
     }
 }

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -15,11 +15,13 @@ namespace DataLayer
 		//		.GetLibrary()
 		//		.ToList();
 
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
+		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context, bool includeParents = false)
             => context
                 .LibraryBooks
                 .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
+                .AsEnumerable()
+                .Where(lb => !lb.Book.IsEpisodeParent() || includeParents)
                 .ToList();
 
         public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
@@ -40,5 +42,51 @@ namespace DataLayer
                 .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
                 .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
+
+        public static IEnumerable<LibraryBook> ParentedEpisodes(this IEnumerable<LibraryBook> libraryBooks)
+            => libraryBooks.Where(lb => lb.Book.IsEpisodeParent()).SelectMany(s => libraryBooks.FindChildren(s));
+
+        public static IEnumerable<LibraryBook> FindOrphanedEpisodes(this IEnumerable<LibraryBook> libraryBooks)
+		    => libraryBooks
+                .Where(lb => lb.Book.IsEpisodeChild())
+                .ExceptBy(
+                    libraryBooks
+                    .ParentedEpisodes()
+                    .Select(ge => ge.Book.AudibleProductId), ge => ge.Book.AudibleProductId);
+
+#nullable enable
+        public static LibraryBook? FindSeriesParent(this IEnumerable<LibraryBook> libraryBooks, LibraryBook seriesEpisode)
+        {
+            if (seriesEpisode.Book.SeriesLink is null) return null;
+
+            try
+            {
+                //Parent books will always have exactly 1 SeriesBook due to how
+                //they are imported in ApiExtended.getChildEpisodesAsync()
+                return libraryBooks.FirstOrDefault(
+                    lb =>
+                    lb.Book.IsEpisodeParent() &&
+                    seriesEpisode.Book.SeriesLink.Any(
+                        s => s.Series.AudibleSeriesId == lb.Book.SeriesLink.Single().Series.AudibleSeriesId));
+            }
+            catch (System.Exception ex)
+            {
+                Serilog.Log.Error(ex, "Query error in {0}", nameof(FindSeriesParent));
+                return null;
+            }
+        }
+#nullable disable
+
+        public static IEnumerable<LibraryBook> FindChildren(this IEnumerable<LibraryBook> bookList, LibraryBook parent)
+            => bookList
+            .Where(
+                lb => 
+                lb.Book.IsEpisodeChild() && 
+                lb.Book.SeriesLink?
+                    .Any(
+                        s => 
+                        s.Series.AudibleSeriesId == parent.Book.AudibleProductId
+                        ) == true
+                    ).ToList();
     }
 }

Source/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;"
-  }
-}

Source/DataLayer/migrate.json

@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
+  }
+}

Source/DtoImporterService/BookImporter.cs

@@ -75,7 +75,7 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
-			var contentType = item.IsEpisodes ? DataLayer.ContentType.Episode : DataLayer.ContentType.Product;
+			var contentType = GetContentType(item);
 
 			// absence of authors is very rare, but possible
 			if (!item.Authors?.Any() ?? true)
@@ -184,5 +184,15 @@ namespace DtoImporterService
 				}
 			}
 		}
+
+		private static DataLayer.ContentType GetContentType(Item item)
+		{
+			if (item.IsEpisodes)
+				return DataLayer.ContentType.Episode;
+			else if (item.IsSeriesParent)
+				return DataLayer.ContentType.Parent;
+			else 
+				return DataLayer.ContentType.Product;			
+		}
 	}
 }

Source/FileLiberator/AudioDecodable.cs

@@ -4,7 +4,8 @@ namespace FileLiberator
 {
     public abstract class AudioDecodable : Processable
     {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
+        public delegate byte[] RequestCoverArtHandler(object sender, EventArgs eventArgs);
+        public event RequestCoverArtHandler RequestCoverArt;
         public event EventHandler<string> TitleDiscovered;
         public event EventHandler<string> AuthorsDiscovered;
         public event EventHandler<string> NarratorsDiscovered;
@@ -32,10 +33,10 @@ namespace FileLiberator
             NarratorsDiscovered?.Invoke(this, narrators);
 		}
 
-        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
+        protected byte[] OnRequestCoverArt()
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
-            RequestCoverArt?.Invoke(this, setCoverArtDel);
+            return RequestCoverArt?.Invoke(this, new());
         }
 
         protected void OnCoverImageDiscovered(byte[] coverImage)

Source/FileLiberator/AudioFileStorageExt.cs

@@ -1,56 +1,70 @@
 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; }
+	public static class AudioFileStorageExt
+	{
+		private class MultipartRenamer
+		{
+			private LibraryBook libraryBook { get; }
 
-            internal MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
+			internal MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
 
-            internal string MultipartFilename(AaxDecrypter.MultiConvertFileProperties props)
-                => Templates.ChapterFile.GetFilename(libraryBook.ToDto(), props);
-        }
+			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;
+		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:
+		/// 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)
+		{
+			if (libraryBook.Book.IsEpisodeChild() && Configuration.Instance.SavePodcastsToParentFolder)
+			{
+				var series = libraryBook.Book.SeriesLink.SingleOrDefault();
+				if (series is not null)
+				{
+					var seriesParent = ApplicationServices.DbContexts.GetContext().GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);
 
-        /// <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, returnFirstExisting: true);
+					if (seriesParent is not null)
+					{
+						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto());
+						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir);
+					}
+				}
+			}
 
-        /// <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);
+			return Templates.Folder.GetFilename(libraryBook.ToDto());
+		}
 
-        /// <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);
-    }
+		/// <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, returnFirstExisting: true);
+
+		/// <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);
+	}
 }

Source/FileLiberator/ConvertToMp3.cs

@@ -14,19 +14,27 @@ namespace FileLiberator
 {
     public class ConvertToMp3 : AudioDecodable
     {
+        public override string Name => "Convert to Mp3";
         private Mp4File m4bBook;
 
-		private long fileSize;
+        private long fileSize;
         private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
-        public override void Cancel() => m4bBook?.Cancel();
+        private bool cancelled = false;
+        public override void Cancel()
+        {            
+            m4bBook?.Cancel();
+            cancelled = true;
+        }
 
-        public override bool Validate(LibraryBook libraryBook)
-        {
+        public static bool ValidateMp3(LibraryBook libraryBook)
+		{
             var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
             return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
         }
 
+        public override bool Validate(LibraryBook libraryBook) => ValidateMp3(libraryBook);
+
         public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
             OnBegin(libraryBook);
@@ -56,12 +64,12 @@ namespace FileLiberator
                 var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
                 OnFileCreated(libraryBook, realMp3Path);
 
-                var statusHandler = new StatusHandler();
-
                 if (result == ConversionResult.Failed)
-                    statusHandler.AddError("Conversion failed");
-
-                return statusHandler;
+                    return new StatusHandler { "Conversion failed" };
+                else if (result == ConversionResult.Cancelled)
+                    return new StatusHandler { "Cancelled" };
+                else
+                    return new StatusHandler();
             }
             finally
             {

Source/FileLiberator/DownloadDecryptBook.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AaxDecrypter;
+using ApplicationServices;
 using AudibleApi;
 using DataLayer;
 using Dinah.Core;
@@ -15,9 +16,10 @@ namespace FileLiberator
 {
     public class DownloadDecryptBook : AudioDecodable
     {
+        public override string Name => "Download & Decrypt";
         private AudiobookDownloadBase abDownloader;
 
-        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
 
         public override void Cancel() => abDownloader?.Cancel();
 
@@ -42,7 +44,7 @@ namespace FileLiberator
 
             try
             {
-                if (libraryBook.Book.Audio_Exists)
+                if (libraryBook.Book.Audio_Exists())
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
                 bool success = false;
@@ -65,18 +67,23 @@ namespace FileLiberator
                     foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
                         FileUtility.SaferDelete(tmpFile.Path);
 
-                    return new StatusHandler { "Decrypt failed" };
+                    return abDownloader?.IsCanceled == true ?
+                        new StatusHandler { "Cancelled" } : 
+                        new StatusHandler { "Decrypt failed" };
                 }
 
-                // moves new files from temp dir to final dest
-                var movedAudioFile = moveFilesToBooksDir(libraryBook, entries);
+                // moves new files from temp dir to final dest.
+                // This could take a few seconds if moving hundreds of files.
+                var movedAudioFile = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
 
                 // decrypt failed
                 if (!movedAudioFile)
                     return new StatusHandler { "Cannot find final audio file after decryption" };
 
-                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-                ApplicationServices.LibraryCommands.UpdateUserDefinedItem(libraryBook.Book);
+                if (Configuration.Instance.DownloadCoverArt)
+                    DownloadCoverArt(libraryBook);
+
+                libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
 
                 return new StatusHandler();
             }
@@ -114,7 +121,7 @@ namespace FileLiberator
                         : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
 
                     if (config.AllowLibationFixup)
-                        converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames);
+                        converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames());
 
                     abDownloader = converter;
                 }
@@ -129,6 +136,7 @@ namespace FileLiberator
 
                 // REAL WORK DONE HERE
                 var success = await Task.Run(abDownloader.Run);
+
                 return success;
             }
             finally
@@ -188,31 +196,27 @@ namespace FileLiberator
                 }
             }
 
-            NAudio.Lame.LameConfig lameConfig = new();
-
-
-            lameConfig.Mode = NAudio.Lame.MPEGMode.Mono;
+            audiobookDlLic.LameConfig = new();
+            audiobookDlLic.LameConfig.Mode = NAudio.Lame.MPEGMode.Mono;
 
             if (config.LameTargetBitrate)
 			{
                 if (config.LameConstantBitrate)
-                    lameConfig.BitRate = config.LameBitrate;
+                    audiobookDlLic.LameConfig.BitRate = config.LameBitrate;
                 else
                 {
-                    lameConfig.ABRRateKbps = config.LameBitrate;
-                    lameConfig.VBR = NAudio.Lame.VBRMode.ABR;
-                    lameConfig.WriteVBRTag = true;
+                    audiobookDlLic.LameConfig.ABRRateKbps = config.LameBitrate;
+                    audiobookDlLic.LameConfig.VBR = NAudio.Lame.VBRMode.ABR;
+                    audiobookDlLic.LameConfig.WriteVBRTag = true;
                 }
 			}
 			else
 			{
-                lameConfig.VBR = NAudio.Lame.VBRMode.Default;
-                lameConfig.VBRQuality = config.LameVBRQuality;
-                lameConfig.WriteVBRTag = true;
+                audiobookDlLic.LameConfig.VBR = NAudio.Lame.VBRMode.Default;
+                audiobookDlLic.LameConfig.VBRQuality = config.LameVBRQuality;
+                audiobookDlLic.LameConfig.WriteVBRTag = true;
             }
 
-            audiobookDlLic.LameConfig = lameConfig;
-
             return audiobookDlLic;
         }
 
@@ -243,7 +247,7 @@ namespace FileLiberator
             if (e is not null)
                 OnCoverImageDiscovered(e);
             else if (Configuration.Instance.AllowLibationFixup)
-                OnRequestCoverArt(abDownloader.SetCoverArt);
+                abDownloader.SetCoverArt(OnRequestCoverArt());
         }
 
         /// <summary>Move new files to 'Books' directory</summary>
@@ -278,5 +282,34 @@ namespace FileLiberator
 
 			return true;
 		}
+
+        private void DownloadCoverArt(LibraryBook libraryBook)
+		{
+            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+            var coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
+            coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
+
+            try
+            {
+                if (File.Exists(coverPath)) 
+                    FileUtility.SaferDelete(coverPath);
+
+                (string picId, PictureSize size) = libraryBook.Book.PictureLarge is null ?
+                    (libraryBook.Book.PictureId, PictureSize.Native) :
+                    (libraryBook.Book.PictureLarge, PictureSize.Native);
+
+                var picBytes = PictureStorage.GetPictureSynchronously(new PictureDefinition(picId, size));
+                
+                if (picBytes.Length > 0)
+                    File.WriteAllBytes(coverPath, picBytes);
+            }
+            catch (Exception ex)
+            {
+                //Failure to download cover art should not be
+                //considered a failure to download the book
+                Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+            }
+        }
+
 	}
 }

Source/FileLiberator/DownloadFile.cs

@@ -1,31 +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>(OnStreamingProgressChanged);
-
-			OnStreamingBegin(proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				OnFileCreated("Upgrade", actualDownloadedFilePath);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				OnStreamingCompleted(proposedDownloadFilePath);
-			}
-		}
-	}
-}

Source/FileLiberator/DownloadPdf.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using ApplicationServices;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
@@ -14,9 +15,10 @@ namespace FileLiberator
 {
 	public class DownloadPdf : Processable
 	{
+		public override string Name => "Download Pdf";
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !libraryBook.Book.PDF_Exists;
+			&& !libraryBook.Book.PDF_Exists();
 
 		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
@@ -28,8 +30,7 @@ namespace FileLiberator
 				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
 				var result = verifyDownload(actualDownloadedFilePath);
 
-				libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
-				ApplicationServices.LibraryCommands.UpdateUserDefinedItem(libraryBook.Book);
+				libraryBook.Book.UpdatePdfStatus(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
 
 				return result;
 			}

Source/FileLiberator/Processable.cs

@@ -11,6 +11,7 @@ namespace FileLiberator
 {
     public abstract class Processable : Streamable
     {
+        public abstract string Name { get; }
         public event EventHandler<LibraryBook> Begin;
 
         /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
@@ -28,7 +29,7 @@ namespace FileLiberator
         public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library)
             => library.Where(libraryBook =>
                 Validate(libraryBook)
-                && (libraryBook.Book.ContentType != ContentType.Episode || LibationFileManager.Configuration.Instance.DownloadEpisodes)
+                && (!libraryBook.Book.IsEpisodeChild() || Configuration.Instance.DownloadEpisodes)
                 );
 
         public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate)
@@ -48,38 +49,9 @@ namespace FileLiberator
                 = (await ProcessAsync(libraryBook))
                 ?? new StatusHandler { "Processable should never return a null status" };
 
-            if (status.IsSuccess)
-                DownloadCoverArt(libraryBook);
-
             return status;
         }
-
-        private void DownloadCoverArt(LibraryBook libraryBook)
-		{
-            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            var coverPath = FileManager.FileUtility.GetValidFilename(System.IO.Path.Combine(destinationDir, "Cover.jpg"), "", true);
-
-            if (System.IO.File.Exists(coverPath)) return;
-
-            try
-            {
-                (string picId, PictureSize size) = libraryBook.Book.PictureLarge is null ?
-                    (libraryBook.Book.PictureId, PictureSize.Native) :
-                    (libraryBook.Book.PictureLarge, PictureSize.Native);
-
-                var picBytes = PictureStorage.GetPictureSynchronously(new PictureDefinition(picId, size));
-
-                if (picBytes.Length > 0)
-                    System.IO.File.WriteAllBytes(coverPath, picBytes);
-            }
-            catch (Exception ex)
-            {
-                //Failure to download cover art should not be
-                //considered a failure to download the book
-                Serilog.Log.Logger.Error(ex.Message);
-            }
-        }
-
+        
         public async Task<StatusHandler> TryProcessAsync(LibraryBook libraryBook)
             => Validate(libraryBook)
             ? await ProcessAsync(libraryBook)

Source/FileManager/BackgroundFileSystem.cs

@@ -134,6 +134,8 @@ namespace FileManager
 
         private void AddPath(string path)
         {
+            if (!File.Exists(path) && !Directory.Exists(path))
+                return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
                 AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));
             else

Source/FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="4.2.0.1" />
+    <PackageReference Include="Dinah.Core" Version="4.4.0.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 

Source/Hangover/Form1.CLI.cs

@@ -0,0 +1,18 @@
+using AppScaffolding;
+
+namespace Hangover
+{
+    public partial class Form1
+    {
+        private void Load_cliTab()
+        {
+
+        }
+
+        private void cliTab_VisibleChanged(object sender, EventArgs e)
+        {
+            if (!databaseTab.Visible)
+                return;
+        }
+    }
+}

Source/Hangover/Form1.Database.cs

@@ -0,0 +1,140 @@
+using ApplicationServices;
+using AppScaffolding;
+using Microsoft.EntityFrameworkCore;
+
+namespace Hangover
+{
+    public partial class Form1
+    {
+        private string dbFile;
+
+        private void Load_databaseTab()
+        {
+            dbFile = UNSAFE_MigrationHelper.DatabaseFile;
+            if (dbFile is null)
+            {
+                databaseFileLbl.Text = $"Database file not found";
+                return;
+            }
+
+            databaseFileLbl.Text = $"Database file: {UNSAFE_MigrationHelper.DatabaseFile ?? "not found"}";
+        }
+
+        private void databaseTab_VisibleChanged(object sender, EventArgs e)
+        {
+            if (!databaseTab.Visible)
+                return;
+        }
+
+        private void sqlExecuteBtn_Click(object sender, EventArgs e)
+        {
+            ensureBackup();
+
+            sqlResultsTb.Clear();
+
+            try
+            {
+                var sql = sqlTb.Text.Trim();
+
+                #region // explanation
+                // Routing statements to non-query is a convenience.
+                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
+                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
+                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
+                //   -- line 1 is a comment
+                //   delete from foo
+                #endregion
+                var lower = sql.ToLower();
+                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
+                    nonQuery(sql);
+                else
+                    query(sql);
+            }
+            catch (Exception ex)
+            {
+                sqlResultsTb.Text = $"{ex.Message}\r\n{ex.StackTrace}";
+            }
+            finally
+            {
+                deleteUnneededBackups();
+            }
+        }
+
+        private string dbBackup;
+        private DateTime dbFileLastModified;
+        private void ensureBackup()
+        {
+            if (dbBackup is not null)
+                return;
+
+            dbFileLastModified = File.GetLastWriteTimeUtc(dbFile);
+
+            dbBackup
+                = Path.ChangeExtension(dbFile, "").TrimEnd('.')
+                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
+                + Path.GetExtension(dbFile);
+            File.Copy(dbFile, dbBackup);
+        }
+
+        private void deleteUnneededBackups()
+        {
+            var newLastModified = File.GetLastWriteTimeUtc(dbFile);
+            if (dbFileLastModified == newLastModified)
+            {
+                File.Delete(dbBackup);
+                dbBackup = null;
+            }
+        }
+
+        void query(string sql)
+        {
+            // ef doesn't support truly generic queries. have to drop down to ado.net
+            using var context = DbContexts.GetContext();
+            using var conn = context.Database.GetDbConnection();
+            conn.Open();
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = sql;
+
+            var reader = cmd.ExecuteReader();
+            var results = 0;
+            var builder = new System.Text.StringBuilder();
+            var lines = 0;
+            while (reader.Read())
+            {
+                results++;
+
+                for (var i = 0; i < reader.FieldCount; i++)
+                    builder.Append(reader.GetValue(i) + "\t");
+                builder.AppendLine();
+
+                lines++;
+                if (lines % 10 == 0)
+                {
+                    sqlResultsTb.AppendText(builder.ToString());
+                    builder.Clear();
+                }
+            }
+
+            sqlResultsTb.AppendText(builder.ToString());
+            builder.Clear();
+
+            if (results == 0)
+                sqlResultsTb.Text = "[no results]";
+            else
+            {
+                sqlResultsTb.AppendText($"\r\n{results} result");
+                if (results != 1) sqlResultsTb.AppendText("s");
+            }
+        }
+
+        void nonQuery(string sql)
+        {
+            using var context = DbContexts.GetContext();
+            var results = context.Database.ExecuteSqlRaw(sql);
+
+            sqlResultsTb.AppendText($"{results} record");
+            if (results != 1) sqlResultsTb.AppendText("s");
+            sqlResultsTb.AppendText(" affected");
+        }
+    }
+}

Source/Hangover/Form1.Designer.cs

@@ -0,0 +1,158 @@
+namespace Hangover
+{
+    partial class Form1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.databaseTab = new System.Windows.Forms.TabPage();
+            this.sqlExecuteBtn = new System.Windows.Forms.Button();
+            this.sqlResultsTb = new System.Windows.Forms.TextBox();
+            this.sqlTb = new System.Windows.Forms.TextBox();
+            this.sqlLbl = new System.Windows.Forms.Label();
+            this.databaseFileLbl = new System.Windows.Forms.Label();
+            this.cliTab = new System.Windows.Forms.TabPage();
+            this.tabControl1.SuspendLayout();
+            this.databaseTab.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.databaseTab);
+            this.tabControl1.Controls.Add(this.cliTab);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(800, 450);
+            this.tabControl1.TabIndex = 0;
+            // 
+            // databaseTab
+            // 
+            this.databaseTab.Controls.Add(this.sqlExecuteBtn);
+            this.databaseTab.Controls.Add(this.sqlResultsTb);
+            this.databaseTab.Controls.Add(this.sqlTb);
+            this.databaseTab.Controls.Add(this.sqlLbl);
+            this.databaseTab.Controls.Add(this.databaseFileLbl);
+            this.databaseTab.Location = new System.Drawing.Point(4, 24);
+            this.databaseTab.Name = "databaseTab";
+            this.databaseTab.Padding = new System.Windows.Forms.Padding(3);
+            this.databaseTab.Size = new System.Drawing.Size(792, 422);
+            this.databaseTab.TabIndex = 0;
+            this.databaseTab.Text = "Database";
+            this.databaseTab.UseVisualStyleBackColor = true;
+            // 
+            // sqlExecuteBtn
+            // 
+            this.sqlExecuteBtn.Location = new System.Drawing.Point(8, 153);
+            this.sqlExecuteBtn.Name = "sqlExecuteBtn";
+            this.sqlExecuteBtn.Size = new System.Drawing.Size(75, 23);
+            this.sqlExecuteBtn.TabIndex = 3;
+            this.sqlExecuteBtn.Text = "Execute";
+            this.sqlExecuteBtn.UseVisualStyleBackColor = true;
+            this.sqlExecuteBtn.Click += new System.EventHandler(this.sqlExecuteBtn_Click);
+            // 
+            // sqlResultsTb
+            // 
+            this.sqlResultsTb.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.sqlResultsTb.Location = new System.Drawing.Point(8, 182);
+            this.sqlResultsTb.Multiline = true;
+            this.sqlResultsTb.Name = "sqlResultsTb";
+            this.sqlResultsTb.ReadOnly = true;
+            this.sqlResultsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.sqlResultsTb.Size = new System.Drawing.Size(776, 234);
+            this.sqlResultsTb.TabIndex = 4;
+            // 
+            // sqlTb
+            // 
+            this.sqlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.sqlTb.Location = new System.Drawing.Point(8, 48);
+            this.sqlTb.Multiline = true;
+            this.sqlTb.Name = "sqlTb";
+            this.sqlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.sqlTb.Size = new System.Drawing.Size(778, 99);
+            this.sqlTb.TabIndex = 2;
+            // 
+            // sqlLbl
+            // 
+            this.sqlLbl.AutoSize = true;
+            this.sqlLbl.Location = new System.Drawing.Point(6, 30);
+            this.sqlLbl.Name = "sqlLbl";
+            this.sqlLbl.Size = new System.Drawing.Size(144, 15);
+            this.sqlLbl.TabIndex = 1;
+            this.sqlLbl.Text = "SQL (database command)";
+            // 
+            // databaseFileLbl
+            // 
+            this.databaseFileLbl.AutoSize = true;
+            this.databaseFileLbl.Location = new System.Drawing.Point(6, 3);
+            this.databaseFileLbl.Name = "databaseFileLbl";
+            this.databaseFileLbl.Size = new System.Drawing.Size(80, 15);
+            this.databaseFileLbl.TabIndex = 0;
+            this.databaseFileLbl.Text = "Database file: ";
+            // 
+            // cliTab
+            // 
+            this.cliTab.Location = new System.Drawing.Point(4, 24);
+            this.cliTab.Name = "cliTab";
+            this.cliTab.Size = new System.Drawing.Size(792, 422);
+            this.cliTab.TabIndex = 1;
+            this.cliTab.Text = "Command Line Interface";
+            this.cliTab.UseVisualStyleBackColor = true;
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.tabControl1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "Form1";
+            this.Text = "Hangover: Libation debug and recovery tool";
+            this.tabControl1.ResumeLayout(false);
+            this.databaseTab.ResumeLayout(false);
+            this.databaseTab.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private TabControl tabControl1;
+        private TabPage databaseTab;
+        private Label databaseFileLbl;
+        private TextBox sqlResultsTb;
+        private TextBox sqlTb;
+        private Label sqlLbl;
+        private Button sqlExecuteBtn;
+        private TabPage cliTab;
+    }
+}

Source/Hangover/Form1.cs

@@ -0,0 +1,16 @@
+namespace Hangover
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+
+            databaseTab.VisibleChanged += databaseTab_VisibleChanged;
+            cliTab.VisibleChanged += cliTab_VisibleChanged;
+
+            Load_databaseTab();
+            Load_cliTab();
+        }
+    }
+}

Source/Hangover/Hangover.csproj

@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationIcon>hangover.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <!--
+  When LibationWinForms and Hangover output to the same dir, Hangover must build before LibationWinForms
+
+  VS > rt-clk solution > Properties
+  left: Project Dependencies
+  top: Projects: LibationWinForms
+  bottom: manually check Hangover
+
+  edit debug and release output paths
+  -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Form1.*.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>

Source/Hangover/Program.cs

@@ -0,0 +1,17 @@
+namespace Hangover
+{
+    internal static class Program
+    {
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new Form1());
+        }
+    }
+}

Source/Hoopla/Hoopla.csproj

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

Source/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
-    }
-}
-

Source/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 ]

Source/Hoopla/temp.cs

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

Source/Libation.sln

@@ -5,10 +5,11 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
 	ProjectSection(SolutionItems) = preProject
+		REFERENCE.txt = REFERENCE.txt
+		_ARCHITECTURE NOTES.txt = _ARCHITECTURE NOTES.txt
+		_DB_NOTES.txt = _DB_NOTES.txt
 		__README - COLLABORATORS.txt = __README - COLLABORATORS.txt
 		__TODO.txt = __TODO.txt
-		_DB_NOTES.txt = _DB_NOTES.txt
-		REFERENCE.txt = REFERENCE.txt
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 Domain Utilities (db aware)", "5 Domain Utilities (db aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
@@ -37,6 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "Lib
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {40C67036-C1A7-4FDF-AA83-8EC902E257F3}
 		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
 	EndProjectSection
 EndProject
@@ -48,8 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{67E66E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationCli", "LibationCli\LibationCli.csproj", "{428163C3-D558-4914-B570-A92069521877}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppScaffolding", "AppScaffolding\AppScaffolding.csproj", "{595E7C4D-506D-486D-98B7-5FDDF398D033}"
@@ -64,6 +64,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager.Tests", "_Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests", "_Tests\LibationFileManager.Tests\LibationFileManager.Tests.csproj", "{EB781571-8548-477E-82AD-FB9FAB548D2F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangover", "Hangover\Hangover.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -110,10 +112,6 @@ Global
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,6 +140,10 @@ Global
 		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -157,7 +159,6 @@ Global
 		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
@@ -165,6 +166,7 @@ Global
 		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationCli/LibationCli.csproj

@@ -14,11 +14,13 @@
 
   <!--
   When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
-  
-  VS > rt-clik solution > Project Build Order...
-  Dependencies [tab]
-  Projects: LibationWinForms
-  manually check LibationCli
+
+  VS > rt-clk solution > Properties
+  left: Project Dependencies
+  top: Projects: LibationWinForms
+  bottom: manually check LibationCli
+
+  edit debug and release output paths
   -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
@@ -29,11 +31,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>

Source/LibationCli/Options/_ProcessableOptionsBase.cs

@@ -9,7 +9,6 @@ using FileLiberator;
 
 namespace LibationCli
 {
-	// streamlined, non-Forms copy of ProcessorAutomationController
 	public abstract class ProcessableOptionsBase : OptionsBase
 	{
 		protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook> completedAction = null)

Source/LibationCli/Program.cs

@@ -27,7 +27,6 @@ namespace LibationCli
 			//                                               //
 			//***********************************************//
 			Setup.Initialize();
-			Setup.SubscribeToDatabaseEvents();
 
 			var types = Setup.LoadVerbs();
 

Source/LibationCli/Setup.cs

@@ -34,15 +34,15 @@ namespace LibationCli
 
 		private static void checkForUpdate()
 		{
-			var (hasUpgrade, zipUrl, htmlUrl, zipName) = LibationScaffolding.GetLatestRelease();
-			if (!hasUpgrade)
+			var upgradeProperties = LibationScaffolding.GetLatestRelease();
+			if (upgradeProperties is null)
 				return;
 
 			var origColor = Console.ForegroundColor;
 			try
 			{
 				Console.ForegroundColor = ConsoleColor.Red;
-				Console.WriteLine($"UPDATE AVAILABLE @ {zipUrl}");
+				Console.WriteLine($"UPDATE AVAILABLE @ {upgradeProperties.ZipUrl}");
 			}
 			finally
 			{
@@ -50,11 +50,6 @@ namespace LibationCli
 			}
 		}
 
-		public static void SubscribeToDatabaseEvents()
-		{
-			DataLayer.UserDefinedItem.ItemChanged += (sender, e) => ApplicationServices.LibraryCommands.UpdateUserDefinedItem(((DataLayer.UserDefinedItem)sender).Book);
-		}
-
 		public static Type[] LoadVerbs() => Assembly.GetExecutingAssembly()
 			.GetTypes()
 			.Where(t => t.GetCustomAttribute<VerbAttribute>() is not null)

Source/LibationFileManager/Configuration.cs

@@ -200,6 +200,13 @@ namespace LibationFileManager
             get => persistentDictionary.GetNonString<Dictionary<string,int>>(nameof(GridColumnsWidths));
             set => persistentDictionary.SetNonString(nameof(GridColumnsWidths), value);
         }
+        
+        [Description("Save cover image alongside audiobook?")]
+        public bool DownloadCoverArt
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(DownloadCoverArt));
+            set => persistentDictionary.SetNonString(nameof(DownloadCoverArt), value);
+        }
 
         public enum BadBookAction
         {
@@ -261,6 +268,20 @@ namespace LibationFileManager
             }
         }
 
+        [Description("Auto download episodes? After scan, download new books in 'checked' accounts.")]
+        public bool AutoDownloadEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(AutoDownloadEpisodes));
+            set => persistentDictionary.SetNonString(nameof(AutoDownloadEpisodes), value);
+        }
+
+        [Description("Save all podcast episodes in a series to the series parent folder?")]
+        public bool SavePodcastsToParentFolder
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(SavePodcastsToParentFolder));
+            set => persistentDictionary.SetNonString(nameof(SavePodcastsToParentFolder), value);
+        }
+
         #region templates: custom file naming
 
         [Description("How to format the folders in which files will be saved")]
@@ -414,7 +435,7 @@ namespace LibationFileManager
                     return libationFilesPathCache;
 
                 // FIRST: must write here before SettingsFilePath in next step reads cache
-                libationFilesPathCache = getLiberationFilesSettingFromJson();
+                libationFilesPathCache = getLibationFilesSettingFromJson();
 
                 // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
                 persistentDictionary = new PersistentDictionary(SettingsFilePath);
@@ -436,7 +457,7 @@ namespace LibationFileManager
 
         private static string libationFilesPathCache;
 
-        private string getLiberationFilesSettingFromJson()
+        private string getLibationFilesSettingFromJson()
         {
             string startingContents = null;
             try
@@ -475,6 +496,14 @@ namespace LibationFileManager
         {
             libationFilesPathCache = null;
 
+            // ensure exists
+            if (!File.Exists(APPSETTINGS_JSON))
+            {
+                // getter creates new file, loads PersistentDictionary
+                var _ = LibationFiles;
+                System.Threading.Thread.Sleep(100);
+            }
+
             var startingContents = File.ReadAllText(APPSETTINGS_JSON);
             var jObj = JObject.Parse(startingContents);
 

Source/LibationFileManager/LibationFileManager.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.1.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationFileManager/QuickFilters.cs

@@ -28,16 +28,22 @@ namespace LibationFileManager
                 inMemoryState = JsonConvert.DeserializeObject<FilterState>(File.ReadAllText(JsonFile));
         }
 
+        public static event EventHandler UseDefaultChanged;
         public static bool UseDefault
         {
             get => inMemoryState.UseDefault;
             set
             {
+                if (UseDefault == value)
+                    return;
+
                 lock (locker)
                 {
                     inMemoryState.UseDefault = value;
                     save(false);
                 }
+
+                UseDefaultChanged?.Invoke(null, null);
             }
         }
 

Source/LibationFileManager/Templates.cs

@@ -207,8 +207,8 @@ namespace LibationFileManager
 
             #region to file name
             /// <summary>USES LIVE CONFIGURATION VALUES</summary>
-            public string GetFilename(LibraryBookDto libraryBookDto)
-                => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, AudibleFileStorage.BooksDirectory, null)
+            public string GetFilename(LibraryBookDto libraryBookDto, string baseDir = null)
+                => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, baseDir ?? AudibleFileStorage.BooksDirectory, null)
                 .GetFilePath();
             #endregion
         }

Source/LibationSearchEngine/SearchEngine.cs

@@ -18,20 +18,20 @@ namespace LibationSearchEngine
     {
         public const Lucene.Net.Util.Version Version = Lucene.Net.Util.Version.LUCENE_30;
 
-        // not customizable. don't move to config
-        private static string SearchEngineDirectory { get; }
-            = new System.IO.DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("SearchEngine").FullName;
-
         public const string _ID_ = "_ID_";
         public const string TAGS = "tags";
         // special field for each book which includes all major parts of the book's metadata. enables non-targetting searching
         public const string ALL = "all";
 
-        // the workaround which allows displaying all books when query is empty
-        public const string ALL_QUERY = "*:*";
+        #region index rules
+        // common fields used in the "all" default search field
+        public const string ALL_AUDIBLE_PRODUCT_ID = nameof(Book.AudibleProductId);
+        public const string ALL_TITLE = nameof(Book.Title);
+        public const string ALL_AUTHOR_NAMES = "AuthorNames";
+        public const string ALL_NARRATOR_NAMES = "NarratorNames";
+        public const string ALL_SERIES_NAMES = "SeriesNames";
 
-		#region index rules
-		private static ReadOnlyDictionary<string, Func<LibraryBook, string>> idIndexRules { get; }
+        private static ReadOnlyDictionary<string, Func<LibraryBook, string>> idIndexRules { get; }
             = new ReadOnlyDictionary<string, Func<LibraryBook, string>>(
                 new Dictionary<string, Func<LibraryBook, string>>
                 {
@@ -50,31 +50,23 @@ namespace LibationSearchEngine
                     [nameof(Book.DatePublished)] = lb => lb.Book.DatePublished?.ToLuceneString(),
 
                     [nameof(Book.Title)] = lb => lb.Book.Title,
-                    [nameof(Book.AuthorNames)] = lb => lb.Book.AuthorNames,
-                    ["Author"] = lb => lb.Book.AuthorNames,
-                    ["Authors"] = lb => lb.Book.AuthorNames,
-                    [nameof(Book.NarratorNames)] = lb => lb.Book.NarratorNames,
-                    ["Narrator"] = lb => lb.Book.NarratorNames,
-                    ["Narrators"] = lb => lb.Book.NarratorNames,
+                    [ALL_AUTHOR_NAMES] = lb => lb.Book.AuthorNames(),
+                    ["Author"] = lb => lb.Book.AuthorNames(),
+                    ["Authors"] = lb => lb.Book.AuthorNames(),
+                    [ALL_NARRATOR_NAMES] = lb => lb.Book.NarratorNames(),
+                    ["Narrator"] = lb => lb.Book.NarratorNames(),
+                    ["Narrators"] = lb => lb.Book.NarratorNames(),
                     [nameof(Book.Publisher)] = lb => lb.Book.Publisher,
 
-                    [nameof(Book.SeriesNames)] = lb => string.Join(
-                        ", ",
-                        lb.Book.SeriesLink
-                            .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
-                            .Select(s => s.Series.AudibleSeriesId)),
-                    ["Series"] = lb => string.Join(
-                        ", ",
-                        lb.Book.SeriesLink
-                            .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
-                            .Select(s => s.Series.AudibleSeriesId)),
+                    [ALL_SERIES_NAMES] = lb => lb.Book.SeriesNames(),
+                    ["Series"] = lb => lb.Book.SeriesNames(),
                     ["SeriesId"] = lb => string.Join(", ", lb.Book.SeriesLink.Select(s => s.Series.AudibleSeriesId)),
 
-                    [nameof(Book.CategoriesNames)] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    [nameof(Book.Category)] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    ["Categories"] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    ["CategoriesId"] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    ["CategoryId"] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
+                    ["CategoriesNames"] = lb => lb.Book.CategoriesIds() is null ? null : string.Join(", ", lb.Book.CategoriesIds()),
+                    [nameof(Book.Category)] = lb => lb.Book.CategoriesIds() is null ? null : string.Join(", ", lb.Book.CategoriesIds()),
+                    ["Categories"] = lb => lb.Book.CategoriesIds() is null ? null : string.Join(", ", lb.Book.CategoriesIds()),
+                    ["CategoriesId"] = lb => lb.Book.CategoriesIds() is null ? null : string.Join(", ", lb.Book.CategoriesIds()),
+                    ["CategoryId"] = lb => lb.Book.CategoriesIds() is null ? null : string.Join(", ", lb.Book.CategoriesIds()),
 
                     [TAGS.FirstCharToUpper()] = lb => lb.Book.UserDefinedItem.Tags,
 
@@ -107,14 +99,14 @@ namespace LibationSearchEngine
             = new ReadOnlyDictionary<string, Func<LibraryBook, bool>>(
                 new Dictionary<string, Func<LibraryBook, bool>>
                 {
-                    ["HasDownloads"] = lb => lb.Book.HasPdf,
-                    ["HasDownload"] = lb => lb.Book.HasPdf,
-                    ["Downloads"] = lb => lb.Book.HasPdf,
-                    ["Download"] = lb => lb.Book.HasPdf,
-                    ["HasPDFs"] = lb => lb.Book.HasPdf,
-                    ["HasPDF"] = lb => lb.Book.HasPdf,
-                    ["PDFs"] = lb => lb.Book.HasPdf,
-                    ["PDF"] = lb => lb.Book.HasPdf,
+                    ["HasDownloads"] = lb => lb.Book.HasPdf(),
+                    ["HasDownload"] = lb => lb.Book.HasPdf(),
+                    ["Downloads"] = lb => lb.Book.HasPdf(),
+                    ["Download"] = lb => lb.Book.HasPdf(),
+                    ["HasPDFs"] = lb => lb.Book.HasPdf(),
+                    ["HasPDF"] = lb => lb.Book.HasPdf(),
+                    ["PDFs"] = lb => lb.Book.HasPdf(),
+                    ["PDF"] = lb => lb.Book.HasPdf(),
 
                     ["IsRated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
                     ["Rated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
@@ -125,15 +117,16 @@ namespace LibationSearchEngine
                     [nameof(Book.IsAbridged)] = lb => lb.Book.IsAbridged,
                     ["Abridged"] = lb => lb.Book.IsAbridged,
 
-                    // this will only be evaluated at time of re-index. ie: state of files moved later will be out of sync until next re-index
                     ["IsLiberated"] = lb => isLiberated(lb.Book),
                     ["Liberated"] = lb => isLiberated(lb.Book),
                     ["LiberatedError"] = lb => liberatedError(lb.Book),
 
-                    ["Podcast"] = lb => lb.Book.ContentType == ContentType.Episode,
-                    ["IsPodcast"] = lb => lb.Book.ContentType == ContentType.Episode,
-                    ["Episode"] = lb => lb.Book.ContentType == ContentType.Episode,
-                    ["IsEpisode"] = lb => lb.Book.ContentType == ContentType.Episode,
+                    ["Podcast"] = lb => lb.Book.IsEpisodeChild(),
+                    ["Podcasts"] = lb => lb.Book.IsEpisodeChild(),
+                    ["IsPodcast"] = lb => lb.Book.IsEpisodeChild(),
+                    ["Episode"] = lb => lb.Book.IsEpisodeChild(),
+                    ["Episodes"] = lb => lb.Book.IsEpisodeChild(),
+                    ["IsEpisode"] = lb => lb.Book.IsEpisodeChild(),
                 }
                 );
 
@@ -151,10 +144,11 @@ namespace LibationSearchEngine
         private static IEnumerable<Func<LibraryBook, string>> allFieldIndexRules { get; }
             = new List<Func<LibraryBook, string>>
             {
-                idIndexRules[nameof(Book.AudibleProductId)],
-                stringIndexRules[nameof(Book.Title)],
-                stringIndexRules[nameof(Book.AuthorNames)],
-                stringIndexRules[nameof(Book.NarratorNames)]
+                idIndexRules[ALL_AUDIBLE_PRODUCT_ID],
+                stringIndexRules[ALL_TITLE],
+                stringIndexRules[ALL_AUTHOR_NAMES],
+                stringIndexRules[ALL_NARRATOR_NAMES],
+                stringIndexRules[ALL_SERIES_NAMES]
             };
 		#endregion
 
@@ -182,18 +176,6 @@ namespace LibationSearchEngine
             foreach (var key in numberIndexRules.Keys)
                 yield return key;
         }
-
-        public static IEnumerable<string> GetSearchFields()
-        {
-            foreach (var key in idIndexRules.Keys)
-                yield return key;
-            foreach (var key in stringIndexRules.Keys)
-                yield return key;
-            foreach (var key in boolIndexRules.Keys)
-                yield return key;
-            foreach (var key in numberIndexRules.Keys)
-                yield return key;
-        }
 		#endregion
 
 		#region create and update index
@@ -290,6 +272,10 @@ namespace LibationSearchEngine
                 book.AudibleProductId,
                 d =>
                 {
+                    //
+                    // TODO: better synonym handling. This is too easy to mess up
+                    //
+
                     // fields are key value pairs. MULTIPLE FIELDS CAN POTENTIALLY HAVE THE SAME KEY.
                     // ie: must remove old before adding new else will create unwanted duplicates.
                     var v1 = isLiberated(book);
@@ -331,6 +317,9 @@ namespace LibationSearchEngine
         }
 		#endregion
 
+        // the workaround which allows displaying all books when query is empty
+        public const string ALL_QUERY = "*:*";
+
 		#region search
         public SearchResultSet Search(string searchString)
         {
@@ -345,7 +334,7 @@ namespace LibationSearchEngine
             return results;
         }
 
-        public static string FormatSearchQuery(string searchString)
+        internal static string FormatSearchQuery(string searchString)
         {
             if (string.IsNullOrWhiteSpace(searchString))
                 return ALL_QUERY;
@@ -491,5 +480,9 @@ namespace LibationSearchEngine
 		#endregion
 
 		private static Directory getIndex() => FSDirectory.Open(SearchEngineDirectory);
+
+        // not customizable. don't move to config
+        private static string SearchEngineDirectory { get; }
+            = new System.IO.DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("SearchEngine").FullName;
     }
 }

Source/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
-	}
-}

Source/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;
-    }
-}

Source/LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -1,114 +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;
-
-		#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, libraryBook.Book.AuthorNames);
-			AudioDecodable_NarratorsDiscovered(sender, 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);
-		}
-
-		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";
-		}
-		#endregion
-
-		#region AudioDecodable event handlers
-		private string title;
-		private string authorNames;
-		private string narratorNames;
-
-		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();
-		}
-
-		private void updateBookInfo()
-			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
-
-		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-		{
-			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
-			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
-		}
-
-		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
-	}
-}

Source/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
-	}
-}

Source/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;
-    }
-}

Source/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;
-	}
-}

Source/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -1,164 +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();
-			this.SetLibationIcon();
-		}
-
-		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_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) { }
-		public virtual void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
-		#endregion
-	}
-}

Source/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;
-    }
-}

Source/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
-	}
-}

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

Source/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}");
-		}
-	}
-}

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

Source/LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,343 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-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(List<LibraryBook> libraryBooks = null)
-		{
-			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, libraryBooks).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;
-                ApplicationServices.LibraryCommands.UpdateUserDefinedItem(libraryBook.Book);
-
-				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;
-
-		private List<LibraryBook> libraryBooks { get; }
-
-		public BackupLoop(LogMe logMe, Processable processable, AutomatedBackupsForm automatedBackupsForm, List<LibraryBook> libraryBooks = null)
-			: base(logMe, processable, automatedBackupsForm)
-			=> this.libraryBooks = libraryBooks ?? ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking();
-
-		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(libraryBooks))
-			{
-				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");
-		}
-	}
-}

Source/LibationWinForms/Dialogs/AccountsDialog.Designer.cs

@@ -31,7 +31,9 @@
 			this.cancelBtn = new System.Windows.Forms.Button();
 			this.saveBtn = new System.Windows.Forms.Button();
 			this.dataGridView1 = new System.Windows.Forms.DataGridView();
+			this.importBtn = new System.Windows.Forms.Button();
 			this.DeleteAccount = new System.Windows.Forms.DataGridViewButtonColumn();
+			this.ExportAccount = new System.Windows.Forms.DataGridViewButtonColumn();
 			this.LibraryScan = new System.Windows.Forms.DataGridViewCheckBoxColumn();
 			this.AccountId = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Locale = new System.Windows.Forms.DataGridViewComboBoxColumn();
@@ -43,9 +45,10 @@
 			// 
 			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(713, 415);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 479);
+			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
-			this.cancelBtn.Size = new System.Drawing.Size(75, 23);
+			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
 			this.cancelBtn.TabIndex = 2;
 			this.cancelBtn.Text = "Cancel";
 			this.cancelBtn.UseVisualStyleBackColor = true;
@@ -54,9 +57,10 @@
 			// saveBtn
 			// 
 			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(612, 415);
+			this.saveBtn.Location = new System.Drawing.Point(714, 479);
+			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
-			this.saveBtn.Size = new System.Drawing.Size(75, 23);
+			this.saveBtn.Size = new System.Drawing.Size(88, 27);
 			this.saveBtn.TabIndex = 1;
 			this.saveBtn.Text = "Save";
 			this.saveBtn.UseVisualStyleBackColor = true;
@@ -71,60 +75,83 @@
 			this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.DeleteAccount,
+            this.ExportAccount,
             this.LibraryScan,
             this.AccountId,
             this.Locale,
             this.AccountName});
-			this.dataGridView1.Location = new System.Drawing.Point(12, 12);
+			this.dataGridView1.Location = new System.Drawing.Point(14, 14);
+			this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.dataGridView1.MultiSelect = false;
 			this.dataGridView1.Name = "dataGridView1";
-			this.dataGridView1.Size = new System.Drawing.Size(776, 397);
+			this.dataGridView1.Size = new System.Drawing.Size(905, 458);
 			this.dataGridView1.TabIndex = 0;
 			this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellContentClick);
 			this.dataGridView1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridView1_DefaultValuesNeeded);
 			// 
+			// importBtn
+			// 
+			this.importBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.importBtn.Location = new System.Drawing.Point(14, 480);
+			this.importBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.importBtn.Name = "importBtn";
+			this.importBtn.Size = new System.Drawing.Size(156, 27);
+			this.importBtn.TabIndex = 1;
+			this.importBtn.Text = "Import from audible-cli";
+			this.importBtn.UseVisualStyleBackColor = true;
+			this.importBtn.Click += new System.EventHandler(this.importBtn_Click);
+			// 
 			// DeleteAccount
 			// 
 			this.DeleteAccount.HeaderText = "Delete";
 			this.DeleteAccount.Name = "DeleteAccount";
 			this.DeleteAccount.ReadOnly = true;
 			this.DeleteAccount.Text = "x";
-			this.DeleteAccount.Width = 44;
+			this.DeleteAccount.Width = 46;
+			// 
+			// ExportAccount
+			// 
+			this.ExportAccount.HeaderText = "Export";
+			this.ExportAccount.Name = "ExportAccount";
+			this.ExportAccount.Text = "Export to audible-cli";
+			this.ExportAccount.Width = 47;
 			// 
 			// LibraryScan
 			// 
 			this.LibraryScan.HeaderText = "Include in library scan?";
 			this.LibraryScan.Name = "LibraryScan";
-			this.LibraryScan.Width = 83;
+			this.LibraryScan.Width = 94;
 			// 
 			// AccountId
 			// 
 			this.AccountId.HeaderText = "Audible email/login";
 			this.AccountId.Name = "AccountId";
-			this.AccountId.Width = 111;
+			this.AccountId.Width = 125;
 			// 
 			// Locale
 			// 
 			this.Locale.HeaderText = "Locale";
 			this.Locale.Name = "Locale";
-			this.Locale.Width = 45;
+			this.Locale.Width = 47;
 			// 
 			// AccountName
 			// 
 			this.AccountName.HeaderText = "Account nickname (optional)";
 			this.AccountName.Name = "AccountName";
-			this.AccountName.Width = 152;
+			this.AccountName.Width = 170;
 			// 
 			// AccountsDialog
 			// 
 			this.AcceptButton = this.saveBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			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(800, 450);
+			this.ClientSize = new System.Drawing.Size(933, 519);
 			this.Controls.Add(this.dataGridView1);
+			this.Controls.Add(this.importBtn);
 			this.Controls.Add(this.saveBtn);
 			this.Controls.Add(this.cancelBtn);
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "AccountsDialog";
 			this.Text = "Audible Accounts";
 			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
@@ -137,7 +164,9 @@
 		private System.Windows.Forms.Button cancelBtn;
 		private System.Windows.Forms.Button saveBtn;
 		private System.Windows.Forms.DataGridView dataGridView1;
+		private System.Windows.Forms.Button importBtn;
 		private System.Windows.Forms.DataGridViewButtonColumn DeleteAccount;
+		private System.Windows.Forms.DataGridViewButtonColumn ExportAccount;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn LibraryScan;
 		private System.Windows.Forms.DataGridViewTextBoxColumn AccountId;
 		private System.Windows.Forms.DataGridViewComboBoxColumn Locale;

Source/LibationWinForms/Dialogs/AccountsDialog.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using AudibleApi;
@@ -10,17 +11,14 @@ namespace LibationWinForms.Dialogs
 	public partial class AccountsDialog : Form
 	{
 		private const string COL_Delete = nameof(DeleteAccount);
+		private const string COL_Export = nameof(ExportAccount);
 		private const string COL_LibraryScan = nameof(LibraryScan);
 		private const string COL_AccountId = nameof(AccountId);
 		private const string COL_AccountName = nameof(AccountName);
 		private const string COL_Locale = nameof(Locale);
 
-		private Form1 _parent { get; }
-
-		public AccountsDialog(Form1 parent)
+		public AccountsDialog()
 		{
-			_parent = parent;
-
 			InitializeComponent();
 
 			dataGridView1.Columns[COL_AccountName].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
@@ -48,12 +46,20 @@ namespace LibationWinForms.Dialogs
 				return;
 
 			foreach (var account in accounts)
-				dataGridView1.Rows.Add(
+				AddAccountToGrid(account);
+		}
+
+		private void AddAccountToGrid(Account account)
+		{
+			int row = dataGridView1.Rows.Add(
 					"X",
+					"Export",
 					account.LibraryScan,
 					account.AccountId,
 					account.Locale.Name,
 					account.AccountName);
+
+			dataGridView1[COL_Export, row].ToolTipText = "Export account authorization to audible-cli";
 		}
 
 		private void dataGridView1_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
@@ -77,6 +83,11 @@ namespace LibationWinForms.Dialogs
 						if (e.RowIndex < dgv.RowCount - 1)
 							dgv.Rows.Remove(row);
 						break;
+					case COL_Export:
+						// if final/edit row: do nothing
+						if (e.RowIndex < dgv.RowCount - 1)
+							Export((string)row.Cells[COL_AccountId].Value, (string)row.Cells[COL_Locale].Value);
+						break;
 						//case COL_MoveUp:
 						//	// if top: do nothing
 						//	if (e.RowIndex < 1)
@@ -128,7 +139,7 @@ namespace LibationWinForms.Dialogs
 			}
 			catch (Exception ex)
 			{
-				MessageBoxAlertAdmin.Show("Error attempting to save accounts", "Error saving accounts", ex);
+				MessageBoxLib.ShowAdminAlert(this, "Error attempting to save accounts", "Error saving accounts", ex);
 			}
 		}
 
@@ -140,13 +151,13 @@ namespace LibationWinForms.Dialogs
 			{
 				if (string.IsNullOrWhiteSpace(dto.AccountId))
 				{
-					MessageBox.Show("Account id cannot be blank. Please enter an account id for all accounts.", "Blank account", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					MessageBox.Show(this, "Account id cannot be blank. Please enter an account id for all accounts.", "Blank account", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					return false;
 				}
 
 				if (string.IsNullOrWhiteSpace(dto.LocaleName))
 				{
-					MessageBox.Show("Please select a locale (i.e.: country or region) for all accounts.", "Blank region", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					MessageBox.Show(this, "Please select a locale (i.e.: country or region) for all accounts.", "Blank region", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					return false;
 				}
 			}
@@ -198,5 +209,95 @@ namespace LibationWinForms.Dialogs
 					LibraryScan = (bool)r.Cells[COL_LibraryScan].Value
 				})
 				.ToList();
+
+		private string GetAudibleCliAppDataPath()
+			=> Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Audible");
+
+		private void Export(string accountId, string locale)
+		{
+			// without transaction, accounts persister will write ANY EDIT immediately to file
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+			var account = persister.AccountsSettings.Accounts.FirstOrDefault(a => a.AccountId == accountId && a.Locale.Name == locale);
+
+			if (account is null)
+				return;
+
+			if (account.IdentityTokens?.IsValid != true)
+			{
+				MessageBox.Show(this, "This account hasn't been authenticated yet. First scan your library to log into your account, then try exporting again.", "Account Not Authenticated");
+				return;
+			}
+
+			SaveFileDialog sfd = new();
+			sfd.Filter = "JSON File|*.json";
+
+			string audibleAppDataDir = GetAudibleCliAppDataPath();
+
+			if (Directory.Exists(audibleAppDataDir))
+				sfd.InitialDirectory = audibleAppDataDir;
+
+			if (sfd.ShowDialog() != DialogResult.OK) return;
+
+			try
+			{
+				var mkbAuth = Mkb79Auth.FromAccount(account);
+				var jsonText = mkbAuth.ToJson();
+
+				File.WriteAllText(sfd.FileName, jsonText);
+
+				MessageBox.Show(this, $"Successfully exported {account.AccountName} to\r\n\r\n{sfd.FileName}", "Success!");
+			}
+			catch (Exception ex)
+			{
+				MessageBoxLib.ShowAdminAlert(
+					this,
+					$"An error occured while exporting account:\r\n{account.AccountName}",
+					"Error Exporting Account",
+					ex);
+			}
+		}
+
+		private async void importBtn_Click(object sender, EventArgs e)
+		{
+			OpenFileDialog ofd = new();
+			ofd.Filter = "JSON File|*.json";
+			ofd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+
+			string audibleAppDataDir = GetAudibleCliAppDataPath();
+
+			if (Directory.Exists(audibleAppDataDir))
+				ofd.InitialDirectory = audibleAppDataDir;
+
+			if (ofd.ShowDialog() != DialogResult.OK) return;
+
+			try
+			{
+				var jsonText = File.ReadAllText(ofd.FileName);
+				var mkbAuth = Mkb79Auth.FromJson(jsonText);
+				var account = await mkbAuth.ToAccountAsync();
+
+				// without transaction, accounts persister will write ANY EDIT immediately to file
+				using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+				if (persister.AccountsSettings.Accounts.Any(a => a.AccountId == account.AccountId && a.IdentityTokens.Locale.Name == account.Locale.Name))
+				{
+					MessageBox.Show(this, $"An account with that account id and country already exists.\r\n\r\nAccount ID: {account.AccountId}\r\nCountry: {account.Locale.Name}", "Cannot Add Duplicate Account");
+					return;
+				}
+
+				persister.AccountsSettings.Add(account);
+
+				AddAccountToGrid(account);
+			}
+			catch (Exception ex)
+			{
+				MessageBoxLib.ShowAdminAlert(
+						this,
+						$"An error occured while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
+						"Error Importing Account",
+						ex);
+			}
+		}
 	}
 }

Source/LibationWinForms/Dialogs/AccountsDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<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">
@@ -58,10 +57,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Original.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="DeleteAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="DeleteAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ExportAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="LibraryScan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -70,10 +69,10 @@
   <metadata name="AccountId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="AccountName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Locale.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="AccountName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

Source/LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -46,15 +46,16 @@ namespace LibationWinForms.Dialogs
 
 			var t = @$"
 Title: {Book.Title}
-Author(s): {Book.AuthorNames}
-Narrator(s): {Book.NarratorNames}
+Author(s): {Book.AuthorNames()}
+Narrator(s): {Book.NarratorNames()}
 Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
-Category: {string.Join(" > ", Book.CategoriesNames)}
+Category: {string.Join(" > ", Book.CategoriesNames())}
 Purchase Date: {_libraryBook.DateAdded.ToString("d")}
 ".Trim();
 
-			if (!string.IsNullOrWhiteSpace(Book.SeriesNames))
-				t += $"\r\nSeries: {Book.SeriesNames}";
+			var seriesNames = Book.SeriesNames();
+			if (!string.IsNullOrWhiteSpace(seriesNames))
+				t += $"\r\nSeries: {seriesNames}";
 
 			var bookRating = Book.Rating?.ToStarString();
 			if (!string.IsNullOrWhiteSpace(bookRating))

Source/LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -15,12 +15,8 @@ namespace LibationWinForms.Dialogs
 		private const string COL_MoveUp = nameof(MoveUp);
 		private const string COL_MoveDown = nameof(MoveDown);
 
-		private Form1 _parent { get; }
-
-		public EditQuickFilters(Form1 parent)
+		public EditQuickFilters()
 		{
-			_parent = parent;
-
 			InitializeComponent();
 
 			dataGridView1.Columns[COL_Filter].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;

Source/LibationWinForms/Dialogs/EditTemplateDialog.cs

@@ -46,7 +46,7 @@ namespace LibationWinForms.Dialogs
 
 			if (template is null)
 			{
-				MessageBoxAlertAdmin.Show($"Programming error. {nameof(EditTemplateDialog)} was not created correctly", "Edit template error", new NullReferenceException($"{nameof(template)} is null"));
+				MessageBoxLib.ShowAdminAlert(this, $"Programming error. {nameof(EditTemplateDialog)} was not created correctly", "Edit template error", new NullReferenceException($"{nameof(template)} is null"));
 				return;
 			}
 

Source/LibationWinForms/Dialogs/LiberatedStatusBatchDialog.Designer.cs

@@ -0,0 +1,120 @@
+namespace LibationWinForms.Dialogs
+{
+    partial class LiberatedStatusBatchDialog
+    {
+        /// <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.bookLiberatedCb = new System.Windows.Forms.ComboBox();
+            this.bookLiberatedLbl = new System.Windows.Forms.Label();
+            this.liberatedDescLbl = new System.Windows.Forms.Label();
+            this.cancelBtn = new System.Windows.Forms.Button();
+            this.saveBtn = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // bookLiberatedCb
+            // 
+            this.bookLiberatedCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.bookLiberatedCb.FormattingEnabled = true;
+            this.bookLiberatedCb.Location = new System.Drawing.Point(52, 54);
+            this.bookLiberatedCb.Name = "bookLiberatedCb";
+            this.bookLiberatedCb.Size = new System.Drawing.Size(121, 23);
+            this.bookLiberatedCb.TabIndex = 7;
+            // 
+            // bookLiberatedLbl
+            // 
+            this.bookLiberatedLbl.AutoSize = true;
+            this.bookLiberatedLbl.Location = new System.Drawing.Point(12, 57);
+            this.bookLiberatedLbl.Name = "bookLiberatedLbl";
+            this.bookLiberatedLbl.Size = new System.Drawing.Size(34, 15);
+            this.bookLiberatedLbl.TabIndex = 6;
+            this.bookLiberatedLbl.Text = "Book";
+            // 
+            // liberatedDescLbl
+            // 
+            this.liberatedDescLbl.AutoSize = true;
+            this.liberatedDescLbl.Location = new System.Drawing.Point(12, 9);
+            this.liberatedDescLbl.Name = "liberatedDescLbl";
+            this.liberatedDescLbl.Size = new System.Drawing.Size(312, 30);
+            this.liberatedDescLbl.TabIndex = 5;
+            this.liberatedDescLbl.Text = "To download again next time: change to Not Downloaded\r\nTo not download: change to" +
+    " Downloaded";
+            // 
+            // cancelBtn
+            // 
+            this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelBtn.Location = new System.Drawing.Point(464, 79);
+            this.cancelBtn.Name = "cancelBtn";
+            this.cancelBtn.Size = new System.Drawing.Size(88, 27);
+            this.cancelBtn.TabIndex = 9;
+            this.cancelBtn.Text = "Cancel";
+            this.cancelBtn.UseVisualStyleBackColor = true;
+            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+            // 
+            // 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(346, 79);
+            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 = 8;
+            this.saveBtn.Text = "Save";
+            this.saveBtn.UseVisualStyleBackColor = true;
+            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+            // 
+            // LiberatedStatusBatchDialog
+            // 
+            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(564, 118);
+            this.Controls.Add(this.cancelBtn);
+            this.Controls.Add(this.saveBtn);
+            this.Controls.Add(this.bookLiberatedCb);
+            this.Controls.Add(this.bookLiberatedLbl);
+            this.Controls.Add(this.liberatedDescLbl);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "LiberatedStatusBatchDialog";
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Liberated status: Whether the book has been downloaded";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.ComboBox bookLiberatedCb;
+        private System.Windows.Forms.Label bookLiberatedLbl;
+        private System.Windows.Forms.Label liberatedDescLbl;
+        private System.Windows.Forms.Button cancelBtn;
+        private System.Windows.Forms.Button saveBtn;
+    }
+}

Source/LibationWinForms/Dialogs/LiberatedStatusBatchDialog.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using DataLayer;
+using Dinah.Core;
+using LibationFileManager;
+
+namespace LibationWinForms.Dialogs
+{
+    public partial class LiberatedStatusBatchDialog : Form
+    {
+        public LiberatedStatus BookLiberatedStatus { get; private set; }
+
+        public class liberatedComboBoxItem
+        {
+            public LiberatedStatus Status { get; set; }
+            public string Text { get; set; }
+            public override string ToString() => Text;
+        }
+
+        public LiberatedStatusBatchDialog()
+        {
+            InitializeComponent();
+            this.SetLibationIcon();
+
+            this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.Liberated, Text = "Downloaded" });
+            this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" });
+
+            this.bookLiberatedCb.SelectedIndex = 0;
+        }
+
+        private void saveBtn_Click(object sender, EventArgs e)
+        {
+            BookLiberatedStatus = ((liberatedComboBoxItem)this.bookLiberatedCb.SelectedItem).Status;
+            this.DialogResult = DialogResult.OK;
+        }
+
+        private void cancelBtn_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+    }
+}

Source/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 = "Remove Books from Libation's Database";
-			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;
-	}
-}

Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -1,173 +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 List<LibraryBook> _libraryBooks { get; }
-		private SortableBindingList<RemovableGridEntry> _removableGridEntries { get; }
-		private string _labelFormat { get; }
-		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;
-			this.SetLibationIcon();
-		}
-
-		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 is null || _accounts.Length == 0)
-				return;
-			try
-			{
-				var removedBooks = await LibraryCommands.FindInactiveBooks(WinformLoginChoiceEager.ApiExtendedFunc, _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);
-		}
-	}
-}

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

Source/LibationWinForms/Dialogs/ScanAccountsDialog.cs

@@ -10,12 +10,8 @@ namespace LibationWinForms.Dialogs
 	{
 		public List<Account> CheckedAccounts { get; } = new List<Account>();
 
-		private Form1 _parent { get; }
-
-		public ScanAccountsDialog(Form1 parent)
+		public ScanAccountsDialog()
 		{
-			_parent = parent;
-
 			InitializeComponent();
 			this.SetLibationIcon();
 		}
@@ -44,7 +40,7 @@ namespace LibationWinForms.Dialogs
 
 		private void editBtn_Click(object sender, EventArgs e)
 		{
-			if (new AccountsDialog(_parent).ShowDialog() == DialogResult.OK)
+			if (new AccountsDialog().ShowDialog() == DialogResult.OK)
 			{
 				// clear grid
 				this.accountsClb.Items.Clear();

Source/LibationWinForms/Dialogs/SettingsDialog.AudioSettings.cs

@@ -21,7 +21,6 @@ namespace LibationWinForms.Dialogs
 
 		private void convertFormatRb_CheckedChanged(object sender, EventArgs e)
 		{
-			lameOptionsGb.Enabled = convertLossyRb.Checked;
 			lameTargetRb_CheckedChanged(sender, e);
 			LameMatchSourceBRCbox_CheckedChanged(sender, e);
 		}

Source/LibationWinForms/Dialogs/SettingsDialog.cs

@@ -35,6 +35,7 @@ namespace LibationWinForms.Dialogs
 			this.showImportedStatsCb.Text = desc(nameof(config.ShowImportedStats));
 			this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
 			this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
+			this.autoDownloadEpisodesCb.Text = desc(nameof(config.AutoDownloadEpisodes));
 
 			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
 			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
@@ -44,6 +45,8 @@ namespace LibationWinForms.Dialogs
 			this.retainAaxFileCbox.Text = desc(nameof(config.RetainAaxFile));
 			this.stripUnabridgedCbox.Text = desc(nameof(config.StripUnabridged));
 			this.createCueSheetCbox.Text = desc(nameof(config.CreateCueSheet));
+			this.downloadCoverArtCbox.Text = desc(nameof(config.DownloadCoverArt));
+			this.saveEpisodesToSeriesFolderCbox.Text = desc(nameof(config.SavePodcastsToParentFolder));
 
 			booksSelectControl.SetSearchTitle("books location");
 			booksSelectControl.SetDirectoryItems(
@@ -57,6 +60,8 @@ namespace LibationWinForms.Dialogs
 				"Books");
 			booksSelectControl.SelectDirectory(config.Books);
 
+			saveEpisodesToSeriesFolderCbox.Checked = config.SavePodcastsToParentFolder;
+
 			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
 			createCueSheetCbox.Checked = config.CreateCueSheet;
 			retainAaxFileCbox.Checked = config.RetainAaxFile;
@@ -73,11 +78,13 @@ namespace LibationWinForms.Dialogs
 			lameConstantBitrateCbox.Checked = config.LameConstantBitrate;
 			LameMatchSourceBRCbox.Checked = config.LameMatchSourceBR;
 			lameVBRQualityTb.Value = config.LameVBRQuality;
+			downloadCoverArtCbox.Checked = config.DownloadCoverArt;
 
 			autoScanCb.Checked = config.AutoScan;
 			showImportedStatsCb.Checked = config.ShowImportedStats;
 			importEpisodesCb.Checked = config.ImportEpisodes;
 			downloadEpisodesCb.Checked = config.DownloadEpisodes;
+			autoDownloadEpisodesCb.Checked = config.AutoDownloadEpisodes;
 
 			lameTargetRb_CheckedChanged(this, e);
 			LameMatchSourceBRCbox_CheckedChanged(this, e);
@@ -179,9 +186,11 @@ namespace LibationWinForms.Dialogs
 
 				// 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();
+					MessageBoxLib.VerboseLoggingWarning_ShowIfTrue();
 			}
 
+			config.SavePodcastsToParentFolder = saveEpisodesToSeriesFolderCbox.Checked;
+
 			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
 			config.CreateCueSheet = createCueSheetCbox.Checked;
 			config.RetainAaxFile = retainAaxFileCbox.Checked;
@@ -196,11 +205,13 @@ namespace LibationWinForms.Dialogs
 			config.LameConstantBitrate = lameConstantBitrateCbox.Checked;
 			config.LameMatchSourceBR = LameMatchSourceBRCbox.Checked;
 			config.LameVBRQuality = lameVBRQualityTb.Value;
+			config.DownloadCoverArt = downloadCoverArtCbox.Checked;
 
 			config.AutoScan = autoScanCb.Checked;
 			config.ShowImportedStats = showImportedStatsCb.Checked;
 			config.ImportEpisodes = importEpisodesCb.Checked;
 			config.DownloadEpisodes = downloadEpisodesCb.Checked;
+			config.AutoDownloadEpisodes = autoDownloadEpisodesCb.Checked;
 
 			config.InProgress = inProgressSelectControl.SelectedDirectory;
 

Source/LibationWinForms/Dialogs/TagsBatchDialog.Designer.cs

@@ -0,0 +1,112 @@
+namespace LibationWinForms.Dialogs
+{
+    partial class TagsBatchDialog
+    {
+        /// <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.tagsDescLbl = new System.Windows.Forms.Label();
+            this.newTagsTb = new System.Windows.Forms.TextBox();
+            this.cancelBtn = new System.Windows.Forms.Button();
+            this.saveBtn = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // tagsDescLbl
+            // 
+            this.tagsDescLbl.AutoSize = true;
+            this.tagsDescLbl.Location = new System.Drawing.Point(13, 9);
+            this.tagsDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.tagsDescLbl.Name = "tagsDescLbl";
+            this.tagsDescLbl.Size = new System.Drawing.Size(458, 15);
+            this.tagsDescLbl.TabIndex = 2;
+            this.tagsDescLbl.Text = "Tags are separated by a space. Each tag can contain letters, numbers, and undersc" +
+    "ores";
+            // 
+            // newTagsTb
+            // 
+            this.newTagsTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.newTagsTb.Location = new System.Drawing.Point(13, 30);
+            this.newTagsTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.newTagsTb.Name = "newTagsTb";
+            this.newTagsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.newTagsTb.Size = new System.Drawing.Size(591, 23);
+            this.newTagsTb.TabIndex = 3;
+            // 
+            // cancelBtn
+            // 
+            this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelBtn.Location = new System.Drawing.Point(517, 71);
+            this.cancelBtn.Name = "cancelBtn";
+            this.cancelBtn.Size = new System.Drawing.Size(88, 27);
+            this.cancelBtn.TabIndex = 6;
+            this.cancelBtn.Text = "Cancel";
+            this.cancelBtn.UseVisualStyleBackColor = true;
+            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+            // 
+            // 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(399, 71);
+            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 = 5;
+            this.saveBtn.Text = "Save";
+            this.saveBtn.UseVisualStyleBackColor = true;
+            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+            // 
+            // TagsBatchDialog
+            // 
+            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(617, 110);
+            this.Controls.Add(this.cancelBtn);
+            this.Controls.Add(this.saveBtn);
+            this.Controls.Add(this.tagsDescLbl);
+            this.Controls.Add(this.newTagsTb);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "TagsBatchDialog";
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Replace Tags";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label tagsDescLbl;
+        private System.Windows.Forms.TextBox newTagsTb;
+        private System.Windows.Forms.Button cancelBtn;
+        private System.Windows.Forms.Button saveBtn;
+    }
+}

Source/LibationWinForms/Dialogs/TagsBatchDialog.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LibationWinForms.Dialogs
+{
+    public partial class TagsBatchDialog : Form
+    {
+        public string NewTags { get; private set; }
+
+        public TagsBatchDialog()
+        {
+            InitializeComponent();
+            this.SetLibationIcon();
+        }
+
+        private void saveBtn_Click(object sender, EventArgs e)
+        {
+            NewTags = this.newTagsTb.Text;
+            this.DialogResult = DialogResult.OK;
+        }
+
+        private void cancelBtn_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+    }
+}

Source/LibationWinForms/Dialogs/TagsBatchDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<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">

Source/LibationWinForms/Form1.BackupCounts.cs

@@ -0,0 +1,119 @@
+using ApplicationServices;
+using Dinah.Core;
+using Dinah.Core.Threading;
+
+namespace LibationWinForms
+{
+	public partial class Form1
+	{
+		private System.ComponentModel.BackgroundWorker updateCountsBw = new();
+
+		protected void Configure_BackupCounts()
+		{
+			// init formattable
+			beginBookBackupsToolStripMenuItem.Format(0);
+			beginPdfBackupsToolStripMenuItem.Format(0);
+			pdfsCountsLbl.Text = "|  [Calculating backed up PDFs]";
+
+			Load += setBackupCounts;
+            LibraryCommands.LibrarySizeChanged += setBackupCounts;
+            LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
+
+			updateCountsBw.DoWork += UpdateCountsBw_DoWork;
+			updateCountsBw.RunWorkerCompleted += exportMenuEnable;
+			updateCountsBw.RunWorkerCompleted += updateBottomBookNumbers;
+			updateCountsBw.RunWorkerCompleted += update_BeginBookBackups_menuItem;
+			updateCountsBw.RunWorkerCompleted += updateBottomPdfNumbers;
+			updateCountsBw.RunWorkerCompleted += udpate_BeginPdfOnlyBackups_menuItem;
+		}
+
+		private bool runBackupCountsAgain;
+
+		private void setBackupCounts(object _, object __)
+		{
+			runBackupCountsAgain = true;
+
+			if (!updateCountsBw.IsBusy)
+				updateCountsBw.RunWorkerAsync();
+		}
+
+		private void UpdateCountsBw_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
+		{
+			while (runBackupCountsAgain)
+			{
+				runBackupCountsAgain = false;
+				e.Result = LibraryCommands.GetCounts();
+			}
+		}
+
+		private void exportMenuEnable(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+			exportLibraryToolStripMenuItem.Enabled = libraryStats.HasBookResults;
+		}
+
+		// this cannot be cleanly be FormattableToolStripMenuItem because of the optional "Errors" text
+		private const string backupsCountsLbl_Format = "BACKUPS: No progress: {0}  In process: {1}  Fully backed up: {2}";
+
+		private void updateBottomBookNumbers(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			var formatString
+				= !libraryStats.HasBookResults ? "No books. Begin by importing your library"
+				: libraryStats.booksError > 0 ? backupsCountsLbl_Format + "  Errors: {3}"
+				: libraryStats.HasPendingBooks ? backupsCountsLbl_Format
+				: $"All {"book".PluralizeWithCount(libraryStats.booksFullyBackedUp)} backed up";
+			var statusStripText = string.Format(formatString,
+				libraryStats.booksNoProgress,
+				libraryStats.booksDownloadedOnly,
+				libraryStats.booksFullyBackedUp,
+				libraryStats.booksError);
+			statusStrip1.UIThreadAsync(() => backupsCountsLbl.Text = statusStripText);
+		}
+
+		// update 'begin book backups' menu item
+		private void update_BeginBookBackups_menuItem(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			var menuItemText
+				= libraryStats.HasPendingBooks
+				? $"{libraryStats.PendingBooks} remaining"
+				: "All books have been liberated";
+			menuStrip1.UIThreadAsync(() =>
+			{
+				beginBookBackupsToolStripMenuItem.Format(menuItemText);
+				beginBookBackupsToolStripMenuItem.Enabled = libraryStats.HasPendingBooks;
+			});
+		}
+
+		private void updateBottomPdfNumbers(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			// don't need to assign the output of Format(). It just makes this logic cleaner
+			var statusStripText
+				= !libraryStats.HasPdfResults ? ""
+				: libraryStats.pdfsNotDownloaded > 0 ? pdfsCountsLbl.Format(libraryStats.pdfsNotDownloaded, libraryStats.pdfsDownloaded)
+				: $"|  All {libraryStats.pdfsDownloaded} PDFs downloaded";
+			statusStrip1.UIThreadAsync(() => pdfsCountsLbl.Text = statusStripText);
+		}
+
+		// update 'begin pdf only backups' menu item
+		private void udpate_BeginPdfOnlyBackups_menuItem(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			var menuItemText
+				= libraryStats.pdfsNotDownloaded > 0
+				? $"{libraryStats.pdfsNotDownloaded} remaining"
+				: "All PDFs have been downloaded";
+			menuStrip1.UIThreadAsync(() =>
+			{
+				beginPdfBackupsToolStripMenuItem.Format(menuItemText);
+				beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0;
+			});
+		}
+    }
+}

Source/LibationWinForms/Form1.Designer.cs

@@ -28,391 +28,559 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
-            this.gridPanel = new System.Windows.Forms.Panel();
-            this.filterHelpBtn = new System.Windows.Forms.Button();
-            this.filterBtn = new System.Windows.Forms.Button();
-            this.filterSearchTb = new System.Windows.Forms.TextBox();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.noAccountsYetAddAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.autoScanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.scanLibraryOfAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.scanLibraryOfSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.removeLibraryBooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.removeAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.removeSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.convertAllM4bToMp3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.scanningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.pdfsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.addFilterBtn = new System.Windows.Forms.Button();
-            this.menuStrip1.SuspendLayout();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // gridPanel
-            // 
-            this.gridPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+			this.filterHelpBtn = new System.Windows.Forms.Button();
+			this.filterBtn = new System.Windows.Forms.Button();
+			this.filterSearchTb = new System.Windows.Forms.TextBox();
+			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+			this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.autoScanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.noAccountsYetAddAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.scanLibraryOfAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.scanLibraryOfSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeLibraryBooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.beginBookBackupsToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem();
+			this.beginPdfBackupsToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem();
+			this.convertAllM4bToMp3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.liberateVisibleToolStripMenuItem_LiberateMenu = new LibationWinForms.FormattableToolStripMenuItem();
+			this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.scanningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.visibleBooksToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem();
+			this.liberateVisibleToolStripMenuItem_VisibleBooksMenu = new LibationWinForms.FormattableToolStripMenuItem();
+			this.replaceTagsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.setDownloadedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+			this.visibleCountLbl = new LibationWinForms.FormattableToolStripStatusLabel();
+			this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
+			this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
+			this.pdfsCountsLbl = new LibationWinForms.FormattableToolStripStatusLabel();
+			this.addQuickFilterBtn = new System.Windows.Forms.Button();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.productsDisplay = new LibationWinForms.GridView.ProductsDisplay();
+			this.toggleQueueHideBtn = new System.Windows.Forms.Button();
+			this.doneRemovingBtn = new System.Windows.Forms.Button();
+			this.removeBooksBtn = new System.Windows.Forms.Button();
+			this.processBookQueue1 = new LibationWinForms.ProcessQueue.ProcessQueueControl();
+			this.menuStrip1.SuspendLayout();
+			this.statusStrip1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			this.panel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// filterHelpBtn
+			// 
+			this.filterHelpBtn.Location = new System.Drawing.Point(15, 3);
+			this.filterHelpBtn.Margin = new System.Windows.Forms.Padding(15, 3, 4, 3);
+			this.filterHelpBtn.Name = "filterHelpBtn";
+			this.filterHelpBtn.Size = new System.Drawing.Size(26, 27);
+			this.filterHelpBtn.TabIndex = 3;
+			this.filterHelpBtn.Text = "?";
+			this.filterHelpBtn.UseVisualStyleBackColor = true;
+			this.filterHelpBtn.Click += new System.EventHandler(this.filterHelpBtn_Click);
+			// 
+			// filterBtn
+			// 
+			this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.filterBtn.Location = new System.Drawing.Point(892, 3);
+			this.filterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.filterBtn.Name = "filterBtn";
+			this.filterBtn.Size = new System.Drawing.Size(88, 27);
+			this.filterBtn.TabIndex = 2;
+			this.filterBtn.Text = "Filter";
+			this.filterBtn.UseVisualStyleBackColor = true;
+			this.filterBtn.Click += new System.EventHandler(this.filterBtn_Click);
+			// 
+			// filterSearchTb
+			// 
+			this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.gridPanel.Location = new System.Drawing.Point(14, 65);
-            this.gridPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.gridPanel.Name = "gridPanel";
-            this.gridPanel.Size = new System.Drawing.Size(979, 445);
-            this.gridPanel.TabIndex = 5;
-            // 
-            // filterHelpBtn
-            // 
-            this.filterHelpBtn.Location = new System.Drawing.Point(14, 31);
-            this.filterHelpBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.filterHelpBtn.Name = "filterHelpBtn";
-            this.filterHelpBtn.Size = new System.Drawing.Size(26, 27);
-            this.filterHelpBtn.TabIndex = 3;
-            this.filterHelpBtn.Text = "?";
-            this.filterHelpBtn.UseVisualStyleBackColor = true;
-            this.filterHelpBtn.Click += new System.EventHandler(this.filterHelpBtn_Click);
-            // 
-            // filterBtn
-            // 
-            this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.filterBtn.Location = new System.Drawing.Point(905, 31);
-            this.filterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.filterBtn.Name = "filterBtn";
-            this.filterBtn.Size = new System.Drawing.Size(88, 27);
-            this.filterBtn.TabIndex = 2;
-            this.filterBtn.Text = "Filter";
-            this.filterBtn.UseVisualStyleBackColor = true;
-            this.filterBtn.Click += new System.EventHandler(this.filterBtn_Click);
-            // 
-            // filterSearchTb
-            // 
-            this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.filterSearchTb.Location = new System.Drawing.Point(217, 33);
-            this.filterSearchTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.filterSearchTb.Name = "filterSearchTb";
-            this.filterSearchTb.Size = new System.Drawing.Size(681, 23);
-            this.filterSearchTb.TabIndex = 1;
-            this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.filterSearchTb.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+			this.filterSearchTb.Location = new System.Drawing.Point(195, 5);
+			this.filterSearchTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.filterSearchTb.Name = "filterSearchTb";
+			this.filterSearchTb.Size = new System.Drawing.Size(689, 25);
+			this.filterSearchTb.TabIndex = 1;
+			this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
+			// 
+			// menuStrip1
+			// 
+			this.menuStrip1.ImageScalingSize = new System.Drawing.Size(40, 40);
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.importToolStripMenuItem,
             this.liberateToolStripMenuItem,
             this.exportToolStripMenuItem,
             this.quickFiltersToolStripMenuItem,
-            this.settingsToolStripMenuItem,
-            this.scanningToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
-            this.menuStrip1.Size = new System.Drawing.Size(1007, 24);
-            this.menuStrip1.TabIndex = 0;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // importToolStripMenuItem
-            // 
-            this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.scanningToolStripMenuItem,
+            this.visibleBooksToolStripMenuItem,
+            this.settingsToolStripMenuItem});
+			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip1.Name = "menuStrip1";
+			this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
+			this.menuStrip1.Size = new System.Drawing.Size(1037, 24);
+			this.menuStrip1.TabIndex = 0;
+			this.menuStrip1.Text = "menuStrip1";
+			// 
+			// importToolStripMenuItem
+			// 
+			this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.autoScanLibraryToolStripMenuItem,
             this.noAccountsYetAddAccountToolStripMenuItem,
             this.scanLibraryToolStripMenuItem,
             this.scanLibraryOfAllAccountsToolStripMenuItem,
             this.scanLibraryOfSomeAccountsToolStripMenuItem,
             this.removeLibraryBooksToolStripMenuItem});
-            this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-            this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
-            this.importToolStripMenuItem.Text = "&Import";
-            // 
-            // noAccountsYetAddAccountToolStripMenuItem
-            // 
-            this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
-            this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-            this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
-            this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
-            // 
-            // autoScanLibraryToolStripMenuItem
-            // 
-            this.autoScanLibraryToolStripMenuItem.Name = "autoScanLibraryToolStripMenuItem";
-            this.autoScanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-            this.autoScanLibraryToolStripMenuItem.Text = "A&uto Scan Library";
-            this.autoScanLibraryToolStripMenuItem.Click += new System.EventHandler(this.autoScanLibraryToolStripMenuItem_Click);
-            // 
-            // scanLibraryToolStripMenuItem
-            // 
-            this.scanLibraryToolStripMenuItem.Name = "scanLibraryToolStripMenuItem";
-            this.scanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-            this.scanLibraryToolStripMenuItem.Text = "Scan &Library";
-            this.scanLibraryToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryToolStripMenuItem_Click);
-            // 
-            // scanLibraryOfAllAccountsToolStripMenuItem
-            // 
-            this.scanLibraryOfAllAccountsToolStripMenuItem.Name = "scanLibraryOfAllAccountsToolStripMenuItem";
-            this.scanLibraryOfAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-            this.scanLibraryOfAllAccountsToolStripMenuItem.Text = "Scan Library of &All Accounts";
-            this.scanLibraryOfAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfAllAccountsToolStripMenuItem_Click);
-            // 
-            // scanLibraryOfSomeAccountsToolStripMenuItem
-            // 
-            this.scanLibraryOfSomeAccountsToolStripMenuItem.Name = "scanLibraryOfSomeAccountsToolStripMenuItem";
-            this.scanLibraryOfSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-            this.scanLibraryOfSomeAccountsToolStripMenuItem.Text = "Scan Library of &Some Accounts...";
-            this.scanLibraryOfSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfSomeAccountsToolStripMenuItem_Click);
-            // 
-            // removeLibraryBooksToolStripMenuItem
-            // 
-            this.removeLibraryBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.importToolStripMenuItem.Name = "importToolStripMenuItem";
+			this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
+			this.importToolStripMenuItem.Text = "&Import";
+			// 
+			// autoScanLibraryToolStripMenuItem
+			// 
+			this.autoScanLibraryToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.autoScanLibraryToolStripMenuItem.Name = "autoScanLibraryToolStripMenuItem";
+			this.autoScanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.autoScanLibraryToolStripMenuItem.Text = "A&uto Scan Library";
+			this.autoScanLibraryToolStripMenuItem.Click += new System.EventHandler(this.autoScanLibraryToolStripMenuItem_Click);
+			// 
+			// noAccountsYetAddAccountToolStripMenuItem
+			// 
+			this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
+			this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
+			this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
+			// 
+			// scanLibraryToolStripMenuItem
+			// 
+			this.scanLibraryToolStripMenuItem.Name = "scanLibraryToolStripMenuItem";
+			this.scanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.scanLibraryToolStripMenuItem.Text = "Scan &Library";
+			this.scanLibraryToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryToolStripMenuItem_Click);
+			// 
+			// scanLibraryOfAllAccountsToolStripMenuItem
+			// 
+			this.scanLibraryOfAllAccountsToolStripMenuItem.Name = "scanLibraryOfAllAccountsToolStripMenuItem";
+			this.scanLibraryOfAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.scanLibraryOfAllAccountsToolStripMenuItem.Text = "Scan Library of &All Accounts";
+			this.scanLibraryOfAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfAllAccountsToolStripMenuItem_Click);
+			// 
+			// scanLibraryOfSomeAccountsToolStripMenuItem
+			// 
+			this.scanLibraryOfSomeAccountsToolStripMenuItem.Name = "scanLibraryOfSomeAccountsToolStripMenuItem";
+			this.scanLibraryOfSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.scanLibraryOfSomeAccountsToolStripMenuItem.Text = "Scan Library of &Some Accounts...";
+			this.scanLibraryOfSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfSomeAccountsToolStripMenuItem_Click);
+			// 
+			// removeLibraryBooksToolStripMenuItem
+			// 
+			this.removeLibraryBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.removeAllAccountsToolStripMenuItem,
             this.removeSomeAccountsToolStripMenuItem});
-            this.removeLibraryBooksToolStripMenuItem.Name = "removeLibraryBooksToolStripMenuItem";
-            this.removeLibraryBooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-            this.removeLibraryBooksToolStripMenuItem.Text = "Remove Library Books";
-            this.removeLibraryBooksToolStripMenuItem.Click += new System.EventHandler(this.removeLibraryBooksToolStripMenuItem_Click);
-            // 
-            // removeAllAccountsToolStripMenuItem
-            // 
-            this.removeAllAccountsToolStripMenuItem.Name = "removeAllAccountsToolStripMenuItem";
-            this.removeAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
-            this.removeAllAccountsToolStripMenuItem.Text = "All Accounts";
-            this.removeAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeAllAccountsToolStripMenuItem_Click);
-            // 
-            // removeSomeAccountsToolStripMenuItem
-            // 
-            this.removeSomeAccountsToolStripMenuItem.Name = "removeSomeAccountsToolStripMenuItem";
-            this.removeSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
-            this.removeSomeAccountsToolStripMenuItem.Text = "Some Accounts";
-            this.removeSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeSomeAccountsToolStripMenuItem_Click);
-            // 
-            // liberateToolStripMenuItem
-            // 
-            this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.removeLibraryBooksToolStripMenuItem.Name = "removeLibraryBooksToolStripMenuItem";
+			this.removeLibraryBooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.removeLibraryBooksToolStripMenuItem.Text = "Remove Library Books";
+			this.removeLibraryBooksToolStripMenuItem.Click += new System.EventHandler(this.removeLibraryBooksToolStripMenuItem_Click);
+			// 
+			// removeAllAccountsToolStripMenuItem
+			// 
+			this.removeAllAccountsToolStripMenuItem.Name = "removeAllAccountsToolStripMenuItem";
+			this.removeAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.removeAllAccountsToolStripMenuItem.Text = "All Accounts";
+			this.removeAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeAllAccountsToolStripMenuItem_Click);
+			// 
+			// removeSomeAccountsToolStripMenuItem
+			// 
+			this.removeSomeAccountsToolStripMenuItem.Name = "removeSomeAccountsToolStripMenuItem";
+			this.removeSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.removeSomeAccountsToolStripMenuItem.Text = "Some Accounts";
+			this.removeSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeSomeAccountsToolStripMenuItem_Click);
+			// 
+			// liberateToolStripMenuItem
+			// 
+			this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.beginBookBackupsToolStripMenuItem,
             this.beginPdfBackupsToolStripMenuItem,
-            this.convertAllM4bToMp3ToolStripMenuItem});
-            this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
-            this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-            this.liberateToolStripMenuItem.Text = "&Liberate";
-            // 
-            // beginBookBackupsToolStripMenuItem
-            // 
-            this.beginBookBackupsToolStripMenuItem.Name = "beginBookBackupsToolStripMenuItem";
-            this.beginBookBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-            this.beginBookBackupsToolStripMenuItem.Text = "Begin &Book and PDF Backups: {0}";
-            this.beginBookBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginBookBackupsToolStripMenuItem_Click);
-            // 
-            // beginPdfBackupsToolStripMenuItem
-            // 
-            this.beginPdfBackupsToolStripMenuItem.Name = "beginPdfBackupsToolStripMenuItem";
-            this.beginPdfBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-            this.beginPdfBackupsToolStripMenuItem.Text = "Begin &PDF Only Backups: {0}";
-            this.beginPdfBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginPdfBackupsToolStripMenuItem_Click);
-            // 
-            // convertAllM4bToMp3ToolStripMenuItem
-            // 
-            this.convertAllM4bToMp3ToolStripMenuItem.Name = "convertAllM4bToMp3ToolStripMenuItem";
-            this.convertAllM4bToMp3ToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-            this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all M4b to Mp3 [Long-running]...";
-            this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click);
-            // 
-            // exportToolStripMenuItem
-            // 
-            this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.convertAllM4bToMp3ToolStripMenuItem,
+            this.liberateVisibleToolStripMenuItem_LiberateMenu});
+			this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
+			this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+			this.liberateToolStripMenuItem.Text = "&Liberate";
+			// 
+			// beginBookBackupsToolStripMenuItem
+			// 
+			this.beginBookBackupsToolStripMenuItem.FormatText = "Begin &Book and PDF Backups: {0}";
+			this.beginBookBackupsToolStripMenuItem.Name = "beginBookBackupsToolStripMenuItem";
+			this.beginBookBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
+			this.beginBookBackupsToolStripMenuItem.Text = "Begin &Book and PDF Backups: {0}";
+			this.beginBookBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginBookBackupsToolStripMenuItem_Click);
+			// 
+			// beginPdfBackupsToolStripMenuItem
+			// 
+			this.beginPdfBackupsToolStripMenuItem.FormatText = "Begin &PDF Only Backups: {0}";
+			this.beginPdfBackupsToolStripMenuItem.Name = "beginPdfBackupsToolStripMenuItem";
+			this.beginPdfBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
+			this.beginPdfBackupsToolStripMenuItem.Text = "Begin &PDF Only Backups: {0}";
+			this.beginPdfBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginPdfBackupsToolStripMenuItem_Click);
+			// 
+			// convertAllM4bToMp3ToolStripMenuItem
+			// 
+			this.convertAllM4bToMp3ToolStripMenuItem.Name = "convertAllM4bToMp3ToolStripMenuItem";
+			this.convertAllM4bToMp3ToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
+			this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all &M4b to Mp3 [Long-running]...";
+			this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click);
+			// 
+			// liberateVisibleToolStripMenuItem_LiberateMenu
+			// 
+			this.liberateVisibleToolStripMenuItem_LiberateMenu.FormatText = "Liberate &Visible Books: {0}";
+			this.liberateVisibleToolStripMenuItem_LiberateMenu.Name = "liberateVisibleToolStripMenuItem_LiberateMenu";
+			this.liberateVisibleToolStripMenuItem_LiberateMenu.Size = new System.Drawing.Size(293, 22);
+			this.liberateVisibleToolStripMenuItem_LiberateMenu.Text = "Liberate &Visible Books: {0}";
+			this.liberateVisibleToolStripMenuItem_LiberateMenu.Click += new System.EventHandler(this.liberateVisible);
+			// 
+			// exportToolStripMenuItem
+			// 
+			this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.exportLibraryToolStripMenuItem});
-            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
-            this.exportToolStripMenuItem.Text = "E&xport";
-            // 
-            // exportLibraryToolStripMenuItem
-            // 
-            this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
-            this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-            this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
-            this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
-            // 
-            // quickFiltersToolStripMenuItem
-            // 
-            this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
+			this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
+			this.exportToolStripMenuItem.Text = "E&xport";
+			// 
+			// exportLibraryToolStripMenuItem
+			// 
+			this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
+			this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+			this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
+			this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
+			// 
+			// quickFiltersToolStripMenuItem
+			// 
+			this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.firstFilterIsDefaultToolStripMenuItem,
             this.editQuickFiltersToolStripMenuItem,
             this.toolStripSeparator1});
-            this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
-            this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
-            this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
-            // 
-            // firstFilterIsDefaultToolStripMenuItem
-            // 
-            this.firstFilterIsDefaultToolStripMenuItem.Name = "firstFilterIsDefaultToolStripMenuItem";
-            this.firstFilterIsDefaultToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-            this.firstFilterIsDefaultToolStripMenuItem.Text = "Start Libation with 1st filter &Default";
-            this.firstFilterIsDefaultToolStripMenuItem.Click += new System.EventHandler(this.FirstFilterIsDefaultToolStripMenuItem_Click);
-            // 
-            // editQuickFiltersToolStripMenuItem
-            // 
-            this.editQuickFiltersToolStripMenuItem.Name = "editQuickFiltersToolStripMenuItem";
-            this.editQuickFiltersToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-            this.editQuickFiltersToolStripMenuItem.Text = "&Edit quick filters...";
-            this.editQuickFiltersToolStripMenuItem.Click += new System.EventHandler(this.EditQuickFiltersToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
-            // 
-            // settingsToolStripMenuItem
-            // 
-            this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
+			this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
+			this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
+			// 
+			// firstFilterIsDefaultToolStripMenuItem
+			// 
+			this.firstFilterIsDefaultToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.firstFilterIsDefaultToolStripMenuItem.Name = "firstFilterIsDefaultToolStripMenuItem";
+			this.firstFilterIsDefaultToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+			this.firstFilterIsDefaultToolStripMenuItem.Text = "Start Libation with 1st filter &Default";
+			this.firstFilterIsDefaultToolStripMenuItem.Click += new System.EventHandler(this.firstFilterIsDefaultToolStripMenuItem_Click);
+			// 
+			// editQuickFiltersToolStripMenuItem
+			// 
+			this.editQuickFiltersToolStripMenuItem.Name = "editQuickFiltersToolStripMenuItem";
+			this.editQuickFiltersToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+			this.editQuickFiltersToolStripMenuItem.Text = "&Edit quick filters...";
+			this.editQuickFiltersToolStripMenuItem.Click += new System.EventHandler(this.editQuickFiltersToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
+			// 
+			// scanningToolStripMenuItem
+			// 
+			this.scanningToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.scanningToolStripMenuItem.Enabled = false;
+			this.scanningToolStripMenuItem.Image = global::LibationWinForms.Properties.Resources.import_16x16;
+			this.scanningToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.scanningToolStripMenuItem.Name = "scanningToolStripMenuItem";
+			this.scanningToolStripMenuItem.Size = new System.Drawing.Size(93, 20);
+			this.scanningToolStripMenuItem.Text = "Scanning...";
+			this.scanningToolStripMenuItem.Visible = false;
+			// 
+			// visibleBooksToolStripMenuItem
+			// 
+			this.visibleBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.liberateVisibleToolStripMenuItem_VisibleBooksMenu,
+            this.replaceTagsToolStripMenuItem,
+            this.setDownloadedToolStripMenuItem,
+            this.removeToolStripMenuItem});
+			this.visibleBooksToolStripMenuItem.FormatText = "&Visible Books: {0}";
+			this.visibleBooksToolStripMenuItem.Name = "visibleBooksToolStripMenuItem";
+			this.visibleBooksToolStripMenuItem.Size = new System.Drawing.Size(108, 20);
+			this.visibleBooksToolStripMenuItem.Text = "&Visible Books: {0}";
+			// 
+			// liberateVisibleToolStripMenuItem_VisibleBooksMenu
+			// 
+			this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.FormatText = "&Liberate: {0}";
+			this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Name = "liberateVisibleToolStripMenuItem_VisibleBooksMenu";
+			this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Size = new System.Drawing.Size(209, 22);
+			this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Text = "&Liberate: {0}";
+			this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Click += new System.EventHandler(this.liberateVisible);
+			// 
+			// replaceTagsToolStripMenuItem
+			// 
+			this.replaceTagsToolStripMenuItem.Name = "replaceTagsToolStripMenuItem";
+			this.replaceTagsToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+			this.replaceTagsToolStripMenuItem.Text = "Replace &Tags...";
+			this.replaceTagsToolStripMenuItem.Click += new System.EventHandler(this.replaceTagsToolStripMenuItem_Click);
+			// 
+			// setDownloadedToolStripMenuItem
+			// 
+			this.setDownloadedToolStripMenuItem.Name = "setDownloadedToolStripMenuItem";
+			this.setDownloadedToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+			this.setDownloadedToolStripMenuItem.Text = "Set \'&Downloaded\' status...";
+			this.setDownloadedToolStripMenuItem.Click += new System.EventHandler(this.setDownloadedToolStripMenuItem_Click);
+			// 
+			// removeToolStripMenuItem
+			// 
+			this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
+			this.removeToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+			this.removeToolStripMenuItem.Text = "&Remove from library...";
+			this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
+			// 
+			// settingsToolStripMenuItem
+			// 
+			this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.accountsToolStripMenuItem,
             this.basicSettingsToolStripMenuItem,
             this.toolStripSeparator2,
             this.aboutToolStripMenuItem});
-            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-            this.settingsToolStripMenuItem.Text = "&Settings";
-            // 
-            // accountsToolStripMenuItem
-            // 
-            this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
-            this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-            this.accountsToolStripMenuItem.Text = "&Accounts...";
-            this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
-            // 
-            // basicSettingsToolStripMenuItem
-            // 
-            this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
-            this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-            this.basicSettingsToolStripMenuItem.Text = "&Settings...";
-            this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(130, 6);
-            // 
-            // aboutToolStripMenuItem
-            // 
-            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-            this.aboutToolStripMenuItem.Text = "A&bout...";
-            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
-            // 
-            // scanningToolStripMenuItem
-            // 
-            this.scanningToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.scanningToolStripMenuItem.Enabled = false;
-            this.scanningToolStripMenuItem.Image = global::LibationWinForms.Properties.Resources.import_16x16;
-            this.scanningToolStripMenuItem.Name = "scanningToolStripMenuItem";
-            this.scanningToolStripMenuItem.Size = new System.Drawing.Size(93, 20);
-            this.scanningToolStripMenuItem.Text = "Scanning...";
-            this.scanningToolStripMenuItem.Visible = false;
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+			this.settingsToolStripMenuItem.Text = "&Settings";
+			// 
+			// accountsToolStripMenuItem
+			// 
+			this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
+			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
+			this.accountsToolStripMenuItem.Text = "&Accounts...";
+			this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
+			// 
+			// basicSettingsToolStripMenuItem
+			// 
+			this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
+			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
+			this.basicSettingsToolStripMenuItem.Text = "&Settings...";
+			this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(130, 6);
+			// 
+			// aboutToolStripMenuItem
+			// 
+			this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+			this.aboutToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
+			this.aboutToolStripMenuItem.Text = "A&bout...";
+			this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
+			// 
+			// statusStrip1
+			// 
+			this.statusStrip1.ImageScalingSize = new System.Drawing.Size(40, 40);
+			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.visibleCountLbl,
             this.springLbl,
             this.backupsCountsLbl,
             this.pdfsCountsLbl});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 517);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
-            this.statusStrip1.Size = new System.Drawing.Size(1007, 22);
-            this.statusStrip1.TabIndex = 6;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // visibleCountLbl
-            // 
-            this.visibleCountLbl.Name = "visibleCountLbl";
-            this.visibleCountLbl.Size = new System.Drawing.Size(53, 17);
-            this.visibleCountLbl.Text = "Visible: 0";
-            // 
-            // springLbl
-            // 
-            this.springLbl.Name = "springLbl";
-            this.springLbl.Size = new System.Drawing.Size(548, 17);
-            this.springLbl.Spring = true;
-            // 
-            // backupsCountsLbl
-            // 
-            this.backupsCountsLbl.Name = "backupsCountsLbl";
-            this.backupsCountsLbl.Size = new System.Drawing.Size(218, 17);
-            this.backupsCountsLbl.Text = "[Calculating backed up book quantities]";
-            // 
-            // pdfsCountsLbl
-            // 
-            this.pdfsCountsLbl.Name = "pdfsCountsLbl";
-            this.pdfsCountsLbl.Size = new System.Drawing.Size(171, 17);
-            this.pdfsCountsLbl.Text = "|  [Calculating backed up PDFs]";
-            // 
-            // addFilterBtn
-            // 
-            this.addFilterBtn.Location = new System.Drawing.Point(47, 31);
-            this.addFilterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.addFilterBtn.Name = "addFilterBtn";
-            this.addFilterBtn.Size = new System.Drawing.Size(163, 27);
-            this.addFilterBtn.TabIndex = 4;
-            this.addFilterBtn.Text = "Add To Quick Filters";
-            this.addFilterBtn.UseVisualStyleBackColor = true;
-            this.addFilterBtn.Click += new System.EventHandler(this.AddFilterBtn_Click);
-            // 
-            // Form1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1007, 539);
-            this.Controls.Add(this.filterBtn);
-            this.Controls.Add(this.addFilterBtn);
-            this.Controls.Add(this.filterSearchTb);
-            this.Controls.Add(this.filterHelpBtn);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.gridPanel);
-            this.Controls.Add(this.menuStrip1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MainMenuStrip = this.menuStrip1;
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "Form1";
-            this.Text = "Libation: Liberate your Library";
-            this.Load += new System.EventHandler(this.Form1_Load);
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.statusStrip1.Location = new System.Drawing.Point(0, 618);
+			this.statusStrip1.Name = "statusStrip1";
+			this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
+			this.statusStrip1.ShowItemToolTips = true;
+			this.statusStrip1.Size = new System.Drawing.Size(1037, 22);
+			this.statusStrip1.TabIndex = 6;
+			this.statusStrip1.Text = "statusStrip1";
+			// 
+			// visibleCountLbl
+			// 
+			this.visibleCountLbl.FormatText = "Visible: {0}";
+			this.visibleCountLbl.Name = "visibleCountLbl";
+			this.visibleCountLbl.Size = new System.Drawing.Size(61, 17);
+			this.visibleCountLbl.Text = "Visible: {0}";
+			// 
+			// springLbl
+			// 
+			this.springLbl.Name = "springLbl";
+			this.springLbl.Size = new System.Drawing.Size(523, 17);
+			this.springLbl.Spring = true;
+			// 
+			// backupsCountsLbl
+			// 
+			this.backupsCountsLbl.Name = "backupsCountsLbl";
+			this.backupsCountsLbl.Size = new System.Drawing.Size(218, 17);
+			this.backupsCountsLbl.Text = "[Calculating backed up book quantities]";
+			// 
+			// pdfsCountsLbl
+			// 
+			this.pdfsCountsLbl.FormatText = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
+			this.pdfsCountsLbl.Name = "pdfsCountsLbl";
+			this.pdfsCountsLbl.Size = new System.Drawing.Size(218, 17);
+			this.pdfsCountsLbl.Text = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
+			// 
+			// addQuickFilterBtn
+			// 
+			this.addQuickFilterBtn.Location = new System.Drawing.Point(50, 3);
+			this.addQuickFilterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.addQuickFilterBtn.Name = "addQuickFilterBtn";
+			this.addQuickFilterBtn.Size = new System.Drawing.Size(137, 27);
+			this.addQuickFilterBtn.TabIndex = 4;
+			this.addQuickFilterBtn.Text = "Add To Quick Filters";
+			this.addQuickFilterBtn.UseVisualStyleBackColor = true;
+			this.addQuickFilterBtn.Click += new System.EventHandler(this.addQuickFilterBtn_Click);
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.panel1);
+			this.splitContainer1.Panel1.Controls.Add(this.menuStrip1);
+			this.splitContainer1.Panel1.Controls.Add(this.statusStrip1);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.processBookQueue1);
+			this.splitContainer1.Size = new System.Drawing.Size(1463, 640);
+			this.splitContainer1.SplitterDistance = 1037;
+			this.splitContainer1.SplitterWidth = 8;
+			this.splitContainer1.TabIndex = 7;
+			// 
+			// panel1
+			// 
+			this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+			this.panel1.Controls.Add(this.productsDisplay);
+			this.panel1.Controls.Add(this.toggleQueueHideBtn);
+			this.panel1.Controls.Add(this.doneRemovingBtn);
+			this.panel1.Controls.Add(this.removeBooksBtn);
+			this.panel1.Controls.Add(this.addQuickFilterBtn);
+			this.panel1.Controls.Add(this.filterHelpBtn);
+			this.panel1.Controls.Add(this.filterSearchTb);
+			this.panel1.Controls.Add(this.filterBtn);
+			this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.panel1.Location = new System.Drawing.Point(0, 24);
+			this.panel1.Margin = new System.Windows.Forms.Padding(0);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(1037, 594);
+			this.panel1.TabIndex = 7;
+			// 
+			// productsDisplay
+			// 
+			this.productsDisplay.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.productsDisplay.AutoScroll = true;
+			this.productsDisplay.Location = new System.Drawing.Point(15, 36);
+			this.productsDisplay.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.productsDisplay.Name = "productsDisplay";
+			this.productsDisplay.Size = new System.Drawing.Size(1007, 555);
+			this.productsDisplay.TabIndex = 9;
+			this.productsDisplay.VisibleCountChanged += new System.EventHandler<int>(this.productsDisplay_VisibleCountChanged);
+			this.productsDisplay.RemovableCountChanged += new System.EventHandler<int>(this.productsDisplay_RemovableCountChanged);
+			this.productsDisplay.LiberateClicked += new System.EventHandler<DataLayer.LibraryBook>(this.ProductsDisplay_LiberateClicked);
+			this.productsDisplay.InitialLoaded += new System.EventHandler(this.productsDisplay_InitialLoaded);
+			// 
+			// toggleQueueHideBtn
+			// 
+			this.toggleQueueHideBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.toggleQueueHideBtn.Location = new System.Drawing.Point(989, 3);
+			this.toggleQueueHideBtn.Margin = new System.Windows.Forms.Padding(4, 3, 15, 3);
+			this.toggleQueueHideBtn.Name = "toggleQueueHideBtn";
+			this.toggleQueueHideBtn.Size = new System.Drawing.Size(33, 27);
+			this.toggleQueueHideBtn.TabIndex = 8;
+			this.toggleQueueHideBtn.Text = "❱❱❱";
+			this.toggleQueueHideBtn.UseVisualStyleBackColor = true;
+			this.toggleQueueHideBtn.Click += new System.EventHandler(this.ToggleQueueHideBtn_Click);
+			// 
+			// doneRemovingBtn
+			// 
+			this.doneRemovingBtn.Location = new System.Drawing.Point(406, 3);
+			this.doneRemovingBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.doneRemovingBtn.Name = "doneRemovingBtn";
+			this.doneRemovingBtn.Size = new System.Drawing.Size(145, 27);
+			this.doneRemovingBtn.TabIndex = 4;
+			this.doneRemovingBtn.Text = "Done Removing Books";
+			this.doneRemovingBtn.UseVisualStyleBackColor = true;
+			this.doneRemovingBtn.Visible = false;
+			this.doneRemovingBtn.Click += new System.EventHandler(this.doneRemovingBtn_Click);
+			// 
+			// removeBooksBtn
+			// 
+			this.removeBooksBtn.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
+			this.removeBooksBtn.Location = new System.Drawing.Point(206, 3);
+			this.removeBooksBtn.Margin = new System.Windows.Forms.Padding(15, 3, 4, 3);
+			this.removeBooksBtn.Name = "removeBooksBtn";
+			this.removeBooksBtn.Size = new System.Drawing.Size(192, 27);
+			this.removeBooksBtn.TabIndex = 4;
+			this.removeBooksBtn.Text = "Remove # Books from Libation";
+			this.removeBooksBtn.UseVisualStyleBackColor = true;
+			this.removeBooksBtn.Visible = false;
+			this.removeBooksBtn.Click += new System.EventHandler(this.removeBooksBtn_Click);
+			// 
+			// processBookQueue1
+			// 
+			this.processBookQueue1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.processBookQueue1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.processBookQueue1.Location = new System.Drawing.Point(0, 0);
+			this.processBookQueue1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+			this.processBookQueue1.Name = "processBookQueue1";
+			this.processBookQueue1.Size = new System.Drawing.Size(418, 640);
+			this.processBookQueue1.TabIndex = 0;
+			// 
+			// Form1
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1463, 640);
+			this.Controls.Add(this.splitContainer1);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.MainMenuStrip = this.menuStrip1;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.Name = "Form1";
+			this.Text = "Libation: Liberate your Library";
+			this.Load += new System.EventHandler(this.Form1_Load);
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.statusStrip1.ResumeLayout(false);
+			this.statusStrip1.PerformLayout();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel1.PerformLayout();
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+			this.splitContainer1.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
+			this.panel1.PerformLayout();
+			this.ResumeLayout(false);
 
 		}
 
 		#endregion
-
-		private System.Windows.Forms.Panel gridPanel;
 		private System.Windows.Forms.MenuStrip menuStrip1;
 		private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
 		private System.Windows.Forms.StatusStrip statusStrip1;
 		private System.Windows.Forms.ToolStripStatusLabel springLbl;
-		private System.Windows.Forms.ToolStripStatusLabel visibleCountLbl;
+		private LibationWinForms.FormattableToolStripStatusLabel visibleCountLbl;
 		private System.Windows.Forms.ToolStripMenuItem liberateToolStripMenuItem;
 		private System.Windows.Forms.ToolStripStatusLabel backupsCountsLbl;
-		private System.Windows.Forms.ToolStripMenuItem beginBookBackupsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripStatusLabel pdfsCountsLbl;
-		private System.Windows.Forms.ToolStripMenuItem beginPdfBackupsToolStripMenuItem;
+		private LibationWinForms.FormattableToolStripMenuItem beginBookBackupsToolStripMenuItem;
+		private LibationWinForms.FormattableToolStripStatusLabel pdfsCountsLbl;
+		private LibationWinForms.FormattableToolStripMenuItem beginPdfBackupsToolStripMenuItem;
 		private System.Windows.Forms.TextBox filterSearchTb;
 		private System.Windows.Forms.Button filterBtn;
 		private System.Windows.Forms.Button filterHelpBtn;
@@ -420,7 +588,7 @@
 		private System.Windows.Forms.ToolStripMenuItem scanLibraryToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem quickFiltersToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem firstFilterIsDefaultToolStripMenuItem;
-		private System.Windows.Forms.Button addFilterBtn;
+		private System.Windows.Forms.Button addQuickFilterBtn;
 		private System.Windows.Forms.ToolStripMenuItem editQuickFiltersToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.ToolStripMenuItem basicSettingsToolStripMenuItem;
@@ -438,5 +606,18 @@
         private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem scanningToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem autoScanLibraryToolStripMenuItem;
-    }
+        private LibationWinForms.FormattableToolStripMenuItem visibleBooksToolStripMenuItem;
+        private LibationWinForms.FormattableToolStripMenuItem liberateVisibleToolStripMenuItem_VisibleBooksMenu;
+        private System.Windows.Forms.ToolStripMenuItem replaceTagsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem setDownloadedToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem removeToolStripMenuItem;
+        private LibationWinForms.FormattableToolStripMenuItem liberateVisibleToolStripMenuItem_LiberateMenu;
+		private System.Windows.Forms.SplitContainer splitContainer1;
+		private LibationWinForms.ProcessQueue.ProcessQueueControl processBookQueue1;
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.Button toggleQueueHideBtn;
+		private LibationWinForms.GridView.ProductsDisplay productsDisplay;
+		private System.Windows.Forms.Button removeBooksBtn;
+		private System.Windows.Forms.Button doneRemovingBtn;
+	}
 }

Source/LibationWinForms/Form1.Export.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Windows.Forms;
+using ApplicationServices;
+
+namespace LibationWinForms
+{
+    public partial class Form1
+    {
+        private void Configure_Export() { }
+
+		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)
+			{
+				MessageBoxLib.ShowAdminAlert(this, "Error attempting to export your library.", "Error exporting", ex);
+			}
+		}
+	}
+}

Source/LibationWinForms/Form1.Filter.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Windows.Forms;
+using LibationWinForms.Dialogs;
+
+namespace LibationWinForms
+{
+    public partial class Form1
+    {
+		protected void Configure_Filter() { }
+
+		private void filterHelpBtn_Click(object sender, EventArgs e) => new SearchSyntaxDialog().ShowDialog();
+
+		private void filterSearchTb_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			if (e.KeyChar == (char)Keys.Return)
+			{
+				performFilter(this.filterSearchTb.Text);
+
+				// silence the 'ding'
+				e.Handled = true;
+			}
+		}
+
+		private void filterBtn_Click(object sender, EventArgs e) => performFilter(this.filterSearchTb.Text);
+
+		private string lastGoodFilter = "";
+		private void performFilter(string filterString)
+		{
+			this.filterSearchTb.Text = filterString;
+
+			try
+			{
+				productsDisplay.Filter(filterString);
+				lastGoodFilter = filterString;
+			}
+			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
+				performFilter(lastGoodFilter);
+			}
+		}
+	}
+}