Remove local retrieval of activation bytes. Use audible api. Dramatically reduces program's size

Added support for downloaded chapter titles.

AaxDecrypter/AAXChapters.cs

@@ -0,0 +1,40 @@
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using Dinah.Core.Diagnostics;
+
+namespace AaxDecrypter
+{
+    public class AAXChapters : Chapters
+    {
+        public AAXChapters(string file)
+        {
+            var info = new ProcessStartInfo
+            {
+                FileName = DecryptSupportLibraries.ffprobePath,
+                Arguments = "-loglevel panic -show_chapters -print_format xml \"" + file + "\""
+            };
+            var xml = info.RunHidden().Output;
+
+            var xmlDocument = new System.Xml.XmlDocument();
+            xmlDocument.LoadXml(xml);
+            var chaptersXml = xmlDocument.SelectNodes("/ffprobe/chapters/chapter")
+                .Cast<System.Xml.XmlNode>()
+                .Where(n => n.Name == "chapter");
+
+            foreach (var cnode in chaptersXml)
+            {
+                double startTime = double.Parse(cnode.Attributes["start_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
+                double endTime = double.Parse(cnode.Attributes["end_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
+
+                string chapterTitle = cnode.ChildNodes
+                    .Cast<System.Xml.XmlNode>()
+                    .Where(childnode => childnode.Attributes["key"].Value == "title")
+                    .Select(childnode => childnode.Attributes["value"].Value)
+                    .FirstOrDefault();
+
+                AddChapter(new Chapter(startTime, endTime, chapterTitle));
+            }
+        }
+    }
+}

AaxDecrypter/AaxDecrypter.csproj

@@ -10,57 +10,11 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="..\..\..\..\..\..\Dinah%2527s folder\coding\_NET\Visual Studio 2019\Libation\AaxDecrypter\UNTESTED\BytesCrackerLib\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="BytesCrackerLib\alglib1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_0_10000x789935_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_1_10000x791425_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_2_10000x790991_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_3_10000x792120_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_4_10000x790743_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_5_10000x790568_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_6_10000x791458_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_7_10000x791707_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_8_10000x790202_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_9_10000x791022_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\ffmpeg.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\ffprobe.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\rcrack.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="DecryptLib\AtomicParsley.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

AaxDecrypter/AaxToM4bConverter.cs

@@ -62,15 +62,18 @@ namespace AaxDecrypter
         public Tags tags { get; private set; }
         public EncodingInfo encodingInfo { get; private set; }
 
-        public static async Task<AaxToM4bConverter> CreateAsync(string inputFile, string decryptKey)
+        private Func<Task<string>> getKeyFuncAsync { get; }
+
+        public static async Task<AaxToM4bConverter> CreateAsync(string inputFile, string decryptKey, Func<Task<string>> getKeyFunc, Chapters chapters = null)
         {
-            var converter = new AaxToM4bConverter(inputFile, decryptKey);
+            var converter = new AaxToM4bConverter(inputFile, decryptKey, getKeyFunc);
+            converter.chapters = chapters ?? new AAXChapters(inputFile);
             await converter.prelimProcessing();
             converter.printPrelim();
 
             return converter;
         }
-        private AaxToM4bConverter(string inputFile, string decryptKey)
+        private AaxToM4bConverter(string inputFile, string decryptKey, Func<Task<string>> getKeyFunc)
         {
 			ArgumentValidator.EnsureNotNullOrWhiteSpace(inputFile, nameof(inputFile));
             if (!File.Exists(inputFile))
@@ -92,18 +95,18 @@ namespace AaxDecrypter
 
             inputFileName = inputFile;
             this.decryptKey = decryptKey;
+            this.getKeyFuncAsync = getKeyFunc;
         }
 
         private async Task prelimProcessing()
         {
             tags = new Tags(inputFileName);
             encodingInfo = new EncodingInfo(inputFileName);
-            chapters = new Chapters(inputFileName, tags.duration.TotalSeconds);
 
             var defaultFilename = Path.Combine(
                 Path.GetDirectoryName(inputFileName),
-                getASCIITag(tags.author),
-                getASCIITag(tags.title) + ".m4b"
+                PathLib.ToPathSafeString(tags.author),
+                PathLib.ToPathSafeString(tags.title) + ".m4b"
                 );
 
 			// set default name
@@ -111,12 +114,6 @@ namespace AaxDecrypter
 
             await Task.Run(() => saveCover(inputFileName));
         }
-        private string getASCIITag(string property)
-        {
-            foreach (char ch in new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars()))
-                property = property.Replace(ch.ToString(), "");
-            return property;
-        }
 
         private void saveCover(string aaxFile)
         {
@@ -126,19 +123,14 @@ namespace AaxDecrypter
 
         private void printPrelim()
         {
-            Console.WriteLine("Audible Book ID = " + tags.id);
+            Console.WriteLine($"Audible Book ID = {tags.id}");
 
-            Console.WriteLine("Book: " + tags.title);
-            Console.WriteLine("Author: " + tags.author);
-            Console.WriteLine("Narrator: " + tags.narrator);
-            Console.WriteLine("Year: " + tags.year);
-            Console.WriteLine("Total Time: "
-                + tags.duration.GetTotalTimeFormatted()
-                + " in " + chapters.Count() + " chapters");
-            Console.WriteLine("WARNING-Source is "
-                + encodingInfo.originalBitrate + " kbits @ "
-                + encodingInfo.sampleRate + "Hz, "
-                + encodingInfo.channels + " channels");
+            Console.WriteLine($"Book: {tags.title}");
+            Console.WriteLine($"Author: {tags.author}");
+            Console.WriteLine($"Narrator: {tags.narrator}");
+            Console.WriteLine($"Year: {tags.year}");
+            Console.WriteLine($"Total Time: {tags.duration.GetTotalTimeFormatted()} in {chapters.Count} chapters");
+            Console.WriteLine($"WARNING-Source is {encodingInfo.originalBitrate} kbits @ {encodingInfo.sampleRate}Hz, {encodingInfo.channels} channels");
         }
 
         public bool Run()
@@ -159,19 +151,14 @@ namespace AaxDecrypter
 
         public void SetOutputFilename(string outFileName)
         {
-            outputFileName = outFileName;
-
-            if (Path.GetExtension(outputFileName) != ".m4b")
-                outputFileName = outputFileWithNewExt(".m4b");
-
-			if (File.Exists(outputFileName))
-				File.Delete(outputFileName);
-
+            outputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
             outDir = Path.GetDirectoryName(outputFileName);
+
+            if (File.Exists(outputFileName))
+                File.Delete(outputFileName);
         }
 
-        private string outputFileWithNewExt(string extension)
-            => Path.Combine(outDir, Path.GetFileNameWithoutExtension(outputFileName) + '.' + extension.Trim('.'));
+        private string outputFileWithNewExt(string extension) => PathLib.ReplaceExtension(outputFileName, extension);
 
         public bool Step1_CreateDir()
         {
@@ -225,22 +212,12 @@ namespace AaxDecrypter
 
         private int getKey_decrypt(string tempRipFile)
         {
-            getKey();
+            decryptKey = getKey();
             return decrypt(tempRipFile);
         }
-        private void getKey()
-        {
-            Console.WriteLine("Discovering decrypt key");
 
-            Console.WriteLine("Getting file hash");
-            var checksum = BytesCracker.GetChecksum(inputFileName);
-            Console.WriteLine("File hash calculated: " + checksum);
-
-            Console.WriteLine("Cracking activation bytes");
-            var activation_bytes = BytesCracker.GetActivationBytes(checksum);
-            decryptKey = activation_bytes;
-            Console.WriteLine("Activation bytes cracked. Decrypt key: " + activation_bytes);
-        }
+        // I am NOT happy about doing async this way. Async needs to be added to Step framework
+        string getKey() => getKeyFuncAsync().GetAwaiter().GetResult();
 
         private int decrypt(string tempRipFile)
         {
@@ -294,9 +271,9 @@ namespace AaxDecrypter
         public bool Step3_Chapterize()
         {
             var str1 = "";
-            if (chapters.FirstChapterStart != 0.0)
+            if (chapters.FirstChapter.StartTime != 0.0)
             {
-                str1 = " -ss " + chapters.FirstChapterStart.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + (chapters.LastChapterStart - 1.0).ToString("0.000", CultureInfo.InvariantCulture) + " ";
+                str1 = " -ss " + chapters.FirstChapter.StartTime.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + chapters.LastChapter.EndTime.ToString("0.000", CultureInfo.InvariantCulture) + " ";
             }
 
             var ffmpegTags = tags.GenerateFfmpegTags();
@@ -349,13 +326,13 @@ namespace AaxDecrypter
 
         public bool End_CreateCue()
         {
-            File.WriteAllText(outputFileWithNewExt(".cue"), chapters.GetCuefromChapters(Path.GetFileName(outputFileName)));
+            File.WriteAllText(outputFileWithNewExt(".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), chapters));
             return true;
         }
 
         public bool End_CreateNfo()
         {
-            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateNfoContents(AppName, tags, encodingInfo, chapters));
+            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateContents(AppName, tags, encodingInfo, chapters));
             return true;
         }
     }

AaxDecrypter/Chapter.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AaxDecrypter
+{
+    public class Chapter
+    {
+        public Chapter(double startTime, double endTime, string title)
+        {
+            StartTime = startTime;
+            EndTime = endTime;
+            Title = title;
+        }
+        /// <summary>
+        /// Chapter start time, in seconds.
+        /// </summary>
+        public double StartTime { get; private set; }
+        /// <summary>
+        /// Chapter end time, in seconds.
+        /// </summary>
+        public double EndTime { get; private set; }
+        public string Title { get; private set; }
+    }
+}

AaxDecrypter/Chapters.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AaxDecrypter
+{
+    public abstract class Chapters
+    {
+        private List<Chapter> _chapterList = new();
+        public int Count => _chapterList.Count;
+        public Chapter FirstChapter => _chapterList[0];
+        public Chapter LastChapter => _chapterList[Count - 1];
+        public IEnumerable<Chapter> ChapterList => _chapterList.AsEnumerable();
+        public IEnumerable<TimeSpan> GetBeginningTimes() => ChapterList.Select(c => TimeSpan.FromSeconds(c.StartTime));
+        protected void AddChapter(Chapter chapter)
+        {
+            _chapterList.Add(chapter);
+        }
+        protected void AddChapters(IEnumerable<Chapter> chapters)
+        {
+            _chapterList.AddRange(chapters);
+        }
+        public string GenerateFfmpegChapters()
+        {
+            var stringBuilder = new StringBuilder();
+
+            foreach (Chapter c in ChapterList)
+            {
+                stringBuilder.Append("[CHAPTER]\n");
+                stringBuilder.Append("TIMEBASE=1/1000\n");
+                stringBuilder.Append("START=" + c.StartTime * 1000 + "\n");
+                stringBuilder.Append("END=" + c.EndTime * 1000 + "\n");
+                stringBuilder.Append("title=" + c.Title + "\n");
+            }
+
+            return stringBuilder.ToString();
+        }
+    }
+}

AaxDecrypter/Cue.cs

@@ -0,0 +1,60 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Dinah.Core;
+
+namespace AaxDecrypter
+{
+    public static class Cue
+    {
+        public static string CreateContents(string filePath, Chapters chapters)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine(GetFileLine(filePath, "MP3"));
+
+            var trackCount = 0;
+            foreach (Chapter c in chapters.ChapterList)
+            {
+                trackCount++;
+                var startTime = TimeSpan.FromSeconds(c.StartTime);
+
+                stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
+                stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss\\:ff}");
+            }
+
+            return stringBuilder.ToString();
+        }
+
+        public static void UpdateFileName(FileInfo cueFileInfo, string audioFilePath)
+            => UpdateFileName(cueFileInfo.FullName, audioFilePath);
+
+        public static void UpdateFileName(string cueFilePath, FileInfo audioFileInfo)
+            => UpdateFileName(cueFilePath, audioFileInfo.FullName);
+
+        public static void UpdateFileName(FileInfo cueFileInfo, FileInfo audioFileInfo)
+            => UpdateFileName(cueFileInfo.FullName, audioFileInfo.FullName);
+
+        public static void UpdateFileName(string cueFilePath, string audioFilePath)
+        {
+            var cueContents = File.ReadAllLines(cueFilePath);
+
+            for (var i = 0; i < cueContents.Length; i++)
+            {
+                var line = cueContents[i];
+                if (!line.Trim().StartsWith("FILE") || !line.Contains(" "))
+                    continue;
+
+                var fileTypeBegins = line.LastIndexOf(" ") + 1;
+                cueContents[i] = GetFileLine(audioFilePath, line[fileTypeBegins..]);
+                break;
+            }
+
+            File.WriteAllLines(cueFilePath, cueContents);
+        }
+
+        private static string GetFileLine(string filePath, string audioType) => $"FILE {Path.GetFileName(filePath).SurroundWithQuotes()} {audioType}";
+    }
+}

AaxDecrypter/NFO.cs

@@ -0,0 +1,54 @@
+namespace AaxDecrypter
+{
+    public static class NFO
+    {
+        public static string CreateContents(string ripper, Tags tags, EncodingInfo encodingInfo, Chapters chapters)
+        {
+            var _hours = (int)tags.duration.TotalHours;
+            var myDuration
+                = (_hours > 0 ? _hours + " hours, " : "")
+                + tags.duration.Minutes + " minutes, "
+                + tags.duration.Seconds + " seconds";
+
+            var header
+                = "General Information\r\n"
+                + "===================\r\n"
+                + $" Title:                  {tags.title}\r\n"
+                + $" Author:                 {tags.author}\r\n"
+                + $" Read By:                {tags.narrator}\r\n"
+                + $" Copyright:              {tags.year}\r\n"
+                + $" Audiobook Copyright:    {tags.year}\r\n";
+            if (tags.genre != "")
+                header += $" Genre:                  {tags.genre}\r\n";
+
+            var s
+                = header
+                + $" Publisher:              {tags.publisher}\r\n"
+                + $" Duration:               {myDuration}\r\n"
+                + $" Chapters:               {chapters.Count}\r\n"
+                + "\r\n"
+                + "\r\n"
+                + "Media Information\r\n"
+                + "=================\r\n"
+                + " Source Format:          Audible AAX\r\n"
+                + $" Source Sample Rate:     {encodingInfo.sampleRate} Hz\r\n"
+                + $" Source Channels:        {encodingInfo.channels}\r\n"
+                + $" Source Bitrate:         {encodingInfo.originalBitrate} kbits\r\n"
+                + "\r\n"
+                + " Lossless Encode:        Yes\r\n"
+                + " Encoded Codec:          AAC / M4B\r\n"
+                + $" Encoded Sample Rate:    {encodingInfo.sampleRate} Hz\r\n"
+                + $" Encoded Channels:       {encodingInfo.channels}\r\n"
+                + $" Encoded Bitrate:        {encodingInfo.originalBitrate} kbits\r\n"
+                + "\r\n"
+                + $" Ripper:                 {ripper}\r\n"
+                + "\r\n"
+                + "\r\n"
+                + "Book Description\r\n"
+                + "================\r\n"
+                + tags.comments;
+
+            return s;
+        }
+    }
+}

AaxDecrypter/UNTESTED/BytesCracker.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public static class BytesCracker
-    {
-        public static string GetChecksum(string aaxPath)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = BytesCrackerSupportLibraries.ffprobePath,
-                Arguments = aaxPath.SurroundWithQuotes(),
-                WorkingDirectory = Directory.GetCurrentDirectory()
-            };
-
-            // checksum is in the debug info. ffprobe's debug info is written to stderr, not stdout
-            var ffprobeStderr = info.RunHidden().Error;
-
-            // example checksum line:
-            // ... [aax] file checksum == 0c527840c4f18517157eb0b4f9d6f9317ce60cd1
-            var checksum = ffprobeStderr.ExtractString("file checksum == ", 40);
-
-            return checksum;
-        }
-
-        /// <summary>use checksum to get activation bytes. activation bytes are unique per audible customer. only have to do this 1x/customer</summary>
-        public static string GetActivationBytes(string checksum)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = BytesCrackerSupportLibraries.rcrackPath,
-                Arguments = @". -h " + checksum,
-                WorkingDirectory = Directory.GetCurrentDirectory()
-            };
-
-            var rcrackStdout = info.RunHidden().Output;
-
-            // example result
-            // 0c527840c4f18517157eb0b4f9d6f9317ce60cd1  \xbd\x89X\x09  hex:bd895809
-            var activation_bytes = rcrackStdout.ExtractString("hex:", 8);
-
-            return activation_bytes;
-        }
-    }
-}

