Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Order() introduced in .NET 7 #8923

Merged
merged 1 commit into from
Dec 19, 2022
Merged

Use Order() introduced in .NET 7 #8923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Emby.Server.Implementations/IO/LibraryMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void Start()
.OfType<Folder>()
.SelectMany(f => f.PhysicalLocations)
.Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i);
.Order();

foreach (var path in paths)
{
Expand Down
2 changes: 1 addition & 1 deletion Emby.Server.Implementations/Library/LibraryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ private VirtualFolderInfo GetVirtualFolderInfo(string dir, List<BaseItem> allCol
}
})
.Where(i => i is not null)
.OrderBy(i => i)
.Order()
.ToArray(),

CollectionType = GetCollectionType(dir)
Expand Down
2 changes: 1 addition & 1 deletion Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ private T GetMultiDiscMovie<T>(List<FileSystemMetadata> multiDiscFolders, IDirec
}

return false;
}).OrderBy(i => i).ToList();
}).Order().ToList();

// If different video types were found, don't allow this
if (videoTypes.Distinct().Count() > 1)
Expand Down
8 changes: 4 additions & 4 deletions Jellyfin.Api/Controllers/FilterController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,25 @@ public FilterController(ILibraryManager libraryManager, IUserManager userManager
Years = itemList.Select(i => i.ProductionYear ?? -1)
.Where(i => i > 0)
.Distinct()
.OrderBy(i => i)
.Order()
.ToArray(),

Genres = itemList.SelectMany(i => i.Genres)
.DistinctNames()
.OrderBy(i => i)
.Order()
.ToArray(),

Tags = itemList
.SelectMany(i => i.Tags)
.Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i)
.Order()
.ToArray(),

OfficialRatings = itemList
.Select(i => i.OfficialRating)
.Where(i => !string.IsNullOrWhiteSpace(i))
.Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i)
.Order()
.ToArray()
};
}
Expand Down
4 changes: 2 additions & 2 deletions MediaBrowser.Providers/Manager/MetadataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ private ItemUpdateType UpdateGenres(TItemType item, IList<BaseItem> children)
.Distinct(StringComparer.OrdinalIgnoreCase)
.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;
}
Expand All @@ -486,7 +486,7 @@ private ItemUpdateType UpdateStudios(TItemType item, IList<BaseItem> children)
.Distinct(StringComparer.OrdinalIgnoreCase)
.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;
}
Expand Down