diff --git a/TVRename/LibrarySummary/Check/CustomLanguageMovieCheck.cs b/TVRename/LibrarySummary/Check/CustomLanguageMovieCheck.cs index eaabfe7c..ec6c4b1c 100644 --- a/TVRename/LibrarySummary/Check/CustomLanguageMovieCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomLanguageMovieCheck.cs @@ -17,5 +17,9 @@ protected override void FixInternal() protected override string FieldName => "Use Custom Language"; protected override bool Field => Movie.UseCustomLanguage; + + protected override string CustomFieldValue => Movie.CustomLanguageCode; + + protected override string DefaultFieldValue => Movie.Provider==TVDoc.ProviderType.TMDB ? TVSettings.Instance.TMDBLanguage.ThreeAbbreviation : TVSettings.Instance.PreferredTVDBLanguage.ThreeAbbreviation; } } diff --git a/TVRename/LibrarySummary/Check/CustomLanguageTvShowCheck.cs b/TVRename/LibrarySummary/Check/CustomLanguageTvShowCheck.cs index 60b8b705..1ec471ca 100644 --- a/TVRename/LibrarySummary/Check/CustomLanguageTvShowCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomLanguageTvShowCheck.cs @@ -17,5 +17,11 @@ protected override void FixInternal() protected override string FieldName => "Use Custom Language"; protected override bool Field => Show.UseCustomLanguage; + + protected override string CustomFieldValue => Show.CustomLanguageCode; + + protected override string DefaultFieldValue => Show.Provider == TVDoc.ProviderType.TMDB + ? TVSettings.Instance.TMDBLanguage.ThreeAbbreviation + : TVSettings.Instance.PreferredTVDBLanguage.ThreeAbbreviation; } } diff --git a/TVRename/LibrarySummary/Check/CustomMovieCheck.cs b/TVRename/LibrarySummary/Check/CustomMovieCheck.cs index 412cbe1e..dad22bf8 100644 --- a/TVRename/LibrarySummary/Check/CustomMovieCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomMovieCheck.cs @@ -12,10 +12,12 @@ protected CustomMovieCheck([NotNull] MovieConfiguration movie, TVDoc doc) : base protected override string MovieCheckName => FieldName; protected abstract string FieldName { get; } protected abstract bool Field { get; } + protected abstract string CustomFieldValue { get; } + protected abstract string DefaultFieldValue { get; } public override bool Check() => Field; [NotNull] - public override string Explain() => $"{FieldName} is enabled for this Movie, by default is is not."; + public override string Explain() => $"{FieldName} is enabled for this Movie [{CustomFieldValue}], by default is is not [{DefaultFieldValue}]."; } } diff --git a/TVRename/LibrarySummary/Check/CustomNameMovieCheck.cs b/TVRename/LibrarySummary/Check/CustomNameMovieCheck.cs index 9319a448..fd9f3325 100644 --- a/TVRename/LibrarySummary/Check/CustomNameMovieCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomNameMovieCheck.cs @@ -17,5 +17,10 @@ protected override void FixInternal() protected override string FieldName => "Use Custom Name"; protected override bool Field => Movie.UseCustomShowName; + + protected override string CustomFieldValue => Movie.CustomShowName; + + [NotNull] + protected override string DefaultFieldValue => Movie.CachedMovie?.Name??string.Empty; } } diff --git a/TVRename/LibrarySummary/Check/CustomNameTvShowCheck.cs b/TVRename/LibrarySummary/Check/CustomNameTvShowCheck.cs index a863eb2c..941ff27a 100644 --- a/TVRename/LibrarySummary/Check/CustomNameTvShowCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomNameTvShowCheck.cs @@ -16,5 +16,9 @@ protected override void FixInternal() [NotNull] protected override string FieldName => "Use Custom TV Show Name"; protected override bool Field => Show.UseCustomShowName; + protected override string CustomFieldValue => Show.CustomShowName; + + [NotNull] + protected override string DefaultFieldValue => Show.CachedShow?.Name ?? string.Empty; } } diff --git a/TVRename/LibrarySummary/Check/CustomRegionMovieCheck.cs b/TVRename/LibrarySummary/Check/CustomRegionMovieCheck.cs index 6055f08e..8ce0ffcd 100644 --- a/TVRename/LibrarySummary/Check/CustomRegionMovieCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomRegionMovieCheck.cs @@ -17,5 +17,10 @@ protected override void FixInternal() protected override string FieldName => "Use Custom Region"; protected override bool Field => Movie.UseCustomRegion; + + [NotNull] + protected override string CustomFieldValue => Movie.CustomRegionCode??string.Empty; + + protected override string DefaultFieldValue => Movie.Provider==TVDoc.ProviderType.TMDB?TVSettings.Instance.TMDBRegion.ThreeAbbreviation: string.Empty; } } diff --git a/TVRename/LibrarySummary/Check/CustomRegionTvShowCheck.cs b/TVRename/LibrarySummary/Check/CustomRegionTvShowCheck.cs index 49b8cd67..debe0a13 100644 --- a/TVRename/LibrarySummary/Check/CustomRegionTvShowCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomRegionTvShowCheck.cs @@ -16,5 +16,9 @@ protected override void FixInternal() [NotNull] protected override string FieldName => "Use Custom Region"; protected override bool Field => Show.UseCustomRegion; + [NotNull] + protected override string CustomFieldValue => Show.CustomRegionCode ?? string.Empty; + + protected override string DefaultFieldValue => Show.Provider == TVDoc.ProviderType.TMDB ? TVSettings.Instance.TMDBRegion.ThreeAbbreviation : string.Empty; } } diff --git a/TVRename/LibrarySummary/Check/CustomSearchTvShowCheck.cs b/TVRename/LibrarySummary/Check/CustomSearchTvShowCheck.cs index 1221ce8b..7b60f61a 100644 --- a/TVRename/LibrarySummary/Check/CustomSearchTvShowCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomSearchTvShowCheck.cs @@ -17,5 +17,9 @@ protected override void FixInternal() protected override string FieldName => "Use Custom Search"; protected override bool Field => Show.UseCustomSearchUrl; + + protected override string CustomFieldValue => Show.CustomSearchUrl; + + protected override string DefaultFieldValue => TVSettings.Instance.TheSearchers.CurrentSearch.Url; } } diff --git a/TVRename/LibrarySummary/Check/CustomTvShowCheck.cs b/TVRename/LibrarySummary/Check/CustomTvShowCheck.cs index f3379ea5..b3009c7c 100644 --- a/TVRename/LibrarySummary/Check/CustomTvShowCheck.cs +++ b/TVRename/LibrarySummary/Check/CustomTvShowCheck.cs @@ -12,16 +12,12 @@ protected CustomTvShowCheck([NotNull] ShowConfiguration show, TVDoc doc) : base( public override string CheckName => "[TV] " + FieldName; protected abstract string FieldName { get; } protected abstract bool Field { get; } + protected abstract string CustomFieldValue { get; } + protected abstract string DefaultFieldValue { get; } - public override bool Check() - { - return Field; - } + public override bool Check() => Field; [NotNull] - public override string Explain() - { - return $"{FieldName} is enabled for this TV Show, by default is is not."; - } + public override string Explain() => $"{FieldName} is enabled for this TV Show [{CustomFieldValue}], by default is is not [{DefaultFieldValue}]."; } } diff --git a/TVRename/LibrarySummary/Check/ManualFoldersMovieCheck.cs b/TVRename/LibrarySummary/Check/ManualFoldersMovieCheck.cs index 3e84322a..0b9fc21a 100644 --- a/TVRename/LibrarySummary/Check/ManualFoldersMovieCheck.cs +++ b/TVRename/LibrarySummary/Check/ManualFoldersMovieCheck.cs @@ -146,5 +146,11 @@ private void CopyOrMove([NotNull] DirectoryInfo fromDirectory, string toDirector protected override string FieldName => "Use manual folders"; protected override bool Field => Movie.UseManualLocations; + + [NotNull] + protected override string CustomFieldValue => Movie.ManualLocations.ToCsv(); + + [NotNull] + protected override string DefaultFieldValue => Movie.AutomaticLocations().ToCsv(); } } diff --git a/TVRename/LibrarySummary/Check/UseManualFoldersTvShowCheck.cs b/TVRename/LibrarySummary/Check/UseManualFoldersTvShowCheck.cs index 3f2c1ae4..59301e45 100644 --- a/TVRename/LibrarySummary/Check/UseManualFoldersTvShowCheck.cs +++ b/TVRename/LibrarySummary/Check/UseManualFoldersTvShowCheck.cs @@ -1,3 +1,4 @@ +using System.Linq; using JetBrains.Annotations; namespace TVRename @@ -17,5 +18,10 @@ protected override void FixInternal() Show.ManualFolderLocations.Clear(); Show.AutoAddType = ShowConfiguration.AutomaticFolderType.libraryDefaultFolderFormat; } + [NotNull] + protected override string CustomFieldValue => Show.ManualFolderLocations.Values.SelectMany(x=>x).ToCsv(); + + [NotNull] + protected override string DefaultFieldValue => Show.AutoAddFolderBase; } }