AaxDecrypter/UNTESTED/BytesCrackerSupportLibraries.cs

@@ -1,28 +0,0 @@
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public static class BytesCrackerSupportLibraries
-    {
-        // GetActivationBytes dependencies
-        //   rcrack.exe
-        //   alglib1.dll
-        //   RainbowCrack files to recover your own Audible activation data (activation_bytes) in an offline manner
-        //   audible_byte#4-4_0_10000x789935_0.rtc
-        //   audible_byte#4-4_1_10000x791425_0.rtc
-        //   audible_byte#4-4_2_10000x790991_0.rtc
-        //   audible_byte#4-4_3_10000x792120_0.rtc
-        //   audible_byte#4-4_4_10000x790743_0.rtc
-        //   audible_byte#4-4_5_10000x790568_0.rtc
-        //   audible_byte#4-4_6_10000x791458_0.rtc
-        //   audible_byte#4-4_7_10000x791707_0.rtc
-        //   audible_byte#4-4_8_10000x790202_0.rtc
-        //   audible_byte#4-4_9_10000x791022_0.rtc
-
-        private static string appPath_ { get; } = Path.GetDirectoryName(Dinah.Core.Exe.FileLocationOnDisk);
-        private static string bytesCrackerLib_ { get; } = Path.Combine(appPath_, "BytesCrackerLib");
-
-        public static string ffprobePath { get; } = Path.Combine(bytesCrackerLib_, "ffprobe.exe");
-        public static string rcrackPath { get; } = Path.Combine(bytesCrackerLib_, "rcrack.exe");
-    }
-}

