Bugfix: decrypt book with no author

BETA READY

.gitignore

@@ -328,3 +328,8 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+
+
+# manually ignored files
+/__TODO.txt
+/DataLayer/LibationContext.db

AaxDecrypter/UNTESTED/AaxToM4bConverter.cs

@@ -72,8 +72,9 @@ namespace AaxDecrypter
         }
         private AaxToM4bConverter(string inputFile, string decryptKey)
         {
-            if (string.IsNullOrWhiteSpace(inputFile)) throw new ArgumentNullException(nameof(inputFile), "Input file may not be null or whitespace");
-            if (!File.Exists(inputFile)) throw new ArgumentNullException(nameof(inputFile), "File does not exist");
+			ArgumentValidator.EnsureNotNullOrWhiteSpace(inputFile, nameof(inputFile));
+            if (!File.Exists(inputFile))
+                throw new ArgumentNullException(nameof(inputFile), "File does not exist");
 
             steps = new StepSequence
             {
@@ -89,20 +90,20 @@ namespace AaxDecrypter
                 ["End: Create Nfo"] = End_CreateNfo
             };
 
-            this.inputFileName = inputFile;
+            inputFileName = inputFile;
             this.decryptKey = decryptKey;
         }
 
         private async Task prelimProcessing()
         {
-            this.tags = new Tags(this.inputFileName);
-            this.encodingInfo = new EncodingInfo(this.inputFileName);
-            this.chapters = new Chapters(this.inputFileName, this.tags.duration.TotalSeconds);
+            tags = new Tags(inputFileName);
+            encodingInfo = new EncodingInfo(inputFileName);
+            chapters = new Chapters(inputFileName, tags.duration.TotalSeconds);
 
             var defaultFilename = Path.Combine(
-                Path.GetDirectoryName(this.inputFileName),
-                getASCIITag(this.tags.author),
-                getASCIITag(this.tags.title) + ".m4b"
+                Path.GetDirectoryName(inputFileName),
+                getASCIITag(tags.author),
+                getASCIITag(tags.title) + ".m4b"
                 );
             SetOutputFilename(defaultFilename);
 
@@ -118,7 +119,7 @@ namespace AaxDecrypter
         private void saveCover(string aaxFile)
         {
 			using var file = TagLib.File.Create(aaxFile, "audio/mp4", TagLib.ReadStyle.Average);
-			this.coverBytes = file.Tag.Pictures[0].Data.Data;
+			coverBytes = file.Tag.Pictures[0].Data.Data;
 		}
 
         private void printPrelim()
@@ -156,21 +157,21 @@ namespace AaxDecrypter
 
         public void SetOutputFilename(string outFileName)
         {
-            this.outputFileName = outFileName;
+            outputFileName = outFileName;
 
-            if (Path.GetExtension(this.outputFileName) != ".m4b")
-                this.outputFileName = outputFileWithNewExt(".m4b");
+            if (Path.GetExtension(outputFileName) != ".m4b")
+                outputFileName = outputFileWithNewExt(".m4b");
 
-            this.outDir = Path.GetDirectoryName(this.outputFileName);
+            outDir = Path.GetDirectoryName(outputFileName);
         }
 
         private string outputFileWithNewExt(string extension)
-            => Path.Combine(this.outDir, Path.GetFileNameWithoutExtension(this.outputFileName) + '.' + extension.Trim('.'));
+            => Path.Combine(outDir, Path.GetFileNameWithoutExtension(outputFileName) + '.' + extension.Trim('.'));
 
         public bool Step1_CreateDir()
         {
-            ProcessRunner.WorkingDir = this.outDir;
-            Directory.CreateDirectory(this.outDir);
+            ProcessRunner.WorkingDir = outDir;
+            Directory.CreateDirectory(outDir);
             return true;
         }
 
@@ -178,7 +179,7 @@ namespace AaxDecrypter
         {
             DecryptProgressUpdate?.Invoke(this, 0);
 
-            var tempRipFile = Path.Combine(this.outDir, "funny.aac");
+            var tempRipFile = Path.Combine(outDir, "funny.aac");
 
             var fail = "WARNING-Decrypt failure. ";
 
@@ -193,7 +194,7 @@ namespace AaxDecrypter
                 if (returnCode == -99)
                 {
                     Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-                    this.decryptKey = null;
+                    decryptKey = null;
                     returnCode = getKey_decrypt(tempRipFile);
                 }
             }
@@ -232,7 +233,7 @@ namespace AaxDecrypter
 
             Console.WriteLine("Cracking activation bytes");
             var activation_bytes = BytesCracker.GetActivationBytes(checksum);
-            this.decryptKey = activation_bytes;
+            decryptKey = activation_bytes;
             Console.WriteLine("Activation bytes cracked. Decrypt key: " + activation_bytes);
         }
 
@@ -243,10 +244,10 @@ namespace AaxDecrypter
             Console.WriteLine("Decrypting with key " + decryptKey);
 
             var returnCode = 100;
-            var thread = new Thread(() => returnCode = this.ngDecrypt());
+            var thread = new Thread(() => returnCode = ngDecrypt());
             thread.Start();
 
-            double fileLen = new FileInfo(this.inputFileName).Length;
+            double fileLen = new FileInfo(inputFileName).Length;
             while (thread.IsAlive && returnCode == 100)
             {
                 Thread.Sleep(500);
@@ -266,7 +267,7 @@ namespace AaxDecrypter
             var info = new ProcessStartInfo
             {
                 FileName = DecryptSupportLibraries.mp4trackdumpPath,
-                Arguments = "-c " + this.encodingInfo.channels + " -r " + this.encodingInfo.sampleRate + " \"" + this.inputFileName + "\""
+                Arguments = "-c " + encodingInfo.channels + " -r " + encodingInfo.sampleRate + " \"" + inputFileName + "\""
             };
             info.EnvironmentVariables["VARIABLE"] = decryptKey;
 
@@ -280,20 +281,20 @@ namespace AaxDecrypter
         }
 
         // temp file names for steps 3, 4, 5
-        string tempChapsPath => Path.Combine(this.outDir, "tempChaps.mp4");
+        string tempChapsPath => Path.Combine(outDir, "tempChaps.mp4");
         string mp4_file => outputFileWithNewExt(".mp4");
         string ff_txt_file => mp4_file + ".ff.txt";
 
         public bool Step3_Chapterize()
         {
             string str1 = "";
-            if (this.chapters.FirstChapterStart != 0.0)
+            if (chapters.FirstChapterStart != 0.0)
             {
-                str1 = " -ss " + this.chapters.FirstChapterStart.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + (this.chapters.LastChapterStart - 1.0).ToString("0.000", CultureInfo.InvariantCulture) + " ";
+                str1 = " -ss " + chapters.FirstChapterStart.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + (chapters.LastChapterStart - 1.0).ToString("0.000", CultureInfo.InvariantCulture) + " ";
             }
 
-            string ffmpegTags = this.tags.GenerateFfmpegTags();
-            string ffmpegChapters = this.chapters.GenerateFfmpegChapters();
+            string ffmpegTags = tags.GenerateFfmpegTags();
+            string ffmpegChapters = chapters.GenerateFfmpegChapters();
             File.WriteAllText(ff_txt_file, ffmpegTags + ffmpegChapters);
 
             var tagAndChapterInfo = new ProcessStartInfo
@@ -309,8 +310,8 @@ namespace AaxDecrypter
         public bool Step4_InsertCoverArt()
         {
             // save cover image as temp file
-            var coverPath = Path.Combine(this.outDir, "cover-" + Guid.NewGuid() + ".jpg");
-            FileExt.CreateFile(coverPath, this.coverBytes);
+            var coverPath = Path.Combine(outDir, "cover-" + Guid.NewGuid() + ".jpg");
+            FileExt.CreateFile(coverPath, coverBytes);
 
             var insertCoverArtInfo = new ProcessStartInfo
             {
@@ -329,26 +330,26 @@ namespace AaxDecrypter
         {
             FileExt.SafeDelete(mp4_file);
             FileExt.SafeDelete(ff_txt_file);
-            FileExt.SafeMove(tempChapsPath, this.outputFileName);
+            FileExt.SafeMove(tempChapsPath, outputFileName);
 
             return true;
         }
 
         public bool Step6_AddTags()
         {
-            this.tags.AddAppleTags(this.outputFileName);
+            tags.AddAppleTags(outputFileName);
             return true;
         }
 
         public bool End_CreateCue()
         {
-            File.WriteAllText(outputFileWithNewExt(".cue"), this.chapters.GetCuefromChapters(Path.GetFileName(this.outputFileName)));
+            File.WriteAllText(outputFileWithNewExt(".cue"), chapters.GetCuefromChapters(Path.GetFileName(outputFileName)));
             return true;
         }
 
         public bool End_CreateNfo()
         {
-            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateNfoContents(AppName, this.tags, this.encodingInfo, this.chapters));
+            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateNfoContents(AppName, tags, encodingInfo, chapters));
             return true;
         }
     }

AaxDecrypter/UNTESTED/Tags.cs

@@ -28,7 +28,7 @@ namespace AaxDecrypter
 			using TagLib.File tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
 			this.title = tagLibFile.Tag.Title.Replace(" (Unabridged)", "");
 			this.album = tagLibFile.Tag.Album.Replace(" (Unabridged)", "");
-			this.author = tagLibFile.Tag.FirstPerformer;
+			this.author = tagLibFile.Tag.FirstPerformer ?? "[unknown]";
 			this.year = tagLibFile.Tag.Year.ToString();
 			this.comments = tagLibFile.Tag.Comment;
 			this.duration = tagLibFile.Properties.Duration;

ApplicationServices/UNTESTED/LibraryCommands.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Threading.Tasks;
+using AudibleApi;
+using DataLayer;
+using DtoImporterService;
+using InternalUtilities;
+
+namespace ApplicationServices
+{
+	public static class LibraryCommands
+	{
+		public static async Task<(int totalCount, int newCount)> ImportLibraryAsync(ILoginCallback callback)
+		{
+			try
+			{
+				var audibleApiActions = new AudibleApiActions();
+				var items = await audibleApiActions.GetAllLibraryItemsAsync(callback);
+				var totalCount = items.Count;
+				Serilog.Log.Logger.Debug($"GetAllLibraryItems: Total count {totalCount}");
+
+				var libImporter = new LibraryImporter();
+				var newCount = await Task.Run(() => libImporter.Import(items));
+				Serilog.Log.Logger.Debug($"Import: New count {newCount}");
+
+				await Task.Run(() => SearchEngineCommands.FullReIndex());
+				Serilog.Log.Logger.Debug("FullReIndex: success");
+
+				return (totalCount, newCount);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error importing library");
+				throw;
+			}
+		}
+
+		public static int UpdateTags(this LibationContext context, Book book, string newTags)
+		{
+			try
+			{
+				book.UserDefinedItem.Tags = newTags;
+
+				var qtyChanges = context.SaveChanges();
+
+				if (qtyChanges > 0)
+					SearchEngineCommands.UpdateBookTags(book);
+
+				return qtyChanges;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error updating tags");
+				throw;
+			}
+		}
+	}
+}

ApplicationServices/UNTESTED/LibraryIndexer.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using AudibleApi;
-using DtoImporterService;
-using InternalUtilities;
-
-namespace ApplicationService
-{
-	public class LibraryIndexer
-	{
-		public async Task<(int totalCount, int newCount)> IndexAsync(ILoginCallback callback)
-		{
-			var audibleApiActions = new AudibleApiActions();
-			var items = await audibleApiActions.GetAllLibraryItemsAsync(callback);
-			var totalCount = items.Count;
-
-			var libImporter = new LibraryImporter();
-			var newCount = await Task.Run(() => libImporter.Import(items));
-
-			await SearchEngineActions.FullReIndexAsync();
-
-			return (totalCount, newCount);
-		}
-	}
-}

ApplicationServices/UNTESTED/SearchEngineActions.cs

@@ -1,26 +0,0 @@
-using System.Threading.Tasks;
-using DataLayer;
-
-namespace ApplicationService
-{
-	public static class SearchEngineActions
-	{
-		public static async Task FullReIndexAsync()
-		{
-			var engine = new LibationSearchEngine.SearchEngine();
-			await engine.CreateNewIndexAsync().ConfigureAwait(false);
-		}
-
-		public static void UpdateBookTags(Book book)
-		{
-			var engine = new LibationSearchEngine.SearchEngine();
-			engine.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
-		}
-
-		public static async Task ProductReIndexAsync(string productId)
-		{
-			var engine = new LibationSearchEngine.SearchEngine();
-			await engine.UpdateBookAsync(productId).ConfigureAwait(false);
-		}
-	}
-}

ApplicationServices/UNTESTED/SearchEngineCommands.cs

@@ -0,0 +1,42 @@
+using DataLayer;
+using LibationSearchEngine;
+
+namespace ApplicationServices
+{
+	public static class SearchEngineCommands
+	{
+		public static void FullReIndex()
+		{
+			var engine = new SearchEngine();
+			engine.CreateNewIndex();
+		}
+
+		public static SearchResultSet Search(string searchString)
+		{
+			var engine = new SearchEngine();
+			try
+			{
+				return engine.Search(searchString);
+			}
+			catch (System.IO.FileNotFoundException)
+			{
+				FullReIndex();
+				return engine.Search(searchString);
+			}
+		}
+
+		public static void UpdateBookTags(Book book)
+		{
+			var engine = new SearchEngine();
+			try
+			{
+				engine.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
+			}
+			catch (System.IO.FileNotFoundException)
+			{
+				FullReIndex();
+				engine.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
+			}
+		}
+	}
+}

AudibleDotCom/AudibleDotCom.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

AudibleDotCom/UNTESTED/AudiblePage.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Linq;
-using Dinah.Core;
-
-namespace AudibleDotCom
-{
-    public enum AudiblePageType
-    {
-        ProductDetails = 1,
-
-        Library = 2
-    }
-    public static class AudiblePageExt
-    {
-        public static AudiblePage GetAudiblePageRobust(this AudiblePageType audiblePage) => AudiblePage.FromPageType(audiblePage);
-    }
-
-    public abstract partial class AudiblePage : Enumeration<AudiblePage>
-    {
-        // useful for generic classes:
-        //     public abstract class PageScraper<T> where T : AudiblePageRobust {
-        //         public AudiblePage AudiblePage => AudiblePageRobust.GetAudiblePageFromType(typeof(T));
-        public static AudiblePageType GetAudiblePageFromType(Type audiblePageRobustType)
-            => (AudiblePageType)GetAll().Single(t => t.GetType() == audiblePageRobustType).Id;
-
-        public AudiblePageType AudiblePageType { get; }
-
-        protected AudiblePage(AudiblePageType audiblePage, string abbreviation) : base((int)audiblePage, abbreviation) => AudiblePageType = audiblePage;
-
-        public static AudiblePage FromPageType(AudiblePageType audiblePage) => FromValue((int)audiblePage);
-
-        /// <summary>For pages which need a param, the param is marked with {0}</summary>
-        protected abstract string Url { get; }
-        public string GetUrl(string id) => string.Format(Url, id);
-
-        public string Abbreviation => DisplayName;
-    }
-    public abstract partial class AudiblePage : Enumeration<AudiblePage>
-    {
-        public static AudiblePage Library { get; } = LibraryPage.Instance;
-        public class LibraryPage : AudiblePage
-        {
-            #region singleton stuff
-            public static LibraryPage Instance { get; } = new LibraryPage();
-            static LibraryPage() { }
-            private LibraryPage() : base(AudiblePageType.Library, "LIB") { }
-            #endregion
-
-            protected override string Url => "http://www.audible.com/lib";
-        }
-    }
-    public abstract partial class AudiblePage : Enumeration<AudiblePage>
-    {
-        public static AudiblePage Product { get; } = ProductDetailPage.Instance;
-        public class ProductDetailPage : AudiblePage
-        {
-            #region singleton stuff
-            public static ProductDetailPage Instance { get; } = new ProductDetailPage();
-            static ProductDetailPage() { }
-            private ProductDetailPage() : base(AudiblePageType.ProductDetails, "PD") { }
-            #endregion
-
-            protected override string Url => "http://www.audible.com/pd/{0}";
-        }
-    }
-}

AudibleDotCom/UNTESTED/AudiblePageSource.cs

@@ -1,43 +0,0 @@
-using FileManager;
-
-namespace AudibleDotCom
-{
-    public class AudiblePageSource
-    {
-        public AudiblePageType AudiblePage { get; }
-        public string Source { get; }
-        public string PageId { get; }
-
-        public AudiblePageSource(AudiblePageType audiblePage, string source, string pageId)
-        {
-            AudiblePage = audiblePage;
-            Source = source;
-            PageId = pageId;
-        }
-
-        /// <summary>declawed allows local file to safely be reloaded in chrome
-        /// NOTE ABOUT DECLAWED FILES
-        /// making them safer also breaks functionality
-        /// eg: previously hidden parts become visible. this changes how selenium can parse pages.
-        ///     hidden elements don't expose .Text property</summary>
-        public AudiblePageSource Declawed() => new AudiblePageSource(AudiblePage, FileUtility.Declaw(Source), PageId);
-
-        public string Serialized() => $"<!-- |{AudiblePage.GetAudiblePageRobust().Abbreviation}|{(PageId ?? "").Trim()}| -->\r\n" + Source;
-
-        public static AudiblePageSource Deserialize(string serializedSource)
-        {
-            var endOfLine1 = serializedSource.IndexOf('\n');
-
-            var parameters = serializedSource
-                .Substring(0, endOfLine1)
-                .Split('|');
-            var abbrev = parameters[1];
-            var pageId = parameters[2];
-
-            var source = serializedSource.Substring(endOfLine1 + 1);
-            var audiblePage = AudibleDotCom.AudiblePage.FromDisplayName(abbrev).AudiblePageType;
-
-            return new AudiblePageSource(audiblePage, source, pageId);
-        }
-    }
-}

AudibleDotComAutomation/AudibleDotComAutomation.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Selenium.Support" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AudibleDotCom\AudibleDotCom.csproj" />
-    <ProjectReference Include="..\CookieMonster\CookieMonster.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="chromedriver.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>

AudibleDotComAutomation/UNTESTED/Page Retrievers/Abstract_SeleniumRetriever.cs

