tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed typo and removed unused method.

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2021-06-21 10:07:30 -06:00
parent eedc9bb34d
commit 8231766d2c
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
FileLiberator/DownloadBook.cs
View File

@ -30,7 +30,7 @@ namespace FileLiberator
public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook) public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
{ {
var tempAaxFilename = getDownloadPath(libraryBook); var tempAaxFilename = getDownloadPath(libraryBook);
var actualFilePath = await downloadAacxBookAsync(libraryBook, tempAaxFilename); var actualFilePath = await downloadAaxcBookAsync(libraryBook, tempAaxFilename);
moveBook(libraryBook, actualFilePath); moveBook(libraryBook, actualFilePath);
return verifyDownload(libraryBook); return verifyDownload(libraryBook);
} }
@ -41,7 +41,7 @@ namespace FileLiberator
libraryBook.Book.Title, libraryBook.Book.Title,
"aax", "aax",
libraryBook.Book.AudibleProductId); libraryBook.Book.AudibleProductId);
private async Task<string> downloadAacxBookAsync(LibraryBook libraryBook, string tempAaxFilename) private async Task<string> downloadAaxcBookAsync(LibraryBook libraryBook, string tempAaxFilename)
{ {
validate(libraryBook); validate(libraryBook);
@ -88,45 +88,6 @@ namespace FileLiberator
}); });
throw ex; throw ex;
} }
private async Task<string> 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) private static void validate(LibraryBook libraryBook)
{ {