Merge branch 'rmcrackan:master' into master

Source/ApplicationServices/LibraryExporter.cs

@@ -100,6 +100,9 @@ namespace ApplicationServices
 
 		[Name("Content Type")]
 		public string ContentType { get; set; }
+
+        [Name("Audio Format")]
+		public string AudioFormat { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -132,7 +135,8 @@ namespace ApplicationServices
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
-				ContentType = a.Book.ContentType.ToString()
+				ContentType = a.Book.ContentType.ToString(),
+				AudioFormat = a.Book.AudioFormat.ToString()
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -202,7 +206,8 @@ namespace ApplicationServices
 				nameof(ExportDto.MyLibationTags),
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
-				nameof (ExportDto.ContentType)
+				nameof(ExportDto.ContentType),
+				nameof(ExportDto.AudioFormat)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -268,6 +273,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
+				row.CreateCell(col++).SetCellValue(dto.AudioFormat);
 
 				rowIndex++;
 			}

Source/DataLayer/EfClasses/AudioFormat.cs

@@ -17,7 +17,6 @@ namespace DataLayer
 
     public class AudioFormat : IComparable<AudioFormat>, IComparable
     {
-
         internal int AudioFormatID { get; private set; }
         public int Bitrate { get; private init; }
         public int SampleRate { get; private init; }

Source/FileLiberator/UtilityExtensions.cs

@@ -37,7 +37,11 @@ namespace FileLiberator
 			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
 
 			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order
+			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order,
+
+			BitRate = libraryBook.Book.AudioFormat.Bitrate,
+			SampleRate = libraryBook.Book.AudioFormat.SampleRate,
+			Channels = libraryBook.Book.AudioFormat.Channels,
 		};
 	}
 }

Source/LibationFileManager/LibraryBookDto.cs

@@ -20,6 +20,10 @@ namespace LibationFileManager
 
         public string SeriesName { get; set; }
         public string SeriesNumber { get; set; }
+
+        public int BitRate { get; set; }
+        public int SampleRate { get; set; }
+        public int Channels { get; set; }
     }
 
     public class LibraryBookDto : BookDto

Source/LibationFileManager/TemplateTags.cs

@@ -34,6 +34,9 @@ namespace LibationFileManager
         public static TemplateTags Series { get; } = new TemplateTags("series", "Name of series");
         // can't also have a leading zeros version. Too many weird edge cases. Eg: "1-4"
         public static TemplateTags SeriesNumber { get; } = new TemplateTags("series#", "Number order in series");
+        public static TemplateTags Bitrate { get; } = new TemplateTags("bitrate", "File's orig. bitrate");
+        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 Locale { get; } = new TemplateTags("locale", "Region/country");
 

Source/LibationFileManager/Templates.cs

@@ -137,6 +137,9 @@ namespace LibationFileManager
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBookDto.FirstNarrator);
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, libraryBookDto.SeriesNumber);
+			fileNamingTemplate.AddParameterReplacement(TemplateTags.Bitrate, libraryBookDto.BitRate);
+			fileNamingTemplate.AddParameterReplacement(TemplateTags.SampleRate, libraryBookDto.SampleRate);
+			fileNamingTemplate.AddParameterReplacement(TemplateTags.Channels, libraryBookDto.Channels);
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.Account, libraryBookDto.Account);
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.Locale, libraryBookDto.Locale);
 

Source/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs

@@ -41,6 +41,7 @@
             this.bookLiberatedCb = new System.Windows.Forms.ComboBox();
             this.bookLiberatedLbl = new System.Windows.Forms.Label();
             this.liberatedDescLbl = new System.Windows.Forms.Label();
+            this.audibleLink = new System.Windows.Forms.LinkLabel();
             ((System.ComponentModel.ISupportInitialize)(this.coverPb)).BeginInit();
             this.tagsGb.SuspendLayout();
             this.liberatedGb.SuspendLayout();