@@ -1,184 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleDotCom;
-using Dinah.Core.Humanizer;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Chrome;
-using OpenQA.Selenium.Support.UI;
-
-namespace AudibleDotComAutomation
-{
-    /// <summary>browser manipulation. web driver access
-    /// browser operators. create and store web driver, browser navigation which can vary depending on whether anon or auth'd
-    /// 
-    /// this base class: is online. no auth. used for most pages. retain no chrome cookies</summary>
-    public abstract class SeleniumRetriever : IPageRetriever
-    {
-        #region // chrome driver details
-        /*
-           HIDING CHROME CONSOLE WINDOW
-           hiding chrome console window has proven to cause more headaches than it solves. here's how to do it though:
-               // can also use CreateDefaultService() overloads to specify driver path and/or file name
-               var chromeDriverService = ChromeDriverService.CreateDefaultService();
-               chromeDriverService.HideCommandPromptWindow = true;
-               return new ChromeDriver(chromeDriverService, options);
-
-           HEADLESS CHROME
-           this WOULD be how to do headless. but amazon/audible are far too tricksy about their changes and anti-scraping measures
-           which renders 'headless' mode useless
-               var options = new ChromeOptions();
-               options.AddArgument("--headless");
-
-           SPECIFYING DRIVER LOCATION
-           if continues to have trouble finding driver:
-               var driver = new ChromeDriver(@"C:\my\path\to\chromedriver\directory");
-               var chromeDriverService = ChromeDriverService.CreateDefaultService(@"C:\my\path\to\chromedriver\directory");
-         */
-        #endregion
-
-        protected IWebDriver Driver { get; }
-        Humanizer humanizer { get; } = new Humanizer();
-
-        protected SeleniumRetriever()
-        {
-            Driver = new ChromeDriver(ctorCreateChromeOptions());
-        }
-
-        /// <summary>no auth. retain no chrome cookies</summary>
-        protected virtual ChromeOptions ctorCreateChromeOptions() => new ChromeOptions();
-
-        protected async Task AudibleLinkClickAsync(IWebElement element)
-        {
-            // EACH CALL to audible should have a small random wait to reduce chances of scrape detection
-            await humanizer.Wait();
-
-            await Task.Run(() => Driver.Click(element));
-
-            await waitForSpinnerAsync();
-
-            // sometimes these clicks just take a while. add a few more seconds
-            await Task.Delay(5000);
-        }
-
-        By spinnerLocator { get; } = By.Id("library-main-overlay");
-        private async Task waitForSpinnerAsync()
-        {
-            // if loading overlay w/spinner exists: pause, wait for it to end
-
-            await Task.Delay(100);
-
-            if (Driver.FindElements(spinnerLocator).Count > 0)
-                new WebDriverWait(Driver, TimeSpan.FromSeconds(60))
-                    .Until(ExpectedConditions.InvisibilityOfElementLocated(spinnerLocator));
-        }
-
-        private bool isFirstRun = true;
-        protected virtual async Task FirstRunAsync()
-        {
-            // load with no beginning wait. then wait 7 seconds to allow for page flicker. it usually happens after ~5 seconds. can happen irrespective of login state
-            await Task.Run(() => Driver.Navigate().GoToUrl("http://www.audible.com/"));
-            await Task.Delay(7000);
-        }
-
-        public async Task<IEnumerable<AudiblePageSource>> GetPageSourcesAsync(AudiblePageType audiblePage, string pageId = null)
-        {
-            if (isFirstRun)
-            {
-                await FirstRunAsync();
-                isFirstRun = false;
-            }
-
-            await initFirstPageAsync(audiblePage, pageId);
-
-            return await processUrl(audiblePage, pageId);
-        }
-
-        private async Task initFirstPageAsync(AudiblePageType audiblePage, string pageId)
-        {
-            // EACH CALL to audible should have a small random wait to reduce chances of scrape detection
-            await humanizer.Wait();
-
-            var url = audiblePage.GetAudiblePageRobust().GetUrl(pageId);
-            await Task.Run(() => Driver.Navigate().GoToUrl(url));
-
-            await waitForSpinnerAsync();
-        }
-
-        private async Task<IEnumerable<AudiblePageSource>> processUrl(AudiblePageType audiblePage, string pageId)
-        {
-            var pageSources = new List<AudiblePageSource>();
-            do
-            {
-                pageSources.Add(new AudiblePageSource(audiblePage, Driver.PageSource, pageId));
-            }
-            while (await hasMorePagesAsync());
-
-            return pageSources;
-        }
-
-        #region has more pages
-        /// <summary>if no more pages, return false. else, navigate to next page and return true</summary>
-        private async Task<bool> hasMorePagesAsync()
-        {
-            var next = //old_hasMorePages() ??
-                new_hasMorePages();
-            if (next == null)
-                return false;
-
-            await AudibleLinkClickAsync(next);
-            return true;
-        }
-
-        private IWebElement old_hasMorePages()
-        {
-            var parentElements = Driver.FindElements(By.ClassName("adbl-page-next"));
-            if (parentElements.Count == 0)
-                return null;
-
-            var childElements = parentElements[0].FindElements(By.LinkText("NEXT"));
-            if (childElements.Count != 1)
-                return null;
-
-            return childElements[0];
-        }
-
-        // ~ oct 2017
-        private IWebElement new_hasMorePages()
-        {
-            // get all active/enabled navigation links
-            var pageNavLinks = Driver.FindElements(By.ClassName("library-load-page"));
-            if (pageNavLinks.Count == 0)
-                return null;
-
-            // get only the right chevron if active.
-            // note: there are also right chevrons which are not for wish list navigation which is why we first filter by library-load-page
-            var nextLink = pageNavLinks
-                .Where(p => p.FindElements(By.ClassName("bc-icon-chevron-right")).Count > 0)
-                .ToList(); // cut-off delayed execution
-            if (nextLink.Count == 0)
-                return null;
-
-            return nextLink.Single().FindElement(By.TagName("button"));
-        }
-        #endregion
-
-        #region IDisposable pattern
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing && Driver != null)
-            {
-                // Quit() does cleanup AND disposes
-                Driver.Quit();
-            }
-        }
-        #endregion
-    }
-}

AudibleDotComAutomation/UNTESTED/Page Retrievers/AuthSeleniumRetriever.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenQA.Selenium;
-
-namespace AudibleDotComAutomation
-{
-    /// <summary>for user collections: lib, WL</summary>
-    public abstract class AuthSeleniumRetriever : SeleniumRetriever
-    {
-        protected bool IsLoggedIn => GetListenerPageLink() != null;
-
-        // needed?
-        protected AuthSeleniumRetriever() : base() { }
-
-        protected IWebElement GetListenerPageLink()
-        {
-            var listenerPageElement = Driver.FindElements(By.XPath("//a[contains(@href, '/review-by-author')]"));
-            if (listenerPageElement.Count > 0)
-                return listenerPageElement[0];
-            return null;
-        }
-    }
-}

AudibleDotComAutomation/UNTESTED/Page Retrievers/BrowserlessRetriever.cs

@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using AudibleDotCom;
-using CookieMonster;
-using Dinah.Core;
-using Dinah.Core.Humanizer;
-
-namespace AudibleDotComAutomation
-{
-    public class BrowserlessRetriever : IPageRetriever
-    {
-        Humanizer humanizer { get; } = new Humanizer();
-
-        public async Task<IEnumerable<AudiblePageSource>> GetPageSourcesAsync(AudiblePageType audiblePage, string pageId = null)
-        {
-            switch (audiblePage)
-            {
-case AudiblePageType.Library: return await getLibraryPageSourcesAsync();
-                default: throw new NotImplementedException();
-            }
-        }
-
-        private async Task<IEnumerable<AudiblePageSource>> getLibraryPageSourcesAsync()
-        {
-            var collection = new List<AudiblePageSource>();
-
-            var cookies = await getAudibleCookiesAsync();
-
-            var currPageNum = 1;
-            bool hasMorePages;
-            do
-            {
-                // EACH CALL to audible should have a small random wait to reduce chances of scrape detection
-                await humanizer.Wait();
-
-var html = await getLibraryPageAsync(cookies, currPageNum);
-var pageSource = new AudiblePageSource(AudiblePageType.Library, html, null);
-                collection.Add(pageSource);
-
-                hasMorePages = getHasMorePages(pageSource.Source);
-
-                currPageNum++;
-            } while (hasMorePages);
-
-            return collection;
-        }
-
-        private static async Task<CookieContainer> getAudibleCookiesAsync()
-        {
-            var liveCookies = await CookiesHelper.GetLiveCookieValuesAsync();
-
-            var audibleCookies = liveCookies.Where(c
-                => c.Domain.ContainsInsensitive("audible.com")
-                || c.Domain.ContainsInsensitive("adbl")
-                || c.Domain.ContainsInsensitive("amazon.com"))
-            .ToList();
-
-            var cookies = new CookieContainer();
-            foreach (var c in audibleCookies)
-                cookies.Add(new Cookie(c.Name, c.Value, "/", c.Domain));
-
-            return cookies;
-        }
-
-        private static bool getHasMorePages(string html)
-        {
-            var doc = new HtmlAgilityPack.HtmlDocument();
-            doc.LoadHtml(html);
-
-            // final page, invalid page:
-            //   <span class="bc-button
-            //     bc-button-secondary
-            //     nextButton
-            //     bc-button-disabled">
-            // only page: ???
-            // has more pages:
-            //   <span class="bc-button
-            //     bc-button-secondary
-            //     refinementFormButton
-            //     nextButton">
-            var next_active_link = doc
-                .DocumentNode
-                .Descendants()
-                .FirstOrDefault(n =>
-                    n.HasClass("nextButton") &&
-                    !n.HasClass("bc-button-disabled"));
-
-            return next_active_link != null;
-        }
-
-        private static async Task<string> getLibraryPageAsync(CookieContainer cookies, int pageNum)
-        {
-			#region // POST example (from 2017 ajax)
-			// var destination = "https://www.audible.com/lib-ajax";
-			// var webRequest = (HttpWebRequest)WebRequest.Create(destination);
-			// webRequest.Method = "POST";
-			// webRequest.Accept = "*/*";
-			// webRequest.AllowAutoRedirect = false;
-			// webRequest.UserAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; .NET CLR 1.0.3705)";
-			// webRequest.ContentType = "application/x-www-form-urlencoded; charset=UTF-8";
-			// webRequest.Credentials = null;
-			//
-			// webRequest.CookieContainer = new CookieContainer();
-			// webRequest.CookieContainer.Add(cookies.GetCookies(new Uri(destination)));
-			//
-			// var postData = $"progType=all&timeFilter=all&itemsPerPage={itemsPerPage}&searchTerm=&searchType=&sortColumn=&sortType=down&page={pageNum}&mode=normal&subId=&subTitle=";
-			// var data = Encoding.UTF8.GetBytes(postData);
-			// webRequest.ContentLength = data.Length;
-			// using var dataStream = webRequest.GetRequestStream();
-			// dataStream.Write(data, 0, data.Length);
-			#endregion
-
-            var destination = "https://" + $"www.audible.com/lib?purchaseDateFilter=all&programFilter=all&sortBy=PURCHASE_DATE.dsc&page={pageNum}";
-            var webRequest = (HttpWebRequest)WebRequest.Create(destination);
-            webRequest.UserAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; .NET CLR 1.0.3705)";
-
-            webRequest.CookieContainer = new CookieContainer();
-            webRequest.CookieContainer.Add(cookies.GetCookies(new Uri(destination)));
-
-            var webResponse = await webRequest.GetResponseAsync();
-            return new StreamReader(webResponse.GetResponseStream()).ReadToEnd();
-        }
-
-        public void Dispose() { }
-    }
-}

AudibleDotComAutomation/UNTESTED/Page Retrievers/ManualLoginSeleniumRetriever.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Support.UI;
-
-namespace AudibleDotComAutomation
-{
-    /// <summary>online. get auth by logging in with provided username and password
-    /// retain no chrome cookies. enter user + pw login</summary>
-    public class ManualLoginSeleniumRetriever : AuthSeleniumRetriever
-    {
-        string _username;
-        string _password;
-        public ManualLoginSeleniumRetriever(string username, string password) : base()
-        {
-            _username = username;
-            _password = password;
-        }
-        protected override async Task FirstRunAsync()
-        {
-            await base.FirstRunAsync();
-
-            // can't extract this into AuthSeleniumRetriever ctor. can't use username/pw until prev ctors are complete
-
-            // click login link
-            await AudibleLinkClickAsync(getLoginLink());
-
-            // wait until login page loads
-            new WebDriverWait(Driver, TimeSpan.FromSeconds(60)).Until(ExpectedConditions.ElementIsVisible(By.Id("ap_email")));
-
-            // insert credentials
-            Driver
-                .FindElement(By.Id("ap_email"))
-                .SendKeys(_username);
-            Driver
-                .FindElement(By.Id("ap_password"))
-                .SendKeys(_password);
-
-            // submit
-            var submitElement
-                = Driver.FindElements(By.Id("signInSubmit")).FirstOrDefault()
-                ?? Driver.FindElement(By.Id("signInSubmit-input"));
-            await AudibleLinkClickAsync(submitElement);
-
-            // wait until audible page loads
-            new WebDriverWait(Driver, TimeSpan.FromSeconds(60))
-                .Until(d => GetListenerPageLink());
-
-            if (!IsLoggedIn)
-                throw new Exception("not logged in");
-        }
-        private IWebElement getLoginLink()
-        {
-            {
-                var loginLinkElements1 = Driver.FindElements(By.XPath("//a[contains(@href, '/signin')]"));
-                if (loginLinkElements1.Any())
-                    return loginLinkElements1[0];
-            }
-
-            //
-            // ADD ADDITIONAL ACCEPTABLE PATTERNS HERE
-            //
-            //{
-            //    var loginLinkElements2 = Driver.FindElements(By.XPath("//a[contains(@href, '/signin')]"));
-            //    if (loginLinkElements2.Any())
-            //        return loginLinkElements2[0];
-            //}
-
-            throw new NotFoundException("Cannot locate login link");
-        }
-    }
-}

AudibleDotComAutomation/UNTESTED/Page Retrievers/UserDataSeleniumRetriever.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenQA.Selenium.Chrome;
-
-namespace AudibleDotComAutomation
-{
-    /// <summary>online. load auth, cookies etc from user data</summary>
-    public class UserDataSeleniumRetriever : AuthSeleniumRetriever
-    {
-        public UserDataSeleniumRetriever() : base()
-        {
-            // can't extract this into AuthSeleniumRetriever ctor. can't use username/pw until prev ctors are complete
-            if (!IsLoggedIn)
-                throw new Exception("not logged in");
-        }
-
-        /// <summary>Use current user data/chrome cookies. DO NOT use if chrome is already open</summary>
-        protected override ChromeOptions ctorCreateChromeOptions()
-        {
-            var options = base.ctorCreateChromeOptions();
-
-            // load user data incl cookies. default on windows:
-            //   %LOCALAPPDATA%\Google\Chrome\User Data
-            //   C:\Users\username\AppData\Local\Google\Chrome\User Data
-            var chromeDefaultWindowsUserDataDir = System.IO.Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "Google",
-                "Chrome",
-                "User Data");
-            options.AddArguments($"user-data-dir={chromeDefaultWindowsUserDataDir}");
-
-            return options;
-        }
-    }
-}

AudibleDotComAutomation/UNTESTED/Page Retrievers/_IPageRetriever.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using AudibleDotCom;
-
-namespace AudibleDotComAutomation
-{
-    public interface IPageRetriever : IDisposable
-    {
-        Task<IEnumerable<AudiblePageSource>> GetPageSourcesAsync(AudiblePageType audiblePage, string pageId = null);
-    }
-}

AudibleDotComAutomation/UNTESTED/Selenium.Examples.cs

@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Support.UI;
-
-namespace AudibleDotComAutomation.Examples
-{
-    public class SeleniumExamples
-    {
-        public IWebDriver Driver { get; set; }
-
-        IWebElement GetListenerPageLink()
-        {
-            var listenerPageElement = Driver.FindElements(By.XPath("//a[contains(@href, '/review-by-author')]"));
-            if (listenerPageElement.Count > 0)
-                return listenerPageElement[0];
-            return null;
-        }
-        void wait_examples()
-        {
-            new WebDriverWait(Driver, TimeSpan.FromSeconds(60))
-                .Until(ExpectedConditions.ElementIsVisible(By.Id("mast-member-acct-name")));
-
-            new WebDriverWait(Driver, TimeSpan.FromSeconds(60))
-                .Until(d => GetListenerPageLink());
-
-            // https://stackoverflow.com/questions/21339339/how-to-add-custom-expectedconditions-for-selenium
-            new WebDriverWait(Driver, TimeSpan.FromSeconds(60))
-                .Until((d) =>
-                {
-                    // could be refactored into OR, AND per the java selenium library
-
-                    // check 1
-                    var e1 = Driver.FindElements(By.Id("mast-member-acct-name"));
-                    if (e1.Count > 0)
-                        return e1[0];
-                    // check 2
-                    var e2 = Driver.FindElements(By.Id("header-account-info-0"));
-                    if (e2.Count > 0)
-                        return e2[0];
-                    return null;
-                });
-        }
-        void XPath_examples()
-        {
-            // <tr>
-            //   <td>1</td>
-            //   <td>2</td>
-            // </tr>
-            // <tr>
-            //   <td>3</td>
-            //   <td>4</td>
-            // </tr>
-
-            ReadOnlyCollection<IWebElement> all_tr = Driver.FindElements(By.XPath("/tr"));
-            IWebElement first_tr = Driver.FindElement(By.XPath("/tr"));
-            IWebElement second_tr = Driver.FindElement(By.XPath("/tr[2]"));
-            // beginning with a single / starts from root
-            IWebElement ERROR_not_at_root = Driver.FindElement(By.XPath("/td"));
-            // 2 slashes searches all, NOT just descendants
-            IWebElement td1 = Driver.FindElement(By.XPath("//td"));
-
-            // 2 slashes still searches all, NOT just descendants
-            IWebElement still_td1 = first_tr.FindElement(By.XPath("//td"));
-            
-            // dot operator starts from current node specified by first_tr
-            // single slash: immediate descendant
-            IWebElement td3 = first_tr.FindElement(By.XPath(
-                ".//td"));
-            // double slash: descendant at any depth
-            IWebElement td3_also = first_tr.FindElement(By.XPath(
-                "./td"));
-
-            // <input type="hidden" name="asin" value="ABCD1234">
-            IWebElement find_anywhere_in_doc = first_tr.FindElement(By.XPath(
-                "//input[@name='asin']"));
-            IWebElement find_in_subsection = first_tr.FindElement(By.XPath(
-                ".//input[@name='asin']"));
-
-            // search entire page. useful for:
-            // - RulesLocator to find something that only appears once on the page
-            // - non-list pages. eg: product details
-            var onePerPageRules = new RuleFamily
-            {
-                RowsLocator = By.XPath("/*"), // search entire page
-                Rules = new RuleSet {
-                    (row, productItem) => productItem.CustomerId = row.FindElement(By.XPath("//input[@name='cust_id']")).GetValue(),
-                    (row, productItem) => productItem.UserName = row.FindElement(By.XPath("//input[@name='user_name']")).GetValue()
-                }
-            };
-            // - applying conditionals to entire page
-            var ruleFamily = new RuleFamily
-            {
-                RowsLocator = By.XPath("//*[starts-with(@id,'adbl-library-content-row-')]"),
-                // Rules = getRuleSet()
-            };
-        }
-        #region Rules classes stubs
-        public class RuleFamily { public By RowsLocator; public IRuleClass Rules; }
-        public interface IRuleClass { }
-        public class RuleSet : IRuleClass, IEnumerable<IRuleClass>
-        {
-            public void Add(IRuleClass ruleClass) { }
-            public void Add(RuleAction action) { }
-
-            public IEnumerator<IRuleClass> GetEnumerator() => throw new NotImplementedException();
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => throw new NotImplementedException();
-        }
-        public delegate void RuleAction(IWebElement row, ProductItem productItem);
-        public class ProductItem { public string CustomerId; public string UserName; }
-        #endregion
-    }
-}

