mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-06 06:07:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge cdaf46995e into 9e36fa4263

Browse Source
This commit is contained in:
mammo0 2025-08-02 06:59:42 -04:00 committed by GitHub
commit cc2cf4c200
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,7 +737,7 @@ namespace Emby.Server.Implementations.Library
foreach (var resolver in multiItemResolvers)
{
var result = resolver.ResolveMultiple(parent, fileList, collectionType, directoryService);
var result = resolver.ResolveMultiple(parent, fileList, collectionType, directoryService, libraryOptions);
if (result?.Items.Count > 0)
{

4
Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
View File

@ -15,6 +15,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.IO;
namespace Emby.Server.Implementations.Library.Resolvers.Audio
@ -41,7 +42,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
Folder parent,
List<FileSystemMetadata> files,
CollectionType? collectionType,
IDirectoryService directoryService)
IDirectoryService directoryService,
LibraryOptions libraryOptions)
{
var result = ResolveMultipleInternal(parent, files, collectionType);

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

@ -16,6 +16,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
@ -65,9 +66,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
Folder parent,
List<FileSystemMetadata> files,
CollectionType? collectionType,
IDirectoryService directoryService)
IDirectoryService directoryService,
LibraryOptions libraryOptions)
{
var result = ResolveMultipleInternal(parent, files, collectionType);
var result = ResolveMultipleInternal(parent, files, collectionType, libraryOptions.EnableVersionGrouping);
if (result is not null)
{
@ -188,7 +190,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
private MultiItemResolverResult ResolveMultipleInternal(
Folder parent,
List<FileSystemMetadata> files,
CollectionType? collectionType)
CollectionType? collectionType,
bool supportMultiEditions)
{
if (IsInvalid(parent, collectionType))
{
@ -197,7 +200,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
if (collectionType is CollectionType.musicvideos)
{
return ResolveVideos<MusicVideo>(parent, files, true, collectionType, false);
return ResolveVideos<MusicVideo>(parent, files, supportMultiEditions, collectionType, false);
}
if (collectionType == CollectionType.homevideos || collectionType == CollectionType.photos)
@ -223,12 +226,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
if (collectionType == CollectionType.movies)
{
return ResolveVideos<Movie>(parent, files, true, collectionType, true);
return ResolveVideos<Movie>(parent, files, supportMultiEditions, collectionType, true);
}
if (collectionType == CollectionType.tvshows)
{
return ResolveVideos<Episode>(parent, files, false, collectionType, true);
return ResolveVideos<Episode>(parent, files, supportMultiEditions, collectionType, true);
}
return null;

4
MediaBrowser.Controller/Resolvers/IItemResolver.cs
View File

@ -5,6 +5,7 @@ using Jellyfin.Data.Enums;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.IO;
namespace MediaBrowser.Controller.Resolvers
@ -34,7 +35,8 @@ namespace MediaBrowser.Controller.Resolvers
Folder parent,
List<FileSystemMetadata> files,
CollectionType? collectionType,
IDirectoryService directoryService);
IDirectoryService directoryService,
LibraryOptions libraryOptions);
}
public class MultiItemResolverResult

2
MediaBrowser.Model/Configuration/LibraryOptions.cs
View File

@ -56,6 +56,8 @@ namespace MediaBrowser.Model.Configuration
public bool ExtractTrickplayImagesDuringLibraryScan { get; set; }
public bool EnableVersionGrouping { get; set; }
public MediaPathInfo[] PathInfos { get; set; }
public bool SaveLocalMetadata { get; set; }