From 7ff4953f7b3508f0fec7fa97a0543a29d8c4629e Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Thu, 1 Jul 2021 11:19:16 -0400 Subject: [PATCH] RetainAaxFiles no longer used --- FileLiberator/DownloadDecryptBook.cs | 2 +- LibationLauncher/LibationLauncher.csproj | 2 +- LibationLauncher/Program.cs | 22 ---------------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/FileLiberator/DownloadDecryptBook.cs b/FileLiberator/DownloadDecryptBook.cs index 0cead1c7..cc22ef7e 100644 --- a/FileLiberator/DownloadDecryptBook.cs +++ b/FileLiberator/DownloadDecryptBook.cs @@ -44,7 +44,7 @@ namespace FileLiberator if (outputAudioFilename is null) return new StatusHandler { "Decrypt failed" }; - // moves files and returns dest dir. Do not put inside of if(RetainAaxFiles) + // moves files and returns dest dir _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename); var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId); diff --git a/LibationLauncher/LibationLauncher.csproj b/LibationLauncher/LibationLauncher.csproj index 0bcf08f7..4d0a2507 100644 --- a/LibationLauncher/LibationLauncher.csproj +++ b/LibationLauncher/LibationLauncher.csproj @@ -13,7 +13,7 @@ win-x64 - 5.0.0.1 + 5.0.0.2 diff --git a/LibationLauncher/Program.cs b/LibationLauncher/Program.cs index 5b664cc5..9fc3815d 100644 --- a/LibationLauncher/Program.cs +++ b/LibationLauncher/Program.cs @@ -29,7 +29,6 @@ namespace LibationLauncher AudibleApiStorage.EnsureAccountsSettingsFileExists(); migrate_to_v4_0_0(); - migrate_to_v4_0_3(); // add setting for whether to delete/retain aax migrate_to_v5_0_0(); ensureLoggingConfig(); @@ -209,27 +208,6 @@ namespace LibationLauncher } #endregion - #region migrate_to_v4_0_3 add setting for whether to delete/retain aax - private static void migrate_to_v4_0_3() - { - if (!File.Exists(Configuration.Instance.SettingsFilePath)) - return; - - // use JObject to remove decrypt key and locale from Settings.json - var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath); - var jObj = JObject.Parse(settingsContents); - - var jRetainAaxFiles = jObj.Property("RetainAaxFiles"); - if (jRetainAaxFiles is null) - { - jObj.Add("RetainAaxFiles", false); - - var newContents = jObj.ToString(Formatting.Indented); - File.WriteAllText(Configuration.Instance.SettingsFilePath, newContents); - } - } - #endregion - #region migrate_to_v5_0_0 re-gegister device if device info not in settings private static void migrate_to_v5_0_0() {