@@ -53,7 +54,7 @@
             this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.saveBtn.Name = "saveBtn";
             this.saveBtn.Size = new System.Drawing.Size(88, 27);
-			this.saveBtn.TabIndex = 3;
+            this.saveBtn.TabIndex = 4;
             this.saveBtn.Text = "Save";
             this.saveBtn.UseVisualStyleBackColor = true;
             this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
@@ -110,7 +111,7 @@
             this.tagsGb.Location = new System.Drawing.Point(12, 220);
             this.tagsGb.Name = "tagsGb";
             this.tagsGb.Size = new System.Drawing.Size(570, 73);
-			this.tagsGb.TabIndex = 0;
+            this.tagsGb.TabIndex = 2;
             this.tagsGb.TabStop = false;
             this.tagsGb.Text = "Edit Tags";
             // 
@@ -120,7 +121,7 @@
             this.cancelBtn.Location = new System.Drawing.Point(494, 427);
             this.cancelBtn.Name = "cancelBtn";
             this.cancelBtn.Size = new System.Drawing.Size(88, 27);
-			this.cancelBtn.TabIndex = 4;
+            this.cancelBtn.TabIndex = 5;
             this.cancelBtn.Text = "Cancel";
             this.cancelBtn.UseVisualStyleBackColor = true;
             this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
@@ -137,7 +138,7 @@
             this.liberatedGb.Location = new System.Drawing.Point(12, 299);
             this.liberatedGb.Name = "liberatedGb";
             this.liberatedGb.Size = new System.Drawing.Size(570, 122);
-			this.liberatedGb.TabIndex = 2;
+            this.liberatedGb.TabIndex = 3;
             this.liberatedGb.TabStop = false;
             this.liberatedGb.Text = "Liberated status: Whether the book/pdf has been downloaded";
             // 
@@ -186,6 +187,17 @@
             this.liberatedDescLbl.TabIndex = 0;
             this.liberatedDescLbl.Text = "To download again next time: change to Not Downloaded\r\nTo not download: change to" +
     " Downloaded";
+            // 
+            // audibleLink
+            // 
+            this.audibleLink.AutoSize = true;
+            this.audibleLink.Location = new System.Drawing.Point(12, 169);
+            this.audibleLink.Name = "audibleLink";
+            this.audibleLink.Size = new System.Drawing.Size(57, 45);
+            this.audibleLink.TabIndex = 0;
+            this.audibleLink.TabStop = true;
+            this.audibleLink.Text = "Open in\r\nAudible\r\n(browser)";
+            this.audibleLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.audibleLink_LinkClicked);
             // 
             // BookDetailsDialog
             // 
@@ -194,6 +206,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(594, 466);
+            this.Controls.Add(this.audibleLink);
             this.Controls.Add(this.liberatedGb);
             this.Controls.Add(this.cancelBtn);
             this.Controls.Add(this.tagsGb);
@@ -232,5 +245,6 @@
 		private System.Windows.Forms.ComboBox bookLiberatedCb;
 		private System.Windows.Forms.Label bookLiberatedLbl;
 		private System.Windows.Forms.Label liberatedDescLbl;
+        private System.Windows.Forms.LinkLabel audibleLink;
     }
 }

Source/LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -131,5 +131,12 @@ Audible ID: {Book.AudibleProductId}
 			this.DialogResult = DialogResult.Cancel;
 			this.Close();
 		}
+
+        private void audibleLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+			var locale = AudibleApi.Localization.Get(_libraryBook.Book.Locale);
+			var link = $"https://www.audible.{locale.TopDomain}/pd/{Book.AudibleProductId}";
+			Go.To.Url(link);
+		}
     }
 }

Source/LibationWinForms/Dialogs/EditTemplateDialog.cs

