pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge a726629d94 into 5612cb8178

This commit is contained in:
SenorSmartyPants 2024-04-25 09:15:44 -04:00 committed by GitHub
parent 5612cb8178 a726629d94
commit f758431f47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 280 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,8 @@ using Episode = MediaBrowser.Controller.Entities.TV.Episode;
using EpisodeInfo = Emby.Naming.TV.EpisodeInfo;
using Genre = MediaBrowser.Controller.Entities.Genre;
using Person = MediaBrowser.Controller.Entities.Person;
using Season = MediaBrowser.Controller.Entities.TV.Season;
using Series = MediaBrowser.Controller.Entities.TV.Series;
using VideoResolver = Emby.Naming.Video.VideoResolver;
namespace Emby.Server.Implementations.Library
@ -2654,11 +2656,12 @@ namespace Emby.Server.Implementations.Library
yield break;
}
var resolver = new EpisodeResolver(_namingOptions);
var count = fileSystemChildren.Count;
for (var i = 0; i < count; i++)
{
var current = fileSystemChildren[i];
if (current.IsDirectory && _namingOptions.AllExtrasTypesFolderNames.ContainsKey(current.Name))
if (!owner.IsInMixedFolder && current.IsDirectory && _namingOptions.AllExtrasTypesFolderNames.ContainsKey(current.Name))
{
var filesInSubFolder = _fileSystem.GetFiles(current.FullName, null, false, false);
foreach (var file in filesInSubFolder)
@ -2677,10 +2680,61 @@ namespace Emby.Server.Implementations.Library
}
else if (!current.IsDirectory && _extraResolver.TryGetExtraTypeForOwner(current.FullName, ownerVideoInfo, out var extraType))
{
var extra = GetExtra(current, extraType.Value);
if (extra is not null)
// if owner is dir, don't own episode extras
// test if extra filename is formatted like an episode
int? dashIndex = current.Name?.LastIndexOf('-');
string prefix = null;
if (dashIndex is int dashIndexValue)
{
yield return extra;
if (dashIndexValue >= 0)
{
prefix = current.Name.Substring(0, dashIndexValue); // possible episode name
prefix = ParseName(prefix).Name; // clean name - remove all things in brackets etc
string path = current.FullName;
path = string.Concat(path.AsSpan(0, path.LastIndexOf('-')), current.Extension);
var episodeInfo = resolver.Resolve(path, false);
string seriesName = null;
if (owner is Series series)
{
seriesName = series.Name;
}
if (owner is Season season)
{
seriesName = season.SeriesName;
}
if (seriesName is not null && episodeInfo?.SeriesName is not null)
{
// trim series names like episodepathparser does
seriesName = seriesName
.Trim()
.Trim('_', '.', '-')
.Trim();
var episodeInfoSeriesName = episodeInfo.SeriesName
.Trim()
.Trim('_', '.', '-')
.Trim();
if (seriesName.Equals(episodeInfoSeriesName, StringComparison.OrdinalIgnoreCase))
{
// don't attach episode extras to series or season
continue;
}
}
}
}
// if owner is Episode, only suffix type matches will be allowed, episode file cleaned name must match
if (owner is not Episode || (prefix is not null && prefix.Equals(ownerVideoInfo.Name, StringComparison.OrdinalIgnoreCase)))
{
var extra = GetExtra(current, extraType.Value);
if (extra is not null)
{
yield return extra;
}
}
}
}

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