AaxDecrypter/UNTESTED/Chapters.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public class Chapters
-    {
-        private List<double> markers { get; }
-
-        public double FirstChapterStart => markers[0];
-        public double LastChapterStart => markers[markers.Count - 1];
-
-        public Chapters(string file, double totalTime)
-        {
-            markers = getAAXChapters(file);
-
-            // add end time
-            markers.Add(totalTime);
-        }
-
-        private static List<double> getAAXChapters(string file)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_chapters -print_format xml \"" + file + "\""
-            };
-            var xml = info.RunHidden().Output;
-
-            var xmlDocument = new System.Xml.XmlDocument();
-            xmlDocument.LoadXml(xml);
-            var chapters = xmlDocument.SelectNodes("/ffprobe/chapters/chapter")
-                .Cast<System.Xml.XmlNode>()
-                .Select(xmlNode => double.Parse(xmlNode.Attributes["start_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture))
-                .ToList();
-            return chapters;
-        }
-
-        // subtract 1 b/c end time marker is a real entry but isn't a real chapter
-        public int Count() => markers.Count - 1;
-
-        public string GetCuefromChapters(string fileName)
-        {
-            var stringBuilder = new StringBuilder();
-            if (fileName != "")
-            {
-                stringBuilder.Append("FILE \"" + fileName + "\" MP4\n");
-            }
-
-            for (var i = 0; i < Count(); i++)
-            {
-                var chapter = i + 1;
-
-                var timeSpan = TimeSpan.FromSeconds(markers[i]);
-                var minutes = Math.Floor(timeSpan.TotalMinutes).ToString();
-                var seconds = timeSpan.Seconds.ToString("D2");
-                var milliseconds = (timeSpan.Milliseconds / 10).ToString("D2");
-                string str = minutes + ":" + seconds + ":" + milliseconds;
-
-                stringBuilder.Append("TRACK " + chapter + " AUDIO\n");
-                stringBuilder.Append("  TITLE \"Chapter " + chapter.ToString("D2") + "\"\n");
-                stringBuilder.Append("  INDEX 01 " + str + "\n");
-            }
-
-            return stringBuilder.ToString();
-        }
-
-        public string GenerateFfmpegChapters()
-        {
-            var stringBuilder = new StringBuilder();
-
-            for (var i = 0; i < Count(); i++)
-            {
-                var chapter = i + 1;
-
-                var start = markers[i] * 1000.0;
-                var end = markers[i + 1] * 1000.0;
-                var chapterName = chapter.ToString("D3");
-
-                stringBuilder.Append("[CHAPTER]\n");
-                stringBuilder.Append("TIMEBASE=1/1000\n");
-                stringBuilder.Append("START=" + start + "\n");
-                stringBuilder.Append("END=" + end + "\n");
-                stringBuilder.Append("title=" + chapterName + "\n");
-            }
-
-            return stringBuilder.ToString();
-        }
-    }
-}

