diff --git a/AppScaffolding/AppScaffolding.csproj b/AppScaffolding/AppScaffolding.csproj index b23e4756..6e620036 100644 --- a/AppScaffolding/AppScaffolding.csproj +++ b/AppScaffolding/AppScaffolding.csproj @@ -3,7 +3,7 @@ net5.0 - 6.2.9.1 + 6.2.9.3 diff --git a/FileLiberator/AudioFileStorageExt.cs b/FileLiberator/AudioFileStorageExt.cs index d799d547..080eba90 100644 --- a/FileLiberator/AudioFileStorageExt.cs +++ b/FileLiberator/AudioFileStorageExt.cs @@ -50,7 +50,7 @@ namespace FileLiberator .GetFilePath(); public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension) - => GetFileTemplateSingle(Configuration.Instance.FolderTemplate, libraryBook, dirFullPath, extension) + => GetFileTemplateSingle(Configuration.Instance.FileTemplate, libraryBook, dirFullPath, extension) .GetFilePath(); internal static FileTemplate GetFileTemplateSingle(string template, LibraryBook libraryBook, string dirFullPath, string extension) @@ -73,7 +73,7 @@ namespace FileLiberator fileTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBook.Book.Narrators.FirstOrDefault()?.Name); var seriesLink = libraryBook.Book.SeriesLink.FirstOrDefault(); - fileTemplate.AddParameterReplacement(TemplateTags.SeriesName, seriesLink?.Series.Name); + fileTemplate.AddParameterReplacement(TemplateTags.Series, seriesLink?.Series.Name); fileTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, seriesLink?.Order); return fileTemplate; diff --git a/LibationFileManager/TemplateTags.cs b/LibationFileManager/TemplateTags.cs index 262cb853..5b16e316 100644 --- a/LibationFileManager/TemplateTags.cs +++ b/LibationFileManager/TemplateTags.cs @@ -25,7 +25,7 @@ namespace LibationFileManager public static TemplateTags FirstAuthor { get; } = new TemplateTags("first author", "First author"); public static TemplateTags Narrator { get; } = new TemplateTags("narrator", "Narrator(s)"); public static TemplateTags FirstNarrator { get; } = new TemplateTags("first narrator", "First narrator"); - public static TemplateTags SeriesName { get; } = new TemplateTags("series name", "Name of series"); + 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");