@ -281,8 +281,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
ExtraFiles = leftOver
};
var isInMixedFolder = resolverResult.Count > 1 || parent?.IsTopParent == true;
foreach (var video in resolverResult)
{
var firstVideo = video.Files[0];
@ -298,7 +296,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
var videoItem = new T
{
Path = path,
IsInMixedFolder = isInMixedFolder,
ProductionYear = video.Year,
Name = parseName ? video.Name : firstVideo.Name,
AdditionalParts = additionalParts,
@ -313,6 +310,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
result.ExtraFiles.AddRange(files.Where(i => !ContainsFile(resolverResult, i)));
// calculate if in mixed folder after extra files have been removed from count
var isInMixedFolder = result.Items.Count > 1 || parent?.IsTopParent == true;
foreach (var item in result.Items)
{
item.IsInMixedFolder = isInMixedFolder;
}
return result;
}

3
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -19,6 +19,7 @@ using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
@ -1338,7 +1339,7 @@ namespace MediaBrowser.Controller.Entities
/// <returns><c>true</c> if any items have changed, else <c>false</c>.</returns>
protected virtual async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
{
if (!IsFileProtocol || !SupportsOwnedItems || IsInMixedFolder || this is ICollectionFolder or UserRootFolder or AggregateFolder || this.GetType() == typeof(Folder))
if (!IsFileProtocol || !SupportsOwnedItems || (IsInMixedFolder && this is not Episode) || this is ICollectionFolder or UserRootFolder or AggregateFolder || this.GetType() == typeof(Folder))
{
return false;
}

2
MediaBrowser.Controller/Entities/TV/Episode.cs
View File

@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.Entities.TV
public int? IndexNumberEnd { get; set; }
[JsonIgnore]
protected override bool SupportsOwnedItems => IsStacked || MediaSourceCount > 1;
protected override bool SupportsOwnedItems => true;
[JsonIgnore]
public override bool SupportsInheritedParentImages => true;

212
tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
View File

@ -331,4 +331,216 @@ public class FindExtrasTests
Assert.Equal("/series/Dexter/trailer.mkv", extras[0].Path);
Assert.Equal("/series/Dexter/trailers/trailer2.mkv", extras[1].Path);
}
[Fact]
public void FindExtras_SeriesWithExtras_FindsCorrectExtras()
{
var owner = new Series { Name = "Dexter", Path = "/series/Dexter" };
var paths = new List<string>
{
"/series/Dexter/Season 1/Dexter - S01E01.mkv",
"/series/Dexter/Season 1/Dexter - S01E01-deleted.mkv",
"/series/Dexter/Season 1/Dexter - S01E01 [WEBDL-1080p AVC][AAC 2.0][YouTube]-deleted.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-interview.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-scene.mkv",
"/series/Dexter/Season 1/It's a begining-behindthescenes.mkv",
"/series/Dexter/Season 1/interviews/The Cast.mkv",
"/series/Dexter/Funny-behindthescenes.mkv",
"/series/Dexter/interviews/The Director.mkv",
"/series/Dexter/Dexter - S02E05.mkv",
"/series/Dexter/Dexter - S02E05-clip.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth-featurette.mkv",
};
var files = paths.Select(p => new FileSystemMetadata
{
FullName = p,
Name = Path.GetFileName(p),
Extension = Path.GetExtension(p),
IsDirectory = string.IsNullOrEmpty(Path.GetExtension(p))
}).ToList();
var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Equal(2, extras.Count);
Assert.Equal(ExtraType.BehindTheScenes, extras[0].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("Funny-behindthescenes", extras[0].FileNameWithoutExtension);
Assert.Equal("/series/Dexter/Funny-behindthescenes.mkv", extras[0].Path);
Assert.Equal("/series/Dexter/interviews/The Director.mkv", extras[1].Path);
}
[Fact]
public void FindExtras_SeasonWithExtras_FindsCorrectExtras()
{
var owner = new Season { Name = "Season 1", SeriesName = "Dexter", Path = "/series/Dexter/Season 1" };
var paths = new List<string>
{
"/series/Dexter/Season 1/Dexter 1x01 [Bluray-1080p x264][AC3 5.1][-reward] - Northwest Passage.mkv",
"/series/Dexter/Season 1/Dexter 1x01-deleted.mkv",
"/series/Dexter/Season 1/Dexter 1x01 [WEBDL-1080p AVC][AAC 2.0][YouTube]-deleted.mkv",
"/series/Dexter/Season 1/Dexter 1x01 [WEBDL-1080p AVC][AAC 2.0][YouTube][-MrC] - Log Lady Introduction 1-extra.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-interview.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-scene.mkv",
"/series/Dexter/Season 1/It's a begining-behindthescenes.mkv",
"/series/Dexter/Season 1/interviews/The Cast.mkv",
"/series/Dexter/Funny-behindthescenes.mkv",
"/series/Dexter/interviews/The Director.mkv",
"/series/Dexter/Dexter - S02E05.mkv",
"/series/Dexter/Dexter - S02E05-clip.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth-featurette.mkv",
};
var files = paths.Select(p => new FileSystemMetadata
{
FullName = p,
Name = Path.GetFileName(p),
Extension = Path.GetExtension(p),
IsDirectory = string.IsNullOrEmpty(Path.GetExtension(p))
}).ToList();
var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Equal(2, extras.Count);
Assert.Equal(ExtraType.BehindTheScenes, extras[0].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("It's a begining-behindthescenes", extras[0].FileNameWithoutExtension);
Assert.Equal("/series/Dexter/Season 1/It's a begining-behindthescenes.mkv", extras[0].Path);
Assert.Equal("/series/Dexter/Season 1/interviews/The Cast.mkv", extras[1].Path);
}
[Fact]
public void FindExtras_SeasonWithExtras_FindsCorrectExtras2()
{
// Series name directory has special characters stripped that episodes do not
var owner = new Season { Name = "Season 1", SeriesName = "The Venture Bros.", Path = "/series/The Venture Bros/Season 1" };
var paths = new List<string>
{
"/series/The Venture Bros/Season 1/The Venture Bros. S01E01.mkv",
"/series/The Venture Bros/Season 1/The Venture Bros. S01E01-deleted.mkv",
"/series/The Venture Bros/Season 1/The Venture Bros. - S01E02 - Second Epi.mkv",
"/series/The Venture Bros/Season 1/The Venture Bros. - S01E02 - Second Epi-interview.mkv",
"/series/The Venture Bros/Season 1/The Venture Bros. - S01E02 - Second Epi-scene.mkv",
"/series/The Venture Bros/Season 1/It's a begining-behindthescenes.mkv",
"/series/The Venture Bros/Season 1/interviews/The Cast.mkv",
};
var files = paths.Select(p => new FileSystemMetadata
{
FullName = p,
Name = Path.GetFileName(p),
Extension = Path.GetExtension(p),
IsDirectory = string.IsNullOrEmpty(Path.GetExtension(p))
}).ToList();
var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Equal(2, extras.Count);
Assert.Equal(ExtraType.BehindTheScenes, extras[0].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("It's a begining-behindthescenes", extras[0].FileNameWithoutExtension);
Assert.Equal("/series/The Venture Bros/Season 1/It's a begining-behindthescenes.mkv", extras[0].Path);
Assert.Equal("/series/The Venture Bros/Season 1/interviews/The Cast.mkv", extras[1].Path);
}
[Fact]
public void FindExtras_EpisodeWithExtras_FindsCorrectExtras()
{
var paths = new List<string>
{
"/series/Dexter/Season 1/Dexter - S01E01.mkv",
"/series/Dexter/Season 1/Dexter - S01E01-deleted.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-interview.mkv",
"/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-scene.mkv",
"/series/Dexter/Season 1/It's a begining-behindthescenes.mkv",
"/series/Dexter/Season 1/interviews/The Cast.mkv",
"/series/Dexter/Funny-behindthescenes.mkv",
"/series/Dexter/interviews/The Director.mkv",
"/series/Dexter/Dexter - S02E05.mkv",
"/series/Dexter/Dexter - S02E05-clip.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth-featurette.mkv",
"/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth-featurette2.mkv",
"/series/Dexter/Dexter - S03E05/Deleted Scenes/Meet Friends.mkv",
};
var files = paths.Select(p => new FileSystemMetadata
{
FullName = p,
Name = Path.GetFileName(p),
Extension = Path.GetExtension(p),
IsDirectory = string.IsNullOrEmpty(Path.GetExtension(p))
}).ToList();
var owner = new Episode { Name = "Dexter - S01E01", Path = "/series/Dexter/Season 1/Dexter - S01E01.mkv", IsInMixedFolder = true };
var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Single(extras);
Assert.Equal(ExtraType.DeletedScene, extras[0].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("/series/Dexter/Season 1/Dexter - S01E01-deleted.mkv", extras[0].Path);
owner = new Episode { Name = "Dexter - S01E02 - Second Epi", Path = "/series/Dexter/Season 1/Dexter - S01E02 - Second Epi.mkv", IsInMixedFolder = true };
extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Equal(2, extras.Count);
Assert.Equal(ExtraType.Interview, extras[0].ExtraType);
Assert.Equal(ExtraType.Scene, extras[1].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-interview.mkv", extras[0].Path);
Assert.Equal("/series/Dexter/Season 1/Dexter - S01E02 - Second Epi-scene.mkv", extras[1].Path);
owner = new Episode { Name = "Dexter - S02E05", Path = "/series/Dexter/Dexter - S02E05.mkv", IsInMixedFolder = true };
extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Single(extras);
Assert.Equal(ExtraType.Clip, extras[0].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("/series/Dexter/Dexter - S02E05-clip.mkv", extras[0].Path);
// episode folder with special feature subfolders are not supported yet, but it should be considered as not mixed, but current is marked as mixed
Folder folderOwner = new Folder { Name = "Dexter - S03E05", Path = "/series/Dexter/Dexter - S03E05", IsInMixedFolder = false };
extras = _libraryManager.FindExtras(folderOwner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Equal(3, extras.Count);
// directory type extras are found before suffix type
Assert.Equal(ExtraType.DeletedScene, extras[0].ExtraType);
Assert.Equal("/series/Dexter/Dexter - S03E05/Deleted Scenes/Meet Friends.mkv", extras[0].Path);
Assert.Equal(ExtraType.Featurette, extras[1].ExtraType);
Assert.Equal(typeof(Video), extras[1].GetType());
Assert.Equal("/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth-featurette.mkv", extras[1].Path);
Assert.Equal("/series/Dexter/Dexter - S03E05/Dexter - S03E05 - Fifth-featurette2.mkv", extras[2].Path);
}
[Fact]
public void FindExtras_EpisodeWithExtras_CleanNameTest()
{
var paths = new List<string>
{
"/series/Dexter/Season 1/Dexter - S01E01[Bluray-1080p x264][AC3 5.1].mkv",
"/series/Dexter/Season 1/Dexter - S01E01 [WEBDL-1080p AVC][AAC 2.0][YouTube]-deleted.mkv",
"/series/Dexter/Season 1/Dexter - S01E01[Bluray-1080p x264][AC3 5.1] - Some crazy deleted scene -deleted.mkv"
};
var files = paths.Select(p => new FileSystemMetadata
{
FullName = p,
Name = Path.GetFileName(p),
Extension = Path.GetExtension(p),
IsDirectory = string.IsNullOrEmpty(Path.GetExtension(p))
}).ToList();
var owner = new Episode { Name = "Dexter - S01E01", Path = "/series/Dexter/Season 1/Dexter - S01E01[Bluray-1080p x264][AC3 5.1].mkv", IsInMixedFolder = true };
var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
Assert.Equal(2, extras.Count);
Assert.Equal(ExtraType.DeletedScene, extras[0].ExtraType);
Assert.Equal(typeof(Video), extras[0].GetType());
Assert.Equal("/series/Dexter/Season 1/Dexter - S01E01 [WEBDL-1080p AVC][AAC 2.0][YouTube]-deleted.mkv", extras[0].Path);
}
}