Improved logging

AaxDecrypter/UNTESTED/AaxToM4bConverter.cs

@@ -293,14 +293,14 @@ namespace AaxDecrypter
 
         public bool Step3_Chapterize()
         {
-            string str1 = "";
+            var str1 = "";
             if (chapters.FirstChapterStart != 0.0)
             {
                 str1 = " -ss " + chapters.FirstChapterStart.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + (chapters.LastChapterStart - 1.0).ToString("0.000", CultureInfo.InvariantCulture) + " ";
             }
 
-            string ffmpegTags = tags.GenerateFfmpegTags();
-            string ffmpegChapters = chapters.GenerateFfmpegChapters();
+            var ffmpegTags = tags.GenerateFfmpegTags();
+            var ffmpegChapters = chapters.GenerateFfmpegChapters();
             File.WriteAllText(ff_txt_file, ffmpegTags + ffmpegChapters);
 
             var tagAndChapterInfo = new ProcessStartInfo

AaxDecrypter/UNTESTED/Chapters.cs

@@ -17,10 +17,10 @@ namespace AaxDecrypter
 
         public Chapters(string file, double totalTime)
         {
-            this.markers = getAAXChapters(file);
+            markers = getAAXChapters(file);
 
             // add end time
-            this.markers.Add(totalTime);
+            markers.Add(totalTime);
         }
 
         private static List<double> getAAXChapters(string file)
@@ -42,7 +42,7 @@ namespace AaxDecrypter
         }
 
         // subtract 1 b/c end time marker is a real entry but isn't a real chapter
-        public int Count() => this.markers.Count - 1;
+        public int Count() => markers.Count - 1;
 
         public string GetCuefromChapters(string fileName)
         {
@@ -56,7 +56,7 @@ namespace AaxDecrypter
             {
                 var chapter = i + 1;
 
-                var timeSpan = TimeSpan.FromSeconds(this.markers[i]);
+                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");
@@ -78,8 +78,8 @@ namespace AaxDecrypter
             {
                 var chapter = i + 1;
 
-                var start = this.markers[i] * 1000.0;
-                var end = this.markers[i + 1] * 1000.0;
+                var start = markers[i] * 1000.0;
+                var end = markers[i + 1] * 1000.0;
                 var chapterName = chapter.ToString("D3");
 
                 stringBuilder.Append("[CHAPTER]\n");

AaxDecrypter/UNTESTED/Tags.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text;
 using TagLib;
 using TagLib.Mpeg4;
 using Dinah.Core;
@@ -23,52 +18,50 @@ namespace AaxDecrypter
         public string genre { get; }
         public TimeSpan duration { get; }
 
+        // input file
         public Tags(string file)
         {
-			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 ?? "[unknown]";
-			this.year = tagLibFile.Tag.Year.ToString();
-			this.comments = tagLibFile.Tag.Comment;
-			this.duration = tagLibFile.Properties.Duration;
-			this.genre = tagLibFile.Tag.FirstGenre;
+            using var tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
+			title = tagLibFile.Tag.Title.Replace(" (Unabridged)", "");
+			album = tagLibFile.Tag.Album.Replace(" (Unabridged)", "");
+			author = tagLibFile.Tag.FirstPerformer ?? "[unknown]";
+			year = tagLibFile.Tag.Year.ToString();
+			comments = tagLibFile.Tag.Comment ?? "";
+			duration = tagLibFile.Properties.Duration;
+			genre = tagLibFile.Tag.FirstGenre ?? "";
 
-			var tag = tagLibFile.GetTag(TagTypes.Apple, true);
-			this.publisher = tag.Publisher;
-			this.narrator = string.IsNullOrWhiteSpace(tagLibFile.Tag.FirstComposer) ? tag.Narrator : tagLibFile.Tag.FirstComposer;
-			this.comments = !string.IsNullOrWhiteSpace(tag.LongDescription) ? tag.LongDescription : tag.Description;
-			this.id = tag.AudibleCDEK;
+            var tag = tagLibFile.GetTag(TagTypes.Apple, true);
+			publisher = tag.Publisher ?? "";
+			narrator = string.IsNullOrWhiteSpace(tagLibFile.Tag.FirstComposer) ? tag.Narrator : tagLibFile.Tag.FirstComposer;
+			comments = !string.IsNullOrWhiteSpace(tag.LongDescription) ? tag.LongDescription : tag.Description;
+			id = tag.AudibleCDEK;
 		}
 
+        // my best guess of what this step is doing:
+        // re-publish the data we read from the input file => output file
         public void AddAppleTags(string file)
         {
-			using var file1 = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-			var tag = (AppleTag)file1.GetTag(TagTypes.Apple, true);
-			tag.Publisher = this.publisher;
-			tag.LongDescription = this.comments;
-			tag.Description = this.comments;
-			file1.Save();
+            using var tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
+            var tag = (AppleTag)tagLibFile.GetTag(TagTypes.Apple, true);
+			tag.Publisher = publisher;
+			tag.LongDescription = comments;
+			tag.Description = comments;
+            tagLibFile.Save();
 		}
 
         public string GenerateFfmpegTags()
-        {
-            StringBuilder stringBuilder = new StringBuilder();
-
-            stringBuilder.Append(";FFMETADATA1\n");
-            stringBuilder.Append("major_brand=aax\n");
-            stringBuilder.Append("minor_version=1\n");
-            stringBuilder.Append("compatible_brands=aax M4B mp42isom\n");
-            stringBuilder.Append("date=" + this.year + "\n");
-            stringBuilder.Append("genre=" + this.genre + "\n");
-            stringBuilder.Append("title=" + this.title + "\n");
-            stringBuilder.Append("artist=" + this.author + "\n");
-            stringBuilder.Append("album=" + this.album + "\n");
-            stringBuilder.Append("composer=" + this.narrator + "\n");
-            stringBuilder.Append("comment=" + this.comments.Truncate(254) + "\n");
-            stringBuilder.Append("description=" + this.comments + "\n");
-
-            return stringBuilder.ToString();
-        }
+            => $";FFMETADATA1"
+            + $"\nmajor_brand=aax"
+            + $"\nminor_version=1"
+            + $"\ncompatible_brands=aax M4B mp42isom"
+            + $"\ndate={year}"
+            + $"\ngenre={genre}"
+            + $"\ntitle={title}"
+            + $"\nartist={author}"
+            + $"\nalbum={album}"
+            + $"\ncomposer={narrator}"
+            + $"\ncomment={comments.Truncate(254)}"
+            + $"\ndescription={comments}"
+            + $"\n";
     }
 }

DtoImporterService/UNTESTED/BookImporter.cs

@@ -131,7 +131,18 @@ namespace DtoImporterService
 				foreach (var seriesEntry in item.Series)
 				{
 					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-					book.UpsertSeries(series, seriesEntry.Index);
+
+					var index = 0f;
+					try
+					{
+						index = seriesEntry.Index;
+					}
+					catch (Exception ex)
+					{
+						Serilog.Log.Logger.Error(ex, $"Error parsing series index. Title: {item.Title}. ASIN: {item.Asin}. Series index: {seriesEntry.Sequence}");
+					}
+
+					book.UpsertSeries(series, index);
 				}
 			}
 		}

