Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 05:34:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Order() introduced in .NET 7 (#8923)

Browse Source
This commit is contained in:
Bond-009 2022-12-19 17:30:00 +01:00 committed by GitHub
parent b80b50437c
commit 497d8c4957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/IO/LibraryMonitor.cs
View File

@ -131,7 +131,7 @@ namespace Emby.Server.Implementations.IO
.OfType<Folder>() .OfType<Folder>()
.SelectMany(f => f.PhysicalLocations) .SelectMany(f => f.PhysicalLocations)
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i); .Order();
foreach (var path in paths) foreach (var path in paths)
{ {

2
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -1175,7 +1175,7 @@ namespace Emby.Server.Implementations.Library
} }
}) })
.Where(i => i is not null) .Where(i => i is not null)
.OrderBy(i => i) .Order()
.ToArray(), .ToArray(),
CollectionType = GetCollectionType(dir) CollectionType = GetCollectionType(dir)

2
Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

@ -529,7 +529,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
} }
return false; return false;
}).OrderBy(i => i).ToList(); }).Order().ToList();
// If different video types were found, don't allow this // If different video types were found, don't allow this
if (videoTypes.Distinct().Count() > 1) if (videoTypes.Distinct().Count() > 1)

8
Jellyfin.Api/Controllers/FilterController.cs
View File

@ -92,25 +92,25 @@ namespace Jellyfin.Api.Controllers
Years = itemList.Select(i => i.ProductionYear ?? -1) Years = itemList.Select(i => i.ProductionYear ?? -1)
.Where(i => i > 0) .Where(i => i > 0)
.Distinct() .Distinct()
.OrderBy(i => i) .Order()
.ToArray(), .ToArray(),
Genres = itemList.SelectMany(i => i.Genres) Genres = itemList.SelectMany(i => i.Genres)
.DistinctNames() .DistinctNames()
.OrderBy(i => i) .Order()
.ToArray(), .ToArray(),
Tags = itemList Tags = itemList
.SelectMany(i => i.Tags) .SelectMany(i => i.Tags)
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i) .Order()
.ToArray(), .ToArray(),
OfficialRatings = itemList OfficialRatings = itemList
.Select(i => i.OfficialRating) .Select(i => i.OfficialRating)
.Where(i => !string.IsNullOrWhiteSpace(i)) .Where(i => !string.IsNullOrWhiteSpace(i))
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i) .Order()
.ToArray() .ToArray()
}; };
} }

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

@ -465,7 +465,7 @@ namespace MediaBrowser.Providers.Manager
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.ToArray(); .ToArray();
if (currentList.Length != item.Genres.Length || !currentList.OrderBy(i => i).SequenceEqual(item.Genres.OrderBy(i => i), StringComparer.OrdinalIgnoreCase)) if (currentList.Length != item.Genres.Length || !currentList.Order().SequenceEqual(item.Genres.Order(), StringComparer.OrdinalIgnoreCase))
{ {
updateType |= ItemUpdateType.MetadataEdit; updateType |= ItemUpdateType.MetadataEdit;
} }
@ -486,7 +486,7 @@ namespace MediaBrowser.Providers.Manager
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.ToArray(); .ToArray();
if (currentList.Length != item.Studios.Length || !currentList.OrderBy(i => i).SequenceEqual(item.Studios.OrderBy(i => i), StringComparer.OrdinalIgnoreCase)) if (currentList.Length != item.Studios.Length || !currentList.Order().SequenceEqual(item.Studios.Order(), StringComparer.OrdinalIgnoreCase))
{ {
updateType |= ItemUpdateType.MetadataEdit; updateType |= ItemUpdateType.MetadataEdit;
} }