AudibleDotComAutomation/UNTESTED/SeleniumExt.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Interactions;
-
-namespace AudibleDotComAutomation
-{
-    public static class IWebElementExt
-    {
-        // allows getting Text from elements even if hidden
-        // this only works on visible elements: webElement.Text
-        // http://yizeng.me/2014/04/08/get-text-from-hidden-elements-using-selenium-webdriver/#c-sharp
-        //
-        public static string GetText(this IWebElement webElement) => webElement.GetAttribute("textContent");
-
-        public static string GetValue(this IWebElement webElement) => webElement.GetAttribute("value");
-    }
-
-    public static class IWebDriverExt
-    {
-        /// <summary>Use this instead of element.Click() to ensure that the element is clicked even if it's not currently scrolled into view</summary>
-        public static void Click(this IWebDriver driver, IWebElement element)
-        {
-            // from: https://stackoverflow.com/questions/12035023/selenium-webdriver-cant-click-on-a-link-outside-the-page
-
-
-            //// this works but isn't really the same
-            //element.SendKeys(Keys.Enter);
-
-
-            //// didn't work for me
-            //new Actions(driver)
-            //    .MoveToElement(element)
-            //    .Click()
-            //    .Build()
-            //    .Perform();
-
-            driver.ScrollIntoView(element);
-            element.Click();
-        }
-        public static void ScrollIntoView(this IWebDriver driver, IWebElement element)
-            => ((IJavaScriptExecutor)driver).ExecuteScript($"window.scroll({element.Location.X}, {element.Location.Y})");
-    }
-}

CookieMonster/CookieMonster.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.6.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

CookieMonster/UNTESTED/Browsers/Chrome.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SQLite;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using FileManager;
-
-namespace CookieMonster
-{
-    internal class Chrome : IBrowser
-    {
-		public async Task<IEnumerable<CookieValue>> GetAllCookiesAsync()
-		{
-			var col = new List<CookieValue>();
-
-			var strPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Google\Chrome\User Data\Default\Cookies");
-			if (!FileUtility.FileExists(strPath))
-				return col;
-
-			//
-			// IF WE GET AN ERROR HERE
-			//   then add a reference to sqlite core in the project which is ultimately calling this.
-			// a project which directly references CookieMonster doesn't need to also ref sqlite.
-			// however, for any further number of abstractions, the project needs to directly ref sqlite.
-			// eg: this will not work unless the winforms proj adds sqlite to ref.s:
-			//     LibationWinForm > AudibleDotComAutomation > CookieMonster
-			//
-			using var conn = new SQLiteConnection("Data Source=" + strPath + ";pooling=false");
-			using var cmd = conn.CreateCommand();
-			cmd.CommandText = "SELECT host_key, name, value, encrypted_value, last_access_utc, expires_utc FROM cookies;";
-
-			conn.Open();
-			using var reader = await cmd.ExecuteReaderAsync().ConfigureAwait(false);
-			while (reader.Read())
-			{
-				var host_key = reader.GetString(0);
-				var name = reader.GetString(1);
-				var value = reader.GetString(2);
-				var last_access_utc = reader.GetInt64(4);
-				var expires_utc = reader.GetInt64(5);
-
-				// https://stackoverflow.com/a/25874366
-				if (string.IsNullOrWhiteSpace(value))
-				{
-					var encrypted_value = (byte[])reader[3];
-					var decodedData = System.Security.Cryptography.ProtectedData.Unprotect(encrypted_value, null, System.Security.Cryptography.DataProtectionScope.CurrentUser);
-					value = Encoding.ASCII.GetString(decodedData);
-				}
-
-				try
-				{
-					// if something goes wrong in this step (eg: a cookie has an invalid filetime), then just skip this cookie
-					col.Add(new CookieValue { Browser = "chrome", Domain = host_key, Name = name, Value = value, LastAccess = chromeTimeToDateTimeUtc(last_access_utc), Expires = chromeTimeToDateTimeUtc(expires_utc) });
-				}
-				catch { }
-			}
-
-			return col;
-		}
-
-		// Chrome uses 1601-01-01 00:00:00 UTC as the epoch (ie the starting point for the millisecond time counter).
-		// this is the same as "FILETIME" in Win32 except FILETIME uses 100ns ticks instead of ms.
-		private static DateTime chromeTimeToDateTimeUtc(long time) => DateTime.SpecifyKind(DateTime.FromFileTime(time * 10), DateTimeKind.Utc);
-	}
-}

CookieMonster/UNTESTED/Browsers/FireFox.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SQLite;
-using System.IO;
-using System.Threading.Tasks;
-using FileManager;
-
-namespace CookieMonster
-{
-    internal class FireFox : IBrowser
-    {
-        public async Task<IEnumerable<CookieValue>> GetAllCookiesAsync()
-        {
-            var col = new List<CookieValue>();
-
-            string strPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"Mozilla\Firefox\Profiles");
-            if (!FileUtility.FileExists(strPath))
-                return col;
-            var dirs = new DirectoryInfo(strPath).GetDirectories("*.default");
-            if (dirs.Length != 1)
-                return col;
-            strPath = Path.Combine(strPath, dirs[0].Name, "cookies.sqlite");
-            if (!FileUtility.FileExists(strPath))
-                return col;
-
-            // First copy the cookie jar so that we can read the cookies from unlocked copy while FireFox is running
-            var strTemp = strPath + ".temp";
-
-            File.Copy(strPath, strTemp, true);
-
-			// Now open the temporary cookie jar and extract Value from the cookie if we find it.
-			using var conn = new SQLiteConnection("Data Source=" + strTemp + ";pooling=false");
-			using var cmd = conn.CreateCommand();
-            cmd.CommandText = "SELECT host, name, value, lastAccessed, expiry FROM moz_cookies; ";
-
-            conn.Open();
-			using var reader = await cmd.ExecuteReaderAsync().ConfigureAwait(false);
-			while (reader.Read())
-			{
-			    var host_key = reader.GetString(0);
-			    var name = reader.GetString(1);
-			    var value = reader.GetString(2);
-			    var lastAccessed = reader.GetInt32(3);
-			    var expiry = reader.GetInt32(4);
-
-			    col.Add(new CookieValue { Browser = "firefox", Domain = host_key, Name = name, Value = value, LastAccess = lastAccessedToDateTime(lastAccessed), Expires = expiryToDateTime(expiry) });
-			}
-
-            if (FileUtility.FileExists(strTemp))
-                File.Delete(strTemp);
-
-            return col;
-        }
-
-        // time is in microseconds since unix epoch
-        private static DateTime lastAccessedToDateTime(int time) => new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(time);
-
-        // time is in normal seconds since unix epoch
-        private static DateTime expiryToDateTime(int time) => new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc).AddSeconds(time);
-    }
-}

CookieMonster/UNTESTED/Browsers/IBrowser.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace CookieMonster
-{
-    internal interface IBrowser
-    {
-        Task<IEnumerable<CookieValue>> GetAllCookiesAsync();
-    }
-}

CookieMonster/UNTESTED/Browsers/InternetExplorer.cs

@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CookieMonster
-{
-    internal class InternetExplorer : IBrowser
-    {
-        public async Task<IEnumerable<CookieValue>> GetAllCookiesAsync()
-        {
-            // real locations of Windows Cookies folders
-            //
-            // Windows 7:
-            // C:\Users\username\AppData\Roaming\Microsoft\Windows\Cookies
-            // C:\Users\username\AppData\Roaming\Microsoft\Windows\Cookies\Low
-            //
-            // Windows 8, Windows 8.1, Windows 10:
-            // C:\Users\username\AppData\Local\Microsoft\Windows\INetCookies
-            // C:\Users\username\AppData\Local\Microsoft\Windows\INetCookies\Low
-
-            var strPath = Environment.GetFolderPath(Environment.SpecialFolder.Cookies);
-
-            var col = (await getIECookiesAsync(strPath).ConfigureAwait(false)).ToList();
-            col = col.Concat(await getIECookiesAsync(Path.Combine(strPath, "Low"))).ToList();
-
-            return col;
-        }
-
-        private static async Task<IEnumerable<CookieValue>> getIECookiesAsync(string strPath)
-        {
-            var cookies = new List<CookieValue>();
-
-            var files = await Task.Run(() => Directory.EnumerateFiles(strPath, "*.txt"));
-            foreach (string path in files)
-            {
-                var cookiesInFile = new List<CookieValue>();
-
-                var cookieLines = File.ReadAllLines(path);
-                CookieValue currCookieVal = null;
-                for (var i = 0; i < cookieLines.Length; i++)
-                {
-                    var line = cookieLines[i];
-
-                    // IE cookie format
-                    // 0  Cookie name
-                    // 1  Cookie value
-                    // 2  Host / path for the web server setting the cookie
-                    // 3  Flags
-                    // 4  Expiration time (low int)
-                    // 5  Expiration time (high int)
-                    // 6  Creation time (low int)
-                    // 7  Creation time (high int)
-                    // 8  Record delimiter == "*"
-                    var pos = i % 9;
-                    long expLoTemp = 0;
-                    long creatLoTemp = 0;
-                    if (pos == 0)
-                    {
-                        currCookieVal = new CookieValue { Browser = "ie", Name = line };
-                        cookiesInFile.Add(currCookieVal);
-                    }
-                    else if (pos == 1)
-                        currCookieVal.Value = line;
-                    else if (pos == 2)
-                        currCookieVal.Domain = line;
-                    else if (pos == 4)
-                        expLoTemp = Int64.Parse(line);
-                    else if (pos == 5)
-                        currCookieVal.Expires = LoHiToDateTime(expLoTemp, Int64.Parse(line));
-                    else if (pos == 6)
-                        creatLoTemp = Int64.Parse(line);
-                    else if (pos == 7)
-                        currCookieVal.LastAccess = LoHiToDateTime(creatLoTemp, Int64.Parse(line));
-                }
-
-                cookies.AddRange(cookiesInFile);
-            }
-
-            return cookies;
-        }
-
-        private static DateTime LoHiToDateTime(long lo, long hi) => DateTime.FromFileTimeUtc(((hi << 32) + lo));
-    }
-}

CookieMonster/UNTESTED/CookieValue.cs

@@ -1,32 +0,0 @@
-using System;
-
-namespace CookieMonster
-{
-    public class CookieValue
-    {
-        public string Browser { get; set; }
-
-        public string Name { get; set; }
-        public string Value { get; set; }
-        public string Domain { get; set; }
-
-        public DateTime LastAccess { get; set; }
-        public DateTime Expires { get; set; }
-
-        public bool IsValid
-        {
-            get
-            {
-                // sanity check. datetimes are stored weird in each cookie type. make sure i haven't converted these incredibly wrong.
-                // some early conversion attempts produced years like 42, 1955, 4033
-                var _5yearsPast = DateTime.UtcNow.AddYears(-5);
-                if (LastAccess < _5yearsPast || LastAccess > DateTime.UtcNow)
-                    return false;
-                // don't check expiry. some sites are setting stupid values for year. eg: 9999
-                return true;
-            }
-        }
-
-        public bool HasExpired => Expires < DateTime.UtcNow;
-    }
-}

CookieMonster/UNTESTED/CookiesHelper.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Dinah.Core.Collections.Generic;
-
-namespace CookieMonster
-{
-    public static class CookiesHelper
-    {
-        internal static IEnumerable<IBrowser> GetBrowsers()
-            => AppDomain.CurrentDomain
-                .GetAssemblies()
-                .SelectMany(s => s.GetTypes())
-                .Where(p => typeof(IBrowser).IsAssignableFrom(p) && !p.IsAbstract && !p.IsInterface)
-                .Select(t => Activator.CreateInstance(t) as IBrowser)
-                .ToList();
-
-        /// <summary>all. including expired</summary>
-        public static async Task<IEnumerable<CookieValue>> GetAllCookieValuesAsync()
-        {
-            //// foreach{await} runs in serial
-            //var allCookies = new List<CookieValue>();
-            //foreach (var b in GetBrowsers())
-            //{
-            //    var browserCookies = await b.GetAllCookiesAsync().ConfigureAwait(false);
-            //    allCookies.AddRange(browserCookies);
-            //}
-
-            //// WhenAll runs in parallel
-            // this 1st step LOOKS like a bug which runs each method until completion. However, since we don't use await, it's actually returning a Task. That resulting task is awaited asynchronously
-            var browserTasks = GetBrowsers().Select(b => b.GetAllCookiesAsync());
-            var results = await Task.WhenAll(browserTasks).ConfigureAwait(false);
-            var allCookies = results.SelectMany(a => a).ToList();
-
-            if (allCookies.Any(c => !c.IsValid))
-                throw new Exception("some date time was converted way too far");
-
-            foreach (var c in allCookies)
-                c.Domain = c.Domain.TrimEnd('/');
-
-            // for each domain+name, only keep the 1 with the most recent access
-            var sortedCookies = allCookies
-                .OrderByDescending(c => c.LastAccess)
-                .DistinctBy(c => new { c.Domain, c.Name })
-                .ToList();
-
-            return sortedCookies;
-        }
-
-        /// <summary>not expired</summary>
-        public static async Task<IEnumerable<CookieValue>> GetLiveCookieValuesAsync()
-            => (await GetAllCookieValuesAsync().ConfigureAwait(false))
-            .Where(c => !c.HasExpired)
-            .ToList();
-    }
-}

DataLayer/DataLayer.csproj

@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -32,6 +32,7 @@
   <ItemGroup>
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
   </ItemGroup>
 

DataLayer/Migrations/20191125182309_Fresh.Designer.cs

