Backport pull request #11647 from jellyfin/release-10.9.z

Fix season names

Original-merge: 2da06bc0b10edcdb43618684396828afa4100b44

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Joshua M. Boniface <joshua@boniface.me>

1 files changed, 13 insertions, 9 deletions

diff --git a/MediaBrowser.Providers/TV/SeriesMetadataService.cs b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
index 0acc1c805..62eb0d89c 100644
--- a/MediaBrowser.Providers/TV/SeriesMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
@@ -88,18 +88,22 @@ namespace MediaBrowser.Providers.TV
 
             var sourceItem = source.Item;
             var targetItem = target.Item;
-            var sourceSeasonNames = sourceItem.SeasonNames;
-            var targetSeasonNames = targetItem.SeasonNames;
+            var sourceSeasonNames = sourceItem.GetSeasonNames();
+            var targetSeasonNames = targetItem.GetSeasonNames();
 
-            if (replaceData || targetSeasonNames.Count == 0)
+            if (replaceData)
             {
-                targetItem.SeasonNames = sourceSeasonNames;
+                foreach (var (number, name) in sourceSeasonNames)
+                {
+                    targetItem.SetSeasonName(number, name);
+                }
             }
-            else if (targetSeasonNames.Count != sourceSeasonNames.Count || !sourceSeasonNames.Keys.All(targetSeasonNames.ContainsKey))
+            else if (!sourceSeasonNames.Keys.All(targetSeasonNames.ContainsKey))
             {
-                foreach (var (number, name) in sourceSeasonNames)
+                var newSeasons = sourceSeasonNames.Where(s => !targetSeasonNames.ContainsKey(s.Key));
+                foreach (var (number, name) in newSeasons)
                 {
-                    targetSeasonNames.TryAdd(number, name);
+                    targetItem.SetSeasonName(number, name);
                 }
             }
 
@@ -221,7 +225,7 @@ namespace MediaBrowser.Providers.TV
         /// <returns>The async task.</returns>
         private async Task UpdateAndCreateSeasonsAsync(Series series, CancellationToken cancellationToken)
         {
-            var seasonNames = series.SeasonNames;
+            var seasonNames = series.GetSeasonNames();
             var seriesChildren = series.GetRecursiveChildren(i => i is Episode || i is Season);
             var seasons = seriesChildren.OfType<Season>().ToList();
             var uniqueSeasonNumbers = seriesChildren
@@ -245,7 +249,7 @@ namespace MediaBrowser.Providers.TV
                     var season = await CreateSeasonAsync(series, seasonName, seasonNumber, cancellationToken).ConfigureAwait(false);
                     series.AddChild(season);
                 }
-                else if (!string.Equals(existingSeason.Name, seasonName, StringComparison.Ordinal))
+                else if (!existingSeason.LockedFields.Contains(MetadataField.Name) && !string.Equals(existingSeason.Name, seasonName, StringComparison.Ordinal))
                 {
                     existingSeason.Name = seasonName;
                     await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);