Bug fix: downloading PDFs without also Liberating books -- post-download verification step was failing

FileLiberator/UNTESTED/DownloadBook.cs

@@ -45,7 +45,7 @@ namespace FileLiberator
 		{
 			validate(libraryBook);
 
-			var api = await AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
+			var api = await GetApiAsync(libraryBook);
 
 			var actualFilePath = await PerformDownloadAsync(
 				tempAaxFilename,

FileLiberator/UNTESTED/DownloadPdf.cs

@@ -31,17 +31,24 @@ 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)
 		{
-			var downloadUrl = getdownloadUrl(libraryBook);
+			var api = await GetApiAsync(libraryBook);
+			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
 			var client = new HttpClient();
 			var actualDownloadedFilePath = await PerformDownloadAsync(

FileLiberator/UNTESTED/DownloadableBase.cs

@@ -38,6 +38,9 @@ namespace FileLiberator
             }
         }
 
+		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
+			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
+
 		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
 		{
 			var progress = new Progress<DownloadProgress>();

LibationLauncher/LibationLauncher.csproj

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

LibationWinForms/LibationWinForms.csproj

@@ -27,9 +27,7 @@
     <Compile Update="UNTESTED\Dialogs\LibationFilesDialog.Designer.cs">
       <DependentUpon>LibationFilesDialog.cs</DependentUpon>
     </Compile>
-    <Compile Update="UNTESTED\Dialogs\ScanAccountsDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Update="UNTESTED\Dialogs\ScanAccountsDialog.cs" />
     <Compile Update="UNTESTED\Dialogs\ScanAccountsDialog.Designer.cs">
       <DependentUpon>ScanAccountsDialog.cs</DependentUpon>
     </Compile>

LibationWinForms/UNTESTED/BookLiberation/DownloadForm.cs

@@ -17,15 +17,15 @@ namespace LibationWinForms.BookLiberation
         // thread-safe UI updates
         public void UpdateFilename(string title) => filenameLbl.UIThread(() => filenameLbl.Text = title);
 
-        public void DownloadProgressChanged(long BytesReceived, long TotalBytesToReceive)
+        public void DownloadProgressChanged(long BytesReceived, long? TotalBytesToReceive)
         {
             // this won't happen with download file. it will happen with download string
-            if (TotalBytesToReceive < 0)
+            if (!TotalBytesToReceive.HasValue || TotalBytesToReceive.Value <= 0)
                 return;
 
-            progressLbl.UIThread(() => progressLbl.Text = $"{BytesReceived:#,##0} of {TotalBytesToReceive:#,##0}");
+            progressLbl.UIThread(() => progressLbl.Text = $"{BytesReceived:#,##0} of {TotalBytesToReceive.Value:#,##0}");
 
-            var d = double.Parse(BytesReceived.ToString()) / double.Parse(TotalBytesToReceive.ToString()) * 100.0;
+            var d = double.Parse(BytesReceived.ToString()) / double.Parse(TotalBytesToReceive.Value.ToString()) * 100.0;
             var i = int.Parse(Math.Truncate(d).ToString());
             progressBar1.UIThread(() => progressBar1.Value = i);
 

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.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.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.Information("Begin " + nameof(BackupAllPdfsAsync));
+
             var downloadPdf = getWiredUpDownloadPdf(completedAction);
 
             var automatedBackupsForm = attachToBackupsForm(downloadPdf);
@@ -126,7 +132,7 @@ namespace LibationWinForms.BookLiberation
                 downloadDialog.UpdateFilename(str);
                 downloadDialog.Show();
             };
-            downloadFile.DownloadProgressChanged += (_, progress) => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive.Value);
+            downloadFile.DownloadProgressChanged += (_, progress) => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive);
             downloadFile.DownloadCompleted += (_, __) => downloadDialog.Close();
 
             await downloadFile.PerformDownloadFileAsync(url, destination);
@@ -161,7 +167,7 @@ namespace LibationWinForms.BookLiberation
             void fileDownloadCompleted(object _, string __) => downloadDialog.Close();
 
             void downloadProgressChanged(object _, Dinah.Core.Net.Http.DownloadProgress progress)
-                => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive.Value);
+                => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive);
 
             void unsubscribe(object _ = null, EventArgs __ = null)
             {

README.md

@@ -14,6 +14,7 @@
     - [Download your books -- DRM-free!](#download-your-books----drm-free)
     - [Download PDF attachments](#download-pdf-attachments)
     - [Details of downloaded files](#details-of-downloaded-files)
+    - [Export your library](#export-your-library)
 3. [Searching and filtering](#searching-and-filtering)
     - [Tags](#tags)
     - [Searches](#searches)
@@ -144,6 +145,12 @@ When you set up Libation, you'll specify a Books directory. Libation looks insid
 * .cue: this is a file which logs where chapter breaks occur. Many tools are able to use this if you want to split your book into files along chapter lines.
 * .nfo: This is just some general info about the book and includes some technical stats about the audiofile.
 
+### Export your library
+
+![Export](images/Export.png)
+
+Export your library to Excel, CSV, or JSON
+
 ## Searching and filtering
 
 ### Tags