@@ -3,57 +3,50 @@ using System;
 using DataLayer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace DataLayer.Migrations
 {
     [DbContext(typeof(LibationContext))]
-    [Migration("20191007202808_UpgradeToCore3")]
-    partial class UpgradeToCore3
+    [Migration("20191125182309_Fresh")]
+    partial class Fresh
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                .HasAnnotation("ProductVersion", "3.0.0");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
                     b.Property<int>("BookId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleProductId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("CategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime?>("DatePublished")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Description")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("HasBookDetails")
-                        .HasColumnType("bit");
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsAbridged")
-                        .HasColumnType("bit");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("LengthInMinutes")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("PictureId")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Title")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -67,16 +60,16 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.BookContributor", b =>
                 {
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("ContributorId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("Role")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<byte>("Order")
-                        .HasColumnType("tinyint");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("BookId", "ContributorId", "Role");
 
@@ -91,17 +84,16 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("CategoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleCategoryId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int?>("ParentCategoryCategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("CategoryId");
 
@@ -124,32 +116,35 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("ContributorId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("AudibleAuthorId")
-                        .HasColumnType("nvarchar(max)");
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("ContributorId");
 
                     b.HasIndex("Name");
 
                     b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
                 });
 
             modelBuilder.Entity("DataLayer.LibraryBook", b =>
                 {
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime>("DateAdded")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("DownloadBookLink")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -160,14 +155,13 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("SeriesId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleSeriesId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("SeriesId");
 
@@ -179,13 +173,13 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.SeriesBook", b =>
                 {
                     b.Property<int>("SeriesId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<float?>("Index")
-                        .HasColumnType("real");
+                        .HasColumnType("REAL");
 
                     b.HasKey("SeriesId", "BookId");
 
@@ -207,18 +201,16 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<float>("OverallRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("PerformanceRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("StoryRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.HasKey("BookId");
 
@@ -232,14 +224,13 @@ namespace DataLayer.Migrations
                         {
                             b1.Property<int>("SupplementId")
                                 .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Url")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("SupplementId");
 
@@ -254,10 +245,10 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Tags")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("BookId");
 
@@ -269,16 +260,16 @@ namespace DataLayer.Migrations
                             b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
                                 {
                                     b2.Property<int>("UserDefinedItemBookId")
-                                        .HasColumnType("int");
+                                        .HasColumnType("INTEGER");
 
                                     b2.Property<float>("OverallRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("PerformanceRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("StoryRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.HasKey("UserDefinedItemBookId");
 

DataLayer/Migrations/20191125182309_Fresh.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace DataLayer.Migrations
 {
-    public partial class UpgradeToCore3 : Migration
+    public partial class Fresh : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -12,7 +12,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     CategoryId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     AudibleCategoryId = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true),
                     ParentCategoryCategoryId = table.Column<int>(nullable: true)
@@ -33,9 +33,9 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     ContributorId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     Name = table.Column<string>(nullable: true),
-                    AudibleAuthorId = table.Column<string>(nullable: true)
+                    AudibleContributorId = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -47,7 +47,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     SeriesId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     AudibleSeriesId = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true)
                 },
@@ -61,13 +61,12 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     BookId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     AudibleProductId = table.Column<string>(nullable: true),
                     Title = table.Column<string>(nullable: true),
                     Description = table.Column<string>(nullable: true),
                     LengthInMinutes = table.Column<int>(nullable: false),
                     PictureId = table.Column<string>(nullable: true),
-                    HasBookDetails = table.Column<bool>(nullable: false),
                     IsAbridged = table.Column<bool>(nullable: false),
                     DatePublished = table.Column<DateTime>(nullable: true),
                     CategoryId = table.Column<int>(nullable: false),
@@ -117,8 +116,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     BookId = table.Column<int>(nullable: false),
-                    DateAdded = table.Column<DateTime>(nullable: false),
-                    DownloadBookLink = table.Column<string>(nullable: true)
+                    DateAdded = table.Column<DateTime>(nullable: false)
                 },
                 constraints: table =>
                 {
@@ -161,7 +159,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     SupplementId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     BookId = table.Column<int>(nullable: false),
                     Url = table.Column<string>(nullable: true)
                 },
@@ -202,6 +200,11 @@ namespace DataLayer.Migrations
                 columns: new[] { "CategoryId", "AudibleCategoryId", "Name", "ParentCategoryCategoryId" },
                 values: new object[] { -1, "", "", null });
 
+            migrationBuilder.InsertData(
+                table: "Contributors",
+                columns: new[] { "ContributorId", "AudibleContributorId", "Name" },
+                values: new object[] { -1, null, "" });
+
             migrationBuilder.CreateIndex(
                 name: "IX_BookContributor_BookId",
                 table: "BookContributor",

DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -3,7 +3,6 @@ using System;
 using DataLayer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace DataLayer.Migrations
@@ -15,43 +14,37 @@ namespace DataLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                .HasAnnotation("ProductVersion", "3.0.0");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
                     b.Property<int>("BookId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleProductId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("CategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime?>("DatePublished")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Description")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("HasBookDetails")
-                        .HasColumnType("bit");
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsAbridged")
-                        .HasColumnType("bit");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("LengthInMinutes")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("PictureId")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Title")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -65,16 +58,16 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.BookContributor", b =>
                 {
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("ContributorId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("Role")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<byte>("Order")
-                        .HasColumnType("tinyint");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("BookId", "ContributorId", "Role");
 
@@ -89,17 +82,16 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("CategoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleCategoryId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int?>("ParentCategoryCategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("CategoryId");
 
@@ -122,32 +114,35 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("ContributorId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("AudibleAuthorId")
-                        .HasColumnType("nvarchar(max)");
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("ContributorId");
 
                     b.HasIndex("Name");
 
                     b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
                 });
 
             modelBuilder.Entity("DataLayer.LibraryBook", b =>
                 {
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime>("DateAdded")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("DownloadBookLink")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -158,14 +153,13 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("SeriesId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleSeriesId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("SeriesId");
 
@@ -177,13 +171,13 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.SeriesBook", b =>
                 {
                     b.Property<int>("SeriesId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<float?>("Index")
-                        .HasColumnType("real");
+                        .HasColumnType("REAL");
 
                     b.HasKey("SeriesId", "BookId");
 
@@ -205,18 +199,16 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<float>("OverallRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("PerformanceRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("StoryRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.HasKey("BookId");
 
@@ -230,14 +222,13 @@ namespace DataLayer.Migrations
                         {
                             b1.Property<int>("SupplementId")
                                 .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Url")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("SupplementId");
 
@@ -252,10 +243,10 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Tags")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("BookId");
 
@@ -267,16 +258,16 @@ namespace DataLayer.Migrations
                             b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
                                 {
                                     b2.Property<int>("UserDefinedItemBookId")
-                                        .HasColumnType("int");
+                                        .HasColumnType("INTEGER");
 
                                     b2.Property<float>("OverallRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("PerformanceRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("StoryRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.HasKey("UserDefinedItemBookId");
 

DataLayer/UNTESTED/Commands/RemoveOrphans.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    public static class RemoveOrphansCommand
-    {
-        public static int RemoveOrphans(this LibationContext context)
-            => context.Database.ExecuteSqlRaw(@"
-                delete c
-                from Contributors c
-                left join BookContributor bc on c.ContributorId = bc.ContributorId
-                left join Books b on bc.BookId = b.BookId
-                where bc.ContributorId is null
-                ");
-    }
-}

DataLayer/UNTESTED/EfClasses/Book.cs

@@ -30,7 +30,6 @@ namespace DataLayer
         public string PictureId { get; set; }
 
         // book details
-        public bool HasBookDetails { get; private set; }
         public bool IsAbridged { get; private set; }
         public DateTime? DatePublished { get; private set; }
 
@@ -62,12 +61,18 @@ namespace DataLayer
             string title,
             string description,
             int lengthInMinutes,
-            IEnumerable<Contributor> authors)
+			IEnumerable<Contributor> authors,
+			IEnumerable<Contributor> narrators,
+			Category category)
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));
             var productId = audibleProductId.Id;
             ArgumentValidator.EnsureNotNullOrWhiteSpace(productId, nameof(productId));
+
+			// assign as soon as possible. stuff below relies on this
+            AudibleProductId = productId;
+
             ArgumentValidator.EnsureNotNullOrWhiteSpace(title, nameof(title));
 
             // non-ef-ctor init.s
@@ -76,24 +81,17 @@ namespace DataLayer
             _seriesLink = new HashSet<SeriesBook>();
             _supplements = new HashSet<Supplement>();
 
-            // since category/id is never null, nullity means it hasn't been loaded
-            CategoryId = Category.GetEmpty().CategoryId;
+			Category = category;
 
             // simple assigns
-            AudibleProductId = productId;
             Title = title;
             Description = description;
             LengthInMinutes = lengthInMinutes;
 
             // assigns with biz logic
             ReplaceAuthors(authors);
-            //ReplaceNarrators(narrators);
-
-            // import previously saved tags
-            // do this immediately. any save occurs before reloading tags will overwrite persistent tags with new blank entries; all old persisted tags will be lost
-            // if refactoring, DO NOT use "ProductId" before it's assigned to. to be safe, just use "productId"
-            UserDefinedItem = new UserDefinedItem(this) { Tags = FileManager.TagsPersistence.GetTags(productId) };
-        }
+            ReplaceNarrators(narrators);
+		}
 
         #region contributors, authors, narrators
         // use uninitialised backing fields - this means we can detect if the collection was loaded
@@ -208,7 +206,7 @@ namespace DataLayer
         #region supplements
         private HashSet<Supplement> _supplements;
         public IEnumerable<Supplement> Supplements => _supplements?.ToList();
-        public bool HasPdfs => Supplements.Any();
+        public bool HasPdf => Supplements.Any();
 
         public void AddSupplementDownloadUrl(string url)
         {
@@ -231,14 +229,12 @@ namespace DataLayer
             // don't overwrite with default values
             IsAbridged |= isAbridged;
             DatePublished = datePublished ?? DatePublished;
-
-            HasBookDetails = true;
         }
 
         public void UpdateCategory(Category category, DbContext context = null)
         {
-            // since category is never null, nullity means it hasn't been loaded
-            if (Category != null || CategoryId == Category.GetEmpty().CategoryId)
+            // since category is never null, nullity means it hasn't been loaded. non null means we're correctly loaded. just overwrite
+            if (Category != null)
             {
                 Category = category;
                 return;
@@ -250,5 +246,7 @@ namespace DataLayer
             context.Entry(this).Reference(s => s.Category).Load();
             Category = category;
         }
-    }
+
+		public override string ToString() => $"[{AudibleProductId}] {Title}";
+	}
 }

DataLayer/UNTESTED/EfClasses/BookContributor.cs

@@ -23,5 +23,7 @@ namespace DataLayer
             Role = role;
             Order = order;
         }
-    }
+
+		public override string ToString() => $"{Book} {Contributor} {Role} {Order}";
+	}
 }

DataLayer/UNTESTED/EfClasses/Category.cs

@@ -18,8 +18,7 @@ namespace DataLayer
     public class Category
     {
         // Empty is a special case. use private ctor w/o validation
-        public static Category GetEmpty() => new Category { CategoryId = -1, AudibleCategoryId = "", Name = "", ParentCategory = null };
-        public bool IsEmpty() => string.IsNullOrWhiteSpace(AudibleCategoryId) || string.IsNullOrWhiteSpace(Name) || ParentCategory == null;
+        public static Category GetEmpty() => new Category { CategoryId = -1, AudibleCategoryId = "", Name = "" };
 
         internal int CategoryId { get; private set; }
         public string AudibleCategoryId { get; private set; }
@@ -48,5 +47,7 @@ namespace DataLayer
             if (parentCategory != null)
                 ParentCategory = parentCategory;
         }
-    }
+
+		public override string ToString() => $"[{AudibleCategoryId}] {Name}";
+	}
 }

DataLayer/UNTESTED/EfClasses/Contributor.cs

@@ -5,26 +5,31 @@ using Dinah.Core;
 namespace DataLayer
 {
     public class Contributor
-    {
-        // contributors search links are just name with url-encoding. space can be + or %20
-        //   author search link:   /search?searchAuthor=Robert+Bevan
-        //   narrator search link: /search?searchNarrator=Robert+Bevan
-        // can also search multiples. concat with comma before url encode
+	{
+		// Empty is a special case. use private ctor w/o validation
+		public static Contributor GetEmpty() => new Contributor { ContributorId = -1, Name = "" };
 
-        // id.s
-        // ----
-        // https://www.audible.com/author/Neil-Gaiman/B000AQ01G2 == https://www.audible.com/author/B000AQ01G2
-        //     goes to summary page
-        //     at bottom "See all titles by Neil Gaiman" goes to https://www.audible.com/search?searchAuthor=Neil+Gaiman
-        // some authors have no id. simply goes to https://www.audible.com/search?searchAuthor=Rufus+Fears
-        // all narrators have no id: https://www.audible.com/search?searchNarrator=Neil+Gaiman
+		// contributors search links are just name with url-encoding. space can be + or %20
+		//   author search link:   /search?searchAuthor=Robert+Bevan
+		//   narrator search link: /search?searchNarrator=Robert+Bevan
+		// can also search multiples. concat with comma before url encode
 
-        internal int ContributorId { get; private set; }
+		// id.s
+		// ----
+		// https://www.audible.com/author/Neil-Gaiman/B000AQ01G2 == https://www.audible.com/author/B000AQ01G2
+		//     goes to summary page
+		//     at bottom "See all titles by Neil Gaiman" goes to https://www.audible.com/search?searchAuthor=Neil+Gaiman
+		// some authors have no id. simply goes to https://www.audible.com/search?searchAuthor=Rufus+Fears
+		// all narrators have no id: https://www.audible.com/search?searchNarrator=Neil+Gaiman
+
+		internal int ContributorId { get; private set; }
         public string Name { get; private set; }
 
         private HashSet<BookContributor> _booksLink;
         public IEnumerable<BookContributor> BooksLink => _booksLink?.ToList();
 
+        public string AudibleContributorId { get; private set; }
+
         private Contributor() { }
         public Contributor(string name)
         {
@@ -34,49 +39,13 @@ namespace DataLayer
 
             Name = name;
         }
+		public Contributor(string name, string audibleContributorId) : this(name)
+		{
+			// don't overwrite with null or whitespace but not an error
+			if (!string.IsNullOrWhiteSpace(audibleContributorId))
+				AudibleContributorId = audibleContributorId;
+		}
 
-        public string AudibleAuthorId { get; private set; }
-        public void UpdateAudibleAuthorId(string authorId)
-        {
-            // don't overwrite with null or whitespace but not an error
-            if (!string.IsNullOrWhiteSpace(authorId))
-                AudibleAuthorId = authorId;
-        }
-
-        #region // AudibleAuthorId refactor: separate author-specific info. overkill for a single optional string
-        ///// <summary>Most authors in Audible have a unique id</summary>
-        //public AudibleAuthorProperty AudibleAuthorProperty { get; private set; }
-        //public void UpdateAuthorId(string authorId, LibationContext context = null)
-        //{
-        //    if (authorId == null)
-        //        return;
-        //    if (AudibleAuthorProperty != null)
-        //    {
-        //        AudibleAuthorProperty.UpdateAudibleAuthorId(authorId);
-        //        return;
-        //    }
-        //    if (context == null)
-        //        throw new ArgumentNullException(nameof(context), "You must provide a context");
-        //    if (context.Contributors.Find(ContributorId) == null)
-        //        throw new InvalidOperationException("Could not update audible author id.");
-        //    var audibleAuthorProperty = new AudibleAuthorProperty();
-        //    audibleAuthorProperty.UpdateAudibleAuthorId(authorId);
-        //    context.AuthorProperties.Add(audibleAuthorProperty);
-        //}
-        //public class AudibleAuthorProperty
-        //{
-        //    public int ContributorId { get; private set; }
-        //    public Contributor Contributor { get; set; }
-
-        //    public string AudibleAuthorId { get; private set; }
-
-        //    public void UpdateAudibleAuthorId(string authorId)
-        //    {
-        //        if (!string.IsNullOrWhiteSpace(authorId))
-        //            AudibleAuthorId = authorId;
-        //    }
-        //}
-        //// ...and create EF table config
-        #endregion
-    }
+		public override string ToString() => Name;
+	}
 }

DataLayer/UNTESTED/EfClasses/LibraryBook.cs

@@ -10,18 +10,14 @@ namespace DataLayer
 
         public DateTime DateAdded { get; private set; }
 
-/// <summary>For downloading AAX file</summary>
-public string DownloadBookLink { get; private set; }
-
         private LibraryBook() { }
-        public LibraryBook(Book book, DateTime dateAdded
-, string downloadBookLink = null
-)
+        public LibraryBook(Book book, DateTime dateAdded)
         {
             ArgumentValidator.EnsureNotNull(book, nameof(book));
             Book = book;
             DateAdded = dateAdded;
-DownloadBookLink = downloadBookLink;
         }
-    }
+
+		public override string ToString() => $"{DateAdded:d} {Book}";
+	}
 }

DataLayer/UNTESTED/EfClasses/Rating.cs

@@ -72,5 +72,7 @@ namespace DataLayer
 
             return string.Join("\r\n", items);
         }
-    }
+
+		public override string ToString() => $"Overall={OverallRating} Perf={PerformanceRating} Story={StoryRating}";
+	}
 }

DataLayer/UNTESTED/EfClasses/Series.cs

@@ -66,5 +66,7 @@ namespace DataLayer
             if (_booksLink.SingleOrDefault(sb => sb.Book == book) == null)
                 _booksLink.Add(new SeriesBook(this, book, index));
         }
-    }
+
+		public override string ToString() => Name;
+	}
 }

DataLayer/UNTESTED/EfClasses/SeriesBook.cs

@@ -34,5 +34,7 @@ namespace DataLayer
             if (index.HasValue)
                 Index = index.Value;
         }
-    }
+
+		public override string ToString() => $"Series={Series} Book={Book}";
+	}
 }

DataLayer/UNTESTED/EfClasses/Supplement.cs

@@ -20,5 +20,7 @@ namespace DataLayer
             Book = book;
             Url = url;
         }
-    }
+
+		public override string ToString() => $"{Book} {Url.Substring(Url.Length - 4)}";
+	}
 }

DataLayer/UNTESTED/EfClasses/UserDefinedItem.cs

@@ -13,29 +13,36 @@ namespace DataLayer
 
         private UserDefinedItem() { }
         internal UserDefinedItem(Book book)
-        {
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
+		{
+			ArgumentValidator.EnsureNotNull(book, nameof(book));
             Book = book;
-        }
+
+			// import previously saved tags
+			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
+			Tags = FileManager.TagsPersistence.GetTags(book.AudibleProductId);
+		}
 
         private string _tags = "";
         public string Tags
         {
             get => _tags;
             set => _tags = sanitize(value);
-        }
-        #region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
-        // only legal chars are letters numbers underscores and separating whitespace
-        //
-        // technically, the only char.s which aren't easily supported are  \  [  ]
-        // however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
-        // it's easy to expand whitelist as needed
-        // for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
-        //
-        // there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
-        // full list of characters which must be escaped:
-        //   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
-        static Regex regex = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
+		}
+
+		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
+
+		#region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
+		// only legal chars are letters numbers underscores and separating whitespace
+		//
+		// technically, the only char.s which aren't easily supported are  \  [  ]
+		// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
+		// it's easy to expand whitelist as needed
+		// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
+		//
+		// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
+		// full list of characters which must be escaped:
+		//   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+		static Regex regex { get; } = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
         private static string sanitize(string input)
         {
             if (string.IsNullOrWhiteSpace(input))
@@ -63,8 +70,6 @@ namespace DataLayer
 
             return string.Join(" ", unique);
         }
-
-        public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
         #endregion
 
         // owned: not an optional one-to-one
@@ -73,5 +78,7 @@ namespace DataLayer
 
         public void UpdateRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
-    }
+
+		public override string ToString() => $"{Book} {Rating} {Tags}";
+	}
 }

DataLayer/UNTESTED/LibationContext.cs

@@ -56,10 +56,13 @@ namespace DataLayer
             modelBuilder.ApplyConfiguration(new SeriesBookConfig());
             modelBuilder.ApplyConfiguration(new CategoryConfig());
 
-            // seeds go here. examples in scratch pad
-            modelBuilder
-                .Entity<Category>()
-                .HasData(Category.GetEmpty());
+			// seeds go here. examples in scratch pad
+			modelBuilder
+				.Entity<Category>()
+				.HasData(Category.GetEmpty());
+			modelBuilder
+				.Entity<Contributor>()
+				.HasData(Contributor.GetEmpty());
 
             // views are now supported via "query types" (instead of "entity types"): https://docs.microsoft.com/en-us/ef/core/modeling/query-types
         }

DataLayer/UNTESTED/LibationContextFactory.cs

@@ -6,6 +6,9 @@ namespace DataLayer
     public class LibationContextFactory : DesignTimeDbContextFactoryBase<LibationContext>
     {
         protected override LibationContext CreateNewInstance(DbContextOptions<LibationContext> options) => new LibationContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlServer(connectionString);
+        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder
+			//.UseSqlServer
+			.UseSqlite
+			(connectionString);
     }
 }

DataLayer/UNTESTED/QueryObjects/BookQueries.cs