@@ -79,7 +79,10 @@ namespace LibationWinForms.Dialogs
 				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 				Narrators = new List<string> { "Stephen Fry" },
 				SeriesName = "Sherlock Holmes",
-				SeriesNumber = "1"
+				SeriesNumber = "1",
+				BitRate = 128,
+				SampleRate = 44100,
+				Channels = 2
 			};
 			var chapterName = "A Flight for Life";
 			var chapterNumber = 4;

Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs

@@ -21,7 +21,7 @@ namespace FileNamingTemplateTests
 			sb.Append('0', 300);
 			var longText = sb.ToString();
 
-			var expectedNew = "C:\\foo\\bar\\my꞉ book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt";
+			var expectedNew = @"C:\foo\bar\my꞉ book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt";
 			var f2 = NEW_GetValidFilename_FileNamingTemplate(@"C:\foo\bar", "my: book " + longText, "txt", "ID123456");
 
 			f2.Should().Be(expectedNew);

Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs

@@ -12,19 +12,30 @@ using static TemplatesTests.Shared;
 
 namespace TemplatesTests
 {
+	/////////////////////////////////////////////////
+	//                                             //
+	//    add general tag replacement tests to:    //
+	//                                             //
+	//    getFileNamingTemplate.Tests              //
+	//                                             //
+	/////////////////////////////////////////////////
+
 	public static class Shared
 	{
-		public static LibraryBookDto GetLibraryBook(string asin, string seriesName = "Sherlock Holmes")
+		public static LibraryBookDto GetLibraryBook(string seriesName = "Sherlock Holmes")
 			=> new()
 			{
 				Account = "my account",
-				AudibleProductId = asin,
+				AudibleProductId = "asin",
 				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
 				Locale = "us",
 				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 				Narrators = new List<string> { "Stephen Fry" },
 				SeriesName = seriesName ?? "",
-				SeriesNumber = "1"
+				SeriesNumber = "1",
+				BitRate = 128,
+				SampleRate = 44100,
+				Channels = 2
 			};
 	}
 
@@ -56,48 +67,49 @@ namespace TemplatesTests
 
 
 		[TestMethod]
-		[DataRow(null, "asin", @"C:\", "ext")]
+		[DataRow(null, @"C:\", "ext")]
 		[ExpectedException(typeof(ArgumentNullException))]
-		public void arg_null_exception(string template, string asin, string dirFullPath, string extension)
+		public void arg_null_exception(string template, string dirFullPath, string extension)
-			=> Templates.getFileNamingTemplate(GetLibraryBook(asin), template, dirFullPath, extension);
+			=> Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension);
 
 		[TestMethod]
-		[DataRow("", "asin", @"C:\foo\bar", "ext")]
+		[DataRow("", @"C:\foo\bar", "ext")]
-		[DataRow("   ", "asin", @"C:\foo\bar", "ext")]
+		[DataRow("   ", @"C:\foo\bar", "ext")]
 		[ExpectedException(typeof(ArgumentException))]
-		public void arg_exception(string template, string asin, string dirFullPath, string extension)
+		public void arg_exception(string template, string dirFullPath, string extension)
-			=> Templates.getFileNamingTemplate(GetLibraryBook(asin), template, dirFullPath, extension);
+			=> Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension);
 
 		[TestMethod]
-		public void null_extension() => Tests("f.txt", "asin", @"C:\foo\bar", null, @"C:\foo\bar\f.txt");
+		public void null_extension() => Tests("f.txt", @"C:\foo\bar", null, @"C:\foo\bar\f.txt");
 
 		[TestMethod]
-		[DataRow("f.txt", "asin", @"C:\foo\bar", "ext", @"C:\foo\bar\f.txt.ext")]
+		[DataRow("f.txt", @"C:\foo\bar", "ext", @"C:\foo\bar\f.txt.ext")]
-		[DataRow("f", "asin", @"C:\foo\bar", "ext", @"C:\foo\bar\f.ext")]
+		[DataRow("f", @"C:\foo\bar", "ext", @"C:\foo\bar\f.ext")]
-		[DataRow("<id>", "asin", @"C:\foo\bar", "ext", @"C:\foo\bar\asin.ext")]
+		[DataRow("<id>", @"C:\foo\bar", "ext", @"C:\foo\bar\asin.ext")]
-		public void Tests(string template, string asin, string dirFullPath, string extension, string expected)
+        [DataRow("<bitrate> - <samplerate> - <channels>", @"C:\foo\bar", "ext", @"C:\foo\bar\128 - 44100 - 2.ext")]
-			=> Templates.getFileNamingTemplate(GetLibraryBook(asin), template, dirFullPath, extension)
+		public void Tests(string template, string dirFullPath, string extension, string expected)
+			=> Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension)
 			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(expected);
 
 		[TestMethod]
 		public void IfSeries_empty()
-			=> Templates.getFileNamingTemplate(GetLibraryBook("asin", "Sherlock Holmes"), "foo<if series-><-if series>bar", @"C:\a\b", "ext")
+			=> Templates.getFileNamingTemplate(GetLibraryBook(), "foo<if series-><-if series>bar", @"C:\a\b", "ext")
 			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(@"C:\a\b\foobar.ext");
 
 		[TestMethod]
 		public void IfSeries_no_series()
-			=> Templates.getFileNamingTemplate(GetLibraryBook("asin", ""), "foo<if series->-<series>-<id>-<-if series>bar", @"C:\a\b", "ext")
+			=> Templates.getFileNamingTemplate(GetLibraryBook(null), "foo<if series->-<series>-<id>-<-if series>bar", @"C:\a\b", "ext")
 			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(@"C:\a\b\foobar.ext");
 
 		[TestMethod]
 		public void IfSeries_with_series()
-			=> Templates.getFileNamingTemplate(GetLibraryBook("asin", "Sherlock Holmes"), "foo<if series->-<series>-<id>-<-if series>bar", @"C:\a\b", "ext")
+			=> Templates.getFileNamingTemplate(GetLibraryBook(), "foo<if series->-<series>-<id>-<-if series>bar", @"C:\a\b", "ext")
 			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(@"C:\a\b\foo-Sherlock Holmes-asin-bar.ext");
@@ -394,10 +406,10 @@ namespace Templates_ChapterFile_Tests
 		static readonly ReplacementCharacters Default = ReplacementCharacters.Default;
 
 		[TestMethod]
-		[DataRow("asin", "[<id>] <ch# 0> of <ch count> - <ch title>", @"C:\foo\", "txt", 6, 10, "chap", @"C:\foo\[asin] 06 of 10 - chap.txt")]
+		[DataRow("[<id>] <ch# 0> of <ch count> - <ch title>", @"C:\foo\", "txt", 6, 10, "chap", @"C:\foo\[asin] 06 of 10 - chap.txt")]
-		[DataRow("asin", "<ch#>", @"C:\foo\", "txt", 6, 10, "chap", @"C:\foo\6.txt")]
+		[DataRow("<ch#>", @"C:\foo\", "txt", 6, 10, "chap", @"C:\foo\6.txt")]
-		public void Tests(string asin, string template, string dir, string ext, int pos, int total, string chapter, string expected)
+		public void Tests(string template, string dir, string ext, int pos, int total, string chapter, string expected)
-			=> Templates.ChapterFile.GetPortionFilename(GetLibraryBook(asin), template, new() { OutputFileName = $"xyz.{ext}", PartsPosition = pos, PartsTotal = total, Title = chapter }, dir, Default)
+			=> Templates.ChapterFile.GetPortionFilename(GetLibraryBook(), template, new() { OutputFileName = $"xyz.{ext}", PartsPosition = pos, PartsTotal = total, Title = chapter }, dir, Default)
 			.Should().Be(expected);
 	}
 }