alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-17 19:54:47 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix distinction queries (#14007)

Browse Source
This commit is contained in:
Tim Eisele
2025-04-27 02:49:30 +02:00
committed by GitHub
parent 67110b512a
commit f576783ae1
15 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@@ -1041,7 +1041,7 @@ namespace MediaBrowser.Providers.Manager
}
else
{
target.Studios = target.Studios.Concat(source.Studios).Distinct().ToArray();
target.Studios = target.Studios.Concat(source.Studios).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
}
@@ -1053,7 +1053,7 @@ namespace MediaBrowser.Providers.Manager
}
else
{
target.Tags = target.Tags.Concat(source.Tags).Distinct().ToArray();
target.Tags = target.Tags.Concat(source.Tags).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
}
@@ -1065,7 +1065,7 @@ namespace MediaBrowser.Providers.Manager
}
else
{
target.ProductionLocations = target.ProductionLocations.Concat(source.ProductionLocations).Distinct().ToArray();
target.ProductionLocations = target.ProductionLocations.Concat(source.ProductionLocations).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
}
@@ -1214,7 +1214,7 @@ namespace MediaBrowser.Providers.Manager
}
else if (sourceHasAlbumArtist.AlbumArtists.Count > 0)
{
targetHasAlbumArtist.AlbumArtists = targetHasAlbumArtist.AlbumArtists.Concat(sourceHasAlbumArtist.AlbumArtists).Distinct().ToArray();
targetHasAlbumArtist.AlbumArtists = targetHasAlbumArtist.AlbumArtists.Concat(sourceHasAlbumArtist.AlbumArtists).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
}
}

2
MediaBrowser.Providers/Music/AlbumMetadataService.cs
View File

@@ -227,7 +227,7 @@ namespace MediaBrowser.Providers.Music
}
else
{
targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct().ToArray();
targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist)))

2
MediaBrowser.Providers/Music/AudioMetadataService.cs
View File

@@ -63,7 +63,7 @@ namespace MediaBrowser.Providers.Music
}
else
{
targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct().ToArray();
targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
if (replaceData || string.IsNullOrEmpty(targetItem.Album))

3
MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
View File

@@ -1,5 +1,6 @@
#pragma warning disable CS1591
using System;
using System.Linq;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
@@ -48,7 +49,7 @@ namespace MediaBrowser.Providers.Music
}
else
{
targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct().ToArray();
targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
}
}
}

2
MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
View File

@@ -99,7 +99,7 @@ public class PlaylistItemsProvider : ILocalMetadataProvider<Playlist>,
.OfType<CollectionFolder>()
.Where(f => f.CollectionType.HasValue && !_ignoredCollections.Contains(f.CollectionType.Value))
.SelectMany(f => f.PhysicalLocations)
.Distinct(StringComparer.OrdinalIgnoreCase)
.Distinct()
.ToList();
using (var stream = File.OpenRead(path))