From 230b23dc8047d8c4b34abea7909c7346d2294a23 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Mon, 18 Jul 2022 22:15:11 -0400 Subject: [PATCH 1/5] on startup, log BetaOptIn --- Source/AppScaffolding/LibationScaffolding.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/AppScaffolding/LibationScaffolding.cs b/Source/AppScaffolding/LibationScaffolding.cs index 4a83cd38..c5ba959f 100644 --- a/Source/AppScaffolding/LibationScaffolding.cs +++ b/Source/AppScaffolding/LibationScaffolding.cs @@ -289,6 +289,7 @@ namespace AppScaffolding LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(), LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(), + config.BetaOptIn, config.LibationFiles, AudibleFileStorage.BooksDirectory, From 579536f65aa40f636524b80a78e261616da80ad2 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Tue, 19 Jul 2022 07:43:34 -0400 Subject: [PATCH 2/5] Revert: project publish => sln publish --- Source/AppScaffolding/AppScaffolding.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index bb39325d..27afd72d 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net6.0-windows - 8.2.1.1 + 8.2.2.1 From 4d84174ba6540a54fc00b4ad6d9e98f47799be1f Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Tue, 19 Jul 2022 08:19:03 -0400 Subject: [PATCH 3/5] AudibleApi: Make exceptions more flexible so that less logic is needed inside catch --- Source/AppScaffolding/AppScaffolding.csproj | 2 +- Source/ApplicationServices/ApplicationServices.csproj | 2 +- Source/AudibleUtilities/AudibleUtilities.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 27afd72d..ffa3d72c 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net6.0-windows - 8.2.2.1 + 8.2.3.1 diff --git a/Source/ApplicationServices/ApplicationServices.csproj b/Source/ApplicationServices/ApplicationServices.csproj index cb4528e5..439fc19f 100644 --- a/Source/ApplicationServices/ApplicationServices.csproj +++ b/Source/ApplicationServices/ApplicationServices.csproj @@ -5,7 +5,7 @@ - + diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj index 3ebae93c..c257130d 100644 --- a/Source/AudibleUtilities/AudibleUtilities.csproj +++ b/Source/AudibleUtilities/AudibleUtilities.csproj @@ -5,7 +5,7 @@ - + From 78186d49733bfca6947fd5bd150179bfc6c76829 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Tue, 19 Jul 2022 09:32:26 -0400 Subject: [PATCH 4/5] update dependencies --- Source/AppScaffolding/AppScaffolding.csproj | 2 +- Source/DataLayer/DataLayer.csproj | 6 +++--- Source/LibationFileManager/LibationFileManager.csproj | 2 +- Source/LibationWinForms/LibationWinForms.csproj | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index ffa3d72c..22a18bed 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -5,7 +5,7 @@ 8.2.3.1 - + diff --git a/Source/DataLayer/DataLayer.csproj b/Source/DataLayer/DataLayer.csproj index 87bd7c77..9ee149f7 100644 --- a/Source/DataLayer/DataLayer.csproj +++ b/Source/DataLayer/DataLayer.csproj @@ -11,12 +11,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/LibationFileManager/LibationFileManager.csproj b/Source/LibationFileManager/LibationFileManager.csproj index 04ae43f2..808f9029 100644 --- a/Source/LibationFileManager/LibationFileManager.csproj +++ b/Source/LibationFileManager/LibationFileManager.csproj @@ -6,7 +6,7 @@ - + diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index ed1695b9..d2618ec1 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -65,7 +65,7 @@ - + From 7f086aeaacf96a20e16ce791cf6a34a2227448b5 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Tue, 19 Jul 2022 15:02:31 -0400 Subject: [PATCH 5/5] Bug fix #318: Audible changed their API, likely in conjunction with shutting down the Windows App. DownloadQuality.Extreme and DownloadQuality.Low now throw errors --- Source/AppScaffolding/AppScaffolding.csproj | 2 +- Source/AudibleUtilities/ApiExtended.cs | 5 +++++ Source/AudibleUtilities/AudibleUtilities.csproj | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 22a18bed..66a20c2a 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net6.0-windows - 8.2.3.1 + 8.2.4.1 diff --git a/Source/AudibleUtilities/ApiExtended.cs b/Source/AudibleUtilities/ApiExtended.cs index 35568c55..46f173ac 100644 --- a/Source/AudibleUtilities/ApiExtended.cs +++ b/Source/AudibleUtilities/ApiExtended.cs @@ -152,6 +152,11 @@ namespace AudibleUtilities Serilog.Log.Logger.Debug("Completed library scan."); #if DEBUG + //// this will not work for multi accounts + //var library_json = "library.json"; + //library_json = System.IO.Path.GetFullPath(library_json); + //if (System.IO.File.Exists(library_json)) + // items = AudibleApi.Common.Converter.FromJson>(System.IO.File.ReadAllText(library_json)); //System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items)); #endif var validators = new List(); diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj index c257130d..b835a2e6 100644 --- a/Source/AudibleUtilities/AudibleUtilities.csproj +++ b/Source/AudibleUtilities/AudibleUtilities.csproj @@ -5,7 +5,7 @@ - +