The Free Software Media System - Server Backend & API
Only save unique values of ProductionLocations, Studios, Tags, Artists and AlbumArtists
Shadowghost77ff451e60fa
diff --git a/Jellyfin.Api/Controllers/ItemUpdateController.cs b/Jellyfin.Api/Controllers/ItemUpdateController.csindex 605d2aeec2..b127433962 100644--- a/Jellyfin.Api/Controllers/ItemUpdateController.cs+++ b/Jellyfin.Api/Controllers/ItemUpdateController.cs@@ -270,7 +270,7 @@ public class ItemUpdateController : BaseJellyfinApiControllerif (request.Studios is not null){- item.Studios = Array.ConvertAll(request.Studios, x => x.Name);+ item.Studios = Array.ConvertAll(request.Studios, x => x.Name).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();}if (request.DateCreated.HasValue)@@ -287,7 +287,7 @@ public class ItemUpdateController : BaseJellyfinApiControlleritem.CustomRating = request.CustomRating;var currentTags = item.Tags;- var newTags = request.Tags;+ var newTags = request.Tags.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();var removedTags = currentTags.Except(newTags).ToList();var addedTags = newTags.Except(currentTags).ToList();item.Tags = newTags;@@ -373,7 +373,7 @@ public class ItemUpdateController : BaseJellyfinApiControllerif (request.ProductionLocations is not null){- item.ProductionLocations = request.ProductionLocations;+ item.ProductionLocations = request.ProductionLocations.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();}item.PreferredMetadataCountryCode = request.PreferredMetadataCountryCode;@@ -421,7 +421,7 @@ public class ItemUpdateController : BaseJellyfinApiController{if (item is IHasAlbumArtist hasAlbumArtists){- hasAlbumArtists.AlbumArtists = Array.ConvertAll(request.AlbumArtists, i => i.Name.Trim());+ hasAlbumArtists.AlbumArtists = Array.ConvertAll(request.AlbumArtists, i => i.Name.Trim()).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();}}@@ -429,7 +429,7 @@ public class ItemUpdateController : BaseJellyfinApiController{if (item is IHasArtist hasArtists){- hasArtists.Artists = Array.ConvertAll(request.ArtistItems, i => i.Name.Trim());+ hasArtists.Artists = Array.ConvertAll(request.ArtistItems, i => i.Name.Trim()).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();}}diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex 5bb4494dd2..cd28c6e43e 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@ -683,14 +683,15 @@ public sealed class BaseItemRepository.SelectMany(f => f.Values).Distinct().ToArray();++ var types = allListedItemValues.Select(e => e.MagicNumber).Distinct().ToArray();+ var values = allListedItemValues.Select(e => e.Value).Distinct().ToArray();+ var allListedItemValuesSet = allListedItemValues.ToHashSet();+var existingValues = context.ItemValues- .Select(e => new- {- item = e,- Key = e.Type + "+" + e.Value- })- .Where(f => allListedItemValues.Select(e => $"{(int)e.MagicNumber}+{e.Value}").Contains(f.Key))- .Select(e => e.item)+ .Where(e => types.Contains(e.Type) && values.Contains(e.Value))+ .AsEnumerable()+ .Where(e => allListedItemValuesSet.Contains((e.Type, e.Value))).ToArray();var missingItemValues = allListedItemValues.Except(existingValues.Select(f => (MagicNumber: f.Type, f.Value))).Select(f => new ItemValue(){@@ -1050,7 +1051,7 @@ public sealed class BaseItemRepositoryentity.TotalBitrate = dto.TotalBitrate;entity.ExternalId = dto.ExternalId;entity.Size = dto.Size;- entity.Genres = string.Join('|', dto.Genres);+ entity.Genres = string.Join('|', dto.Genres.Distinct(StringComparer.OrdinalIgnoreCase));entity.DateCreated = dto.DateCreated == DateTime.MinValue ? null : dto.DateCreated;entity.DateModified = dto.DateModified == DateTime.MinValue ? null : dto.DateModified;entity.ChannelId = dto.ChannelId;@@ -1077,9 +1078,9 @@ public sealed class BaseItemRepository}entity.ExtraIds = dto.ExtraIds is not null ? string.Join('|', dto.ExtraIds) : null;- entity.ProductionLocations = dto.ProductionLocations is not null ? string.Join('|', dto.ProductionLocations.Where(p => !string.IsNullOrWhiteSpace(p))) : null;- entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios) : null;- entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags) : null;+ entity.ProductionLocations = dto.ProductionLocations is not null ? string.Join('|', dto.ProductionLocations.Where(p => !string.IsNullOrWhiteSpace(p)).Distinct(StringComparer.OrdinalIgnoreCase)) : null;+ entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios.Distinct(StringComparer.OrdinalIgnoreCase)) : null;+ entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags.Distinct(StringComparer.OrdinalIgnoreCase)) : null;entity.LockedFields = dto.LockedFields is not null ? dto.LockedFields.Select(e => new BaseItemMetadataField(){@@ -1122,12 +1123,12 @@ public sealed class BaseItemRepositoryif (dto is IHasArtist hasArtists){- entity.Artists = hasArtists.Artists is not null ? string.Join('|', hasArtists.Artists) : null;+ entity.Artists = hasArtists.Artists is not null ? string.Join('|', hasArtists.Artists.Distinct(StringComparer.OrdinalIgnoreCase)) : null;}if (dto is IHasAlbumArtist hasAlbumArtists){- entity.AlbumArtists = hasAlbumArtists.AlbumArtists is not null ? string.Join('|', hasAlbumArtists.AlbumArtists) : null;+ entity.AlbumArtists = hasAlbumArtists.AlbumArtists is not null ? string.Join('|', hasAlbumArtists.AlbumArtists.Distinct(StringComparer.OrdinalIgnoreCase)) : null;}if (dto is LiveTvProgram program)