starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-06 09:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #15594 from jellyfin/release-10.11.z

Browse Source 
Fix isMovie filter logic

Original-merge: 94f3725208

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
theguymadmax
2025-12-03 14:04:25 -05:00
committed by Bond_009
parent ebcfed83c4
commit 70dcf3f7b3
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
View File

@@ -1653,19 +1653,18 @@ public sealed class BaseItemRepository
var tags = filter.Tags.ToList(); var tags = filter.Tags.ToList();
var excludeTags = filter.ExcludeTags.ToList(); var excludeTags = filter.ExcludeTags.ToList();
if (filter.IsMovie == true) if (filter.IsMovie.HasValue)
{ {
if (filter.IncludeItemTypes.Length == 0 var shouldIncludeAllMovieTypes = filter.IsMovie.Value
|| filter.IncludeItemTypes.Contains(BaseItemKind.Movie) && (filter.IncludeItemTypes.Length == 0
|| filter.IncludeItemTypes.Contains(BaseItemKind.Trailer)) || filter.IncludeItemTypes.Contains(BaseItemKind.Movie)
|| filter.IncludeItemTypes.Contains(BaseItemKind.Trailer));
if (!shouldIncludeAllMovieTypes)
{ {
baseQuery = baseQuery.Where(e => e.IsMovie); baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie.Value);
} }
} }
else if (filter.IsMovie.HasValue)
{
baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie);
}
if (filter.IsSeries.HasValue) if (filter.IsSeries.HasValue)
{ {

2
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -1409,7 +1409,7 @@ namespace MediaBrowser.Controller.Entities
if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0)) if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0))
{ {
realChildren = realChildren realChildren = realChildren
.OrderBy(e => e.ProductionYear ?? int.MaxValue) .OrderBy(e => e.PremiereDate ?? DateTime.MaxValue)
.ToArray(); .ToArray();
} }