AaxDecrypter/UNTESTED/NFO.cs

@@ -1,56 +0,0 @@
-namespace AaxDecrypter
-{
-    public static class NFO
-    {
-        public static string CreateNfoContents(string ripper, Tags tags, EncodingInfo encodingInfo, Chapters chapters)
-        {
-            int _hours = (int)tags.duration.TotalHours;
-            string myDuration
-                = (_hours > 0 ? _hours + " hours, " : "")
-                + tags.duration.Minutes + " minutes, "
-                + tags.duration.Seconds + " seconds";
-
-            string str4
-                = "General Information\r\n"
-                + "===================\r\n"
-                + " Title:                  " + tags.title + "\r\n"
-                + " Author:                 " + tags.author + "\r\n"
-                + " Read By:                " + tags.narrator + "\r\n"
-                + " Copyright:              " + tags.year + "\r\n"
-                + " Audiobook Copyright:    " + tags.year + "\r\n";
-            if (tags.genre != "")
-            {
-                str4 = str4 + " Genre:                  " + tags.genre + "\r\n";
-            }
-
-            string s
-                = str4
-                + " Publisher:              " + tags.publisher + "\r\n"
-                + " Duration:               " + myDuration + "\r\n"
-                + " Chapters:               " + chapters.Count() + "\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Media Information\r\n"
-                + "=================\r\n"
-                + " Source Format:          Audible AAX\r\n"
-                + " Source Sample Rate:     " + encodingInfo.sampleRate + " Hz\r\n"
-                + " Source Channels:        " + encodingInfo.channels + "\r\n"
-                + " Source Bitrate:         " + encodingInfo.originalBitrate + " kbits\r\n"
-                + "\r\n"
-                + " Lossless Encode:        Yes\r\n"
-                + " Encoded Codec:          AAC / M4B\r\n"
-                + " Encoded Sample Rate:    " + encodingInfo.sampleRate + " Hz\r\n"
-                + " Encoded Channels:       " + encodingInfo.channels + "\r\n"
-                + " Encoded Bitrate:        " + encodingInfo.originalBitrate + " kbits\r\n"
-                + "\r\n"
-                + " Ripper:                 " + ripper + "\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Book Description\r\n"
-                + "================\r\n"
-                + tags.comments;
-
-            return s;
-        }
-    }
-}

ApplicationServices/ApplicationServices.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="16.0.0" />
-    <PackageReference Include="NPOI" Version="2.5.1" />
+    <PackageReference Include="CsvHelper" Version="27.0.2" />
+    <PackageReference Include="NPOI" Version="2.5.3" />
   </ItemGroup>
 
   <ItemGroup>

ApplicationServices/SearchEngineCommands.cs

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

ApplicationServices/UNTESTED/SearchEngineCommands.cs

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

DataLayer/DataLayer.csproj

@@ -12,13 +12,12 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DataLayer/LibationContext.cs

@@ -56,9 +56,10 @@ namespace DataLayer
             modelBuilder.ApplyConfiguration(new SeriesBookConfig());
             modelBuilder.ApplyConfiguration(new CategoryConfig());
 
-			// seeds go here. examples in scratch pad
-			modelBuilder
-				.Entity<Category>()
+            // seeds go here. examples in Dinah.EntityFrameworkCore.Tests\DbContextFactoryExample.cs
+
+            modelBuilder
+                .Entity<Category>()
 				.HasData(Category.GetEmpty());
 			modelBuilder
 				.Entity<Contributor>()

DataLayer/LibationContextFactory.cs

@@ -6,9 +6,6 @@ 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
-			.UseSqlite
-			(connectionString);
+        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlite(connectionString);
     }
 }

DataLayer/UNTESTED/_scratch pad/ScratchPad.cs

