mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-05-03 23:36:38 +01:00
Fix trickplay generation for parts and alt versions
This commit is contained in:
@@ -3583,7 +3583,7 @@ public sealed class BaseItemRepository
|
||||
.Where(e => e.OwnerId == null);
|
||||
}
|
||||
}
|
||||
else if (filter.OwnerIds.Length == 0 && filter.ExtraTypes.Length == 0)
|
||||
else if (filter.OwnerIds.Length == 0 && filter.ExtraTypes.Length == 0 && !filter.IncludeOwnedItems)
|
||||
{
|
||||
// Exclude alternate versions from general queries. Alternate versions have
|
||||
// OwnerId set (pointing to their primary) but no ExtraType.
|
||||
|
||||
@@ -57,7 +57,8 @@ public class MoveTrickplayFiles : IMigrationRoutine
|
||||
MediaTypes = [MediaType.Video],
|
||||
SourceTypes = [SourceType.Library],
|
||||
IsVirtualItem = false,
|
||||
IsFolder = false
|
||||
IsFolder = false,
|
||||
IncludeOwnedItems = true
|
||||
};
|
||||
|
||||
do
|
||||
|
||||
@@ -360,6 +360,12 @@ namespace MediaBrowser.Controller.Entities
|
||||
|
||||
public bool? HasOwnerId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether to include items with an OwnerId
|
||||
/// (additional parts, alternate versions) that are normally excluded from general queries.
|
||||
/// </summary>
|
||||
public bool IncludeOwnedItems { get; set; }
|
||||
|
||||
public bool? Is4K { get; set; }
|
||||
|
||||
public int? MaxHeight { get; set; }
|
||||
|
||||
@@ -79,6 +79,7 @@ public class TrickplayImagesTask : IScheduledTask
|
||||
IsVirtualItem = false,
|
||||
IsFolder = false,
|
||||
Recursive = true,
|
||||
IncludeOwnedItems = true,
|
||||
Limit = QueryPageLimit
|
||||
};
|
||||
|
||||
|
||||
@@ -70,7 +70,8 @@ public class TrickplayMoveImagesTask : IScheduledTask
|
||||
SourceTypes = [SourceType.Library],
|
||||
IsVirtualItem = false,
|
||||
IsFolder = false,
|
||||
Recursive = true
|
||||
Recursive = true,
|
||||
IncludeOwnedItems = true
|
||||
});
|
||||
|
||||
var trickplayQuery = new InternalItemsQuery
|
||||
@@ -78,7 +79,8 @@ public class TrickplayMoveImagesTask : IScheduledTask
|
||||
MediaTypes = [MediaType.Video],
|
||||
SourceTypes = [SourceType.Library],
|
||||
IsVirtualItem = false,
|
||||
IsFolder = false
|
||||
IsFolder = false,
|
||||
IncludeOwnedItems = true
|
||||
};
|
||||
|
||||
do
|
||||
|
||||
Reference in New Issue
Block a user