Add <account nickname> tag (#629)

Source/FileLiberator/UtilityExtensions.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
 using LibationFileManager;
@@ -20,13 +21,22 @@ namespace FileLiberator
 
 		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
 		{
-			var apiExtended = await AudibleUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+			var apiExtended = await ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
 			return apiExtended.Api;
 		}
 
-		public static LibraryBookDto ToDto(this LibraryBook libraryBook) => new()
+		public static LibraryBookDto ToDto(this LibraryBook libraryBook)
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var nickname
+				= persister.AccountsSettings.Accounts
+				.FirstOrDefault(a => a.AccountId == libraryBook.Account)
+				?.AccountName;
+
+			return new()
 			{
 				Account = libraryBook.Account,
+				AccountNickname = nickname,
 				DateAdded = libraryBook.DateAdded,
 
 				AudibleProductId = libraryBook.Book.AudibleProductId,
@@ -50,4 +60,5 @@ namespace FileLiberator
 				Language = libraryBook.Book.Language
 			};
 		}
+	}
 }

Source/LibationFileManager/LibraryBookDto.cs

@@ -37,5 +37,6 @@ namespace LibationFileManager
 	{
 		public DateTime? DateAdded { get; set; }
 		public string Account { get; set; }
+		public string AccountNickname { get; set; }
     }
 }

Source/LibationFileManager/TemplateEditor[T].cs

@@ -52,7 +52,8 @@ namespace LibationFileManager
 		private static readonly LibraryBookDto libraryBookDto
 			= new()
 			{
-				Account = "my account",
+				Account = "myaccount@example.co",
+				AccountNickname = "my account",
 				DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
 				DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
 				AudibleProductId = "123456789",

Source/LibationFileManager/TemplateTags.cs

@@ -37,6 +37,7 @@ namespace LibationFileManager
         public static TemplateTags SampleRate { get; } = new TemplateTags("samplerate", "File's orig. sample rate");
         public static TemplateTags Channels { get; } = new TemplateTags("channels", "Number of audio channels");
         public static TemplateTags Account { get; } = new TemplateTags("account", "Audible account of this book");
+        public static TemplateTags AccountNickname { get; } = new TemplateTags("account nickname", "Audible account nickname of this book");
         public static TemplateTags Locale { get; } = new ("locale", "Region/country");
         public static TemplateTags YearPublished { get; } = new("year", "Year published");
 		public static TemplateTags Language { get; } = new("language", "Book's language");

Source/LibationFileManager/Templates.cs

@@ -215,6 +215,7 @@ namespace LibationFileManager
 			{ TemplateTags.SampleRate, lb => (int?)(lb.IsPodcastParent ? null : lb.SampleRate) },
 			{ TemplateTags.Channels, lb => (int?)(lb.IsPodcastParent ? null : lb.Channels) },
 			{ TemplateTags.Account, lb => lb.Account },
+			{ TemplateTags.AccountNickname, lb => lb.AccountNickname },
 			{ TemplateTags.Locale, lb => lb.Locale },
 			{ TemplateTags.YearPublished, lb => lb.YearPublished },
 			{ TemplateTags.DatePublished, lb => lb.DatePublished },

Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs

@@ -26,7 +26,8 @@ namespace TemplatesTests
 		public static LibraryBookDto GetLibraryBook(string seriesName = "Sherlock Holmes")
 			=> new()
 			{
-				Account = "my account",
+				Account = "myaccount@example.co",
+				AccountNickname = "my account",
 				DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
 				DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
 				FileDate = new DateTime(2023, 1, 28, 0, 0, 0),