@@ -1,122 +0,0 @@
-using System;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace _scratch_pad
-{
-    ////// to use this as a console, open properties and change from class library => console
-    //// DON'T FORGET TO REVERT IT
-    //public class Program
-    //{
-    //    public static void Main(string[] args)
-    //    {
-    //        var user = new Student() { Name = "Dinah Cheshire" };
-    //        var udi = new UserDef { UserDefId = 1, TagsRaw = "my,tags" };
-
-    //        using var context = new MyTestContextDesignTimeDbContextFactory().Create();
-    //        context.Add(user);
-    //        //context.Add(udi);
-    //        context.Update(udi);
-    //        context.SaveChanges();
-
-    //        Console.WriteLine($"Student was saved in the database with id: {user.Id}");
-    //    }
-    //}
-
-    public class MyTestContextDesignTimeDbContextFactory : DesignTimeDbContextFactoryBase<MyTestContext>
-    {
-        protected override MyTestContext CreateNewInstance(DbContextOptions<MyTestContext> options) => new MyTestContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlite(connectionString);
-    }
-
-    public class MyTestContext : DbContext
-    {
-        // see DesignTimeDbContextFactoryBase for info about ctors and connection strings/OnConfiguring()
-        public MyTestContext(DbContextOptions<MyTestContext> options) : base(options) { }
-
-        #region classes for OnModelCreating() seed example
-        class Blog
-        {
-            public int BlogId { get; set; }
-            public string Url { get; set; }
-            public System.Collections.Generic.ICollection<Post> Posts { get; set; }
-        }
-        class Post
-        {
-            public int PostId { get; set; }
-            public string Content { get; set; }
-            public string Title { get; set; }
-            public int BlogId { get; set; }
-            public Blog Blog { get; set; }
-            public Name AuthorName { get; set; }
-        }
-        class Name
-        {
-            public string First { get; set; }
-            public string Last { get; set; }
-        }
-        #endregion
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            // config
-            modelBuilder.Entity<Blog>(entity => entity.Property(e => e.Url).IsRequired());
-            modelBuilder.Entity<Order>().OwnsOne(p => p.OrderDetails, cb =>
-            {
-                cb.OwnsOne(c => c.BillingAddress);
-                cb.OwnsOne(c => c.ShippingAddress);
-            });
-            modelBuilder.Entity<Post>(entity =>
-                entity
-                    .HasOne(d => d.Blog)
-                    .WithMany(p => p.Posts)
-                    .HasForeignKey("BlogId"));
-
-            // BlogSeed
-            modelBuilder.Entity<Blog>().HasData(new Blog { BlogId = 1, Url = "http://sample.com" });
-
-            // PostSeed
-            modelBuilder.Entity<Post>().HasData(new Post() { BlogId = 1, PostId = 1, Title = "First post", Content = "Test 1" });
-
-            // AnonymousPostSeed
-            modelBuilder.Entity<Post>().HasData(new { BlogId = 1, PostId = 2, Title = "Second post", Content = "Test 2" });
-
-            // OwnedTypeSeed
-            modelBuilder.Entity<Post>().OwnsOne(p => p.AuthorName).HasData(
-                new { PostId = 1, First = "Andriy", Last = "Svyryd" },
-                new { PostId = 2, First = "Diego", Last = "Vega" });
-        }
-
-        public DbSet<Student> Students { get; set; }
-        public DbSet<UserDef> UserDefs { get; set; }
-        public DbSet<Order> Orders { get; set; }
-    }
-
-    public class Student
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-    }
-    public class UserDef
-    {
-        public int UserDefId { get; set; }
-        public string TagsRaw { get; set; }
-    }
-
-    public class Order
-    {
-        public int Id { get; set; }
-        public OrderDetails OrderDetails { get; set; }
-    }
-    public class OrderDetails
-    {
-        public StreetAddress BillingAddress { get; set; }
-        public StreetAddress ShippingAddress { get; set; }
-    }
-    public class StreetAddress
-    {
-        public string Street { get; set; }
-        public string City { get; set; }
-    }
-}

DataLayer/appsettings.json

@@ -1,14 +1,6 @@
 {
   "ConnectionStrings": {
-    "LibationContext_sqlserver": "Server=(LocalDb)\\MSSQLLocalDB;Database=DataLayer.LibationContext;Integrated Security=true;",
-
     "// this connection string is ONLY used for DataLayer's Migrations. this appsettings.json file is NOT used at all by application; it is overwritten":  "",
-    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;",
-
-    "// sqlite notes": "",
-    "// absolute path example": "Data Source=C:/foo/bar/sample.db",
-    "// relative path example": "Data Source=sample.db",
-    "// on windows: sqlite paths accept windows and/or unix slashes": "",
-    "MyTestContext": "Data Source=%DESKTOP%/sample.db"
+    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
   }
 }

FileLiberator/DecryptBook.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AaxDecrypter;
+using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -56,7 +57,11 @@ namespace FileLiberator
                 if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-                var outputAudioFilename = await aaxToM4bConverterDecrypt(aaxFilename, libraryBook);
+				var api = await AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
+
+                var chapters = await downloadChapterNames(libraryBook, api);
+
+                var outputAudioFilename = await aaxToM4bConverterDecrypt(aaxFilename, libraryBook, chapters, api);
 
                 // decrypt failed
                 if (outputAudioFilename == null)
@@ -90,7 +95,23 @@ namespace FileLiberator
             }
         }
 
