From 4dbbc01e72bb460be4f9827a0c6b480954f70c58 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 3 Nov 2021 08:13:31 +0800 Subject: [PATCH] try to remedy MovieFolderFormat and MovieFilenameFormat issues --- TVRename/Settings/TVSettings.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/TVRename/Settings/TVSettings.cs b/TVRename/Settings/TVSettings.cs index fbd6738c..b1d406d2 100644 --- a/TVRename/Settings/TVSettings.cs +++ b/TVRename/Settings/TVSettings.cs @@ -1443,8 +1443,8 @@ public void load([NotNull] XElement xmlSettings) AutoSelectShowInMyShows = xmlSettings.ExtractBool("AutoSelectShowInMyShows", true); SpecialsFolderName = xmlSettings.ExtractString("SpecialsFolderName", "Specials"); SeasonFolderFormat = xmlSettings.ExtractString("SeasonFolderFormat"); - MovieFolderFormat = xmlSettings.ExtractString("MovieFolderFormat"); - MovieFilenameFormat = xmlSettings.ExtractString("MovieFilenameFormat"); + MovieFolderFormat = xmlSettings.ExtractString("MovieFolderFormat", "{ShowName} ({Year})"); + MovieFilenameFormat = xmlSettings.ExtractString("MovieFilenameFormat", "{ShowName} ({Year})"); SearchJSONURL = xmlSettings.ExtractString("SearchJSONURL", "https://eztv.ag/api/get-torrents?imdb_id="); SearchJSONRootNode = xmlSettings.ExtractString("SearchJSONRootNode", "torrents"); SearchJSONFilenameToken = xmlSettings.ExtractString("SearchJSONFilenameToken", "filename"); @@ -1643,6 +1643,15 @@ public void load([NotNull] XElement xmlSettings) DefaultMovieProvider = TVDoc.ProviderType.TMDB; Logger.Error($"Has to update default movie provider"); } + //todo - See whether we need still need this - was just in place to try and remedy issues with 4.4 conversion + if (!MovieFolderFormat.HasValue()) + { + MovieFolderFormat = "{ShowName} ({Year})"; + } + if (!MovieFilenameFormat.HasValue()) + { + MovieFilenameFormat = "{ShowName} ({Year})"; + } } private void UpdateAppUpdateSettings([NotNull] XElement xmlSettings)