FileLiberator/UNTESTED/DownloadBook.cs

@@ -18,6 +18,8 @@ namespace FileLiberator
     /// </summary>
     public class DownloadBook : DownloadableBase
     {
+		private const string SERVICE_UNAVAILABLE = "Content Delivery Companion Service is not available.";
+
         public override bool Validate(LibraryBook libraryBook)
             => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId)
             && !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId);
@@ -48,18 +50,29 @@ namespace FileLiberator
 			System.Threading.Thread.Sleep(100);
 			// if bad file download, a 0-33 byte file will be created
 			// if service unavailable, a 52 byte string will be saved as file
-			if (new FileInfo(actualFilePath).Length < 100)
+			var length = new FileInfo(actualFilePath).Length;
+
+			if (length > 100)
+				return actualFilePath;
+
+			var contents = File.ReadAllText(actualFilePath);
+			File.Delete(actualFilePath);
+
+			var exMsg = contents.StartsWithInsensitive(SERVICE_UNAVAILABLE)
+				? SERVICE_UNAVAILABLE
+				: "Error downloading file";
+
+			var ex = new Exception(exMsg);
+			Serilog.Log.Error(ex, "Download error {@DebugInfo}", new
 			{
-				var contents = File.ReadAllText(actualFilePath);
-				File.Delete(actualFilePath);
-
-				var unavailable = "Content Delivery Companion Service is not available.";
-				if (contents.StartsWithInsensitive(unavailable))
-					throw new Exception(unavailable);
-				throw new Exception("Error downloading file");
-			}
-
-			return actualFilePath;
+				libraryBook.Book.Title,
+				libraryBook.Book.AudibleProductId,
+				tempAaxFilename,
+				actualFilePath,
+				length,
+				contents
+			});
+			throw ex;
 		}
 
 		private void moveBook(LibraryBook libraryBook, string actualFilePath)

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>3.1.1.0</Version>
+    <Version>3.1.7.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

LibationLauncher/UNTESTED/Program.cs

@@ -244,10 +244,27 @@ namespace LibationLauncher
 
 		private static void logStartupState()
 		{
-			Log.Logger.Information("Begin Libation");
-			Log.Logger.Information($"Version: {BuildVersion}");
-			Log.Logger.Information($"LibationFiles: {Configuration.Instance.LibationFiles}");
-			Log.Logger.Information($"Audible locale: {Configuration.Instance.LocaleCountryCode}");
+			var config = Configuration.Instance;
+
+			Log.Logger.Information("Begin Libation. {@DebugInfo}", new
+			{
+				Version = BuildVersion.ToString(),
+
+				AudibleLocale = config.LocaleCountryCode,
+				config.LibationFiles,
+				AudibleFileStorage.BooksDirectory,
+
+				config.DownloadsInProgressEnum,
+				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
+				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
+
+				AudibleFileStorage.DownloadsFinal,
+				DownloadsFinalFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsFinal).Count(),
+
+				config.DecryptInProgressEnum,
+				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
+				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
+			});
 		}
 
 		private static Version BuildVersion => System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;

