From 8231766d2c94fedb8e3c951a0b2e04de9049fefb Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Mon, 21 Jun 2021 10:07:30 -0600 Subject: [PATCH] Fixed typo and removed unused method. --- FileLiberator/DownloadBook.cs | 43 ++--------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/FileLiberator/DownloadBook.cs b/FileLiberator/DownloadBook.cs index 6b3dba91..7ef272d2 100644 --- a/FileLiberator/DownloadBook.cs +++ b/FileLiberator/DownloadBook.cs @@ -30,7 +30,7 @@ namespace FileLiberator public override async Task ProcessItemAsync(LibraryBook libraryBook) { var tempAaxFilename = getDownloadPath(libraryBook); - var actualFilePath = await downloadAacxBookAsync(libraryBook, tempAaxFilename); + var actualFilePath = await downloadAaxcBookAsync(libraryBook, tempAaxFilename); moveBook(libraryBook, actualFilePath); return verifyDownload(libraryBook); } @@ -41,7 +41,7 @@ namespace FileLiberator libraryBook.Book.Title, "aax", libraryBook.Book.AudibleProductId); - private async Task downloadAacxBookAsync(LibraryBook libraryBook, string tempAaxFilename) + private async Task downloadAaxcBookAsync(LibraryBook libraryBook, string tempAaxFilename) { validate(libraryBook); @@ -88,45 +88,6 @@ namespace FileLiberator }); throw ex; } - private async Task downloadBookAsync(LibraryBook libraryBook, string tempAaxFilename) - { - validate(libraryBook); - - var api = await GetApiAsync(libraryBook); - - var actualFilePath = await PerformDownloadAsync( - tempAaxFilename, - (p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p)); - - 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 - 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.Logger.Error(ex, "Download error {@DebugInfo}", new - { - libraryBook.Book.Title, - libraryBook.Book.AudibleProductId, - libraryBook.Book.Locale, - Account = libraryBook.Account?.ToMask() ?? "[empty]", - tempAaxFilename, - actualFilePath, - length, - contents - }); - throw ex; - } private static void validate(LibraryBook libraryBook) {