@@ -8,14 +8,6 @@ namespace DataLayer
 {
     public static class BookQueries
     {
-        public static int BooksWithoutDetailsCount()
-        {
-			using var context = LibationContext.Create();
-			return context
-                .Books
-                .Count(b => !b.HasBookDetails);
-		}
-
         public static Book GetBook_Flat_NoTracking(string productId)
         {
 			using var context = LibationContext.Create();

DataLayer/UNTESTED/QueryObjects/LibraryQueries.cs

@@ -5,13 +5,19 @@ using Microsoft.EntityFrameworkCore;
 namespace DataLayer
 {
     public static class LibraryQueries
-    {
-        public static List<LibraryBook> GetLibrary_Flat_NoTracking()
+	{
+		public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
+			=> context
+				.Library
+				.GetLibrary()
+				.ToList();
+
+		public static List<LibraryBook> GetLibrary_Flat_NoTracking()
         {
 			using var context = LibationContext.Create();
 			return context
                 .Library
-//.AsNoTracking()
+                .AsNoTracking()
                 .GetLibrary()
                 .ToList();
 		}
@@ -21,7 +27,7 @@ namespace DataLayer
 			using var context = LibationContext.Create();
 			return context
                 .Library
-//.AsNoTracking()
+                .AsNoTracking()
 				.GetLibraryBook(productId);
 		}
 

DataLayer/UNTESTED/TagPersistenceInterceptor.cs

@@ -4,57 +4,35 @@ using System.Linq;
 using Dinah.Core.Collections.Generic;
 using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace DataLayer
 {
     internal class TagPersistenceInterceptor : IDbInterceptor
     {
-        public void Executing(DbContext context)
-        {
-            doWork__EFCore(context);
-        }
-
         public void Executed(DbContext context) { }
 
-        static void doWork__EFCore(DbContext context)
-        {
-            // persist tags:
-            var modifiedEntities = context.ChangeTracker.Entries().Where(p => p.State.In(EntityState.Modified, EntityState.Added)).ToList();
-            var tagSets = modifiedEntities.Select(e => e.Entity as UserDefinedItem).Where(a => a != null).ToList();
-            foreach (var t in tagSets)
-                FileManager.TagsPersistence.Save(t.Book.AudibleProductId, t.Tags);
-        }
+        public void Executing(DbContext context)
+		{
+			// persist tags:
+			var modifiedEntities = context
+				.ChangeTracker
+				.Entries()
+				.Where(p => p.State.In(EntityState.Modified, EntityState.Added))
+				.ToList();
 
-        #region // notes: working with proxies, esp EF 6
-        // EF 6: entities are proxied with lazy loading when collections are virtual
-        // EF Core: lazy loading is supported in 2.1 (there is a version of lazy loading with proxy-wrapping and a proxy-less version with DI) but not on by default and are not supported here
+			persistTags(modifiedEntities);
+		}
 
-        //static void doWork_EF6(DbContext context)
-        //{
-        //    var modifiedEntities = context.ChangeTracker.Entries().Where(p => p.State == EntityState.Modified).ToList();
-        //    var unproxiedEntities = modifiedEntities.Select(me => UnProxy(context, me.Entity)).ToList();
-
-        //    // persist tags
-        //    var tagSets = unproxiedEntities.Select(ue => ue as UserDefinedItem).Where(a => a != null).ToList();
-        //    foreach (var t in tagSets)
-        //        FileManager.TagsPersistence.Save(t.ProductId, t.TagsRaw);
-        //}
-
-        //// https://stackoverflow.com/a/25774651
-        //private static T UnProxy<T>(DbContext context, T proxyObject) where T : class
-        //{
-        //    // alternative: https://docs.microsoft.com/en-us/ef/ef6/fundamentals/proxies
-        //    var proxyCreationEnabled = context.Configuration.ProxyCreationEnabled;
-        //    try
-        //    {
-        //        context.Configuration.ProxyCreationEnabled = false;
-        //        return context.Entry(proxyObject).CurrentValues.ToObject() as T;
-        //    }
-        //    finally
-        //    {
-        //        context.Configuration.ProxyCreationEnabled = proxyCreationEnabled;
-        //    }
-        //}
-        #endregion
-    }
+		private static void persistTags(List<EntityEntry> modifiedEntities)
+		{
+			var tagSets = modifiedEntities
+				.Select(e => e.Entity as UserDefinedItem)
+				// filter by null but NOT by blank. blank is the valid way to show the absence of tags
+				.Where(a => a != null)
+				.ToList();
+			foreach (var t in tagSets)
+				FileManager.TagsPersistence.Save(t.Book.AudibleProductId, t.Tags);
+		}
+	}
 }

DataLayer/UNTESTED/Utilities/LocalDatabaseInfo.cs

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

DataLayer/_HowTo- EF Core.txt

@@ -1,6 +1,5 @@
 HOW TO CREATE: EF CORE PROJECT
 ==============================
-easiest with .NET Core but there's also a work-around for .NET Standard
 example is for sqlite but the same works with MsSql
 
 
@@ -26,7 +25,6 @@ set project "Set as StartUp Project"
 Tools >> Nuget Package Manager >> Package Manager Console
 default project: Examples\SQLite_NETCore2_0
 
-note: in EFCore, Enable-Migrations is no longer used. start with add-migration
 PM> add-migration InitialCreate
 PM> Update-Database
 

DataLayer/_big db refactor.txt

@@ -1,55 +0,0 @@
-proposed extensible schema to generalize beyond audible
-
-problems
-0) reeks of premature optimization
-- i'm currently only doing audible audiobooks. this adds several layers of abstraction for the sake of possible expansion
-- there's a good chance that supporting another platform may not conform to this schema, in which case i'd have done this for nothing. genres are one likely pain point
-- libation is currently single-user. hopefully the below would suffice for adding users, but if i'm wrong it might be all pain and no gain
-1) very thorough == very complex
-2) there are some books which would still be difficult to taxonimize
-- joy of cooking. has become more of a brand
-- the bible. has different versions that aren't just editions
-- dictionary. authored by a publisher
-3) "books" vs "editions" is a confusing problem waiting to happen
-
-[AIPK=auto increm PK]
-
-(libation) users [AIPK id, name, join date]
-audible users [AIPK id, AUDIBLE-PK username]
-libation audible users [PK user id, PK audible user id -- cluster PK across all FKs]
-- potential danger in multi-user environment. wouldn't want one libation user getting access to a different libation user's audible info
-contributors [AIPK id, name]. prev people. incl publishers
-audible authors [PK/FK contributor id, AUDIBLE-PK author id]
-roles [AIPK id, name]. seeded: author, narrator, publisher. could expand (eg: translator, editor) without each needing a new table
-books [AIPK id, title, desc]
-book contributors [FK book id, FK contributor id, FK role id, order -- cluster PK across all FKs]
-- likely only authors
-editions [AIPK id, FK book id, title]. could expand to include year, is first edition, is abridged
-- reasons for optional different title: "Ender's Game: Special 20th Anniversary Edition", "Harry Potter and the Sorcerer's Stone" vs "Harry Potter and the Philosopher's Stone" vs "Harry Potter y la piedra filosofal", "Midnight Riot" vs "Rivers of London"
-edition contributors [FK edition id, FK contributor id, FK role id, order -- cluster PK across all FKs]
-- likely everything except authors. eg narrators, publisher
-audiobooks [PK/FK edition id, lengthInMinutes]
-- could expand to other formats by adding other similar tables. eg: print with #pages and isbn, ebook with mb
-audible origins [AIPK id, name]. seeded: library. detail. json. series
-audible books [PK/FK edition id, AUDIBLE-PK product id, picture id, sku, 3 ratings, audible category id, audible origin id]
-- could expand to other vendors by adding other similar tables
-audible user ratings [PK/FK edition id, audible user id, 3 ratings]
-audible supplements [AIPK id, FK edition id, download url]
-- pdfs only. although book download info could be the same format, they're substantially different and subject to change
-audible book downloads [PK/FK edition id, audible user id, bookdownloadlink]
-pictures [AIPK id, FK edition id, filename (xyz.jpg -- not incl path)]
-audible categories [AIPK id, AUDIBLE-PK category id, name, parent]. may only nest 1 deep
-(libation) library [FK libation user id, FK edition id, date added -- cluster PK across all FKs]
-(libation) user defined [FK libation user id, FK edition id, tagsRaw (, notes...) -- cluster PK across all FKs]
-- there's no reason to restrict tags to library items, so don't combine/link this table with library
-series [AIPK id, name]
-audible series [FK series id, AUDIBLE-PK series id/asin, audible origin id]
-- could also include a 'name' field for what audible calls this series
-series books [FK series id, FK book id (NOT edition id), index -- cluster PK across all FKs]
-- "index" not "order". display this number; don't just put in this sequence
-- index is float instead of int to allow for in-between books. eg 2.5
-- if only using "editions" (ie: getting rid of the "books" table), to show 2 editions as the same book in a series, give them the same index
-(libation) user shelves [AIPK id, FK libation user id, name, desc]
-- custom shelf. similar to library but very different in philosophy. likely different in evolving details
-(libation) shelf books [AIPK id, FK user shelf id, date added, order]
-- technically, it's no violation to list a book more than once so use AIPK

DataLayer/_schema and patterns.txt

@@ -1,76 +0,0 @@
-ignore for now:
-authorProperties [PK/FK contributor id, AUDIBLE-PK author id]
-  notes in Contributor.cs for later refactoring
-
-c# enum only, not their own tables:
-roles [AIPK id, name]. seeded: author, narrator, publisher. could expand (eg: translator, editor) without each needing a new table
-origins [AIPK id, name]. seeded: library. detail. json. series
-
-
--- begin SCHEMA ---------------------------------------------------------------------------------------------------------------------
-any audible keys should be indexed
-
-SCHEMA
-======
-contributors [AIPK id, name]. people and publishers
-books [AIPK id, AUDIBLE-PK product id, title, desc, lengthInMinutes, picture id, 3 ratings, category id, origin id]
-- product instances. each edition and version is discrete: unique and disconnected from different editions of the same book
-- on book re-import
-  update:
-    update book origin and series origin with the new source type
-    overwrite simple fields
-    invoke complex contributor updates
-    details page gets
-      un/abridged
-      release date
-      language
-      publisher
-      series info incl name
-      categories
-  if new == series: ignore. do update series info. do not update book info
-  else if old == json: update (incl if new == json)
-  else if old == library && new == detail: update
-  else: ignore
-book contributors [FK book id, FK contributor id, FK role id, order -- cluster PK across all FKs]
-supplements [AIPK id, FK book id, download url]
-categories [AIPK id, AUDIBLE-PK category id, name, parent]. may only nest 1 deep
-user defined [PK/FK book id, 3 ratings, tagsRaw]
-series [AIPK id, AUDIBLE-PK series id/asin, name, origin id]
-series books [FK series id, FK book id, index -- cluster PK across all FKs]
-- "index" not "order". display this number; don't just put in this sequence
-- index is float instead of int to allow for in-between books. eg 2.5
-- to show 2 editions as the same book in a series, give them the same index
-- re-import using series page, there will need to be a re-eval of import logic
-library [PK/FK book id, date added, bookdownloadlink]
--- end SCHEMA ---------------------------------------------------------------------------------------------------------------------
-
--- begin SIMPLIFIED DDD ---------------------------------------------------------------------------------------------------------------------
-combine domain and persistence (C(r)UD). no repository pattern. encapsulated in domain objects; direct calls to EF Core
-https://www.thereformedprogrammer.net/creating-domain-driven-design-entity-classes-with-entity-framework-core/
-    // pattern for x-to-many
-    public void AddReview(int numStars, DbContext context = null)
-    {
-        if (_reviews != null)                  _reviews.Add(new Review(numStars));
-        else if (context == null)              throw new Exception("need context");
-        else if (context.Entry(this).IsKeySet) context.Add(new Review(numStars, BookId));
-        else                                   throw new Exception("Could not add");
-    }
-
-    // pattern for optional one-to-one
-    MyPropClass MyProps { get; private set; }
-    public void AddMyProps(string s, int i, DbContext context = null)
-    {
-        // avoid a trip to the db
-        if (MyProps != null) { MyProps.Update(s, i); return; }
-        if (BookId == 0) { MyProps = new MyPropClass(s, i); return; }
-        if (context == null) throw new Exception("need context");
-        // per Jon P Smith, this single trip to db loads the property if there is one
-        // note: .Reference() is for single object references. for collections use .Collection()
-        context.Entry(this).Reference(s => s.MyProps).Load();
-        if (MyProps != null) MyProps.Update(s, i);
-        else MyProps = new MyPropClass(s, i);
-    }
-
-repository reads are 'query object'-like extension methods
-https://www.thereformedprogrammer.net/is-the-repository-pattern-useful-with-entity-framework-core/#1-query-objects-a-way-to-isolate-and-hide-database-read-code
--- and SIMPLIFIED DDD ---------------------------------------------------------------------------------------------------------------------

DataLayer/appsettings.json

@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "LibationContext": "Server=(LocalDb)\\MSSQLLocalDB;Database=DataLayer.LibationContext;Integrated Security=true;",
+    "LibationContext_sqlserver": "Server=(LocalDb)\\MSSQLLocalDB;Database=DataLayer.LibationContext;Integrated Security=true;",
+    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;",
 
     "// on windows sqlite paths accept windows and/or unix slashes": "",
     "MyTestContext": "Data Source=%DESKTOP%/sample.db"

DtoImporterService/BookImporter.cs

@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class BookImporter : ItemsImporterBase
-	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new BookValidator().Validate(items);
-
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
-		{
-			// pre-req.s
-			new ContributorImporter().Import(items, context);
-			new SeriesImporter().Import(items, context);
-			new CategoryImporter().Import(items, context);
-
-			// get distinct
-			var productIds = items.Select(i => i.ProductId).ToList();
-
-			// load db existing => .Local
-			loadLocal_books(productIds, context);
-
-			// upsert
-			var qtyNew = upsertBooks(items, context);
-			return qtyNew;
-		}
-
-		private void loadLocal_books(List<string> productIds, LibationContext context)
-		{
-			var localProductIds = context.Books.Local.Select(b => b.AudibleProductId);
-			var remainingProductIds = productIds
-				.Distinct()
-				.Except(localProductIds)
-				.ToList();
-
-			// GetBooks() eager loads Series, category, et al
-			if (remainingProductIds.Any())
-				context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-		}
-
-		private int upsertBooks(IEnumerable<Item> items, LibationContext context)
-		{
-			var qtyNew = 0;
-
-			foreach (var item in items)
-			{
-				var book = context.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.ProductId);
-				if (book is null)
-				{
-					// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-					var authors = item
-						.Authors
-						.Select(a => context.Contributors.Local.Single(c => a.Name == c.Name))
-						.ToList();
-
-					book = context.Books.Add(new Book(
-						new AudibleProductId(item.ProductId), item.Title, item.Description, item.LengthInMinutes, authors))
-						.Entity;
-
-					qtyNew++;
-				}
-
-				// if no narrators listed, author is the narrator
-				if (item.Narrators is null || !item.Narrators.Any())
-					item.Narrators = item.Authors;
-				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-				var narrators = item
-					.Narrators
-					.Select(n => context.Contributors.Local.Single(c => n.Name == c.Name))
-					.ToList();
-				// not all books have narrators. these will already be using author as narrator. don't undo this
-				if (narrators.Any())
-					book.ReplaceNarrators(narrators);
-
-				// set/update book-specific info which may have changed
-				book.PictureId = item.PictureId;
-				book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
-				if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-					book.AddSupplementDownloadUrl(item.SupplementUrl);
-
-				var publisherName = item.Publisher;
-				if (!string.IsNullOrWhiteSpace(publisherName))
-				{
-					var publisher = context.Contributors.Local.Single(c => publisherName == c.Name);
-					book.ReplacePublisher(publisher);
-				}
-
-				// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
-				book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);
-
-				//
-				// this was round 1 when it was a 2 step process
-				//
-				//// update series even for existing books. these are occasionally updated
-				//var seriesIds = item.Series.Select(kvp => kvp.SeriesId).ToList();
-				//var allSeries = context.Series.Local.Where(c => seriesIds.Contains(c.AudibleSeriesId)).ToList();
-				//foreach (var series in allSeries)
-				//	book.UpsertSeries(series);
-
-				// these will upsert over library-scraped series, but will not leave orphans
-				if (item.Series != null)
-				{
-					foreach (var seriesEntry in item.Series)
-					{
-						var series = context.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-						book.UpsertSeries(series, seriesEntry.Index);
-					}
-				}
-
-				// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
-				var category = context.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == item.Categories.LastOrDefault().CategoryId);
-				if (category != null)
-					book.UpdateCategory(category, context);
-
-				book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/UNTESTED/BookImporter.cs

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

DtoImporterService/UNTESTED/CategoryImporter.cs

@@ -33,8 +33,11 @@ namespace DtoImporterService
 				.Except(localIds)
 				.ToList();
 
+			// load existing => local
+			// remember to include default/empty/missing
+			var emptyName = Contributor.GetEmpty().Name;
 			if (remainingCategoryIds.Any())
-				context.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId)).ToList();
+				context.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId) || c.Name == emptyName).ToList();
 		}
 
 		// only use after loading contributors => local

DtoImporterService/UNTESTED/ContributorImporter.cs

@@ -19,10 +19,10 @@ namespace DtoImporterService
 			var publishers = items.GetPublishersDistinct().ToList();
 
 			// load db existing => .Local
-			var allNames = authors
-				.Select(a => a.Name)
+			var allNames = publishers
+				.Union(authors.Select(n => n.Name))
 				.Union(narrators.Select(n => n.Name))
-				.Union(publishers)
+				.Where(name => !string.IsNullOrWhiteSpace(name))
 				.ToList();
 			loadLocal_contributors(allNames, context);
 
@@ -36,9 +36,6 @@ namespace DtoImporterService
 
 		private void loadLocal_contributors(List<string> contributorNames, LibationContext context)
 		{
-			contributorNames.Remove(null);
-			contributorNames.Remove("");
-
 			//// BAD: very inefficient
 			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
 
@@ -50,11 +47,10 @@ namespace DtoImporterService
 				.ToList();
 
 			// load existing => local
+			// remember to include default/empty/missing
+			var emptyName = Contributor.GetEmpty().Name;
 			if (remainingContribNames.Any())
-				context.Contributors.Where(c => remainingContribNames.Contains(c.Name)).ToList();
-			// _________________________________^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			// i tried to extract this pattern, but this part prohibits doing so
-			// wouldn't work anyway for Books.GetBooks()
+				context.Contributors.Where(c => remainingContribNames.Contains(c.Name) || c.Name == emptyName).ToList();
 		}
 
 		// only use after loading contributors => local
@@ -67,11 +63,9 @@ namespace DtoImporterService
 				var person = context.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
 				if (person == null)
 				{
-					person = context.Contributors.Add(new Contributor(p.Name)).Entity;
+					person = context.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
 					qtyNew++;
 				}
-
-				person.UpdateAudibleAuthorId(p.Asin);
 			}
 
 			return qtyNew;

DtoImporterService/UNTESTED/ImporterBase.cs

@@ -20,12 +20,28 @@ namespace DtoImporterService
 				}
 			}
 
-			var exceptions = Validate(param);
-			if (exceptions != null && exceptions.Any())
-				throw new AggregateException($"Device Jobs Service configuration validation failed", exceptions);
+			try
+			{
+				var exceptions = Validate(param);
+				if (exceptions != null && exceptions.Any())
+					throw new AggregateException($"Importer validation failed", exceptions);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Import error: validation");
+				throw;
+			}
 
-			var result = func(param, context);
-			return result;
+			try
+			{
+				var result = func(param, context);
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Import error: post-validation importing");
+				throw;
+			}
 		}
 		IEnumerable<Exception> Validate(T param);
 	}

DtoImporterService/UNTESTED/LibraryImporter.cs

@@ -28,10 +28,7 @@ namespace DtoImporterService
 			{
 				var libraryBook = new LibraryBook(
 					context.Books.Local.Single(b => b.AudibleProductId == newItem.ProductId),
-					newItem.DateAdded
-// needed for scraping
-//,FileManager.FileUtility.RestoreDeclawed(newLibraryDTO.DownloadBookLink)
-					);
+					newItem.DateAdded);
 				context.Library.Add(libraryBook);
 			}
 

DtoImporterService/UNTESTED/SeriesImporter.cs

@@ -17,17 +17,17 @@ namespace DtoImporterService
 			var series = items.GetSeriesDistinct().ToList();
 
 			// load db existing => .Local
-			var seriesIds = series.Select(s => s.SeriesId).ToList();
-			loadLocal_series(seriesIds, context);
+			loadLocal_series(series, context);
 
 			// upsert
 			var qtyNew = upsertSeries(series, context);
 			return qtyNew;
 		}
 
