increm version

FileLiberator/UNTESTED/DecryptBook.cs

@@ -62,9 +62,21 @@ namespace FileLiberator
                 if (outputAudioFilename == null)
                     return new StatusHandler { "Decrypt failed" };
 
-                moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+                var destinationDir = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
 
-                Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
+                var config = Configuration.Instance;
+                if (config.RetainAaxFiles)
+                {
+                    var newAaxFilename = FileUtility.GetValidFilename(
+                        destinationDir,
+                        Path.GetFileNameWithoutExtension(aaxFilename),
+                        "aax");
+                    File.Move(aaxFilename, newAaxFilename);
+                }
+                else
+                {
+                    Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
+                }
 
                 var statusHandler = new StatusHandler();
                 var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
@@ -120,7 +132,7 @@ namespace FileLiberator
             }
         }
 
-        private static void moveFilesToBooksDir(Book product, string outputAudioFilename)
+        private static string moveFilesToBooksDir(Book product, string outputAudioFilename)
 		{
 			// create final directory. move each file into it. MOVE AUDIO FILE LAST
 			// new dir: safetitle_limit50char + " [" + productId + "]"
@@ -142,7 +154,9 @@ namespace FileLiberator
 
 				File.Move(f.FullName, dest);
 			}
-		}
+
+            return destinationDir;
+        }
 
 		private static string getDestDir(Book product)
 		{

FileManager/UNTESTED/Configuration.cs

@@ -83,6 +83,13 @@ namespace FileManager
             set => persistentDictionary.Set(nameof(DecryptInProgressEnum), value);
         }
 
+        [Description("Retain .aax files after decrypting?")]
+        public bool RetainAaxFiles
+        {
+            get => persistentDictionary.Get<bool>(nameof(RetainAaxFiles));
+            set => persistentDictionary.Set(nameof(RetainAaxFiles), value);
+        }
+
         // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
 
         // singleton stuff

FileManager/UNTESTED/PersistentDictionary.cs

@@ -40,8 +40,13 @@ namespace FileManager
             return stringCache[propertyName];
         }
 
-        public T Get<T>(string propertyName) where T : class
-            => GetObject(propertyName) is T obj ? obj : default;
+        public T Get<T>(string propertyName)
+        {
+            var o = GetObject(propertyName);
+            if (o is null) return default;
+            if (o is JToken jt) return jt.Value<T>();
+            return (T)o;
+        }
 
         public object GetObject(string propertyName)
         {

InternalUtilities/UNTESTED/AudibleApiActions.cs

@@ -13,19 +13,33 @@ namespace InternalUtilities
 	{
 		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
 		public static Task<Api> GetApiAsync(string username, string localeName, ILoginCallback loginCallback = null)
-			=> EzApiCreator.GetApiAsync(
+		{
+			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			{
+				username,
+				LocaleName = localeName,
+			});
+			return EzApiCreator.GetApiAsync(
 				Localization.Get(localeName),
 				AudibleApiStorage.AccountsSettingsFile,
 				AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName),
 				loginCallback);
+		}
 
 		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
 		public static Task<Api> GetApiAsync(ILoginCallback loginCallback, Account account)
-			=> EzApiCreator.GetApiAsync(
+		{
+			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			{
+				AccountId = account?.AccountId ?? "[empty]",
+				LocaleName = account?.Locale?.Name
+			});
+			return EzApiCreator.GetApiAsync(
 				account.Locale,
 				AudibleApiStorage.AccountsSettingsFile,
 				account.GetIdentityTokensJsonPath(),
 				loginCallback);
+		}
 
 		private static AsyncRetryPolicy policy { get; }
 			= Policy.Handle<Exception>()

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>4.0.0.1</Version>
+    <Version>4.0.3.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

LibationLauncher/UNTESTED/Program.cs

@@ -27,7 +27,8 @@ namespace LibationLauncher
 
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
 
-			migrate_v3_to_v4();
+			migrate_to_v4_0_0();
+			migrate_to_v4_0_3(); // add setting for whether to delete/retain aax
 
 			ensureLoggingConfig();
 			ensureSerilogConfig();
@@ -83,7 +84,7 @@ namespace LibationLauncher
 		#region v3 => v4 migration
 		static string AccountsSettingsFileLegacy30 => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
 
-		private static void migrate_v3_to_v4()
+		private static void migrate_to_v4_0_0()
 		{
 			migrateLegacyIdentityFile();
 
@@ -205,6 +206,27 @@ 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
+
 		private static string defaultLoggingLevel { get; } = "Information";
 		private static void ensureLoggingConfig()
 		{

README.md

@@ -1,6 +1,6 @@
 # Libation: Liberate your Library
 
-## [Download Libation](https://github.com/rmcrackan/Libation/releases)
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
 # Table of Contents
 
@@ -9,6 +9,7 @@
     - [The bad](#the-bad)
     - [The ugly](#the-ugly)
 2. [Getting started](#getting-started)
+    - [Create Accounts](#create-accounts)
     - [Import your library](#import-your-library)
     - [Download your books -- DRM-free!](#download-your-books----drm-free)
     - [Download PDF attachments](#download-pdf-attachments)
@@ -57,12 +58,26 @@ I made this for myself and I want to share it with the great programming and aud
 
 #### [Download Libation](https://github.com/rmcrackan/Libation/releases)
 
+### Create Accounts
+
+Create your account(s):
+
+![Create your accounts, menu](images/v40_accounts.png)
+
+New locale options include many more regions including old audible accounts which pre-date the amazon acquisition
+
+![Choose your account locales](images/v40_locales.png)
+
 ### Import your library
 
 Select Import > Scan Library:
 
 ![Import step 1](images/Import1.png)
 
+Or if you have multiple accounts, you'll get to choose whether to scan all accounts or just the ones you select:
+
+![Import which accounts](images/v40_import.png)
+
 You'll see this window while it's scanning:
 
 ![Import step 2](images/Import2.png)