increm version

ApplicationServices/UNTESTED/LibraryCommands.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using DataLayer;
+using Dinah.Core;
 using DtoImporterService;
 using InternalUtilities;
 using Serilog;
@@ -61,13 +62,13 @@ namespace ApplicationServices
 
 		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
 		{
-			Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
 
 			var localeName = account.Locale?.Name;
 			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
 			{
-				account.AccountName,
-				account.AccountId,
+				AccountName = account.AccountName.ToMask(),
+				AccountId = account.AccountId.ToMask(),
 				LocaleName = localeName,
 			});
 

FileLiberator/UNTESTED/DownloadPdf.cs

@@ -31,12 +31,18 @@ namespace FileLiberator
 		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;
+			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
+			var file = getdownloadUrl(libraryBook);
 
-			return Path.Combine(destinationDir, Path.GetFileName(getdownloadUrl(libraryBook)));
+			if (existingPath != null)
+				return Path.Combine(existingPath, Path.GetFileName(file));
+
+			var full = FileUtility.GetValidFilename(
+				AudibleFileStorage.PDF.StorageDirectory,
+				libraryBook.Book.Title,
+				Path.GetExtension(file),
+				libraryBook.Book.AudibleProductId);
+			return full;
 		}
 
 		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)

FileLiberator/UNTESTED/IProcessableExt.cs

@@ -46,7 +46,7 @@ namespace FileLiberator
 
         private static async Task<StatusHandler> processBookAsync(IProcessable processable, LibraryBook libraryBook)
         {
-            Serilog.Log.Information("Begin " + nameof(processBookAsync) + " {@DebugInfo}", new
+            Serilog.Log.Logger.Information("Begin " + nameof(processBookAsync) + " {@DebugInfo}", new
             {
                 libraryBook.Book.Title,
                 libraryBook.Book.AudibleProductId,

InternalUtilities/UNTESTED/AudibleApiActions.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApiDTOs;
+using Dinah.Core;
 using Polly;
 using Polly.Retry;
 
@@ -16,7 +17,7 @@ namespace InternalUtilities
 		{
 			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
 			{
-				username,
+				Username = username.ToMask(),
 				LocaleName = localeName,
 			});
 			return EzApiCreator.GetApiAsync(
@@ -31,7 +32,7 @@ namespace InternalUtilities
 		{
 			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
 			{
-				AccountId = account?.AccountId ?? "[empty]",
+				AccountId = account?.AccountId.ToMask() ?? "[empty]",
 				LocaleName = account?.Locale?.Name
 			});
 			return EzApiCreator.GetApiAsync(

LibationLauncher/LibationLauncher.csproj

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

LibationWinForms/UNTESTED/BookLiberation/ProcessorAutomationController.cs

@@ -10,6 +10,8 @@ namespace LibationWinForms.BookLiberation
     {
         public static async Task BackupSingleBookAsync(string productId, EventHandler<LibraryBook> completedAction = null)
         {
+            Serilog.Log.Logger.Information("Begin " + nameof(BackupSingleBookAsync) + " {@DebugInfo}", new { productId });
+
             var backupBook = getWiredUpBackupBook(completedAction);
 
             var automatedBackupsForm = attachToBackupsForm(backupBook);
@@ -20,6 +22,8 @@ namespace LibationWinForms.BookLiberation
 
         public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
         {
+            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
+
             var backupBook = getWiredUpBackupBook(completedAction);
 
             var automatedBackupsForm = attachToBackupsForm(backupBook);
@@ -96,6 +100,8 @@ namespace LibationWinForms.BookLiberation
 
         public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
         {
+            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
+
             var downloadPdf = getWiredUpDownloadPdf(completedAction);
 
             var automatedBackupsForm = attachToBackupsForm(downloadPdf);

LibationWinForms/UNTESTED/Form1.cs

@@ -335,7 +335,7 @@ namespace LibationWinForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, "Error attempting to export library");
+                Serilog.Log.Logger.Error(ex, "Error attempting to export library");
                 MessageBox.Show("Error attempting to export your library. Error message:\r\n\r\n" + ex.Message, "Error exporting", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }