Merge pull request #80 from Mbucari/master

Fixed AAXC not downloading.

ApplicationServices/LibraryExporter.cs

@@ -88,6 +88,15 @@ namespace ApplicationServices
 
 		[Name("My Libation Tags")]
 		public string MyLibationTags { get; set; }
+
+		[Name("Book Liberation Status")]
+		public string BookStatus { get; set; }
+
+		[Name("Book File Location")]
+		public string BookLocation { get; set; }
+
+		[Name("PDF Liberation Status")]
+		public string PdfStatus { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -116,7 +125,10 @@ namespace ApplicationServices
 				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
 				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
 				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
-				MyLibationTags = a.Book.UserDefinedItem.Tags
+				MyLibationTags = a.Book.UserDefinedItem.Tags,
+				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
+				BookLocation = a.Book.UserDefinedItem.BookLocation,
+				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString()
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -187,7 +199,10 @@ namespace ApplicationServices
 				nameof (ExportDto.MyRatingOverall),
 				nameof (ExportDto.MyRatingPerformance),
 				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags)
+				nameof (ExportDto.MyLibationTags),
+				nameof (ExportDto.BookStatus),
+				nameof (ExportDto.BookLocation),
+				nameof (ExportDto.PdfStatus)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -249,6 +264,9 @@ namespace ApplicationServices
 				col = createCell(row, col, dto.MyRatingStory);
 
 				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
+				row.CreateCell(col++).SetCellValue(dto.BookStatus);
+				row.CreateCell(col++).SetCellValue(dto.BookLocation);
+				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 
 				rowIndex++;
 			}

FileLiberator/DownloadDecryptBook.cs

@@ -78,7 +78,7 @@ namespace FileLiberator
                     contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
                     contentLic?.Voucher?.Key,
                     contentLic?.Voucher?.Iv,
-                    Resources.UserAgent
+                    "Audible/671 CFNetwork/1240.0.4 Darwin/20.6.0"
                     );
 
                 if (Configuration.Instance.AllowLibationFixup)

FileManager/BackgroundFileSystem.cs

@@ -22,6 +22,8 @@ namespace FileManager
 
         public string FindFile(string regexPattern, RegexOptions options)
         {
+            if (fsCache is null) return null;
+
             lock (fsCache)
             {
                 return fsCache.FirstOrDefault(s => Regex.IsMatch(s, regexPattern, options));

LibationLauncher/LibationLauncher.csproj

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