-		private void loadLocal_series(List<string> seriesIds, LibationContext context)
+		private void loadLocal_series(List<AudibleApiDTOs.Series> series, LibationContext context)
 		{
-			var localIds = context.Series.Local.Select(s => s.AudibleSeriesId);
+			var seriesIds = series.Select(s => s.SeriesId).ToList();
+			var localIds = context.Series.Local.Select(s => s.AudibleSeriesId).ToList();
 			var remainingSeriesIds = seriesIds
 				.Distinct()
 				.Except(localIds)

FileLiberator/FileLiberator.csproj

@@ -5,10 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
     <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\ApplicationService\ApplicationService.csproj" />
-    <ProjectReference Include="..\AudibleDotComAutomation\AudibleDotComAutomation.csproj" />
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
+    <ProjectReference Include="..\FileManager\FileManager.csproj" />
     <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
   </ItemGroup>
 

FileLiberator/UNTESTED/BackupBook.cs

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

FileLiberator/UNTESTED/DecryptBook.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using AaxDecrypter;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+using FileManager;
+
+namespace FileLiberator
+{
+    /// <summary>
+    /// Decrypt audiobook files
+    /// 
+    /// Processes:
+    /// Download: download aax file: the DRM encrypted audiobook
+    /// Decrypt: remove DRM encryption from audiobook. Store final book
+    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
+    /// </summary>
+    public class DecryptBook : IDecryptable
+    {
+        public event EventHandler<string> Begin;
+        public event EventHandler<string> StatusUpdate;
+        public event EventHandler<string> DecryptBegin;
+
+        public event EventHandler<string> TitleDiscovered;
+        public event EventHandler<string> AuthorsDiscovered;
+        public event EventHandler<string> NarratorsDiscovered;
+        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
+        public event EventHandler<int> UpdateProgress;
+
+        public event EventHandler<string> DecryptCompleted;
+        public event EventHandler<string> Completed;
+
+        public bool Validate(LibraryBook libraryBook)
+            => AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
+            && !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
+
+		// do NOT use ConfigureAwait(false) on ProcessAsync()
+		// often calls events which prints to forms in the UI context
+		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        {
+            var displayMessage = $"[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}";
+
+            Begin?.Invoke(this, displayMessage);
+
+            try
+            {
+                var aaxFilename = AudibleFileStorage.AAX.GetPath(libraryBook.Book.AudibleProductId);
+
+                if (aaxFilename == null)
+                    return new StatusHandler { "aaxFilename parameter is null" };
+                if (!FileUtility.FileExists(aaxFilename))
+                    return new StatusHandler { $"Cannot find AAX file: {aaxFilename}" };
+                if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
+                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
+
+                var proposedOutputFile = Path.Combine(AudibleFileStorage.DecryptInProgress, $"[{libraryBook.Book.AudibleProductId}].m4b");
+                var outputAudioFilename = await aaxToM4bConverterDecrypt(proposedOutputFile, aaxFilename);
+
+                // decrypt failed
+                if (outputAudioFilename == null)
+                    return new StatusHandler { "Decrypt failed" };
+
+                moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+
+                Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
+
+                var statusHandler = new StatusHandler();
+                var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
+                if (!finalAudioExists)
+                    statusHandler.AddError("Cannot find final audio file after decryption");
+                return statusHandler;
+            }
+            finally
+            {
+                Completed?.Invoke(this, displayMessage);
+            }
+        }
+
+        private async Task<string> aaxToM4bConverterDecrypt(string proposedOutputFile, string aaxFilename)
+        {
+            DecryptBegin?.Invoke(this, $"Begin decrypting {aaxFilename}");
+
+            try
+            {
+                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, Configuration.Instance.DecryptKey);
+                converter.AppName = "Libation";
+
+                TitleDiscovered?.Invoke(this, converter.tags.title);
+                AuthorsDiscovered?.Invoke(this, converter.tags.author);
+                NarratorsDiscovered?.Invoke(this, converter.tags.narrator);
+                CoverImageFilepathDiscovered?.Invoke(this, converter.coverBytes);
+
+                converter.SetOutputFilename(proposedOutputFile);
+                converter.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
+
+                // REAL WORK DONE HERE
+                var success = await Task.Run(() => converter.Run());
+
+                if (!success)
+                {
+                    Console.WriteLine("decrypt failed");
+                    return null;
+                }
+
+                Configuration.Instance.DecryptKey = converter.decryptKey;
+
+                return converter.outputFileName;
+            }
+            finally
+            {
+                DecryptCompleted?.Invoke(this, $"Completed decrypting {aaxFilename}");
+            }
+        }
+
+        private static void moveFilesToBooksDir(Book product, string outputAudioFilename)
+        {
+            // files are: temp path\author\[asin].ext
+            var m4bDir = new FileInfo(outputAudioFilename).Directory;
+            var files = m4bDir
+                .EnumerateFiles()
+                .Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
+                .ToList();
+
+            // create final directory. move each file into it. MOVE AUDIO FILE LAST
+            // new dir: safetitle_limit50char + " [" + productId + "]"
+
+            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
+            var underscoreIndex = product.Title.IndexOf(':');
+            var titleDir = (underscoreIndex < 4) ? product.Title : product.Title.Substring(0, underscoreIndex);
+            var finalDir = FileUtility.GetValidFilename(AudibleFileStorage.BooksDirectory, titleDir, null, product.AudibleProductId);
+            Directory.CreateDirectory(finalDir);
+
+            // move audio files to the end of the collection so these files are moved last
+            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
+            files = files
+                .Except(musicFiles)
+                .Concat(musicFiles)
+                .ToList();
+
+            var musicFileExt = musicFiles
+                .Select(f => f.Extension)
+                .Distinct()
+                .Single()
+                .Trim('.');
+
+            foreach (var f in files)
+            {
+                var dest = AudibleFileStorage.Audio.IsFileTypeMatch(f)
+                    // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
+                    ? FileUtility.GetValidFilename(finalDir, product.Title, musicFileExt, product.AudibleProductId)
+                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
+                    : FileUtility.GetValidFilename(finalDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
+
+                File.Move(f.FullName, dest);
+            }
+        }
+    }
+}

FileLiberator/UNTESTED/DownloadBook.cs

@@ -0,0 +1,66 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core.ErrorHandling;
+using FileManager;
+
+namespace FileLiberator
+{
+    /// <summary>
+    /// Download DRM book
+    /// 
+    /// Processes:
+    /// Download: download aax file: the DRM encrypted audiobook
+    /// Decrypt: remove DRM encryption from audiobook. Store final book
+    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
+    /// </summary>
+    public class DownloadBook : DownloadableBase
+    {
+        public override bool Validate(LibraryBook libraryBook)
+            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId)
+            && !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId);
+
+		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
+		{
+			var tempAaxFilename = getDownloadPath(libraryBook);
+			var actualFilePath = await downloadBookAsync(libraryBook, tempAaxFilename);
+			moveBook(libraryBook, actualFilePath);
+			return verifyDownload(libraryBook);
+		}
+
+		private static string getDownloadPath(LibraryBook libraryBook)
+			=> FileUtility.GetValidFilename(
+				AudibleFileStorage.DownloadsInProgress,
+				libraryBook.Book.Title,
+				"aax",
+				libraryBook.Book.AudibleProductId);
+
+		private async Task<string> downloadBookAsync(LibraryBook libraryBook, string tempAaxFilename)
+		{
+			var api = await AudibleApi.EzApiCreator.GetApiAsync(AudibleApiStorage.IdentityTokensFile);
+
+			var actualFilePath = await PerformDownloadAsync(
+				tempAaxFilename,
+				(p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p));
+
+			return actualFilePath;
+		}
+
+		private void moveBook(LibraryBook libraryBook, string actualFilePath)
+		{
+			var newAaxFilename = FileUtility.GetValidFilename(
+				AudibleFileStorage.DownloadsFinal,
+				libraryBook.Book.Title,
+				"aax",
+				libraryBook.Book.AudibleProductId);
+			File.Move(actualFilePath, newAaxFilename);
+			Invoke_StatusUpdate($"Successfully downloaded. Moved to: {newAaxFilename}");
+		}
+
+		private static StatusHandler verifyDownload(LibraryBook libraryBook)
+			=> !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
+			? new StatusHandler { "Downloaded AAX file cannot be found" }
+			: new StatusHandler();
+	}
+}

FileLiberator/UNTESTED/DownloadPdf.cs

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

FileLiberator/UNTESTED/DownloadableBase.cs

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

FileLiberator/UNTESTED/IDecryptable.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ScrapingDomainServices
+namespace FileLiberator
 {
     public interface IDecryptable : IProcessable
     {

FileLiberator/UNTESTED/IDownloadable.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ScrapingDomainServices
+namespace FileLiberator
 {
     public interface IDownloadable : IProcessable
     {

FileLiberator/UNTESTED/IProcessable.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 
-namespace ScrapingDomainServices
+namespace FileLiberator
 {
     public interface IProcessable
     {
@@ -14,8 +14,8 @@ namespace ScrapingDomainServices
 
         event EventHandler<string> Completed;
 
-        /// <returns>True == Valid</returns>
-        Task<bool> ValidateAsync(LibraryBook libraryBook);
+		/// <returns>True == Valid</returns>
+		bool Validate(LibraryBook libraryBook);
 
         /// <returns>True == success</returns>
         Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);

FileLiberator/UNTESTED/IProcessableExt.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core.ErrorHandling;
+
+namespace FileLiberator
+{
+    public static class IProcessableExt
+    {
+        //
+        // DO NOT USE ConfigureAwait(false) WITH ProcessAsync() unless ensuring ProcessAsync() implementation is cross-thread compatible
+        // ProcessAsync() often does a lot with forms in the UI context
+        //
+
+
+        /// <summary>Process the first valid product. Create default context</summary>
+        /// <returns>Returns either the status handler from the process, or null if all books have been processed</returns>
+        public static async Task<StatusHandler> ProcessFirstValidAsync(this IProcessable processable)
+        {
+            var libraryBook = processable.GetNextValid();
+            if (libraryBook == null)
+                return null;
+
+			// this should never happen. check anyway. ProcessFirstValidAsync returning null is the signal that we're done. we can't let another IProcessable accidentally send this commans
+			var status = await processable.ProcessAsync(libraryBook);
+            if (status == null)
+                throw new Exception("Processable should never return a null status");
+
+            return status;
+        }
+
+        public static LibraryBook GetNextValid(this IProcessable processable)
+        {
+            var libraryBooks = LibraryQueries.GetLibrary_Flat_NoTracking();
+
+            foreach (var libraryBook in libraryBooks)
+                if (processable.Validate(libraryBook))
+                    return libraryBook;
+
+            return null;
+        }
+
+		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
+			=> processable.Validate(libraryBook)
+			? await processable.ProcessAsync(libraryBook)
+			: new StatusHandler();
+	}
+}

FileManager/FileManager.csproj

@@ -4,6 +4,10 @@
     <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Polly" Version="7.1.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
   </ItemGroup>

FileManager/UNTESTED/AudibleApiStorage.cs

@@ -4,6 +4,7 @@ namespace FileManager
 {
 	public static class AudibleApiStorage
 	{
+		// not customizable. don't move to config
 		public static string IdentityTokensFile => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
 	}
 }

FileManager/UNTESTED/AudibleFileStorage.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 using Dinah.Core;
 using Dinah.Core.Collections.Generic;
 
@@ -21,21 +21,6 @@ namespace FileManager
     public sealed class AudibleFileStorage : Enumeration<AudibleFileStorage>
     {
         #region static
-        // centralize filetype mappings to ensure uniqueness
-        private static Dictionary<string, FileType> extensionMap => new Dictionary<string, FileType>
-        {
-            [".m4b"] = FileType.Audio,
-            [".mp3"] = FileType.Audio,
-            [".aac"] = FileType.Audio,
-            [".mp4"] = FileType.Audio,
-            [".m4a"] = FileType.Audio,
-
-            [".aax"] = FileType.AAX,
-
-            [".pdf"] = FileType.PDF,
-            [".zip"] = FileType.PDF,
-        };
-
         public static AudibleFileStorage Audio { get; }
         public static AudibleFileStorage AAX { get; }
         public static AudibleFileStorage PDF { get; }
@@ -79,9 +64,9 @@ namespace FileManager
 
             // must do this in static ctor, not w/inline properties
             // static properties init before static ctor so these dir.s would still be null
-            Audio = new AudibleFileStorage(FileType.Audio, BooksDirectory);
-            AAX = new AudibleFileStorage(FileType.AAX, DownloadsFinal);
-            PDF = new AudibleFileStorage(FileType.PDF, BooksDirectory);
+            Audio = new AudibleFileStorage(FileType.Audio, BooksDirectory, "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac");
+            AAX = new AudibleFileStorage(FileType.AAX, DownloadsFinal, "aax");
+            PDF = new AudibleFileStorage(FileType.PDF, BooksDirectory, "pdf", "zip");
         }
         #endregion
 
@@ -90,9 +75,14 @@ namespace FileManager
 
         public string StorageDirectory => DisplayName;
 
-        public IEnumerable<string> Extensions => extensionMap.Where(kvp => kvp.Value == FileType).Select(kvp => kvp.Key);
+		private IEnumerable<string> extensions_noDots { get; }
+		private string extAggr { get; }
 
-        private AudibleFileStorage(FileType fileType, string storageDirectory) : base((int)fileType, storageDirectory) { }
+        private AudibleFileStorage(FileType fileType, string storageDirectory, params string[] extensions) : base((int)fileType, storageDirectory)
+		{
+			extensions_noDots = extensions.Select(ext => ext.Trim('.')).ToList();
+			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
+		}
 
         /// <summary>
         /// Example for full books:
@@ -100,78 +90,30 @@ namespace FileManager
         /// - a directory name has the product id and an audio file is immediately inside
         /// - any audio filename contains the product id
         /// </summary>
-        public async Task<bool> ExistsAsync(string productId)
-            => (await GetAsync(productId).ConfigureAwait(false)) != null;
+        public bool Exists(string productId)
+            => GetPath(productId) != null;
 
-        public async Task<string> GetAsync(string productId)
-            => await getAsync(productId).ConfigureAwait(false);
-
-        private async Task<string> getAsync(string productId)
+		public string GetPath(string productId)
         {
-            {
+			{
                 var cachedFile = FilePathCache.GetPath(productId, FileType);
                 if (cachedFile != null)
                     return cachedFile;
             }
 
-            // this is how files are saved by default. check this method first
-            {
-                var diskFile_byDirName = (await Task.Run(() => getFile_checkDirName(productId)).ConfigureAwait(false));
-                if (diskFile_byDirName != null)
-                {
-                    FilePathCache.Upsert(productId, FileType, diskFile_byDirName);
-                    return diskFile_byDirName;
-                }
-            }
+			var firstOrNull =
+				Directory
+				.EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
+				.FirstOrDefault(s => Regex.IsMatch(s, $@"{productId}.*?\.({extAggr})$", RegexOptions.IgnoreCase));
 
-            {
-                var diskFile_byFileName = (await Task.Run(() => getFile_checkFileName(productId, StorageDirectory, SearchOption.AllDirectories)).ConfigureAwait(false));
-                if (diskFile_byFileName != null)
-                {
-                    FilePathCache.Upsert(productId, FileType, diskFile_byFileName);
-                    return diskFile_byFileName;
-                }
-            }
-
-            return null;
+			if (firstOrNull is null)
+				return null;
+			FilePathCache.Upsert(productId, FileType, firstOrNull);
+			return firstOrNull;
         }
 
-        // returns audio file if there is a directory where both are true
-        // - the directory name contains the productId
-        // - the directory contains an audio file in it's top dir (not recursively)
-        private string getFile_checkDirName(string productId)
-        {
-            foreach (var d in Directory.EnumerateDirectories(StorageDirectory, "*.*", SearchOption.AllDirectories))
-            {
-                if (!fileHasId(d, productId))
-                    continue;
-
-                var firstAudio = Directory
-                    .EnumerateFiles(d, "*.*", SearchOption.TopDirectoryOnly)
-                    .FirstOrDefault(f => IsFileTypeMatch(f));
-                if (firstAudio != null)
-                    return firstAudio;
-            }
-            return null;
-        }
-
-        // returns audio file if there is an file where both are true
-        // - the file name contains the productId
-        // - the file is an audio type
-        private string getFile_checkFileName(string productId, string dir, SearchOption searchOption)
-            => Directory
-            .EnumerateFiles(dir, "*.*", searchOption)
-            .FirstOrDefault(f => fileHasId(f, productId) && IsFileTypeMatch(f));
-
-        public bool IsFileTypeMatch(string filename)
-            => Extensions.ContainsInsensative(Path.GetExtension(filename));
-
         public bool IsFileTypeMatch(FileInfo fileInfo)
-            => Extensions.ContainsInsensative(fileInfo.Extension);
-
-        // use GetFileName, NOT GetFileNameWithoutExtension. This tests files AND directories. if the dir has a dot in the final part of the path, it will be treated like the file extension
-        private static bool fileHasId(string file, string productId)
-            => Path.GetFileName(file).ContainsInsensitive(productId);
+            => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
         #endregion
     }
 }

FileManager/UNTESTED/Configuration.cs

@@ -38,7 +38,7 @@ namespace FileManager
         [Description("Location of the configuration file where these settings are saved. Please do not edit this file directly while Libation is running.")]
         public string Filepath { get; }
 
-        [Description("Your user-specific key used to decrypt your audible files (*.aax) into audio files you can use anywhere (*.m4b)")]
+        [Description("[Advanced. Leave alone in most cases.] Your user-specific key used to decrypt your audible files (*.aax) into audio files you can use anywhere (*.m4b)")]
         public string DecryptKey
         {
             get => persistentDictionary[nameof(DecryptKey)];

FileManager/UNTESTED/FilePathCache.cs

@@ -15,7 +15,7 @@ namespace FileManager
             public string Path { get; set; }
         }
 
-        static List<CacheEntry> inMemoryCache = new List<CacheEntry>();
+        static List<CacheEntry> inMemoryCache { get; } = new List<CacheEntry>();
 
         public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
 
@@ -83,9 +83,9 @@ namespace FileManager
             catch (IOException)
             {
                 try { resave(); }
-                catch (IOException)
-                {
-                    Console.WriteLine("...that's not good");
+                catch (IOException ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error saving FilePaths.json");
                     throw;
                 }
             }

FileManager/UNTESTED/FileUtility.cs

@@ -27,13 +27,6 @@ namespace FileManager
             return File.Exists(path);
         }
 
-        /// <param name="proposedPath">acceptable inputs:
-        ///   example.txt
-        ///   C:\Users\username\Desktop\example.txt</param>
-        /// <returns>Returns full name and path of unused filename. including (#)</returns>
-        public static string GetValidFilename(string proposedPath)
-            => GetValidFilename(Path.GetDirectoryName(proposedPath), Path.GetFileNameWithoutExtension(proposedPath), Path.GetExtension(proposedPath));
-
         public static string GetValidFilename(string dirFullPath, string filename, string extension, params string[] metadataSuffixes)
         {
             if (string.IsNullOrWhiteSpace(dirFullPath))
@@ -77,25 +70,5 @@ namespace FileManager
                 property = property.Replace(ch.ToString(), "");
             return property;
         }
-
-        public static string Declaw(string str)
-            => str
-                .Replace("<script", "<sxcript")
-                .Replace(".net", ".nxet")
-                .Replace(".com", ".cxom")
-                .Replace("<link", "<lxink")
-                .Replace("http", "hxttp");
-        public static string RestoreDeclawed(string str)
-            => str
-                ?.Replace("<sxcript", "<script")
-                .Replace(".nxet", ".net")
-                .Replace(".cxom", ".com")
-                .Replace("<lxink", "<link")
-                .Replace("hxttp", "http");
-
-        public static string TitleCompressed(string title)
-            => new string(title
-                .Where(c => (char.IsLetterOrDigit(c)))
-                .ToArray());
     }
 }

FileManager/UNTESTED/PictureStorage.cs

@@ -2,77 +2,112 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 
 namespace FileManager
 {
-    /// <summary>
-    /// Files are small. Entire file is read from disk every time. No volitile storage. Paths are well known
-    /// </summary>
+	public enum PictureSize { _80x80, _300x300, _500x500 }
+	public struct PictureDefinition
+	{
+		public string PictureId { get; }
+		public PictureSize Size { get; }
+
+		public PictureDefinition(string pictureId, PictureSize pictureSize)
+		{
+			PictureId = pictureId;
+			Size = pictureSize;
+		}
+	}
     public static class PictureStorage
     {
-        public enum PictureSize { _80x80, _300x300, _500x500 }
-
         // not customizable. don't move to config
         private static string ImagesDirectory { get; }
             = new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("Images").FullName;
 
-        private static string getPath(string pictureId, PictureSize size)
-            => Path.Combine(ImagesDirectory, $"{pictureId}{size}.jpg");
+		private static string getPath(PictureDefinition def)
+			=> Path.Combine(ImagesDirectory, $"{def.PictureId}{def.Size}.jpg");
 
-        public static byte[] GetImage(string pictureId, PictureSize size)
-        {
-            var path = getPath(pictureId, size);
-            if (!FileUtility.FileExists(path))
-                DownloadImages(pictureId);
+		private static System.Timers.Timer timer { get; }
+		static PictureStorage()
+		{
+			timer = new System.Timers.Timer(700)
+			{
+				AutoReset = true,
+				Enabled = true
+			};
+			timer.Elapsed += (_, __) => timerDownload();
+		}
 
-            return File.ReadAllBytes(path);
-        }
+		public static event EventHandler<string> PictureCached;
 
-        public static void DownloadImages(string pictureId)
-        {
-            var path80 = getPath(pictureId, PictureSize._80x80);
-            var path300 = getPath(pictureId, PictureSize._300x300);
-            var path500 = getPath(pictureId, PictureSize._500x500);
+		private static Dictionary<PictureDefinition, byte[]> cache { get; } = new Dictionary<PictureDefinition, byte[]>();
+		public static (bool isDefault, byte[] bytes) GetPicture(PictureDefinition def)
+		{
+			if (!cache.ContainsKey(def))
+			{
+				var path = getPath(def);
+				cache[def]
+					= FileUtility.FileExists(path)
+					? File.ReadAllBytes(path)
+					: null;
+			}
+			return (cache[def] == null, cache[def] ?? getDefaultImage(def.Size));
+		}
 
-            int retry = 0;
-            do
-            {
-                try
-                {
-					using var webClient = new System.Net.WebClient();
-					// download any that don't exist
-					{
-						if (!FileUtility.FileExists(path80))
-						{
-							var bytes = webClient.DownloadData(
-								"https://images-na.ssl-images-amazon.com/images/I/" + pictureId + "._SL80_.jpg");
-							File.WriteAllBytes(path80, bytes);
-						}
-					}
+		private static Dictionary<PictureSize, byte[]> defaultImages { get; } = new Dictionary<PictureSize, byte[]>();
+		public static void SetDefaultImage(PictureSize pictureSize, byte[] bytes)
+			=> defaultImages[pictureSize] = bytes;
+		private static byte[] getDefaultImage(PictureSize size)
+			=> defaultImages.ContainsKey(size)
+			? defaultImages[size]
+			: new byte[0];
 
-					{
-						if (!FileUtility.FileExists(path300))
-						{
-							var bytes = webClient.DownloadData(
-								"https://images-na.ssl-images-amazon.com/images/I/" + pictureId + "._SL300_.jpg");
-							File.WriteAllBytes(path300, bytes);
-						}
-					}
+		// necessary to avoid IO errors. ReadAllBytes and WriteAllBytes can conflict in some cases, esp when debugging
+		private static bool isProcessing;
+		private static void timerDownload()
+		{
+			// must live outside try-catch, else 'finally' can reset another thread's lock
+			if (isProcessing)
+				return;
 
-					{
-						if (!FileUtility.FileExists(path500))
-						{
-							var bytes = webClient.DownloadData(
-								"https://m.media-amazon.com/images/I/" + pictureId + "._SL500_.jpg");
-							File.WriteAllBytes(path500, bytes);
-						}
-					}
+			try
+			{
+				isProcessing = true;
 
-					break;
-				}
-                catch { retry++; }
-            }
-            while (retry < 3);
-        }
-    }
+				var def = cache
+					.Where(kvp => kvp.Value is null)
+					.Select(kvp => kvp.Key)
+					// 80x80 should be 1st since it's enum value == 0
+					.OrderBy(d => d.PictureId)
+					.FirstOrDefault();
+
+				// no more null entries. all requsted images are cached
+				if (string.IsNullOrWhiteSpace(def.PictureId))
+					return;
+
+				var bytes = downloadBytes(def);
+				saveFile(def, bytes);
+				cache[def] = bytes;
+
+				PictureCached?.Invoke(nameof(PictureStorage), def.PictureId);
+			}
+			finally
+			{
+				isProcessing = false;
+			}
+		}
+
+		private static HttpClient imageDownloadClient { get; } = new HttpClient();
+		private static byte[] downloadBytes(PictureDefinition def)
+		{
+			var sz = def.Size.ToString().Split('x')[1];
+			return imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}._SL{sz}_.jpg").Result;
+		}
+
+		private static void saveFile(PictureDefinition def, byte[] bytes)
+		{
+			var path = getPath(def);
+			File.WriteAllBytes(path, bytes);
+		}
+	}
 }