-        private async Task<string> aaxToM4bConverterDecrypt(string aaxFilename, LibraryBook libraryBook)
+        private static async Task<Chapters> downloadChapterNames(LibraryBook libraryBook, Api api)
+        {
+            try
+            {
+                var contentMetadata = await api.GetLibraryBookMetadataAsync(libraryBook.Book.AudibleProductId);
+                if (contentMetadata?.ChapterInfo is null)
+                    return null;
+
+                return new DownloadedChapters(contentMetadata.ChapterInfo);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private async Task<string> aaxToM4bConverterDecrypt(string aaxFilename, LibraryBook libraryBook, Chapters chapters, Api api)
         {
             DecryptBegin?.Invoke(this, $"Begin decrypting {aaxFilename}");
 
@@ -102,7 +123,7 @@ namespace FileLiberator
                     .AccountsSettings
                     .GetAccount(libraryBook.Account, libraryBook.Book.Locale);
 
-                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, account.DecryptKey);
+                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, account.DecryptKey, api.GetActivationBytesAsync, chapters);
                 converter.AppName = "Libation";
 
                 TitleDiscovered?.Invoke(this, converter.tags.title);
@@ -144,15 +165,21 @@ namespace FileLiberator
 
 			var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
 
-			foreach (var f in sortedFiles)
-			{
-				var dest = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-					// audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-					? FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId)
-					// non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
-					: FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
+            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
+            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
 
-				File.Move(f.FullName, dest);
+            foreach (var f in sortedFiles)
+            {
+                var dest
+                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
+                    ? audioFileName
+                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
+                    : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
+
+                if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
+                    Cue.UpdateFileName(f, audioFileName);
+
+                File.Move(f.FullName, dest);
 			}
 
             return destinationDir;

FileLiberator/DownloadedChapters.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using AaxDecrypter;
+using AudibleApiDTOs;
+using Dinah.Core.Diagnostics;
+
+
+namespace FileLiberator
+{
+    public class DownloadedChapters : Chapters
+    {
+        public DownloadedChapters(ChapterInfo chapterInfo)
+        {
+            AddChapters(chapterInfo.Chapters
+                .Select(c => new AaxDecrypter.Chapter(c.StartOffsetMs / 1000d, (c.StartOffsetMs + c.LengthMs) / 1000d, c.Title)));
+        }
+    }
+}

FileManager/FileManager.csproj

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

Libation.sln

@@ -86,6 +86,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Libation Tests", "0 Libat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore.Tests", "..\Dinah.Core\_Tests\Dinah.EntityFrameworkCore.Tests\Dinah.EntityFrameworkCore.Tests.csproj", "{6F5131A0-09AE-4707-B82B-5E53CB74688E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -208,6 +212,14 @@ Global
 		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -242,6 +254,8 @@ Global
 		{E7EFD64D-6630-4426-B09C-B6862A92E3FD} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{F3B04A3A-20C8-4582-A54A-715AF6A5D859} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{6F5131A0-09AE-4707-B82B-5E53CB74688E} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>4.2.0.1</Version>
+    <Version>4.4.0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,7 +21,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Octokit" Version="0.48.0" />
+    <PackageReference Include="Octokit" Version="0.50.0" />
   </ItemGroup>
 
   <ItemGroup>

LibationLauncher/Program.cs

@@ -380,19 +380,25 @@ namespace LibationLauncher
 				try
 				{
 					LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFileAsync(zipUrl, selectedPath).GetAwaiter().GetResult();
-					MessageBox.Show($"File downloaded");
+					MessageBox.Show("File downloaded");
 				}
 				catch (Exception ex)
 				{
-					MessageBox.Show($"ERROR: {ex.Message}\r\n{ex.StackTrace}");
+					Error(ex, "Error downloading update");
 				}
 			}
 			catch (Exception ex)
 			{
-				MessageBox.Show($"Error checking for update. ERROR: {ex.Message}\r\n{ex.StackTrace}");
+				Error(ex, "Error checking for update");
 			}
 		}
 
+		private static void Error(Exception ex, string message)
+		{
+			Log.Logger.Error(ex, message);
+			MessageBox.Show($"{message}\r\nSee log for details");
+		}
+
 		private static void logStartupState()
 		{
 			var config = Configuration.Instance;

LibationSearchEngine/LuceneRegex.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace LibationSearchEngine
+{
+    internal static class LuceneRegex
+    {
+        #region pattern pieces
+        //  negative lookbehind: cannot be preceeded by an escaping \
+        const string NOT_ESCAPED = @"(?<!\\)";
+
+        // disallow spaces and lucene reserved characters
+        //     + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+        // define chars
+        // escape and concat
+        // create regex. also disallow spaces
+        private static char[] disallowedChars { get; } = new[] {
+            '+', '-', '&', '|', '!', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '\\' };
+        private static string disallowedCharsEscaped { get; } = disallowedChars.Select(c => $@"\{c}").Aggregate((a, b) => a + b);
+        private static string WORD_CAPTURE { get; } = $@"([^\s{disallowedCharsEscaped}]+)";
+
+        // : with optional preceeding spaces. capture these so i don't accidentally replace a non-field name
+        const string FIELD_END = @"(\s*:)";
+
+        const string BEGIN_TAG = @"\[";
+        const string END_TAG = @"\]";
+
+        // space is forgiven at beginning and end of tag but not in the middle
+        // literal space character only. do NOT allow new lines, tabs, ...
+        const string OPTIONAL_SPACE_LITERAL = @"\u0020*";
+        #endregion
+
+        private static string tagPattern { get; } = NOT_ESCAPED + BEGIN_TAG + OPTIONAL_SPACE_LITERAL + WORD_CAPTURE + OPTIONAL_SPACE_LITERAL + END_TAG;
+        public static Regex TagRegex { get; } = new Regex(tagPattern, RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
+
+        private static string fieldPattern { get; } = NOT_ESCAPED + WORD_CAPTURE + FIELD_END;
+        public static Regex FieldRegex { get; } = new Regex(fieldPattern, RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
+
+        // auto-pad numbers to 8 char.s. This will match int.s and dates (yyyyMMdd)
+        //   positive look behind: beginning  space  {  [  :
+        //   positive look ahead: end  space  ]  }
+        public static Regex NumbersRegex { get; } = new Regex(@"(?<=^|\s|\{|\[|:)(\d+\.?\d*)(?=$|\s|\]|\})", RegexOptions.Compiled);
+
+        /// <summary>
+        /// proper bools are single keywords which are turned into keyword:True
+        /// if bordered by colons or inside brackets, they are not stand-alone bool keywords
+        /// the negative lookbehind and lookahead patterns prevent bugs where a bool keyword is also a user-defined tag:
+        ///   [israted]
+        ///     parseTag => tags:israted
+        ///     replaceBools => tags:israted:True
+        ///   or
+        ///     [israted]
+        ///       replaceBools => israted:True
+        ///         parseTag => [israted:True]
+        /// also don't want to apply :True where the value already exists:
+        ///   israted:false => israted:false:True
+        ///   
+        /// despite using parans, lookahead and lookbehind are zero-length assertions which do not capture. therefore the bool search keyword is still $1 since it's the first and only capture
+        /// </summary>
+        private static string boolPattern_parameterized { get; }
+            = @"
+### IMPORTANT: 'ignore whitespace' is only partially honored in character sets
+### - new lines are ok
+### - ANY leading whitespace is treated like actual matching spaces  :(
+
+                    ### can't begin with colon. incorrect syntax
+                    ### can't begin with open bracket: this signals the start of a tag
+(?<!                # begin negative lookbehind
+  [:\[]             #   char set: colon and open bracket, escaped
+  \s*               #   optional space
+)                   # end negative lookbehind
+
+\b                  # word boundary
+  ({0})             #   captured bool search keyword. this is the $1 reference used in regex.Replace
+\b                  # word boundary
+
+                    ### can't end with colon. this signals that the bool's value already exists
+                    ### can't begin with close bracket: this signals the end of a tag
+(?!                 # begin negative lookahead
+  \s*               #   optional space
+  [:\]]             #   char set: colon and close bracket, escaped
+)                   # end negative lookahead
+";
+        private static Dictionary<string, Regex> boolRegexDic { get; } = new Dictionary<string, Regex>();
+        public static Regex GetBoolRegex(string boolSearch)
+        {
+            if (boolRegexDic.TryGetValue(boolSearch, out var regex))
+                return regex;
+
+            var boolPattern = string.Format(boolPattern_parameterized, boolSearch);
+            regex = new Regex(boolPattern, RegexOptions.IgnorePatternWhitespace | RegexOptions.IgnoreCase | RegexOptions.Compiled);
+            boolRegexDic.Add(boolSearch, regex);
+
+            return regex;
+        }
+    }
+}

LibationSearchEngine/SearchEngine.cs

@@ -26,9 +26,16 @@ namespace LibationSearchEngine
 
         public const string _ID_ = "_ID_";
         public const string TAGS = "tags";
+        // special field for each book which includes all major parts of the book's metadata. enables non-targetting searching
         public const string ALL = "all";
 
-        private static ReadOnlyDictionary<string, Func<LibraryBook, string>> idIndexRules { get; }
+        // the workaround which allows displaying all books when query is empty
+        public const string ALL_QUERY = "*:*";
+
+        public SearchEngine(LibationContext context) => this.context = context;
+
+		#region index rules
+		private static ReadOnlyDictionary<string, Func<LibraryBook, string>> idIndexRules { get; }
             = new ReadOnlyDictionary<string, Func<LibraryBook, string>>(
                 new Dictionary<string, Func<LibraryBook, string>>
                 {
@@ -38,6 +45,7 @@ namespace LibationSearchEngine
                     ["ASIN"] = lb => lb.Book.AudibleProductId
                 }
                 );
+
         private static ReadOnlyDictionary<string, Func<LibraryBook, string>> stringIndexRules { get; }
             = new ReadOnlyDictionary<string, Func<LibraryBook, string>>(
                 new Dictionary<string, Func<LibraryBook, string>>
@@ -98,6 +106,7 @@ namespace LibationSearchEngine
                     ["MyRating"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating.ToLuceneString()
                 }
                 );
+
         private static ReadOnlyDictionary<string, Func<LibraryBook, bool>> boolIndexRules { get; }
             = new ReadOnlyDictionary<string, Func<LibraryBook, bool>>(
                 new Dictionary<string, Func<LibraryBook, bool>>
@@ -114,16 +123,17 @@ namespace LibationSearchEngine
                     ["IsRated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
                     ["Rated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
 
-                    ["IsAuthorNarrated"] = lb => isAuthorNarrated(lb),
-                    ["AuthorNarrated"] = lb => isAuthorNarrated(lb),
+                    ["IsAuthorNarrated"] = isAuthorNarrated,
+                    ["AuthorNarrated"] = isAuthorNarrated,
 
                     [nameof(Book.IsAbridged)] = lb => lb.Book.IsAbridged,
                     ["Abridged"] = lb => lb.Book.IsAbridged,
 
                     // this will only be evaluated at time of re-index. ie: state of files moved later will be out of sync until next re-index
-                    ["IsLiberated"] = lb => AudibleFileStorage.Audio.Exists(lb.Book.AudibleProductId),
-                    ["Liberated"] = lb => AudibleFileStorage.Audio.Exists(lb.Book.AudibleProductId),
-                });
+                    ["IsLiberated"] = lb => isLiberated(lb.Book.AudibleProductId),
+                    ["Liberated"] = lb => isLiberated(lb.Book.AudibleProductId),
+                }
+                );
 
         private static bool isAuthorNarrated(LibraryBook lb)
         {
@@ -132,6 +142,8 @@ namespace LibationSearchEngine
             return authors.Intersect(narrators).Any();
         }
 
+        private static bool isLiberated(string id) => AudibleFileStorage.Audio.Exists(id);
+
         // use these common fields in the "all" default search field
         private static IEnumerable<Func<LibraryBook, string>> allFieldIndexRules { get; }
             = new List<Func<LibraryBook, string>>
@@ -141,8 +153,10 @@ namespace LibationSearchEngine
                 stringIndexRules[nameof(Book.AuthorNames)],
                 stringIndexRules[nameof(Book.NarratorNames)]
             };
+		#endregion
 
-        public static IEnumerable<string> GetSearchIdFields()
+		#region get search fields. used for display in help
+		public static IEnumerable<string> GetSearchIdFields()
         {
             foreach (var key in idIndexRules.Keys)
                 yield return key;
@@ -177,11 +191,13 @@ namespace LibationSearchEngine
             foreach (var key in numberIndexRules.Keys)
                 yield return key;
         }
+		#endregion
 
-        private Directory getIndex() => FSDirectory.Open(SearchEngineDirectory);
-
-        public SearchEngine(LibationContext context) => this.context = context;
-
+		#region create and update index
+        /// <summary>
+        /// create new. ie: full re-index
+        /// </summary>
+        /// <param name="overwrite"></param>
         public void CreateNewIndex(bool overwrite = true)
         {
             // 300 products
@@ -215,6 +231,22 @@ namespace LibationSearchEngine
             log();
         }
 
+		/// <summary>Long running. Use await Task.Run(() => UpdateBook(productId))</summary>
+		public void UpdateBook(string productId)
+        {
+            var libraryBook = context.GetLibraryBook_Flat_NoTracking(productId);
+            var term = new Term(_ID_, productId);
+
+            var document = createBookIndexDocument(libraryBook);
+            var createNewIndex = false;
+
+			using var index = getIndex();
+			using var analyzer = new StandardAnalyzer(Version);
+			using var ixWriter = new IndexWriter(index, analyzer, createNewIndex, IndexWriter.MaxFieldLength.UNLIMITED);
+			ixWriter.DeleteDocuments(term);
+			ixWriter.AddDocument(document);
+		}
+
         private static Document createBookIndexDocument(LibraryBook libraryBook)
         {
             var doc = new Document();
@@ -252,77 +284,100 @@ namespace LibationSearchEngine
             return doc;
         }
 
-		/// <summary>Long running. Use await Task.Run(() => UpdateBook(productId))</summary>
-		public void UpdateBook(string productId)
-        {
-            var libraryBook = context.GetLibraryBook_Flat_NoTracking(productId);
-            var term = new Term(_ID_, productId);
+        // update single document entry
+        // all fields, including 'tags' are case-specific
+        public void UpdateTags(string productId, string tags) => updateAnalyzedField(productId, TAGS, tags);
 
-            var document = createBookIndexDocument(libraryBook);
-            var createNewIndex = false;
+        // all fields are case-specific
+        private static void updateAnalyzedField(string productId, string fieldName, string newValue)
+            => updateDocument(
+                productId,
+                d =>
+                {
+                    // fields are key value pairs. MULTIPLE FIELDS CAN POTENTIALLY HAVE THE SAME KEY.
+                    // ie: must remove old before adding new else will create unwanted duplicates.
+                    d.RemoveField(fieldName);
+                    d.AddAnalyzed(fieldName, newValue);
+                });
 
-			using var index = getIndex();
-			using var analyzer = new StandardAnalyzer(Version);
-			using var ixWriter = new IndexWriter(index, analyzer, createNewIndex, IndexWriter.MaxFieldLength.UNLIMITED);
-			ixWriter.DeleteDocuments(term);
-			ixWriter.AddDocument(document);
-		}
+        // update single document entry
+        public void UpdateIsLiberated(string productId)
+            => updateDocument(
+                productId,
+                d =>
+                {
+                    // fields are key value pairs. MULTIPLE FIELDS CAN POTENTIALLY HAVE THE SAME KEY.
+                    // ie: must remove old before adding new else will create unwanted duplicates.
+                    var v = isLiberated(productId);
+                    d.RemoveField("IsLiberated");
+                    d.AddBool("IsLiberated", v);
+                    d.RemoveField("Liberated");
+                    d.AddBool("Liberated", v);
+                });
 
-        public void UpdateTags(string productId, string tags)
+        private static void updateDocument(string productId, Action<Document> action)
         {
             var productTerm = new Term(_ID_, productId);
 
-			using var index = getIndex();
+            using var index = getIndex();
 
-			// get existing document
-			using var searcher = new IndexSearcher(index);
-			var query = new TermQuery(productTerm);
-			var docs = searcher.Search(query, 1);
-			var scoreDoc = docs.ScoreDocs.SingleOrDefault();
-			if (scoreDoc == null)
-				throw new Exception("document not found");
-			var document = searcher.Doc(scoreDoc.Doc);
+            // get existing document
+            using var searcher = new IndexSearcher(index);
+            var query = new TermQuery(productTerm);
+            var docs = searcher.Search(query, 1);
+            var scoreDoc = docs.ScoreDocs.SingleOrDefault();
+            if (scoreDoc == null)
+                throw new Exception("document not found");
+            var document = searcher.Doc(scoreDoc.Doc);
 
 
-			// update document entry with new tags
-			// fields are key value pairs and MULTIPLE FIELDS CAN HAVE THE SAME KEY. must remove old before adding new
-			// REMEMBER: all fields, including 'tags' are case-specific
-			document.RemoveField(TAGS);
-			document.AddAnalyzed(TAGS, tags);
+            // perform update
+            action(document);
 
-			// update index
-			var createNewIndex = false;
-			using var analyzer = new StandardAnalyzer(Version);
-			using var ixWriter = new IndexWriter(index, analyzer, createNewIndex, IndexWriter.MaxFieldLength.UNLIMITED);
-			ixWriter.UpdateDocument(productTerm, document, analyzer);
-		}
 
+            // update index
+            var createNewIndex = false;
+            using var analyzer = new StandardAnalyzer(Version);
+            using var ixWriter = new IndexWriter(index, analyzer, createNewIndex, IndexWriter.MaxFieldLength.UNLIMITED);
+            ixWriter.UpdateDocument(productTerm, document, analyzer);
+        }
+		#endregion
+
+		#region search
         public SearchResultSet Search(string searchString)
         {
-            if (string.IsNullOrWhiteSpace(searchString))
-                searchString = "*:*";
+            Serilog.Log.Logger.Debug("original search string: {@DebugInfo}", new { searchString });
+            searchString = FormatSearchQuery(searchString);
+            Serilog.Log.Logger.Debug("formatted search string: {@DebugInfo}", new { searchString });
 
-            #region apply formatting
-            searchString = parseTag(searchString);
+            var results = generalSearch(searchString);
+            Serilog.Log.Logger.Debug("Hit(s): {@DebugInfo}", new { count = results.Docs.Count() });
+            displayResults(results);
+
+            return results;
+        }
+
+        public static string FormatSearchQuery(string searchString)
+        {
+            if (string.IsNullOrWhiteSpace(searchString))
+                return ALL_QUERY;
 
             searchString = replaceBools(searchString);
 
+            searchString = parseTag(searchString);
+
             // in ranges " TO " must be uppercase
             searchString = searchString.Replace(" to ", " TO ");
 
             searchString = padNumbers(searchString);
 
             searchString = lowerFieldNames(searchString);
-            #endregion
 
-            var results = generalSearch(searchString);
-
-            displayResults(results);
-
-            return results;
+            return searchString;
         }
 
-        private static string parseTag(string tagSearchString)
+		#region format query string
+		private static string parseTag(string tagSearchString)
         {
             var allMatches = LuceneRegex
                 .TagRegex
@@ -341,9 +396,10 @@ namespace LibationSearchEngine
 
         private static string replaceBools(string searchString)
         {
-            // negative look-ahead for optional spaces then colon. don't want to double-up. eg:"israted:false" => "israted:false:True"
             foreach (var boolSearch in boolIndexRules.Keys)
-                searchString = Regex.Replace(searchString, $@"\b({boolSearch})\b(?!\s*:)", @"$1:True", RegexOptions.IgnoreCase);
+                searchString =
+                    LuceneRegex.GetBoolRegex(boolSearch)
+                    .Replace(searchString, @"$1:True");
 
             return searchString;
         }
@@ -380,13 +436,10 @@ namespace LibationSearchEngine
 
             return searchString;
         }
-
-        public int MaxSearchResultsToReturn { get; set; } = 999;
+        #endregion
 
         private SearchResultSet generalSearch(string searchString)
         {
-            Console.WriteLine($"searchString: {searchString}");
-
             var defaultField = ALL;
 
 			using var index = getIndex();
@@ -407,14 +460,14 @@ namespace LibationSearchEngine
 					boolQuery.Add(new MatchAllDocsQuery(), Occur.MUST);
 			}
 
-			Console.WriteLine($"  query: {query}");
-
 			var docs = searcher
-				.Search(query, MaxSearchResultsToReturn)
+				.Search(query, searcher.MaxDoc + 1)
 				.ScoreDocs
 				.Select(ds => new ScoreDocExplicit(searcher.Doc(ds.Doc), ds.Score))
 				.ToList();
-			return new SearchResultSet(query.ToString(), docs);
+            var queryString = query.ToString();
+            Serilog.Log.Logger.Debug("query: {@DebugInfo}", new { queryString });
+			return new SearchResultSet(queryString, docs);
 		}
 
         private IEnumerable<Occur> getOccurs_recurs(BooleanQuery query)
@@ -434,7 +487,6 @@ namespace LibationSearchEngine
 
         private void displayResults(SearchResultSet docs)
         {
-            Console.WriteLine($"Hit(s): {docs.Docs.Count()}");
             //for (int i = 0; i < docs.Docs.Count(); i++)
             //{
             //    var sde = docs.Docs.First();
@@ -442,13 +494,14 @@ namespace LibationSearchEngine
             //    Document doc = sde.Doc;
             //    float score = sde.Score;
 
-            //    Console.WriteLine($"{(i + 1)}) score={score}. Fields:");
+            //    Serilog.Log.Logger.Debug($"{(i + 1)}) score={score}. Fields:");
             //    var allFields = doc.GetFields();
             //    foreach (var f in allFields)
-            //        Console.WriteLine($"   [{f.Name}]={f.StringValue}");
+            //        Serilog.Log.Logger.Debug($"   [{f.Name}]={f.StringValue}");
             //}
-
-            //Console.WriteLine();
         }
+		#endregion
+
+		private static Directory getIndex() => FSDirectory.Open(SearchEngineDirectory);
     }
 }