If no codec during download, retry with all library flags enabled

increase version
- Increase account privacy in logs
2026-01-03 19:37:56 -05:00 · 2020-12-16 11:19:12 -05:00 · 2020-12-14 15:56:30 -05:00 · 2020-12-14 15:42:27 -05:00 · 2020-12-08 16:16:16 -05:00 · 2020-12-03 10:58:45 -05:00
19 changed files with 33 additions and 29 deletions
--- a/AaxDecrypter/AaxDecrypter.csproj
+++ b/AaxDecrypter/AaxDecrypter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/ApplicationServices/ApplicationServices.csproj
+++ b/ApplicationServices/ApplicationServices.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="15.0.6" />
+    <PackageReference Include="CsvHelper" Version="16.0.0" />
    <PackageReference Include="NPOI" Version="2.5.1" />
  </ItemGroup>

--- a/ApplicationServices/UNTESTED/LibraryCommands.cs
+++ b/ApplicationServices/UNTESTED/LibraryCommands.cs
@@ -81,16 +81,13 @@ namespace ApplicationServices
 		{
 			ArgumentValidator.EnsureNotNull(account, nameof(account));

-			var localeName = account.Locale?.Name;
 			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
 			{
-				AccountName = account.AccountName.ToMask(),
-				AccountId = account.AccountId.ToMask(),
-				LocaleName = localeName,
+				Account = account?.MaskedLogEntry ?? "[null]"
 			});

 			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
-			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = localeName }).ToList();
+			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
 		}

 		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
--- a/DataLayer/DataLayer.csproj
+++ b/DataLayer/DataLayer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <PropertyGroup>
@@ -12,13 +12,13 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/DtoImporterService/DtoImporterService.csproj
+++ b/DtoImporterService/DtoImporterService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/FileLiberator/FileLiberator.csproj
+++ b/FileLiberator/FileLiberator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/FileLiberator/UNTESTED/DownloadBook.cs
+++ b/FileLiberator/UNTESTED/DownloadBook.cs
@@ -72,7 +72,7 @@ namespace FileLiberator
 				libraryBook.Book.Title,
 				libraryBook.Book.AudibleProductId,
 				libraryBook.Book.Locale,
-				libraryBook.Account,
+				Account = libraryBook.Account?.ToMask() ?? "[empty]",
 				tempAaxFilename,
 				actualFilePath,
 				length,
--- a/FileLiberator/UNTESTED/IProcessableExt.cs
+++ b/FileLiberator/UNTESTED/IProcessableExt.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using ApplicationServices;
 using DataLayer;
+using Dinah.Core;
 using Dinah.Core.ErrorHandling;

 namespace FileLiberator
@@ -51,7 +52,7 @@ namespace FileLiberator
                libraryBook.Book.Title,
                libraryBook.Book.AudibleProductId,
                libraryBook.Book.Locale,
-                libraryBook.Account
+                Account = libraryBook.Account?.ToMask() ?? "[empty]"
            });

            // this should never happen. check anyway. ProcessFirstValidAsync returning null is the signal that we're done. we can't let another IProcessable accidentally send this command
--- a/FileManager/FileManager.csproj
+++ b/FileManager/FileManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/InternalUtilities/Account.cs
+++ b/InternalUtilities/Account.cs
@@ -93,5 +93,11 @@ namespace InternalUtilities
 		}

 		public override string ToString() => $"{AccountId} - {Locale?.Name ?? "[empty]"}";
+
+		public string MaskedLogEntry => @$"AccountId={mask(AccountId)}|AccountName={mask(AccountName)}|Locale={Locale?.Name ?? "[empty]"}";
+		private static string mask(string str)
+			=> str is null ? "[null]"
+			: str == string.Empty ? "[empty]"
+			: str.ToMask();
 	}
 }
--- a/InternalUtilities/InternalUtilities.csproj
+++ b/InternalUtilities/InternalUtilities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/InternalUtilities/UNTESTED/AudibleApiActions.cs
+++ b/InternalUtilities/UNTESTED/AudibleApiActions.cs
@@ -32,7 +32,7 @@ namespace InternalUtilities
 		{
 			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
 			{
-				AccountId = account?.AccountId.ToMask() ?? "[empty]",
+				Account = account?.MaskedLogEntry ?? "[null]",
 				LocaleName = account?.Locale?.Name
 			});
 			return EzApiCreator.GetApiAsync(
--- a/LibationLauncher/LibationLauncher.csproj
+++ b/LibationLauncher/LibationLauncher.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
    <UseWindowsForms>true</UseWindowsForms>
    <ApplicationIcon>libation.ico</ApplicationIcon>
    <AssemblyName>Libation</AssemblyName>
@@ -13,7 +13,7 @@
    <!-- <PublishSingleFile>true</PublishSingleFile> -->
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>

-    <Version>4.0.13.4</Version>
+    <Version>4.1.4.1</Version>
  </PropertyGroup>

  <ItemGroup>
--- a/LibationSearchEngine/LibationSearchEngine.csproj
+++ b/LibationSearchEngine/LibationSearchEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/LibationWinForms/LibationWinForms.csproj
+++ b/LibationWinForms/LibationWinForms.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
    <UseWindowsForms>true</UseWindowsForms>
    <ApplicationIcon>libation.ico</ApplicationIcon>

--- a/WindowsDesktopUtilities/WindowsDesktopUtilities.csproj
+++ b/WindowsDesktopUtilities/WindowsDesktopUtilities.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
    <UseWindowsForms>true</UseWindowsForms>
    <ApplicationIcon />
    <StartupObject />
--- a/decrypt.csproj
+++ b/decrypt.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
    <RootNamespace>ffmpeg_decrypt</RootNamespace>
    <UseWindowsForms>true</UseWindowsForms>
  </PropertyGroup>
--- a/_Demos/inAudibleLite/inAudibleLite.csproj
+++ b/_Demos/inAudibleLite/inAudibleLite.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
    <UseWindowsForms>true</UseWindowsForms>
  </PropertyGroup>

--- a/_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj
+++ b/_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>

    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
    <PackageReference Include="coverlet.collector" Version="1.3.0">
Author	SHA1	Message	Date
Robert McRackan	0e2469db64	If no codec during download, retry with all library flags enabled	2020-12-16 11:19:12 -05:00
Robert McRackan	9aa4ef70af	increase version	2020-12-14 15:56:30 -05:00
Robert McRackan	1812fc2c7c	- Increase account privacy in logs - Improve book download retry	2020-12-14 15:42:27 -05:00
Robert McRackan	f9849abb7b	Better error logging when codecs are not known	2020-12-08 16:16:16 -05:00
Robert McRackan	9cfe8ee6ca	bug fix: null ref exception	2020-12-03 10:58:45 -05:00
Robert McRackan	44e2cef18c	New in v4.1.0 - upgrade all to .NET5 - bug fix: when codec doesn't appear in prioritized list, just get the 1st available - add more account privacy in logs	2020-12-02 15:23:08 -05:00
Robert McRackan	4dc29affc3	Incl. audible api bug fix. Also add more account privacy in logs	2020-12-02 15:16:48 -05:00
Robert McRackan	2df38706f7	upgrade to .NET5	2020-11-18 09:32:15 -05:00
Robert McRackan	f30e9dae6f	bug fix: include new ApprovalNeeded in enumeration singletons	2020-10-08 22:20:26 -04:00