FileManager/UNTESTED/QuickFilters.cs

@@ -105,12 +105,12 @@ namespace FileManager
             catch (IOException)
             {
                 try { resave(); }
-                catch (IOException)
-                {
-                    Console.WriteLine("...that's not good");
-                    throw;
-                }
-            }
+				catch (IOException ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error saving QuickFilters.json");
+					throw;
+				}
+			}
         }
     }
 }

FileManager/UNTESTED/TagsPersistence.cs

@@ -3,64 +3,57 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
+using Polly;
+using Polly.Retry;
 
 namespace FileManager
 {
     /// <summary>
     /// Tags must also be stored in db for search performance. Stored in json file to survive a db reset.
-    /// json is only read when a product is first loaded
+    /// json is only read when a product is first loaded into the db
     /// json is only written to when tags are edited
     /// json access is infrequent and one-off
-    /// all other reads happen against db. No volitile storage
     /// </summary>
     public static class TagsPersistence
     {
-        public static string TagsFile => Path.Combine(Configuration.Instance.LibationFiles, "BookTags.json");
+		private static string TagsFile => Path.Combine(Configuration.Instance.LibationFiles, "BookTags.json");
 
         private static object locker { get; } = new object();
 
+		// if failed, retry only 1 time after a wait of 100 ms
+		// 1st save attempt sometimes fails with
+		//   The requested operation cannot be performed on a file with a user-mapped section open.
+		private static RetryPolicy policy { get; }
+			= Policy.Handle<Exception>()
+			.WaitAndRetry(new[] { TimeSpan.FromMilliseconds(100) });
+
         public static void Save(string productId, string tags)
-			=> System.Threading.Tasks.Task.Run(() => save_fireAndForget(productId, tags));
-
-		private static void save_fireAndForget(string productId, string tags)
 		{
+			ensureCache();
+
+			cache[productId] = tags;
+
 			lock (locker)
-			{
-				// get all
-				var allDictionary = retrieve();
-
-				// update/upsert tag list
-				allDictionary[productId] = tags;
-
-				// re-save:
-				//   this often fails the first time with
-				//     The requested operation cannot be performed on a file with a user-mapped section open.
-				//   2nd immediate attempt failing was rare. So I added sleep. We'll see...
-				void resave() => File.WriteAllText(TagsFile, JsonConvert.SerializeObject(allDictionary, Formatting.Indented));
-				try { resave(); }
-				catch (IOException debugEx)
-				{
-					// 1000 was always reliable but very slow. trying other values
-					var waitMs = 100;
-
-					System.Threading.Thread.Sleep(waitMs);
-					resave();
-				}
-			}
+				policy.Execute(() => File.WriteAllText(TagsFile, JsonConvert.SerializeObject(cache, Formatting.Indented)));
 		}
 
+		private static Dictionary<string, string> cache;
+
 		public static string GetTags(string productId)
         {
-            var dic = retrieve();
-            return dic.ContainsKey(productId) ? dic[productId] : null;
+			ensureCache();
+
+			cache.TryGetValue(productId, out string value);
+			return value;
         }
 
-        private static Dictionary<string, string> retrieve()
-        {
-            if (!FileUtility.FileExists(TagsFile))
-                return new Dictionary<string, string>();
-			lock (locker)
-				return JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
-        }
-    }
+		private static void ensureCache()
+		{
+			if (cache is null)
+				lock (locker)
+					cache = !FileUtility.FileExists(TagsFile)
+						? new Dictionary<string, string>()
+						: JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
+		}
+	}
 }

FileManager/UNTESTED/WebpageStorage.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace FileManager
-{
-    public static class WebpageStorage
-    {
-        // not customizable. don't move to config
-        private static string PagesDirectory { get; }
-            = new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("Pages").FullName;
-        private static string BookDetailsDirectory { get; }
-            = new DirectoryInfo(PagesDirectory).CreateSubdirectory("Book Details").FullName;
-
-        public static string GetLibraryBatchName() => "Library_" + DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
-        public static string SavePageToBatch(string contents, string batchName, string extension)
-        {
-            var batch_dir = Path.Combine(PagesDirectory, batchName);
-
-            Directory.CreateDirectory(batch_dir);
-
-            var file = Path.Combine(batch_dir, batchName + '.' + extension.Trim('.'));
-            var filename = FileUtility.GetValidFilename(file);
-            File.WriteAllText(filename, contents);
-
-            return filename;
-        }
-
-        public static List<FileInfo> GetJsonFiles(DirectoryInfo libDir)
-            => libDir == null
-            ? new List<FileInfo>()
-            : Directory
-                .EnumerateFiles(libDir.FullName, "*.json")
-                .Select(f => new FileInfo(f))
-                .ToList();
-
-        public static DirectoryInfo GetMostRecentLibraryDir()
-        {
-            var dir = Directory
-                .EnumerateDirectories(PagesDirectory, "Library_*")
-                .OrderBy(a => a)
-                .LastOrDefault();
-            if (string.IsNullOrWhiteSpace(dir))
-                return null;
-            return new DirectoryInfo(dir);
-        }
-
-        public static FileInfo GetBookDetailHtmFileInfo(string productId)
-        {
-            var path = Path.Combine(BookDetailsDirectory, $"BookDetail-{productId}.htm");
-            return new FileInfo(path);
-        }
-
-        public static FileInfo GetBookDetailJsonFileInfo(string productId)
-        {
-            var path = Path.Combine(BookDetailsDirectory, $"BookDetail-{productId}.json");
-            return new FileInfo(path);
-        }
-
-        public static FileInfo SaveBookDetailsToHtm(string productId, string contents)
-        {
-            var fi = GetBookDetailHtmFileInfo(productId);
-            File.WriteAllText(fi.FullName, contents);
-            return fi;
-        }
-    }
-}

InternalUtilities/InternalUtilities.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\Scraping\Scraping.csproj" />
+    <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
 </Project>

InternalUtilities/UNTESTED/AudibleApiActions.cs

@@ -5,26 +5,25 @@ using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApiDTOs;
 using FileManager;
+using Polly;
+using Polly.Retry;
 
 namespace InternalUtilities
 {
 	public class AudibleApiActions
 	{
+		private AsyncRetryPolicy policy { get; }
+			= Policy.Handle<Exception>()
+			// 2 retries == 3 total
+			.RetryAsync(2);
+
 		public async Task<List<Item>> GetAllLibraryItemsAsync(ILoginCallback callback)
 		{
 			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or tokens are refreshed
 			// worse, this 1st dummy call doesn't seem to help:
 			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
 			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-
-			try
-			{
-				return await getItemsAsync(callback);
-			}
-			catch
-			{
-				return await getItemsAsync(callback);
-			}
+			return await policy.ExecuteAsync(() => getItemsAsync(callback));
 		}
 
 		private async Task<List<Item>> getItemsAsync(ILoginCallback callback)
@@ -33,7 +32,7 @@ namespace InternalUtilities
 			var items = await AudibleApiExtensions.GetAllLibraryItemsAsync(api);
 
 			// remove episode parents
-			items.RemoveAll(i => i.Episodes);
+			items.RemoveAll(i => i.IsEpisodes);
 
 			#region // episode handling. doesn't quite work
 			//				// add individual/children episodes
@@ -46,7 +45,7 @@ namespace InternalUtilities
 			//				foreach (var childId in childIds)
 			//				{
 			//					var bookResult = await api.GetLibraryBookAsync(childId, AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-			//					var bookItem = AudibleApiDTOs.LibraryApiV10.FromJson(bookResult.ToString()).Item;
+			//					var bookItem = AudibleApiDTOs.LibraryDtoV10.FromJson(bookResult.ToString()).Item;
 			//					items.Add(bookItem);
 			//				}
 			#endregion

InternalUtilities/UNTESTED/AudibleApiExtensions.cs

@@ -27,11 +27,24 @@ namespace InternalUtilities
 					ResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS
 				});
 
-				// important! use this convert method
-				var libResult = LibraryApiV10.FromJson(page.ToString());
+				var pageStr = page.ToString();
+
+				LibraryDtoV10 libResult;
+				try
+				{
+					// important! use this convert method
+					libResult = LibraryDtoV10.FromJson(pageStr);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error converting library for importing use. Full library:\r\n" + pageStr);
+					throw;
+				}
 
 				if (!libResult.Items.Any())
 					break;
+				else
+					Serilog.Log.Logger.Debug($"Page {i}: {libResult.Items.Length} results");
 
 				allItems.AddRange(libResult.Items);
 			}

InternalUtilities/UNTESTED/AudibleApiValidators.cs

@@ -29,12 +29,12 @@ namespace InternalUtilities
 		{
 			var exceptions = new List<Exception>();
 
+			// a book having no authors is rare but allowed
+
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.ProductId)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.ProductId)}", nameof(items)));
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.Title)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.Title)}", nameof(items)));
-			if (items.Any(i => i.Authors is null))
-				exceptions.Add(new ArgumentException($"Collection contains item(s) with null {nameof(Item.Authors)}", nameof(items)));
 
 			return exceptions;
 		}

InternalUtilities/UNTESTED/DataConverter.cs

@@ -1,51 +0,0 @@
-using System.IO;
-using AudibleDotCom;
-using FileManager;
-using Newtonsoft.Json;
-
-namespace InternalUtilities
-{
-    public static partial class DataConverter
-    {
-        // also need: htm file => PageSource
-
-        public static AudiblePageSource HtmFile_2_AudiblePageSource(string htmFilepath)
-        {
-            var htmContentsDeclawed = File.ReadAllText(htmFilepath);
-            var htmContents = FileUtility.RestoreDeclawed(htmContentsDeclawed);
-            return AudiblePageSource.Deserialize(htmContents);
-        }
-
-        public static FileInfo Value_2_JsonFile(object value, string jsonFilepath)
-        {
-            var json = JsonConvert.SerializeObject(value, Formatting.Indented);
-
-            File.WriteAllText(jsonFilepath, json);
-
-            return new FileInfo(jsonFilepath);
-        }
-
-        /// <summary>AudiblePageSource => declawed htm file</summary>
-        /// <returns>path of htm file</returns>
-        public static FileInfo AudiblePageSource_2_HtmFile_Batch(AudiblePageSource audiblePageSource, string batchName)
-        {
-            var source = audiblePageSource.Declawed().Serialized();
-            var htmFile = WebpageStorage.SavePageToBatch(source, batchName, "htm");
-            return new FileInfo(htmFile);
-        }
-
-        /// <summary>AudiblePageSource => declawed htm file</summary>
-        /// <returns>path of htm file</returns>
-        public static FileInfo AudiblePageSource_2_HtmFile_Product(AudiblePageSource audiblePageSource)
-        {
-            if (audiblePageSource.AudiblePage == AudiblePageType.ProductDetails)
-            {
-                var source = audiblePageSource.Declawed().Serialized();
-                var htmFile = WebpageStorage.SaveBookDetailsToHtm(audiblePageSource.PageId, source);
-                return htmFile;
-            }
-
-            throw new System.NotImplementedException();
-        }
-    }
-}

Libation.sln

@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 	ProjectSection(SolutionItems) = preProject
 		__TODO.txt = __TODO.txt
 		_DB_NOTES.txt = _DB_NOTES.txt
-		lucenenet source code.txt = lucenenet source code.txt
 		REFERENCE.txt = REFERENCE.txt
 	EndProjectSection
 EndProject
@@ -27,15 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\DataLayer.csproj", "{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleDotCom", "AudibleDotCom\AudibleDotCom.csproj", "{4ABB61D3-4959-4F09-883A-9EDC8CE473FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Scraping", "Scraping\Scraping.csproj", "{C2C89551-44FD-41E4-80D3-69AF8CE3F174}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleDotComAutomation", "AudibleDotComAutomation\AudibleDotComAutomation.csproj", "{4CDE10DD-60EC-4CCA-99D1-75224A201C89}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieMonster", "CookieMonster\CookieMonster.csproj", "{7BD02E29-3430-4D06-88D2-5CECEE9ABD01}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScrapingDomainServices", "ScrapingDomainServices\ScrapingDomainServices.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLiberator\FileLiberator.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities", "InternalUtilities\InternalUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
 EndProject
@@ -69,10 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inAudibleLite", "_Demos\inA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core", "..\Dinah.Core\Dinah.Core\Dinah.Core.csproj", "{9E951521-2587-4FC6-AD26-FAA9179FB6C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Drawing", "..\Dinah.Core\Dinah.Core.Drawing\Dinah.Core.Drawing.csproj", "{2CAAD73E-E2F9-4888-B04A-3F3803DABDAE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Windows.Forms", "..\Dinah.Core\Dinah.Core.Windows.Forms\Dinah.Core.Windows.Forms.csproj", "{1306F62D-CDAC-4269-982A-2EED51F0E318}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore", "..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj", "{1255D9BA-CE6E-42E4-A253-6376540B9661}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2", "..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj", "{35803735-B669-4090-9681-CC7F7FABDC71}"
@@ -89,6 +76,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiClientExample", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "ApplicationServices\ApplicationServices.csproj", "{B95650EA-25F0-449E-BA5D-99126BC5D730}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.WindowsDesktop", "..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj", "{059CE32C-9AD6-45E9-A166-790DFFB0B730}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsDesktopUtilities", "WindowsDesktopUtilities\WindowsDesktopUtilities.csproj", "{E7EFD64D-6630-4426-B09C-B6862A92E3FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -107,22 +98,6 @@ Global
 		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ABB61D3-4959-4F09-883A-9EDC8CE473FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ABB61D3-4959-4F09-883A-9EDC8CE473FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ABB61D3-4959-4F09-883A-9EDC8CE473FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ABB61D3-4959-4F09-883A-9EDC8CE473FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2C89551-44FD-41E4-80D3-69AF8CE3F174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2C89551-44FD-41E4-80D3-69AF8CE3F174}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2C89551-44FD-41E4-80D3-69AF8CE3F174}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2C89551-44FD-41E4-80D3-69AF8CE3F174}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CDE10DD-60EC-4CCA-99D1-75224A201C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CDE10DD-60EC-4CCA-99D1-75224A201C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CDE10DD-60EC-4CCA-99D1-75224A201C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CDE10DD-60EC-4CCA-99D1-75224A201C89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BD02E29-3430-4D06-88D2-5CECEE9ABD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BD02E29-3430-4D06-88D2-5CECEE9ABD01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BD02E29-3430-4D06-88D2-5CECEE9ABD01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BD02E29-3430-4D06-88D2-5CECEE9ABD01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -179,14 +154,6 @@ Global
 		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CAAD73E-E2F9-4888-B04A-3F3803DABDAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CAAD73E-E2F9-4888-B04A-3F3803DABDAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CAAD73E-E2F9-4888-B04A-3F3803DABDAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CAAD73E-E2F9-4888-B04A-3F3803DABDAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1306F62D-CDAC-4269-982A-2EED51F0E318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1306F62D-CDAC-4269-982A-2EED51F0E318}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1306F62D-CDAC-4269-982A-2EED51F0E318}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1306F62D-CDAC-4269-982A-2EED51F0E318}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -219,6 +186,14 @@ Global
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
+		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -227,10 +202,6 @@ Global
 		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