LibationSearchEngine/UNTESTED/SearchEngine.cs

@@ -105,14 +105,24 @@ namespace LibationSearchEngine
                     ["HasPDF"] = lb => lb.Book.Supplements.Any(),
                     ["PDFs"] = lb => lb.Book.Supplements.Any(),
                     ["PDF"] = lb => lb.Book.Supplements.Any(),
+
                     ["IsRated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
                     ["Rated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
-                    ["IsAuthorNarrated"] = lb => lb.Book.Authors.Intersect(lb.Book.Narrators).Any(),
-                    ["AuthorNarrated"] = lb => lb.Book.Authors.Intersect(lb.Book.Narrators).Any(),
+
+                    ["IsAuthorNarrated"] = lb => isAuthorNarrated(lb),
+                    ["AuthorNarrated"] = lb => isAuthorNarrated(lb),
+
                     [nameof(Book.IsAbridged)] = lb => lb.Book.IsAbridged,
                     ["Abridged"] = lb => lb.Book.IsAbridged,
                 });
 
+        private static bool isAuthorNarrated(LibraryBook lb)
+        {
+            var authors = lb.Book.Authors.Select(a => a.Name).ToArray();
+            var narrators = lb.Book.Narrators.Select(a => a.Name).ToArray();
+            return authors.Intersect(narrators).Any();
+        }
+
         // use these common fields in the "all" default search field
         private static IEnumerable<Func<LibraryBook, string>> allFieldIndexRules { get; }
             = new List<Func<LibraryBook, string>>

LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.Designer.cs

@@ -73,7 +73,7 @@
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(168, 52);
             this.label4.TabIndex = 3;
-            this.label4.Text = "BOOL FIELDS\r\n\r\nFind books that you haven\'t rated:\r\n     -IsRated";
+            this.label4.Text = "BOOLEAN (TRUE/FALSE) FIELDS\r\n\r\nFind books that you haven\'t rated:\r\n     -IsRated";
             // 
             // label5
             // 

LibationWinForms/UNTESTED/Form1.cs

@@ -129,18 +129,21 @@ namespace LibationWinForms
 
             // update bottom numbers
             var pending = noProgress + downloadedOnly;
-            var text
+            var statusStripText
                 = !results.Any() ? "No books. Begin by importing your library"
                 : pending > 0 ? string.Format(backupsCountsLbl_Format, noProgress, downloadedOnly, fullyBackedUp)
                 : $"All {"book".PluralizeWithCount(fullyBackedUp)} backed up";
-            statusStrip1.UIThread(() => backupsCountsLbl.Text = text);
 
             // update menu item
             var menuItemText
                 = pending > 0
                 ? $"{pending} remaining"
                 : "All books have been liberated";
-            Serilog.Log.Logger.Information(menuItemText);
+
+            Serilog.Log.Logger.Information("Book counts. {@DebugInfo}", new { fullyBackedUp, downloadedOnly, noProgress, pending, statusStripText, menuItemText });
+
+            // update UI
+            statusStrip1.UIThread(() => backupsCountsLbl.Text = statusStripText);
             menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
             menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
         }
@@ -155,18 +158,21 @@ namespace LibationWinForms
             var notDownloaded = boolResults.Count(r => !r);
 
             // update bottom numbers
-            var text
+            var statusStripText
                 = !boolResults.Any() ? ""
                 : notDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, notDownloaded, downloaded)
                 : $"|  All {downloaded} PDFs downloaded";
-            statusStrip1.UIThread(() => pdfsCountsLbl.Text = text);
 
             // update menu item
             var menuItemText
                 = notDownloaded > 0
                 ? $"{notDownloaded} remaining"
                 : "All PDFs have been downloaded";
-            Serilog.Log.Logger.Information(menuItemText);
+
+            Serilog.Log.Logger.Information("PDF counts. {@DebugInfo}", new { downloaded, notDownloaded, statusStripText, menuItemText });
+
+            // update UI
+            statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
             menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = notDownloaded > 0);
             menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
         }

REFERENCE.txt

@@ -1,6 +1,12 @@
 -- begin VERSIONING ---------------------------------------------------------------------------------------------------------------------
 https://github.com/rmcrackan/Libation/releases
 
+v3.1.7 : Improved logging
+v3.1.6 : Bugfix: some series indexes/sequences formats cause library not to import
+v3.1.5 : Bugfix: some series indexes/sequences could cause library not to import
+v3.1.4 : Bugfix: IsAuthorNarrated was returning no books
+v3.1.3 : fix weirdness with build number
+v3.1.2 : minor bug fixes
 v3.1.1 : Check if upgrade available on github
 v3.1.0 : FIRST PUBLIC RELEASE
 v3.1-beta.11 : Improved configuration and settings file management. Configurable logging