Version 1.17.1

README.md

@@ -49,15 +49,15 @@ The application requires .Net Framework 4.7.1 to be installed. On Windows 10 sys
 AAX Audio Converter is configured to support high DPI monitors under Windows 10. It will scale properly when the user changes the DPI or scale factor. 
 
 ## Download
-Windows setup package version 1.17, English and German, with manuals, plus FFmpeg executable:
+Windows setup package version 1.17.1, English and German, with manuals, plus FFmpeg executable:
 
-**[AaxAudioConverter-1.17.0.1-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.0.1/AaxAudioConverter-1.17.0.1-Setup.exe)**
+**[AaxAudioConverter-1.17.1-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.1/AaxAudioConverter-1.17.1-Setup.exe)**
 
 Manuals (also included in the setup package):
 
-**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.0.1/AaxAudioConverter.pdf)**
+**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.1/AaxAudioConverter.pdf)**
 
-**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.0.1/AaxAudioConverter.de.pdf)**
+**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.1/AaxAudioConverter.de.pdf)**
 
 
 ## Dependencies

res/Setup.dat

@@ -1,2 +1,2 @@
-https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.0.1/AaxAudioConverter-1.17.0.1-Setup.exe
-MD5: a2cecfee6e20df138563e3ef7876bb55
+https://github.com/audiamus/AaxAudioConverter/releases/download/v1.17.1/AaxAudioConverter-1.17.1-Setup.exe
+MD5: c6db945d2e357db82ea8b7d461da7b41

src/AaxAudioConverter/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.17.0.1")]
-[assembly: AssemblyFileVersion ("1.17.0.1")]
+[assembly: AssemblyVersion ("1.17.1.0")]
+[assembly: AssemblyFileVersion ("1.17.1.0")]
 [assembly: NeutralResourcesLanguage ("en")]
 

src/AaxAudioConverterLib/AaxAudioConverter.cs

@@ -1964,15 +1964,11 @@ private void getContentMetadata (Book.Part part) {
       var appMetadadata = new AudibleAppContentMetadata ();
       appMetadadata.GetContentMetadata (part, flags);
 
+      if (!withSeries)
+        return;
+
       var simsBySeries = new AudibleAppSimsBySeries ();
       simsBySeries.GetSimsBySeries (part);
-
-      // test only
-      //var ser = part.Book.ExternalMeta;
-      //string s1 = ser.SeqString (Settings.NumDigitsSeriesSeqNo);
-      //string s2 = ser.SeqString (Settings.NumDigitsSeriesSeqNo);
-      //string s3 = ser.SeqString (Settings.NumDigitsSeriesSeqNo);
-      //string s4 = ser.SeqString (Settings.NumDigitsSeriesSeqNo);
     }
 
     private bool updateTags (Book book, Track track) {
@@ -2134,27 +2130,29 @@ private string flatDir (Book book) {
     }
 
     private string initDirectory (Book book, string author, string title) {
+      Log (3, this, () => $"book:\"{book.SortingTitle.Shorten()}\", author={(author is null ? "<null>" : $"\"{author}\"")}, title=\"{title}\"");
 
       string rootDirLong = Settings.OutputDirectory.AsUnc();
 
       string outDirLong = rootDirLong;
       string outDirBookParentLong = rootDirLong;
       string series = string.Empty;
       string seriesSeqNo = string.Empty;
+
       try {
 
         // author + series + title
 
         // do we have an author?
-        if (!string.IsNullOrWhiteSpace (author)) {
+        if (!(Settings.FlatFolders || author.IsNullOrWhiteSpace ())) {
           outDirLong = Path.Combine (outDirLong, author);
           if (!Directory.Exists (outDirLong))
             book.IsNewAuthor = true;
           outDirBookParentLong = outDirLong;
         }
 
         // do we have a series?
-        if (book.HasSeries) {
+        if (Settings.WithSeriesTitle && book.HasSeries) {
           series = book.ExternalMeta.SeriesString().Prune();
           seriesSeqNo = book.ExternalMeta.SeqStringFramed (Settings.NumDigitsSeriesSeqNo).Prune();
           outDirLong = Path.Combine (outDirLong, series);

src/AaxAudioConverterLib/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.17.0.0")]
-[assembly: AssemblyFileVersion ("1.17.0.0")]
+[assembly: AssemblyVersion ("1.17.1.0")]
+[assembly: AssemblyFileVersion ("1.17.1.0")]

src/InnoSetup/AaxAudioConverter setup.iss

@@ -1,5 +1,5 @@
 #define MyAppSetupName 'AAX Audio Converter'
-#define MyAppVersion '1.17.0.1'
+#define MyAppVersion '1.17.1'
 #define MyProgramExe = 'AaxAudioConverter.exe'
 #define MyCompany = 'audiamus'
 #define MyAppName = 'AaxAudioConverter'