-		{4ABB61D3-4959-4F09-883A-9EDC8CE473FB} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{C2C89551-44FD-41E4-80D3-69AF8CE3F174} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{4CDE10DD-60EC-4CCA-99D1-75224A201C89} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{7BD02E29-3430-4D06-88D2-5CECEE9ABD01} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
@@ -245,8 +216,6 @@ Global
 		{DF72740C-900A-45DA-A3A6-4DDD68F286F2} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
 		{74D02251-898E-4CAF-80C7-801820622903} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
 		{9E951521-2587-4FC6-AD26-FAA9179FB6C4} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{2CAAD73E-E2F9-4888-B04A-3F3803DABDAE} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{1306F62D-CDAC-4269-982A-2EED51F0E318} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
 		{1255D9BA-CE6E-42E4-A253-6376540B9661} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
 		{35803735-B669-4090-9681-CC7F7FABDC71} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{5A7681A5-60D9-480B-9AC7-63E0812A2548} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
@@ -255,6 +224,8 @@ Global
 		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
 		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
+		{059CE32C-9AD6-45E9-A166-790DFFB0B730} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
+		{E7EFD64D-6630-4426-B09C-B6862A92E3FD} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationSearchEngine/UNTESTED/SearchEngine.cs

@@ -160,8 +160,7 @@ namespace LibationSearchEngine
 
         private Directory getIndex() => FSDirectory.Open(SearchEngineDirectory);
 
-        public async Task CreateNewIndexAsync() => await Task.Run(() => createNewIndex(true));
-        private void createNewIndex(bool overwrite)
+		public void CreateNewIndex(bool overwrite = true)
         {
             // 300 products
             // 1st run after app is started: 400ms
@@ -231,8 +230,8 @@ namespace LibationSearchEngine
             return doc;
         }
 
-        public async Task UpdateBookAsync(string productId) => await Task.Run(() => updateBook(productId));
-        private void updateBook(string productId)
+		/// <summary>Long running. Use await Task.Run(() => UpdateBook(productId))</summary>
+		public void UpdateBook(string productId)
         {
             var libraryBook = LibraryQueries.GetLibraryBook_Flat_NoTracking(productId);
             var term = new Term(_ID_, productId);

LibationWinForm/LibationWinForm.csproj

@@ -5,16 +5,17 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>libation.ico</ApplicationIcon>
+    <AssemblyName>Libation</AssemblyName>
+
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <!-- <PublishSingleFile>true</PublishSingleFile> -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core.Drawing\Dinah.Core.Drawing.csproj" />
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core.Windows.Forms\Dinah.Core.Windows.Forms.csproj" />
-    <ProjectReference Include="..\ApplicationService\ApplicationService.csproj" />
-    <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
-    <ProjectReference Include="..\ScrapingDomainServices\ScrapingDomainServices.csproj" />
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+    <ProjectReference Include="..\WindowsDesktopUtilities\WindowsDesktopUtilities.csproj" />
   </ItemGroup>
 
   <ItemGroup>

LibationWinForm/Properties/Resources.Designer.cs

@@ -60,6 +60,36 @@ namespace LibationWinForm.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap default_cover_300x300 {
+            get {
+                object obj = ResourceManager.GetObject("default_cover_300x300", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap default_cover_500x500 {
+            get {
+                object obj = ResourceManager.GetObject("default_cover_500x500", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap default_cover_80x80 {
+            get {
+                object obj = ResourceManager.GetObject("default_cover_80x80", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

LibationWinForm/Properties/Resources.resx

@@ -118,6 +118,15 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="default_cover_300x300" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img-coverart-prod-unavailable_300x300.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="default_cover_500x500" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img-coverart-prod-unavailable_500x500.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="default_cover_80x80" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img-coverart-prod-unavailable_80x80.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="edit_tags_25x25" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-tags-25x25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

LibationWinForm/UNTESTED/BookLiberation/AutomatedBackupsForm.cs

@@ -13,10 +13,20 @@ namespace LibationWinForm.BookLiberation
             InitializeComponent();
         }
 
-        public void AppendError(Exception ex) => AppendText("ERROR: " + ex.Message);
-        public void AppendText(string text) => logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
+		public void AppendError(Exception ex)
+		{
+			Serilog.Log.Logger.Error(ex, "Automated backup: error");
+			appendText("ERROR: " + ex.Message);
+		}
+		public void AppendText(string text)
+		{
+			Serilog.Log.Logger.Debug($"Automated backup: {text}");
+			appendText(text);
+		}
+		private void appendText(string text)
+			=> logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
 
-        public void FinalizeUI()
+		public void FinalizeUI()
         {
             keepGoingCb.Enabled = false;
             logTb.AppendText("");

LibationWinForm/UNTESTED/BookLiberation/DecryptForm.cs

@@ -8,18 +8,23 @@ namespace LibationWinForm.BookLiberation
 {
     public partial class DecryptForm : Form
     {
-        public DecryptForm()
+		class SerilogTextWriter : System.IO.TextWriter
+		{
+			public override System.Text.Encoding Encoding => System.Text.Encoding.ASCII;
+			public override void WriteLine(string value) => Serilog.Log.Logger.Debug(value);
+		}
+
+		public DecryptForm()
         {
             InitializeComponent();
         }
 
-        System.IO.TextWriter origOut = Console.Out;
+        System.IO.TextWriter origOut { get; } = Console.Out;
         private void DecryptForm_Load(object sender, EventArgs e)
         {
             // redirect Console.WriteLine to console, textbox
-            System.IO.TextWriter origOut = Console.Out;
             var controlWriter = new RichTextBoxTextWriter(this.rtbLog);
-            var multiLogger = new MultiTextWriter(origOut, controlWriter);
+            var multiLogger = new MultiTextWriter(origOut, controlWriter, new SerilogTextWriter());
             Console.SetOut(multiLogger);
         }
 
@@ -56,15 +61,8 @@ namespace LibationWinForm.BookLiberation
             => bookInfoLbl.UIThread(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
 
         public void SetCoverImage(byte[] coverBytes)
-            => pictureBox1.UIThread(() => pictureBox1.Image = ImageConverter.GetPictureFromBytes(coverBytes));
+            => pictureBox1.UIThread(() => pictureBox1.Image = ImageReader.ToImage(coverBytes));
 
-        public void AppendError(Exception ex) => AppendText("ERROR: " + ex.Message);
-        public void AppendText(string text) =>
-            // redirected to log textbox
-            Console.WriteLine($"{DateTime.Now} {text}")
-            //logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"))
-            ;
-
-        public void UpdateProgress(int percentage) => progressBar1.UIThread(() => progressBar1.Value = percentage);
+		public void UpdateProgress(int percentage) => progressBar1.UIThread(() => progressBar1.Value = percentage);
     }
 }

LibationWinForm/UNTESTED/BookLiberation/NoLongerAvailableForm.Designer.cs

@@ -1,129 +0,0 @@
-namespace LibationWinForm.BookLiberation
-{
-    partial class NoLongerAvailableForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label1 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.missingBtn = new System.Windows.Forms.Button();
-            this.abortBtn = new System.Windows.Forms.Button();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(174, 39);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Book details download failed.\r\n{0} may be no longer available.\r\nVerify the book i" +
-    "s still available here";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(15, 51);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.ReadOnly = true;
-            this.textBox1.Size = new System.Drawing.Size(384, 20);
-            this.textBox1.TabIndex = 1;
-            // 
-            // missingBtn
-            // 
-            this.missingBtn.Location = new System.Drawing.Point(324, 77);
-            this.missingBtn.Name = "missingBtn";
-            this.missingBtn.Size = new System.Drawing.Size(75, 23);
-            this.missingBtn.TabIndex = 3;
-            this.missingBtn.Text = "Missing";
-            this.missingBtn.UseVisualStyleBackColor = true;
-            this.missingBtn.Click += new System.EventHandler(this.missingBtn_Click);
-            // 
-            // abortBtn
-            // 
-            this.abortBtn.Location = new System.Drawing.Point(324, 126);
-            this.abortBtn.Name = "abortBtn";
-            this.abortBtn.Size = new System.Drawing.Size(75, 23);
-            this.abortBtn.TabIndex = 5;
-            this.abortBtn.Text = "Abort";
-            this.abortBtn.UseVisualStyleBackColor = true;
-            this.abortBtn.Click += new System.EventHandler(this.abortBtn_Click);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 74);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(306, 26);
-            this.label2.TabIndex = 2;
-            this.label2.Text = "If the book is not available, click here to mark it as missing\r\nNo further book d" +
-    "etails download will be attempted for this book";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(12, 123);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(204, 26);
-            this.label3.TabIndex = 4;
-            this.label3.Text = "If the book is actually available, click here\r\nto abort and try again later";
-            // 
-            // NoLongerAvailableForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(411, 161);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.abortBtn);
-            this.Controls.Add(this.missingBtn);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "NoLongerAvailableForm";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "No Longer Available";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Button missingBtn;
-        private System.Windows.Forms.Button abortBtn;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-    }
-}

LibationWinForm/UNTESTED/BookLiberation/NoLongerAvailableForm.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Windows.Forms;
-using ScrapingDomainServices;
-
-namespace LibationWinForm.BookLiberation
-{
-    public partial class NoLongerAvailableForm : Form
-    {
-        public ScrapeBookDetails.NoLongerAvailableEnum EnumResult { get; private set; }
-
-        public NoLongerAvailableForm(string title, string url) : this()
-        {
-            this.Text += ": " + title;
-            this.label1.Text = string.Format(this.label1.Text, title);
-            this.textBox1.Text = url;
-        }
-        public NoLongerAvailableForm() => InitializeComponent();
-
-        private void missingBtn_Click(object sender, EventArgs e) => complete(ScrapeBookDetails.NoLongerAvailableEnum.MarkAsMissing);
-        private void abortBtn_Click(object sender, EventArgs e) => complete(ScrapeBookDetails.NoLongerAvailableEnum.Abort);
-
-        private void complete(ScrapeBookDetails.NoLongerAvailableEnum nlaEnum)
-        {
-            EnumResult = nlaEnum;
-            Close();
-        }
-    }
-}

LibationWinForm/UNTESTED/BookLiberation/NoLongerAvailableForm.resx

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

LibationWinForm/UNTESTED/BookLiberation/ProcessorAutomationController.Examples.cs

@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using DataLayer;
-using ScrapingDomainServices;
+using Dinah.Core.ErrorHandling;
+using FileLiberator;
 
 namespace LibationWinForm.BookLiberation
 {
@@ -22,13 +23,20 @@ namespace LibationWinForm.BookLiberation
                 return;
 
             var backupBook = new BackupBook();
-            backupBook.Download.Completed += SetBackupCountsAsync;
-            backupBook.Decrypt.Completed += SetBackupCountsAsync;
-            await backupBook.ProcessValidateLibraryBookAsync(libraryBook);
-        }
+            backupBook.DownloadBook.Completed += SetBackupCountsAsync;
+            backupBook.DecryptBook.Completed += SetBackupCountsAsync;
+            await ProcessValidateLibraryBookAsync(backupBook, libraryBook);
+		}
 
-        // Download First Book (Download encrypted/DRM file)
-        async Task DownloadFirstBookAsync()
+		static async Task<StatusHandler> ProcessValidateLibraryBookAsync(IProcessable processable, LibraryBook libraryBook)
+		{
+			if (!processable.Validate(libraryBook))
+				return new StatusHandler { "Validation failed" };
+			return await processable.ProcessAsync(libraryBook);
+		}
+
+		// Download First Book (Download encrypted/DRM file)
+		async Task DownloadFirstBookAsync()
         {
             var downloadBook = ProcessorAutomationController.GetWiredUpDownloadBook();
             downloadBook.Completed += SetBackupCountsAsync;
@@ -47,8 +55,8 @@ namespace LibationWinForm.BookLiberation
         async Task BackupFirstBookAsync()
         {
             var backupBook = ProcessorAutomationController.GetWiredUpBackupBook();
-            backupBook.Download.Completed += SetBackupCountsAsync;
-            backupBook.Decrypt.Completed += SetBackupCountsAsync;
+            backupBook.DownloadBook.Completed += SetBackupCountsAsync;
+            backupBook.DecryptBook.Completed += SetBackupCountsAsync;
             await backupBook.ProcessFirstValidAsync();
         }
 

LibationWinForm/UNTESTED/BookLiberation/ProcessorAutomationController.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using ScrapingDomainServices;
+using FileLiberator;
 
 namespace LibationWinForm.BookLiberation
 {
@@ -16,10 +16,11 @@ namespace LibationWinForm.BookLiberation
         {
             var backupBook = new BackupBook();
 
-            backupBook.Download.Begin += (_, __) => wireUpDownloadable(backupBook.Download);
-            backupBook.Decrypt.Begin += (_, __) => wireUpDecryptable(backupBook.Decrypt);
+            backupBook.DownloadBook.Begin += (_, __) => wireUpDownloadable(backupBook.DownloadBook);
+            backupBook.DecryptBook.Begin += (_, __) => wireUpDecryptable(backupBook.DecryptBook);
+			backupBook.DownloadPdf.Begin += (_, __) => wireUpDecryptable(backupBook.DecryptBook);
 
-            return backupBook;
+			return backupBook;
         }
         public static DecryptBook GetWiredUpDecryptBook()
         {
@@ -39,21 +40,6 @@ namespace LibationWinForm.BookLiberation
             downloadPdf.Begin += (_, __) => wireUpDownloadable(downloadPdf);
             return downloadPdf;
         }
-        public static ScrapeBookDetails GetWiredUpScrapeBookDetails()
-        {
-            var scrapeBookDetails = new ScrapeBookDetails();
-            scrapeBookDetails.Begin += (_, __) => wireUpDownloadable(scrapeBookDetails);
-
-            scrapeBookDetails.NoLongerAvailableAction = noLongerAvailableUI;
-
-            return scrapeBookDetails;
-        }
-        static ScrapeBookDetails.NoLongerAvailableEnum noLongerAvailableUI(string title, string url)
-        {
-            var nla = new NoLongerAvailableForm(title, url);
-            nla.ShowDialog();
-            return nla.EnumResult;
-        }
 
         // subscribed to Begin event because a new form should be created+processed+closed on each iteration
         private static void wireUpDownloadable(IDownloadable downloadable)
@@ -206,34 +192,43 @@ namespace LibationWinForm.BookLiberation
             #endregion
 
             #region define how model actions will affect form behavior
-            void downloadBegin(object _, string str) => automatedBackupsForm.AppendText("DownloadStep_Begin: " + str);
+            void downloadBookBegin(object _, string str) => automatedBackupsForm.AppendText("DownloadStep_Begin: " + str);
             void statusUpdate(object _, string str) => automatedBackupsForm.AppendText("- " + str);
-            void downloadCompleted(object _, string str) => automatedBackupsForm.AppendText("DownloadStep_Completed: " + str);
-            void decryptBegin(object _, string str) => automatedBackupsForm.AppendText("DecryptStep_Begin: " + str);
+            void downloadBookCompleted(object _, string str) => automatedBackupsForm.AppendText("DownloadStep_Completed: " + str);
+            void decryptBookBegin(object _, string str) => automatedBackupsForm.AppendText("DecryptStep_Begin: " + str);
             // extra line after book is completely finished
-            void decryptCompleted(object _, string str) => automatedBackupsForm.AppendText("DecryptStep_Completed: " + str + Environment.NewLine);
-            #endregion
+            void decryptBookCompleted(object _, string str) => automatedBackupsForm.AppendText("DecryptStep_Completed: " + str + Environment.NewLine);
+			void downloadPdfBegin(object _, string str) => automatedBackupsForm.AppendText("PdfStep_Begin: " + str);
+			// extra line after book is completely finished
+			void downloadPdfCompleted(object _, string str) => automatedBackupsForm.AppendText("PdfStep_Completed: " + str + Environment.NewLine);
+			#endregion
 
-            #region subscribe new form to model's events
-            backupBook.Download.Begin += downloadBegin;
-            backupBook.Download.StatusUpdate += statusUpdate;
-            backupBook.Download.Completed += downloadCompleted;
-            backupBook.Decrypt.Begin += decryptBegin;
-            backupBook.Decrypt.StatusUpdate += statusUpdate;
-            backupBook.Decrypt.Completed += decryptCompleted;
-            #endregion
+			#region subscribe new form to model's events
+			backupBook.DownloadBook.Begin += downloadBookBegin;
+            backupBook.DownloadBook.StatusUpdate += statusUpdate;
+            backupBook.DownloadBook.Completed += downloadBookCompleted;
+            backupBook.DecryptBook.Begin += decryptBookBegin;
+            backupBook.DecryptBook.StatusUpdate += statusUpdate;
+            backupBook.DecryptBook.Completed += decryptBookCompleted;
+			backupBook.DownloadPdf.Begin += downloadPdfBegin;
+			backupBook.DownloadPdf.StatusUpdate += statusUpdate;
+			backupBook.DownloadPdf.Completed += downloadPdfCompleted;
+			#endregion
 
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            automatedBackupsForm.FormClosing += (_, __) =>
+			#region when form closes, unsubscribe from model's events
+			// unsubscribe so disposed forms aren't still trying to receive notifications
+			automatedBackupsForm.FormClosing += (_, __) =>
             {
-                backupBook.Download.Begin -= downloadBegin;
-                backupBook.Download.StatusUpdate -= statusUpdate;
-                backupBook.Download.Completed -= downloadCompleted;
-                backupBook.Decrypt.Begin -= decryptBegin;
-                backupBook.Decrypt.StatusUpdate -= statusUpdate;
-                backupBook.Decrypt.Completed -= decryptCompleted;
-            };
+                backupBook.DownloadBook.Begin -= downloadBookBegin;
+                backupBook.DownloadBook.StatusUpdate -= statusUpdate;
+                backupBook.DownloadBook.Completed -= downloadBookCompleted;
+                backupBook.DecryptBook.Begin -= decryptBookBegin;
+                backupBook.DecryptBook.StatusUpdate -= statusUpdate;
+                backupBook.DecryptBook.Completed -= decryptBookCompleted;
+				backupBook.DownloadPdf.Begin -= downloadPdfBegin;
+				backupBook.DownloadPdf.StatusUpdate -= statusUpdate;
+				backupBook.DownloadPdf.Completed -= downloadPdfCompleted;
+			};
             #endregion
 
             await runBackupLoop(backupBook, automatedBackupsForm);

LibationWinForm/UNTESTED/Dialogs/IndexDialogs/IIndexLibraryDialog.cs

@@ -1,8 +0,0 @@
-namespace LibationWinForm
-{
-    public interface IIndexLibraryDialog : IRunnableDialog
-    {
-        int TotalBooksProcessed { get; }
-        int NewBooksAdded { get; }
-    }
-}