alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-08 21:52:24 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #2696 from mark-monteiro/fix-extras

Browse Source 
Display Extras With Unknown Types
This commit is contained in:
Vasily
2020-04-07 23:39:31 +03:00
committed by GitHub
parent 51991cd182 7be4b57fe7
commit 5b59cd2eb2
9 changed files with 122 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Emby.Server.Implementations/Dto/DtoService.cs
View File

@@ -1056,30 +1056,19 @@ namespace Emby.Server.Implementations.Dto
if (options.ContainsField(ItemFields.SpecialFeatureCount))
{
if (allExtras == null)
{
allExtras = item.GetExtras().ToArray();
}
allExtras = item.GetExtras().ToArray();
dto.SpecialFeatureCount = allExtras.Count(i => i.ExtraType.HasValue && BaseItem.DisplayExtraTypes.Contains(i.ExtraType.Value));
}
if (options.ContainsField(ItemFields.LocalTrailerCount))
{
int trailerCount = 0;
if (allExtras == null)
{
allExtras = item.GetExtras().ToArray();
}
trailerCount += allExtras.Count(i => i.ExtraType.HasValue && i.ExtraType.Value == ExtraType.Trailer);
allExtras ??= item.GetExtras().ToArray();
dto.LocalTrailerCount = allExtras.Count(i => i.ExtraType == ExtraType.Trailer);
if (item is IHasTrailers hasTrailers)
{
trailerCount += hasTrailers.GetTrailerCount();
dto.LocalTrailerCount += hasTrailers.GetTrailerCount();
}
dto.LocalTrailerCount = trailerCount;
}
// Add EpisodeInfo

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

@@ -2609,14 +2609,12 @@ namespace Emby.Server.Implementations.Library
}).OrderBy(i => i.Path);
}
private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes", "interviews" };
public IEnumerable<Video> FindExtras(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
{
var namingOptions = GetNamingOptions();
var files = owner.IsInMixedFolder ? new List<FileSystemMetadata>() : fileSystemChildren.Where(i => i.IsDirectory)
.Where(i => ExtrasSubfolderNames.Contains(i.Name ?? string.Empty, StringComparer.OrdinalIgnoreCase))
.Where(i => BaseItem.AllExtrasTypesFolderNames.Contains(i.Name ?? string.Empty, StringComparer.OrdinalIgnoreCase))
.SelectMany(i => _fileSystem.GetFiles(i.FullName, _videoFileExtensions, false, false))
.ToList();