Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-24 02:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP porting new Repository structure

Browse Source
This commit is contained in:
JPVenson 2024-10-09 10:36:08 +00:00
parent be48cdd9e9
commit b09a41ad1f
50 changed files with 211 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -192,3 +192,6 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences # Wrapping preferences
csharp_preserve_single_line_statements = true csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true csharp_preserve_single_line_blocks = true
# CA1826: Do not use Enumerable methods on indexable collections
dotnet_diagnostic.CA1826.severity = suggestion

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

@ -10,6 +10,7 @@ using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Common; using MediaBrowser.Common;
using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Chapters;
using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
@ -51,6 +52,7 @@ namespace Emby.Server.Implementations.Dto
private readonly Lazy<ILiveTvManager> _livetvManagerFactory; private readonly Lazy<ILiveTvManager> _livetvManagerFactory;
private readonly ITrickplayManager _trickplayManager; private readonly ITrickplayManager _trickplayManager;
private readonly IChapterRepository _chapterRepository;
public DtoService( public DtoService(
ILogger<DtoService> logger, ILogger<DtoService> logger,
@ -63,7 +65,8 @@ namespace Emby.Server.Implementations.Dto
IApplicationHost appHost, IApplicationHost appHost,
IMediaSourceManager mediaSourceManager, IMediaSourceManager mediaSourceManager,
Lazy<ILiveTvManager> livetvManagerFactory, Lazy<ILiveTvManager> livetvManagerFactory,
ITrickplayManager trickplayManager) ITrickplayManager trickplayManager,
IChapterRepository chapterRepository)
{ {
_logger = logger; _logger = logger;
_libraryManager = libraryManager; _libraryManager = libraryManager;
@ -76,6 +79,7 @@ namespace Emby.Server.Implementations.Dto
_mediaSourceManager = mediaSourceManager; _mediaSourceManager = mediaSourceManager;
_livetvManagerFactory = livetvManagerFactory; _livetvManagerFactory = livetvManagerFactory;
_trickplayManager = trickplayManager; _trickplayManager = trickplayManager;
_chapterRepository = chapterRepository;
} }
private ILiveTvManager LivetvManager => _livetvManagerFactory.Value; private ILiveTvManager LivetvManager => _livetvManagerFactory.Value;
@ -165,7 +169,7 @@ namespace Emby.Server.Implementations.Dto
return dto; return dto;
} }
private static IList<BaseItem> GetTaggedItems(IItemByName byName, User? user, DtoOptions options) private static IReadOnlyList<BaseItem> GetTaggedItems(IItemByName byName, User? user, DtoOptions options)
{ {
return byName.GetTaggedItems( return byName.GetTaggedItems(
new InternalItemsQuery(user) new InternalItemsQuery(user)
@ -327,7 +331,7 @@ namespace Emby.Server.Implementations.Dto
return dto; return dto;
} }
private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IList<BaseItem> taggedItems) private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IReadOnlyList<BaseItem> taggedItems)
{ {
if (item is MusicArtist) if (item is MusicArtist)
{ {
@ -1060,7 +1064,7 @@ namespace Emby.Server.Implementations.Dto
if (options.ContainsField(ItemFields.Chapters)) if (options.ContainsField(ItemFields.Chapters))
{ {
dto.Chapters = _itemRepo.GetChapters(item); dto.Chapters = _chapterRepository.GetChapters(item.Id).ToList();
} }
if (options.ContainsField(ItemFields.Trickplay)) if (options.ContainsField(ItemFields.Trickplay))

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

@ -76,6 +76,7 @@ namespace Emby.Server.Implementations.Library
private readonly IItemRepository _itemRepository; private readonly IItemRepository _itemRepository;
private readonly IImageProcessor _imageProcessor; private readonly IImageProcessor _imageProcessor;
private readonly NamingOptions _namingOptions; private readonly NamingOptions _namingOptions;
private readonly IPeopleRepository _peopleRepository;
private readonly ExtraResolver _extraResolver; private readonly ExtraResolver _extraResolver;
/// <summary> /// <summary>
@ -112,6 +113,7 @@ namespace Emby.Server.Implementations.Library
/// <param name="imageProcessor">The image processor.</param> /// <param name="imageProcessor">The image processor.</param>
/// <param name="namingOptions">The naming options.</param> /// <param name="namingOptions">The naming options.</param>
/// <param name="directoryService">The directory service.</param> /// <param name="directoryService">The directory service.</param>
/// <param name="peopleRepository">The People Repository.</param>
public LibraryManager( public LibraryManager(
IServerApplicationHost appHost, IServerApplicationHost appHost,
ILoggerFactory loggerFactory, ILoggerFactory loggerFactory,
@ -127,7 +129,8 @@ namespace Emby.Server.Implementations.Library
IItemRepository itemRepository, IItemRepository itemRepository,
IImageProcessor imageProcessor, IImageProcessor imageProcessor,
NamingOptions namingOptions, NamingOptions namingOptions,
IDirectoryService directoryService) IDirectoryService directoryService,
IPeopleRepository peopleRepository)
{ {
_appHost = appHost; _appHost = appHost;
_logger = loggerFactory.CreateLogger<LibraryManager>(); _logger = loggerFactory.CreateLogger<LibraryManager>();
@ -144,7 +147,7 @@ namespace Emby.Server.Implementations.Library
_imageProcessor = imageProcessor; _imageProcessor = imageProcessor;
_cache = new ConcurrentDictionary<Guid, BaseItem>(); _cache = new ConcurrentDictionary<Guid, BaseItem>();
_namingOptions = namingOptions; _namingOptions = namingOptions;
_peopleRepository = peopleRepository;
_extraResolver = new ExtraResolver(loggerFactory.CreateLogger<ExtraResolver>(), namingOptions, directoryService); _extraResolver = new ExtraResolver(loggerFactory.CreateLogger<ExtraResolver>(), namingOptions, directoryService);
_configurationManager.ConfigurationUpdated += ConfigurationUpdated; _configurationManager.ConfigurationUpdated += ConfigurationUpdated;
@ -1274,7 +1277,7 @@ namespace Emby.Server.Implementations.Library
return ItemIsVisible(item, user) ? item : null; return ItemIsVisible(item, user) ? item : null;
} }
public List<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent) public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent)
{ {
if (query.Recursive && !query.ParentId.IsEmpty()) if (query.Recursive && !query.ParentId.IsEmpty())
{ {
@ -1300,7 +1303,7 @@ namespace Emby.Server.Implementations.Library
return itemList; return itemList;
} }
public List<BaseItem> GetItemList(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query)
{ {
return GetItemList(query, true); return GetItemList(query, true);
} }
@ -1324,7 +1327,7 @@ namespace Emby.Server.Implementations.Library
return _itemRepository.GetCount(query); return _itemRepository.GetCount(query);
} }
public List<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents) public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents)
{ {
SetTopParentIdsOrAncestors(query, parents); SetTopParentIdsOrAncestors(query, parents);
@ -1357,7 +1360,7 @@ namespace Emby.Server.Implementations.Library
_itemRepository.GetItemList(query)); _itemRepository.GetItemList(query));
} }
public List<Guid> GetItemIds(InternalItemsQuery query) public IReadOnlyList<Guid> GetItemIds(InternalItemsQuery query)
{ {
if (query.User is not null) if (query.User is not null)
{ {
@ -2736,12 +2739,12 @@ namespace Emby.Server.Implementations.Library
return path; return path;
} }
public List<PersonInfo> GetPeople(InternalPeopleQuery query) public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery query)
{ {
return _itemRepository.GetPeople(query); return _peopleRepository.GetPeople(query);
} }
public List<PersonInfo> GetPeople(BaseItem item) public IReadOnlyList<PersonInfo> GetPeople(BaseItem item)
{ {
if (item.SupportsPeople) if (item.SupportsPeople)
{ {
@ -2756,12 +2759,12 @@ namespace Emby.Server.Implementations.Library
} }
} }
return new List<PersonInfo>(); return [];
} }
public List<Person> GetPeopleItems(InternalPeopleQuery query) public IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query)
{ {
return _itemRepository.GetPeopleNames(query) return _peopleRepository.GetPeopleNames(query)
.Select(i => .Select(i =>
{ {
try try
@ -2779,9 +2782,9 @@ namespace Emby.Server.Implementations.Library
.ToList()!; // null values are filtered out .ToList()!; // null values are filtered out
} }
public List<string> GetPeopleNames(InternalPeopleQuery query) public IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query)
{ {
return _itemRepository.GetPeopleNames(query); return _peopleRepository.GetPeopleNames(query);
} }
public void UpdatePeople(BaseItem item, List<PersonInfo> people) public void UpdatePeople(BaseItem item, List<PersonInfo> people)
@ -2790,14 +2793,14 @@ namespace Emby.Server.Implementations.Library
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task UpdatePeopleAsync(BaseItem item, List<PersonInfo> people, CancellationToken cancellationToken) public async Task UpdatePeopleAsync(BaseItem item, IReadOnlyList<PersonInfo> people, CancellationToken cancellationToken)
{ {
if (!item.SupportsPeople) if (!item.SupportsPeople)
{ {
return; return;
} }
_itemRepository.UpdatePeople(item.Id, people); _peopleRepository.UpdatePeople(item.Id, people);
if (people is not null) if (people is not null)
{ {
await SavePeopleMetadataAsync(people, cancellationToken).ConfigureAwait(false); await SavePeopleMetadataAsync(people, cancellationToken).ConfigureAwait(false);

25
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -51,7 +51,8 @@ namespace Emby.Server.Implementations.Library
private readonly ILocalizationManager _localizationManager; private readonly ILocalizationManager _localizationManager;
private readonly IApplicationPaths _appPaths; private readonly IApplicationPaths _appPaths;
private readonly IDirectoryService _directoryService; private readonly IDirectoryService _directoryService;
private readonly IMediaStreamRepository _mediaStreamRepository;
private readonly IMediaAttachmentRepository _mediaAttachmentRepository;
private readonly ConcurrentDictionary<string, ILiveStream> _openStreams = new ConcurrentDictionary<string, ILiveStream>(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, ILiveStream> _openStreams = new ConcurrentDictionary<string, ILiveStream>(StringComparer.OrdinalIgnoreCase);
private readonly AsyncNonKeyedLocker _liveStreamLocker = new(1); private readonly AsyncNonKeyedLocker _liveStreamLocker = new(1);
private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options; private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
@ -69,7 +70,9 @@ namespace Emby.Server.Implementations.Library
IFileSystem fileSystem, IFileSystem fileSystem,
IUserDataManager userDataManager, IUserDataManager userDataManager,
IMediaEncoder mediaEncoder, IMediaEncoder mediaEncoder,
IDirectoryService directoryService) IDirectoryService directoryService,
IMediaStreamRepository mediaStreamRepository,
IMediaAttachmentRepository mediaAttachmentRepository)
{ {
_appHost = appHost; _appHost = appHost;
_itemRepo = itemRepo; _itemRepo = itemRepo;
@ -82,6 +85,8 @@ namespace Emby.Server.Implementations.Library
_localizationManager = localizationManager; _localizationManager = localizationManager;
_appPaths = applicationPaths; _appPaths = applicationPaths;
_directoryService = directoryService; _directoryService = directoryService;
_mediaStreamRepository = mediaStreamRepository;
_mediaAttachmentRepository = mediaAttachmentRepository;
} }
public void AddParts(IEnumerable<IMediaSourceProvider> providers) public void AddParts(IEnumerable<IMediaSourceProvider> providers)
@ -89,9 +94,9 @@ namespace Emby.Server.Implementations.Library
_providers = providers.ToArray(); _providers = providers.ToArray();
} }
public List<MediaStream> GetMediaStreams(MediaStreamQuery query) public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery query)
{ {
var list = _itemRepo.GetMediaStreams(query); var list = _mediaStreamRepository.GetMediaStreams(query);
foreach (var stream in list) foreach (var stream in list)
{ {
@ -121,7 +126,7 @@ namespace Emby.Server.Implementations.Library
return false; return false;
} }
public List<MediaStream> GetMediaStreams(Guid itemId) public IReadOnlyList<MediaStream> GetMediaStreams(Guid itemId)
{ {
var list = GetMediaStreams(new MediaStreamQuery var list = GetMediaStreams(new MediaStreamQuery
{ {
@ -131,7 +136,7 @@ namespace Emby.Server.Implementations.Library
return GetMediaStreamsForItem(list); return GetMediaStreamsForItem(list);
} }
private List<MediaStream> GetMediaStreamsForItem(List<MediaStream> streams) private IReadOnlyList<MediaStream> GetMediaStreamsForItem(IReadOnlyList<MediaStream> streams)
{ {
foreach (var stream in streams) foreach (var stream in streams)
{ {
@ -145,13 +150,13 @@ namespace Emby.Server.Implementations.Library
} }
/// <inheritdoc /> /// <inheritdoc />
public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query) public IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
{ {
return _itemRepo.GetMediaAttachments(query); return _mediaAttachmentRepository.GetMediaAttachments(query);
} }
/// <inheritdoc /> /// <inheritdoc />
public List<MediaAttachment> GetMediaAttachments(Guid itemId) public IReadOnlyList<MediaAttachment> GetMediaAttachments(Guid itemId)
{ {
return GetMediaAttachments(new MediaAttachmentQuery return GetMediaAttachments(new MediaAttachmentQuery
{ {
@ -332,7 +337,7 @@ namespace Emby.Server.Implementations.Library
return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase)); return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
} }
public List<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null) public IReadOnlyList<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null)
{ {
ArgumentNullException.ThrowIfNull(item); ArgumentNullException.ThrowIfNull(item);

19
Emby.Server.Implementations/Library/MusicManager.cs
View File

@ -2,6 +2,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq; using System.Linq;
using Jellyfin.Data.Entities; using Jellyfin.Data.Entities;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
@ -24,7 +25,7 @@ namespace Emby.Server.Implementations.Library
_libraryManager = libraryManager; _libraryManager = libraryManager;
} }
public List<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
{ {
var list = new List<BaseItem> var list = new List<BaseItem>
{ {
@ -33,21 +34,21 @@ namespace Emby.Server.Implementations.Library
list.AddRange(GetInstantMixFromGenres(item.Genres, user, dtoOptions)); list.AddRange(GetInstantMixFromGenres(item.Genres, user, dtoOptions));
return list; return list.ToImmutableList();
} }
/// <inheritdoc /> /// <inheritdoc />
public List<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions)
{ {
return GetInstantMixFromGenres(artist.Genres, user, dtoOptions); return GetInstantMixFromGenres(artist.Genres, user, dtoOptions);
} }
public List<BaseItem> GetInstantMixFromAlbum(MusicAlbum item, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromAlbum(MusicAlbum item, User? user, DtoOptions dtoOptions)
{ {
return GetInstantMixFromGenres(item.Genres, user, dtoOptions); return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
} }
public List<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions)
{ {
var genres = item var genres = item
.GetRecursiveChildren(user, new InternalItemsQuery(user) .GetRecursiveChildren(user, new InternalItemsQuery(user)
@ -63,12 +64,12 @@ namespace Emby.Server.Implementations.Library
return GetInstantMixFromGenres(genres, user, dtoOptions); return GetInstantMixFromGenres(genres, user, dtoOptions);
} }
public List<BaseItem> GetInstantMixFromPlaylist(Playlist item, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromPlaylist(Playlist item, User? user, DtoOptions dtoOptions)
{ {
return GetInstantMixFromGenres(item.Genres, user, dtoOptions); return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
} }
public List<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions)
{ {
var genreIds = genres.DistinctNames().Select(i => var genreIds = genres.DistinctNames().Select(i =>
{ {
@ -85,7 +86,7 @@ namespace Emby.Server.Implementations.Library
return GetInstantMixFromGenreIds(genreIds, user, dtoOptions); return GetInstantMixFromGenreIds(genreIds, user, dtoOptions);
} }
public List<BaseItem> GetInstantMixFromGenreIds(Guid[] genreIds, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromGenreIds(Guid[] genreIds, User? user, DtoOptions dtoOptions)
{ {
return _libraryManager.GetItemList(new InternalItemsQuery(user) return _libraryManager.GetItemList(new InternalItemsQuery(user)
{ {
@ -97,7 +98,7 @@ namespace Emby.Server.Implementations.Library
}); });
} }
public List<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions) public IReadOnlyList<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions)
{ {
if (item is MusicGenre) if (item is MusicGenre)
{ {

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

@ -171,7 +171,7 @@ namespace Emby.Server.Implementations.Library
} }
}; };
List<BaseItem> mediaItems; IReadOnlyList<BaseItem> mediaItems;
if (searchQuery.IncludeItemTypes.Length == 1 && searchQuery.IncludeItemTypes[0] == BaseItemKind.MusicArtist) if (searchQuery.IncludeItemTypes.Length == 1 && searchQuery.IncludeItemTypes[0] == BaseItemKind.MusicArtist)
{ {

9
Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
View File

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Chapters;
using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
@ -32,6 +33,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
private readonly IEncodingManager _encodingManager; private readonly IEncodingManager _encodingManager;
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly ILocalizationManager _localization; private readonly ILocalizationManager _localization;
private readonly IChapterRepository _chapterRepository;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ChapterImagesTask" /> class. /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
@ -43,6 +45,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
/// <param name="encodingManager">Instance of the <see cref="IEncodingManager"/> interface.</param> /// <param name="encodingManager">Instance of the <see cref="IEncodingManager"/> interface.</param>
/// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param> /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
/// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param> /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
/// <param name="chapterRepository">Instance of the <see cref="IChapterRepository"/> interface.</param>
public ChapterImagesTask( public ChapterImagesTask(
ILogger<ChapterImagesTask> logger, ILogger<ChapterImagesTask> logger,
ILibraryManager libraryManager, ILibraryManager libraryManager,
@ -50,7 +53,8 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
IApplicationPaths appPaths, IApplicationPaths appPaths,
IEncodingManager encodingManager, IEncodingManager encodingManager,
IFileSystem fileSystem, IFileSystem fileSystem,
ILocalizationManager localization) ILocalizationManager localization,
IChapterRepository chapterRepository)
{ {
_logger = logger; _logger = logger;
_libraryManager = libraryManager; _libraryManager = libraryManager;
@ -59,6 +63,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
_encodingManager = encodingManager; _encodingManager = encodingManager;
_fileSystem = fileSystem; _fileSystem = fileSystem;
_localization = localization; _localization = localization;
_chapterRepository = chapterRepository;
} }
/// <inheritdoc /> /// <inheritdoc />
@ -141,7 +146,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
try try
{ {
var chapters = _itemRepo.GetChapters(video); var chapters = _chapterRepository.GetChapters(video.Id);
var success = await _encodingManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false); var success = await _encodingManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false);

2
Jellyfin.Api/Controllers/LibraryController.cs
View File

@ -793,7 +793,7 @@ public class LibraryController : BaseJellyfinApiController
query.ExcludeArtistIds = excludeArtistIds; query.ExcludeArtistIds = excludeArtistIds;
} }
List<BaseItem> itemsResult = _libraryManager.GetItemList(query); var itemsResult = _libraryManager.GetItemList(query);
var returnList = _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user); var returnList = _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user);

4
Jellyfin.Api/Controllers/MoviesController.cs
View File

@ -97,7 +97,7 @@ public class MoviesController : BaseJellyfinApiController
DtoOptions = dtoOptions DtoOptions = dtoOptions
}; };
var recentlyPlayedMovies = _libraryManager.GetItemList(query); var recentlyPlayedMovies = _libraryManager.GetItemList(query)!;
var itemTypes = new List<BaseItemKind> { BaseItemKind.Movie }; var itemTypes = new List<BaseItemKind> { BaseItemKind.Movie };
if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions) if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions)
@ -120,7 +120,7 @@ public class MoviesController : BaseJellyfinApiController
DtoOptions = dtoOptions DtoOptions = dtoOptions
}); });
var mostRecentMovies = recentlyPlayedMovies.GetRange(0, Math.Min(recentlyPlayedMovies.Count, 6)); var mostRecentMovies = recentlyPlayedMovies.Take(Math.Min(recentlyPlayedMovies.Count, 6));
// Get recently played directors // Get recently played directors
var recentDirectors = GetDirectors(mostRecentMovies) var recentDirectors = GetDirectors(mostRecentMovies)
.ToList(); .ToList();

7
Jellyfin.Api/Controllers/YearsController.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using Jellyfin.Api.Extensions; using Jellyfin.Api.Extensions;
@ -105,18 +106,18 @@ public class YearsController : BaseJellyfinApiController
bool Filter(BaseItem i) => FilterItem(i, excludeItemTypes, includeItemTypes, mediaTypes); bool Filter(BaseItem i) => FilterItem(i, excludeItemTypes, includeItemTypes, mediaTypes);
IList<BaseItem> items; IReadOnlyList<BaseItem> items;
if (parentItem.IsFolder) if (parentItem.IsFolder)
{ {
var folder = (Folder)parentItem; var folder = (Folder)parentItem;
if (userId.IsNullOrEmpty()) if (userId.IsNullOrEmpty())
{ {
items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToList(); items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableList();
} }
else else
{ {
items = recursive ? folder.GetRecursiveChildren(user, query).ToList() : folder.GetChildren(user, true).Where(Filter).ToList(); items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableList();
} }
} }
else else

2
Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
View File

@ -174,7 +174,7 @@ public class MediaStreamRepository(IDbContextFactory<JellyfinDbContext> dbProvid
Level = (float)dto.Level.GetValueOrDefault(), Level = (float)dto.Level.GetValueOrDefault(),
PixelFormat = dto.PixelFormat, PixelFormat = dto.PixelFormat,
BitDepth = dto.BitDepth.GetValueOrDefault(0), BitDepth = dto.BitDepth.GetValueOrDefault(0),
IsAnamorphic = dto.IsAnamorphic.GetValueOrDefault(0), IsAnamorphic = dto.IsAnamorphic.GetValueOrDefault(),
RefFrames = dto.RefFrames.GetValueOrDefault(0), RefFrames = dto.RefFrames.GetValueOrDefault(0),
CodecTag = dto.CodecTag, CodecTag = dto.CodecTag,
Comment = dto.Comment, Comment = dto.Comment,

4
Jellyfin.Server.Implementations/Item/PeopleRepository.cs
View File

@ -89,7 +89,9 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
Name = people.Name, Name = people.Name,
Role = people.Role, Role = people.Role,
SortOrder = people.SortOrder, SortOrder = people.SortOrder,
PersonType = people.Type.ToString() PersonType = people.Type.ToString(),
Item = null!,
ListOrder = people.SortOrder
}; };
return personInfo; return personInfo;

1
Jellyfin.Server.Implementations/ModelConfiguration/ChapterConfiguration.cs
View File

@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace Jellyfin.Server.Implementations.ModelConfiguration; namespace Jellyfin.Server.Implementations.ModelConfiguration;
/// <summary> /// <summary>
/// Chapter configuration. /// Chapter configuration.
/// </summary> /// </summary>

2
Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
View File

@ -179,7 +179,7 @@ public class TrickplayManager : ITrickplayManager
{ {
// Extract images // Extract images
// Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay. // Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay.
var mediaSource = video.GetMediaSources(false).Find(source => Guid.Parse(source.Id).Equals(video.Id)); var mediaSource = video.GetMediaSources(false).FirstOrDefault(source => Guid.Parse(source.Id).Equals(video.Id));
if (mediaSource is null) if (mediaSource is null)
{ {

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

@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Entities
return CreateResolveArgs(directoryService, true).FileSystemChildren; return CreateResolveArgs(directoryService, true).FileSystemChildren;
} }
protected override List<BaseItem> LoadChildren() protected override IReadOnlyList<BaseItem> LoadChildren()
{ {
lock (_childIdsLock) lock (_childIdsLock)
{ {

2
MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
View File

@ -84,7 +84,7 @@ namespace MediaBrowser.Controller.Entities.Audio
return !IsAccessedByName; return !IsAccessedByName;
} }
public IList<BaseItem> GetTaggedItems(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
{ {
if (query.IncludeItemTypes.Length == 0) if (query.IncludeItemTypes.Length == 0)
{ {

2
MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
View File

@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Entities.Audio
return true; return true;
} }
public IList<BaseItem> GetTaggedItems(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
{ {
query.GenreIds = new[] { Id }; query.GenreIds = new[] { Id };
query.IncludeItemTypes = new[] { BaseItemKind.MusicVideo, BaseItemKind.Audio, BaseItemKind.MusicAlbum, BaseItemKind.MusicArtist }; query.IncludeItemTypes = new[] { BaseItemKind.MusicVideo, BaseItemKind.Audio, BaseItemKind.MusicAlbum, BaseItemKind.MusicArtist };

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

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -1044,7 +1045,7 @@ namespace MediaBrowser.Controller.Entities
return PlayAccess.Full; return PlayAccess.Full;
} }
public virtual List<MediaStream> GetMediaStreams() public virtual IReadOnlyList<MediaStream> GetMediaStreams()
{ {
return MediaSourceManager.GetMediaStreams(new MediaStreamQuery return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
{ {
@ -1057,7 +1058,7 @@ namespace MediaBrowser.Controller.Entities
return false; return false;
} }
public virtual List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution) public virtual IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
{ {
if (SourceType == SourceType.Channel) if (SourceType == SourceType.Channel)
{ {
@ -1091,7 +1092,7 @@ namespace MediaBrowser.Controller.Entities
return 1; return 1;
}).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0) }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
.ThenByDescending(i => i, new MediaSourceWidthComparator()) .ThenByDescending(i => i, new MediaSourceWidthComparator())
.ToList(); .ToImmutableList();
} }
protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources() protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
@ -2527,7 +2528,7 @@ namespace MediaBrowser.Controller.Entities
/// </summary> /// </summary>
/// <param name="children">Media children.</param> /// <param name="children">Media children.</param>
/// <returns><c>true</c> if the rating was updated; otherwise <c>false</c>.</returns> /// <returns><c>true</c> if the rating was updated; otherwise <c>false</c>.</returns>
public bool UpdateRatingToItems(IList<BaseItem> children) public bool UpdateRatingToItems(IReadOnlyList<BaseItem> children)
{ {
var currentOfficialRating = OfficialRating; var currentOfficialRating = OfficialRating;

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

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Security; using System.Security;
@ -11,6 +12,7 @@ using System.Text.Json.Serialization;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow; using System.Threading.Tasks.Dataflow;
using J2N.Collections.Generic.Extensions;
using Jellyfin.Data.Entities; using Jellyfin.Data.Entities;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
@ -247,7 +249,7 @@ namespace MediaBrowser.Controller.Entities
/// We want this synchronous. /// We want this synchronous.
/// </summary> /// </summary>
/// <returns>Returns children.</returns> /// <returns>Returns children.</returns>
protected virtual List<BaseItem> LoadChildren() protected virtual IReadOnlyList<BaseItem> LoadChildren()
{ {
// logger.LogDebug("Loading children from {0} {1} {2}", GetType().Name, Id, Path); // logger.LogDebug("Loading children from {0} {1} {2}", GetType().Name, Id, Path);
// just load our children from the repo - the library will be validated and maintained in other processes // just load our children from the repo - the library will be validated and maintained in other processes
@ -659,7 +661,7 @@ namespace MediaBrowser.Controller.Entities
/// Get our children from the repo - stubbed for now. /// Get our children from the repo - stubbed for now.
/// </summary> /// </summary>
/// <returns>IEnumerable{BaseItem}.</returns> /// <returns>IEnumerable{BaseItem}.</returns>
protected List<BaseItem> GetCachedChildren() protected IReadOnlyList<BaseItem> GetCachedChildren()
{ {
return ItemRepository.GetItemList(new InternalItemsQuery return ItemRepository.GetItemList(new InternalItemsQuery
{ {
@ -1283,14 +1285,14 @@ namespace MediaBrowser.Controller.Entities
return true; return true;
} }
public List<BaseItem> GetChildren(User user, bool includeLinkedChildren) public IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren)
{ {
ArgumentNullException.ThrowIfNull(user); ArgumentNullException.ThrowIfNull(user);
return GetChildren(user, includeLinkedChildren, new InternalItemsQuery(user)); return GetChildren(user, includeLinkedChildren, new InternalItemsQuery(user));
} }
public virtual List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query) public virtual IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
{ {
ArgumentNullException.ThrowIfNull(user); ArgumentNullException.ThrowIfNull(user);
@ -1304,7 +1306,7 @@ namespace MediaBrowser.Controller.Entities
AddChildren(user, includeLinkedChildren, result, false, query); AddChildren(user, includeLinkedChildren, result, false, query);
return result.Values.ToList(); return result.Values.ToImmutableList();
} }
protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user) protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
@ -1369,7 +1371,7 @@ namespace MediaBrowser.Controller.Entities
} }
} }
public virtual IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query) public virtual IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
{ {
ArgumentNullException.ThrowIfNull(user); ArgumentNullException.ThrowIfNull(user);
@ -1377,35 +1379,35 @@ namespace MediaBrowser.Controller.Entities
AddChildren(user, true, result, true, query); AddChildren(user, true, result, true, query);
return result.Values; return result.Values.ToImmutableList();
} }
/// <summary> /// <summary>
/// Gets the recursive children. /// Gets the recursive children.
/// </summary> /// </summary>
/// <returns>IList{BaseItem}.</returns> /// <returns>IList{BaseItem}.</returns>
public IList<BaseItem> GetRecursiveChildren() public IReadOnlyList<BaseItem> GetRecursiveChildren()
{ {
return GetRecursiveChildren(true); return GetRecursiveChildren(true);
} }
public IList<BaseItem> GetRecursiveChildren(bool includeLinkedChildren) public IReadOnlyList<BaseItem> GetRecursiveChildren(bool includeLinkedChildren)
{ {
return GetRecursiveChildren(i => true, includeLinkedChildren); return GetRecursiveChildren(i => true, includeLinkedChildren);
} }
public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter) public IReadOnlyList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
{ {
return GetRecursiveChildren(filter, true); return GetRecursiveChildren(filter, true);
} }
public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter, bool includeLinkedChildren) public IReadOnlyList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter, bool includeLinkedChildren)
{ {
var result = new Dictionary<Guid, BaseItem>(); var result = new Dictionary<Guid, BaseItem>();
AddChildrenToList(result, includeLinkedChildren, true, filter); AddChildrenToList(result, includeLinkedChildren, true, filter);
return result.Values.ToList(); return result.Values.ToImmutableList();
} }
/// <summary> /// <summary>
@ -1556,11 +1558,12 @@ namespace MediaBrowser.Controller.Entities
/// Gets the linked children. /// Gets the linked children.
/// </summary> /// </summary>
/// <returns>IEnumerable{BaseItem}.</returns> /// <returns>IEnumerable{BaseItem}.</returns>
public IEnumerable<Tuple<LinkedChild, BaseItem>> GetLinkedChildrenInfos() public IReadOnlyList<Tuple<LinkedChild, BaseItem>> GetLinkedChildrenInfos()
{ {
return LinkedChildren return LinkedChildren
.Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i))) .Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i)))
.Where(i => i.Item2 is not null); .Where(i => i.Item2 is not null)
.ToImmutableList();
} }
protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken) protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)

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

@ -61,7 +61,7 @@ namespace MediaBrowser.Controller.Entities
return false; return false;
} }
public IList<BaseItem> GetTaggedItems(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
{ {
query.GenreIds = new[] { Id }; query.GenreIds = new[] { Id };
query.ExcludeItemTypes = new[] query.ExcludeItemTypes = new[]

4
MediaBrowser.Controller/Entities/IHasMediaSources.cs
View File

@ -22,8 +22,8 @@ namespace MediaBrowser.Controller.Entities
/// </summary> /// </summary>
/// <param name="enablePathSubstitution"><c>true</c> to enable path substitution, <c>false</c> to not.</param> /// <param name="enablePathSubstitution"><c>true</c> to enable path substitution, <c>false</c> to not.</param>
/// <returns>A list of media sources.</returns> /// <returns>A list of media sources.</returns>
List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution); IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution);
List<MediaStream> GetMediaStreams(); IReadOnlyList<MediaStream> GetMediaStreams();
} }
} }

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

@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.Entities
/// </summary> /// </summary>
public interface IItemByName public interface IItemByName
{ {
IList<BaseItem> GetTaggedItems(InternalItemsQuery query); IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query);
} }
public interface IHasDualAccess : IItemByName public interface IHasDualAccess : IItemByName

13
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Jellyfin.Data.Entities; using Jellyfin.Data.Entities;
@ -91,7 +92,7 @@ namespace MediaBrowser.Controller.Entities.Movies
return Enumerable.Empty<BaseItem>(); return Enumerable.Empty<BaseItem>();
} }
protected override List<BaseItem> LoadChildren() protected override IReadOnlyList<BaseItem> LoadChildren()
{ {
if (IsLegacyBoxSet) if (IsLegacyBoxSet)
{ {
@ -99,7 +100,7 @@ namespace MediaBrowser.Controller.Entities.Movies
} }
// Save a trip to the database // Save a trip to the database
return new List<BaseItem>(); return [];
} }
public override bool IsAuthorizedToDelete(User user, List<Folder> allCollectionFolders) public override bool IsAuthorizedToDelete(User user, List<Folder> allCollectionFolders)
@ -127,16 +128,16 @@ namespace MediaBrowser.Controller.Entities.Movies
return LibraryManager.Sort(items, user, new[] { sortBy }, SortOrder.Ascending); return LibraryManager.Sort(items, user, new[] { sortBy }, SortOrder.Ascending);
} }
public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query) public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
{ {
var children = base.GetChildren(user, includeLinkedChildren, query); var children = base.GetChildren(user, includeLinkedChildren, query);
return Sort(children, user).ToList(); return Sort(children, user).ToImmutableList();
} }
public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query) public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
{ {
var children = base.GetRecursiveChildren(user, query); var children = base.GetRecursiveChildren(user, query);
return Sort(children, user).ToList(); return Sort(children, user).ToImmutableList();
} }
public BoxSetInfo GetLookupInfo() public BoxSetInfo GetLookupInfo()

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

@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities
{ {
public static class PeopleHelper public static class PeopleHelper
{ {
public static void AddPerson(List<PersonInfo> people, PersonInfo person) public static void AddPerson(ICollection<PersonInfo> people, PersonInfo person)
{ {
ArgumentNullException.ThrowIfNull(person); ArgumentNullException.ThrowIfNull(person);
ArgumentException.ThrowIfNullOrEmpty(person.Name); ArgumentException.ThrowIfNullOrEmpty(person.Name);

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

@ -62,7 +62,7 @@ namespace MediaBrowser.Controller.Entities
return value; return value;
} }
public IList<BaseItem> GetTaggedItems(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
{ {
query.PersonIds = new[] { Id }; query.PersonIds = new[] { Id };

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

@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.Entities
return true; return true;
} }
public IList<BaseItem> GetTaggedItems(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
{ {
query.StudioIds = new[] { Id }; query.StudioIds = new[] { Id };

4
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@ -189,12 +189,12 @@ namespace MediaBrowser.Controller.Entities.TV
return list; return list;
} }
public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query) public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
{ {
return GetSeasons(user, new DtoOptions(true)); return GetSeasons(user, new DtoOptions(true));
} }
public List<BaseItem> GetSeasons(User user, DtoOptions options) public IReadOnlyList<BaseItem> GetSeasons(User user, DtoOptions options)
{ {
var query = new InternalItemsQuery(user) var query = new InternalItemsQuery(user)
{ {

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

@ -52,7 +52,7 @@ namespace MediaBrowser.Controller.Entities
} }
} }
protected override List<BaseItem> LoadChildren() protected override IReadOnlyList<BaseItem> LoadChildren()
{ {
lock (_childIdsLock) lock (_childIdsLock)
{ {

4
MediaBrowser.Controller/Entities/UserView.cs
View File

@ -134,7 +134,7 @@ namespace MediaBrowser.Controller.Entities
} }
/// <inheritdoc /> /// <inheritdoc />
public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query) public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
{ {
query.SetUser(user); query.SetUser(user);
query.Recursive = true; query.Recursive = true;
@ -145,7 +145,7 @@ namespace MediaBrowser.Controller.Entities
} }
/// <inheritdoc /> /// <inheritdoc />
protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user) protected override IReadOnlyList<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
{ {
return GetChildren(user, false); return GetChildren(user, false);
} }

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

@ -236,7 +236,7 @@ namespace MediaBrowser.Controller.Entities
return ConvertToResult(_libraryManager.GetItemList(query)); return ConvertToResult(_libraryManager.GetItemList(query));
} }
private QueryResult<BaseItem> ConvertToResult(List<BaseItem> items) private QueryResult<BaseItem> ConvertToResult(IReadOnlyList<BaseItem> items)
{ {
return new QueryResult<BaseItem>(items); return new QueryResult<BaseItem>(items);
} }

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

@ -55,7 +55,7 @@ namespace MediaBrowser.Controller.Entities
return true; return true;
} }
public IList<BaseItem> GetTaggedItems(InternalItemsQuery query) public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
{ {
if (!int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year)) if (!int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))
{ {

18
MediaBrowser.Controller/Library/ILibraryManager.cs
View File

@ -483,21 +483,21 @@ namespace MediaBrowser.Controller.Library
/// </summary> /// </summary>
/// <param name="item">The item.</param> /// <param name="item">The item.</param>
/// <returns>List&lt;PersonInfo&gt;.</returns> /// <returns>List&lt;PersonInfo&gt;.</returns>
List<PersonInfo> GetPeople(BaseItem item); IReadOnlyList<PersonInfo> GetPeople(BaseItem item);
/// <summary> /// <summary>
/// Gets the people. /// Gets the people.
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>List&lt;PersonInfo&gt;.</returns> /// <returns>List&lt;PersonInfo&gt;.</returns>
List<PersonInfo> GetPeople(InternalPeopleQuery query); IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery query);
/// <summary> /// <summary>
/// Gets the people items. /// Gets the people items.
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>List&lt;Person&gt;.</returns> /// <returns>List&lt;Person&gt;.</returns>
List<Person> GetPeopleItems(InternalPeopleQuery query); IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query);
/// <summary> /// <summary>
/// Updates the people. /// Updates the people.
@ -513,21 +513,21 @@ namespace MediaBrowser.Controller.Library
/// <param name="people">The people.</param> /// <param name="people">The people.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>The async task.</returns> /// <returns>The async task.</returns>
Task UpdatePeopleAsync(BaseItem item, List<PersonInfo> people, CancellationToken cancellationToken); Task UpdatePeopleAsync(BaseItem item, IReadOnlyList<PersonInfo> people, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the item ids. /// Gets the item ids.
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>List&lt;Guid&gt;.</returns> /// <returns>List&lt;Guid&gt;.</returns>
List<Guid> GetItemIds(InternalItemsQuery query); IReadOnlyList<Guid> GetItemIds(InternalItemsQuery query);
/// <summary> /// <summary>
/// Gets the people names. /// Gets the people names.
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>List&lt;System.String&gt;.</returns> /// <returns>List&lt;System.String&gt;.</returns>
List<string> GetPeopleNames(InternalPeopleQuery query); IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query);
/// <summary> /// <summary>
/// Queries the items. /// Queries the items.
@ -553,9 +553,9 @@ namespace MediaBrowser.Controller.Library
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>QueryResult&lt;BaseItem&gt;.</returns> /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
List<BaseItem> GetItemList(InternalItemsQuery query); IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query);
List<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent); IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent);
/// <summary> /// <summary>
/// Gets the items. /// Gets the items.
@ -563,7 +563,7 @@ namespace MediaBrowser.Controller.Library
/// <param name="query">The query to use.</param> /// <param name="query">The query to use.</param>
/// <param name="parents">Items to use for query.</param> /// <param name="parents">Items to use for query.</param>
/// <returns>List of items.</returns> /// <returns>List of items.</returns>
List<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents); IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
/// <summary> /// <summary>
/// Gets the items result. /// Gets the items result.

8
MediaBrowser.Controller/Library/IMediaSourceManager.cs
View File

@ -29,28 +29,28 @@ namespace MediaBrowser.Controller.Library
/// </summary> /// </summary>
/// <param name="itemId">The item identifier.</param> /// <param name="itemId">The item identifier.</param>
/// <returns>IEnumerable&lt;MediaStream&gt;.</returns> /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
List<MediaStream> GetMediaStreams(Guid itemId); IReadOnlyList<MediaStream> GetMediaStreams(Guid itemId);
/// <summary> /// <summary>
/// Gets the media streams. /// Gets the media streams.
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>IEnumerable&lt;MediaStream&gt;.</returns> /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
List<MediaStream> GetMediaStreams(MediaStreamQuery query); IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery query);
/// <summary> /// <summary>
/// Gets the media attachments. /// Gets the media attachments.
/// </summary> /// </summary>
/// <param name="itemId">The item identifier.</param> /// <param name="itemId">The item identifier.</param>
/// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns> /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
List<MediaAttachment> GetMediaAttachments(Guid itemId); IReadOnlyList<MediaAttachment> GetMediaAttachments(Guid itemId);
/// <summary> /// <summary>
/// Gets the media attachments. /// Gets the media attachments.
/// </summary> /// </summary>
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns> /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query); IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);
/// <summary> /// <summary>
/// Gets the playack media sources. /// Gets the playack media sources.

6
MediaBrowser.Controller/Library/IMusicManager.cs
View File

@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Library
/// <param name="user">The user to use.</param> /// <param name="user">The user to use.</param>
/// <param name="dtoOptions">The options to use.</param> /// <param name="dtoOptions">The options to use.</param>
/// <returns>List of items.</returns> /// <returns>List of items.</returns>
List<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions); IReadOnlyList<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions);
/// <summary> /// <summary>
/// Gets the instant mix from artist. /// Gets the instant mix from artist.
@ -26,7 +26,7 @@ namespace MediaBrowser.Controller.Library
/// <param name="user">The user to use.</param> /// <param name="user">The user to use.</param>
/// <param name="dtoOptions">The options to use.</param> /// <param name="dtoOptions">The options to use.</param>
/// <returns>List of items.</returns> /// <returns>List of items.</returns>
List<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions); IReadOnlyList<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions);
/// <summary> /// <summary>
/// Gets the instant mix from genre. /// Gets the instant mix from genre.
@ -35,6 +35,6 @@ namespace MediaBrowser.Controller.Library
/// <param name="user">The user to use.</param> /// <param name="user">The user to use.</param>
/// <param name="dtoOptions">The options to use.</param> /// <param name="dtoOptions">The options to use.</param>
/// <returns>List of items.</returns> /// <returns>List of items.</returns>
List<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions); IReadOnlyList<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions);
} }
} }

9
MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@ -122,7 +123,7 @@ namespace MediaBrowser.Controller.LiveTv
public IEnumerable<BaseItem> GetTaggedItems() public IEnumerable<BaseItem> GetTaggedItems()
=> Enumerable.Empty<BaseItem>(); => Enumerable.Empty<BaseItem>();
public override List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution) public override IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
{ {
var list = new List<MediaSourceInfo>(); var list = new List<MediaSourceInfo>();
@ -140,12 +141,12 @@ namespace MediaBrowser.Controller.LiveTv
list.Add(info); list.Add(info);
return list; return list.ToImmutableList();
} }
public override List<MediaStream> GetMediaStreams() public override IReadOnlyList<MediaStream> GetMediaStreams()
{ {
return new List<MediaStream>(); return [];
} }
protected override string GetInternalMetadataPath(string basePath) protected override string GetInternalMetadataPath(string basePath)

10
MediaBrowser.Controller/Playlists/Playlist.cs
View File

@ -137,27 +137,27 @@ namespace MediaBrowser.Controller.Playlists
return Task.CompletedTask; return Task.CompletedTask;
} }
public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query) public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
{ {
return GetPlayableItems(user, query); return GetPlayableItems(user, query);
} }
protected override IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService) protected override IReadOnlyList<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
{ {
return []; return [];
} }
public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query) public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
{ {
return GetPlayableItems(user, query); return GetPlayableItems(user, query);
} }
public IEnumerable<Tuple<LinkedChild, BaseItem>> GetManageableItems() public IReadOnlyList<Tuple<LinkedChild, BaseItem>> GetManageableItems()
{ {
return GetLinkedChildrenInfos(); return GetLinkedChildrenInfos();
} }
private List<BaseItem> GetPlayableItems(User user, InternalItemsQuery query) private IReadOnlyList<BaseItem> GetPlayableItems(User user, InternalItemsQuery query)
{ {
query ??= new InternalItemsQuery(user); query ??= new InternalItemsQuery(user);

16
MediaBrowser.Controller/Providers/MetadataResult.cs
View File

@ -3,6 +3,7 @@
#pragma warning disable CA1002, CA2227, CS1591 #pragma warning disable CA1002, CA2227, CS1591
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -13,6 +14,7 @@ namespace MediaBrowser.Controller.Providers
// Images aren't always used so the allocation is a waste a lot of the time // Images aren't always used so the allocation is a waste a lot of the time
private List<LocalImageInfo> _images; private List<LocalImageInfo> _images;
private List<(string Url, ImageType Type)> _remoteImages; private List<(string Url, ImageType Type)> _remoteImages;
private List<PersonInfo> _people;
public MetadataResult() public MetadataResult()
{ {
@ -21,17 +23,21 @@ namespace MediaBrowser.Controller.Providers
public List<LocalImageInfo> Images public List<LocalImageInfo> Images
{ {
get => _images ??= new List<LocalImageInfo>(); get => _images ??= [];
set => _images = value; set => _images = value;
} }
public List<(string Url, ImageType Type)> RemoteImages public List<(string Url, ImageType Type)> RemoteImages
{ {
get => _remoteImages ??= new List<(string Url, ImageType Type)>(); get => _remoteImages ??= [];
set => _remoteImages = value; set => _remoteImages = value;
} }
public List<PersonInfo> People { get; set; } public IReadOnlyList<PersonInfo> People
{
get => _people;
set => _people = value.ToList();
}
public bool HasMetadata { get; set; } public bool HasMetadata { get; set; }
@ -47,7 +53,7 @@ namespace MediaBrowser.Controller.Providers
{ {
People ??= new List<PersonInfo>(); People ??= new List<PersonInfo>();
PeopleHelper.AddPerson(People, p); PeopleHelper.AddPerson(_people, p);
} }
/// <summary> /// <summary>
@ -61,7 +67,7 @@ namespace MediaBrowser.Controller.Providers
} }
else else
{ {
People.Clear(); _people.Clear();
} }
} }
} }

2
MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
View File

@ -39,7 +39,7 @@ namespace MediaBrowser.Providers.BoxSets
protected override bool EnableUpdatingPremiereDateFromChildren => true; protected override bool EnableUpdatingPremiereDateFromChildren => true;
/// <inheritdoc /> /// <inheritdoc />
protected override IList<BaseItem> GetChildrenForMetadataUpdates(BoxSet item) protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(BoxSet item)
{ {
return item.GetLinkedChildren(); return item.GetLinkedChildren();
} }

25
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@ -322,17 +322,17 @@ namespace MediaBrowser.Providers.Manager
return false; return false;
} }
protected virtual IList<BaseItem> GetChildrenForMetadataUpdates(TItemType item) protected virtual IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(TItemType item)
{ {
if (item is Folder folder) if (item is Folder folder)
{ {
return folder.GetRecursiveChildren(); return folder.GetRecursiveChildren();
} }
return Array.Empty<BaseItem>(); return [];
} }
protected virtual ItemUpdateType UpdateMetadataFromChildren(TItemType item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType) protected virtual ItemUpdateType UpdateMetadataFromChildren(TItemType item, IReadOnlyList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
{ {
var updateType = ItemUpdateType.None; var updateType = ItemUpdateType.None;
@ -371,7 +371,7 @@ namespace MediaBrowser.Providers.Manager
return updateType; return updateType;
} }
private ItemUpdateType UpdateCumulativeRunTimeTicks(TItemType item, IList<BaseItem> children) private ItemUpdateType UpdateCumulativeRunTimeTicks(TItemType item, IReadOnlyList<BaseItem> children)
{ {
if (item is Folder folder && folder.SupportsCumulativeRunTimeTicks) if (item is Folder folder && folder.SupportsCumulativeRunTimeTicks)
{ {
@ -395,7 +395,7 @@ namespace MediaBrowser.Providers.Manager
return ItemUpdateType.None; return ItemUpdateType.None;
} }
private ItemUpdateType UpdateDateLastMediaAdded(TItemType item, IList<BaseItem> children) private ItemUpdateType UpdateDateLastMediaAdded(TItemType item, IReadOnlyList<BaseItem> children)
{ {
var updateType = ItemUpdateType.None; var updateType = ItemUpdateType.None;
@ -429,7 +429,7 @@ namespace MediaBrowser.Providers.Manager
return updateType; return updateType;
} }
private ItemUpdateType UpdatePremiereDate(TItemType item, IList<BaseItem> children) private ItemUpdateType UpdatePremiereDate(TItemType item, IReadOnlyList<BaseItem> children)
{ {
var updateType = ItemUpdateType.None; var updateType = ItemUpdateType.None;
@ -467,7 +467,7 @@ namespace MediaBrowser.Providers.Manager
return updateType; return updateType;
} }
private ItemUpdateType UpdateGenres(TItemType item, IList<BaseItem> children) private ItemUpdateType UpdateGenres(TItemType item, IReadOnlyList<BaseItem> children)
{ {
var updateType = ItemUpdateType.None; var updateType = ItemUpdateType.None;
@ -488,7 +488,7 @@ namespace MediaBrowser.Providers.Manager
return updateType; return updateType;
} }
private ItemUpdateType UpdateStudios(TItemType item, IList<BaseItem> children) private ItemUpdateType UpdateStudios(TItemType item, IReadOnlyList<BaseItem> children)
{ {
var updateType = ItemUpdateType.None; var updateType = ItemUpdateType.None;
@ -509,7 +509,7 @@ namespace MediaBrowser.Providers.Manager
return updateType; return updateType;
} }
private ItemUpdateType UpdateOfficialRating(TItemType item, IList<BaseItem> children) private ItemUpdateType UpdateOfficialRating(TItemType item, IReadOnlyList<BaseItem> children)
{ {
var updateType = ItemUpdateType.None; var updateType = ItemUpdateType.None;
@ -1142,13 +1142,8 @@ namespace MediaBrowser.Providers.Manager
} }
} }
private static void MergePeople(List<PersonInfo> source, List<PersonInfo> target) private static void MergePeople(IReadOnlyList<PersonInfo> source, IReadOnlyList<PersonInfo> target)
{ {
if (target is null)
{
target = new List<PersonInfo>();
}
foreach (var person in target) foreach (var person in target)
{ {
var normalizedName = person.Name.RemoveDiacritics(); var normalizedName = person.Name.RemoveDiacritics();

8
MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
View File

@ -36,6 +36,7 @@ namespace MediaBrowser.Providers.MediaInfo
private readonly IMediaSourceManager _mediaSourceManager; private readonly IMediaSourceManager _mediaSourceManager;
private readonly LyricResolver _lyricResolver; private readonly LyricResolver _lyricResolver;
private readonly ILyricManager _lyricManager; private readonly ILyricManager _lyricManager;
private readonly IMediaStreamRepository _mediaStreamRepository;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="AudioFileProber"/> class. /// Initializes a new instance of the <see cref="AudioFileProber"/> class.
@ -47,6 +48,7 @@ namespace MediaBrowser.Providers.MediaInfo
/// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param> /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
/// <param name="lyricResolver">Instance of the <see cref="LyricResolver"/> interface.</param> /// <param name="lyricResolver">Instance of the <see cref="LyricResolver"/> interface.</param>
/// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param> /// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param>
/// <param name="mediaStreamRepository">Instance of the <see cref="IMediaStreamRepository"/>.</param>
public AudioFileProber( public AudioFileProber(
ILogger<AudioFileProber> logger, ILogger<AudioFileProber> logger,
IMediaSourceManager mediaSourceManager, IMediaSourceManager mediaSourceManager,
@ -54,7 +56,8 @@ namespace MediaBrowser.Providers.MediaInfo
IItemRepository itemRepo, IItemRepository itemRepo,
ILibraryManager libraryManager, ILibraryManager libraryManager,
LyricResolver lyricResolver, LyricResolver lyricResolver,
ILyricManager lyricManager) ILyricManager lyricManager,
IMediaStreamRepository mediaStreamRepository)
{ {
_mediaEncoder = mediaEncoder; _mediaEncoder = mediaEncoder;
_itemRepo = itemRepo; _itemRepo = itemRepo;
@ -63,6 +66,7 @@ namespace MediaBrowser.Providers.MediaInfo
_mediaSourceManager = mediaSourceManager; _mediaSourceManager = mediaSourceManager;
_lyricResolver = lyricResolver; _lyricResolver = lyricResolver;
_lyricManager = lyricManager; _lyricManager = lyricManager;
_mediaStreamRepository = mediaStreamRepository;
ATL.Settings.DisplayValueSeparator = InternalValueSeparator; ATL.Settings.DisplayValueSeparator = InternalValueSeparator;
ATL.Settings.UseFileNameWhenNoTitle = false; ATL.Settings.UseFileNameWhenNoTitle = false;
ATL.Settings.ID3v2_separatev2v3Values = false; ATL.Settings.ID3v2_separatev2v3Values = false;
@ -149,7 +153,7 @@ namespace MediaBrowser.Providers.MediaInfo
audio.HasLyrics = mediaStreams.Any(s => s.Type == MediaStreamType.Lyric); audio.HasLyrics = mediaStreams.Any(s => s.Type == MediaStreamType.Lyric);
_itemRepo.SaveMediaStreams(audio.Id, mediaStreams, cancellationToken); _mediaStreamRepository.SaveMediaStreams(audio.Id, mediaStreams, cancellationToken);
} }
/// <summary> /// <summary>

2
MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
View File

@ -74,7 +74,7 @@ namespace MediaBrowser.Providers.MediaInfo
return GetImage((Audio)item, imageStreams, cancellationToken); return GetImage((Audio)item, imageStreams, cancellationToken);
} }
private async Task<DynamicImageResponse> GetImage(Audio item, List<MediaStream> imageStreams, CancellationToken cancellationToken) private async Task<DynamicImageResponse> GetImage(Audio item, IReadOnlyList<MediaStream> imageStreams, CancellationToken cancellationToken)
{ {
var path = GetAudioImagePath(item); var path = GetAudioImagePath(item);

15
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -31,6 +31,7 @@ namespace MediaBrowser.Providers.MediaInfo
public class FFProbeVideoInfo public class FFProbeVideoInfo
{ {
private readonly ILogger<FFProbeVideoInfo> _logger; private readonly ILogger<FFProbeVideoInfo> _logger;
private readonly IMediaSourceManager _mediaSourceManager;
private readonly IMediaEncoder _mediaEncoder; private readonly IMediaEncoder _mediaEncoder;
private readonly IItemRepository _itemRepo; private readonly IItemRepository _itemRepo;
private readonly IBlurayExaminer _blurayExaminer; private readonly IBlurayExaminer _blurayExaminer;
@ -42,7 +43,8 @@ namespace MediaBrowser.Providers.MediaInfo
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
private readonly AudioResolver _audioResolver; private readonly AudioResolver _audioResolver;
private readonly SubtitleResolver _subtitleResolver; private readonly SubtitleResolver _subtitleResolver;
private readonly IMediaSourceManager _mediaSourceManager; private readonly IMediaAttachmentRepository _mediaAttachmentRepository;
private readonly IMediaStreamRepository _mediaStreamRepository;
public FFProbeVideoInfo( public FFProbeVideoInfo(
ILogger<FFProbeVideoInfo> logger, ILogger<FFProbeVideoInfo> logger,
@ -57,7 +59,9 @@ namespace MediaBrowser.Providers.MediaInfo
IChapterRepository chapterManager, IChapterRepository chapterManager,
ILibraryManager libraryManager, ILibraryManager libraryManager,
AudioResolver audioResolver, AudioResolver audioResolver,
SubtitleResolver subtitleResolver) SubtitleResolver subtitleResolver,
IMediaAttachmentRepository mediaAttachmentRepository,
IMediaStreamRepository mediaStreamRepository)
{ {
_logger = logger; _logger = logger;
_mediaSourceManager = mediaSourceManager; _mediaSourceManager = mediaSourceManager;
@ -72,6 +76,9 @@ namespace MediaBrowser.Providers.MediaInfo
_libraryManager = libraryManager; _libraryManager = libraryManager;
_audioResolver = audioResolver; _audioResolver = audioResolver;
_subtitleResolver = subtitleResolver; _subtitleResolver = subtitleResolver;
_mediaAttachmentRepository = mediaAttachmentRepository;
_mediaStreamRepository = mediaStreamRepository;
_mediaStreamRepository = mediaStreamRepository;
} }
public async Task<ItemUpdateType> ProbeVideo<T>( public async Task<ItemUpdateType> ProbeVideo<T>(
@ -267,11 +274,11 @@ namespace MediaBrowser.Providers.MediaInfo
video.HasSubtitles = mediaStreams.Any(i => i.Type == MediaStreamType.Subtitle); video.HasSubtitles = mediaStreams.Any(i => i.Type == MediaStreamType.Subtitle);
_itemRepo.SaveMediaStreams(video.Id, mediaStreams, cancellationToken); _mediaStreamRepository.SaveMediaStreams(video.Id, mediaStreams, cancellationToken);
if (mediaAttachments.Any()) if (mediaAttachments.Any())
{ {
_itemRepo.SaveMediaAttachments(video.Id, mediaAttachments, cancellationToken); _mediaAttachmentRepository.SaveMediaAttachments(video.Id, mediaAttachments, cancellationToken);
} }
if (options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh if (options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh

13
MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
View File

@ -67,6 +67,8 @@ namespace MediaBrowser.Providers.MediaInfo
/// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param> /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
/// <param name="namingOptions">The <see cref="NamingOptions"/>.</param> /// <param name="namingOptions">The <see cref="NamingOptions"/>.</param>
/// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param> /// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param>
/// <param name="mediaAttachmentRepository">Instance of the <see cref="IMediaAttachmentRepository"/> interface.</param>
/// <param name="mediaStreamRepository">Instance of the <see cref="IMediaStreamRepository"/> interface.</param>
public ProbeProvider( public ProbeProvider(
IMediaSourceManager mediaSourceManager, IMediaSourceManager mediaSourceManager,
IMediaEncoder mediaEncoder, IMediaEncoder mediaEncoder,
@ -81,7 +83,9 @@ namespace MediaBrowser.Providers.MediaInfo
IFileSystem fileSystem, IFileSystem fileSystem,
ILoggerFactory loggerFactory, ILoggerFactory loggerFactory,
NamingOptions namingOptions, NamingOptions namingOptions,
ILyricManager lyricManager) ILyricManager lyricManager,
IMediaAttachmentRepository mediaAttachmentRepository,
IMediaStreamRepository mediaStreamRepository)
{ {
_logger = loggerFactory.CreateLogger<ProbeProvider>(); _logger = loggerFactory.CreateLogger<ProbeProvider>();
_audioResolver = new AudioResolver(loggerFactory.CreateLogger<AudioResolver>(), localization, mediaEncoder, fileSystem, namingOptions); _audioResolver = new AudioResolver(loggerFactory.CreateLogger<AudioResolver>(), localization, mediaEncoder, fileSystem, namingOptions);
@ -101,7 +105,9 @@ namespace MediaBrowser.Providers.MediaInfo
chapterManager, chapterManager,
libraryManager, libraryManager,
_audioResolver, _audioResolver,
_subtitleResolver); _subtitleResolver,
mediaAttachmentRepository,
mediaStreamRepository);
_audioProber = new AudioFileProber( _audioProber = new AudioFileProber(
loggerFactory.CreateLogger<AudioFileProber>(), loggerFactory.CreateLogger<AudioFileProber>(),
@ -110,7 +116,8 @@ namespace MediaBrowser.Providers.MediaInfo
itemRepo, itemRepo,
libraryManager, libraryManager,
_lyricResolver, _lyricResolver,
lyricManager); lyricManager,
mediaStreamRepository);
} }
/// <inheritdoc /> /// <inheritdoc />

6
MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
View File

@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.MediaInfo
public async Task<List<string>> DownloadSubtitles( public async Task<List<string>> DownloadSubtitles(
Video video, Video video,
List<MediaStream> mediaStreams, IReadOnlyList<MediaStream> mediaStreams,
bool skipIfEmbeddedSubtitlesPresent, bool skipIfEmbeddedSubtitlesPresent,
bool skipIfAudioTrackMatches, bool skipIfAudioTrackMatches,
bool requirePerfectMatch, bool requirePerfectMatch,
@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.MediaInfo
public Task<bool> DownloadSubtitles( public Task<bool> DownloadSubtitles(
Video video, Video video,
List<MediaStream> mediaStreams, IReadOnlyList<MediaStream> mediaStreams,
bool skipIfEmbeddedSubtitlesPresent, bool skipIfEmbeddedSubtitlesPresent,
bool skipIfAudioTrackMatches, bool skipIfAudioTrackMatches,
bool requirePerfectMatch, bool requirePerfectMatch,
@ -120,7 +120,7 @@ namespace MediaBrowser.Providers.MediaInfo
private async Task<bool> DownloadSubtitles( private async Task<bool> DownloadSubtitles(
Video video, Video video,
List<MediaStream> mediaStreams, IReadOnlyList<MediaStream> mediaStreams,
bool skipIfEmbeddedSubtitlesPresent, bool skipIfEmbeddedSubtitlesPresent,
bool skipIfAudioTrackMatches, bool skipIfAudioTrackMatches,
bool requirePerfectMatch, bool requirePerfectMatch,

4
MediaBrowser.Providers/Music/AlbumMetadataService.cs
View File

@ -47,11 +47,11 @@ namespace MediaBrowser.Providers.Music
protected override bool EnableUpdatingStudiosFromChildren => true; protected override bool EnableUpdatingStudiosFromChildren => true;
/// <inheritdoc /> /// <inheritdoc />
protected override IList<BaseItem> GetChildrenForMetadataUpdates(MusicAlbum item) protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(MusicAlbum item)
=> item.GetRecursiveChildren(i => i is Audio); => item.GetRecursiveChildren(i => i is Audio);
/// <inheritdoc /> /// <inheritdoc />
protected override ItemUpdateType UpdateMetadataFromChildren(MusicAlbum item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType) protected override ItemUpdateType UpdateMetadataFromChildren(MusicAlbum item, IReadOnlyList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
{ {
var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType); var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType);

5
MediaBrowser.Providers/Music/ArtistMetadataService.cs
View File

@ -1,6 +1,7 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Audio;
@ -28,7 +29,7 @@ namespace MediaBrowser.Providers.Music
protected override bool EnableUpdatingGenresFromChildren => true; protected override bool EnableUpdatingGenresFromChildren => true;
/// <inheritdoc /> /// <inheritdoc />
protected override IList<BaseItem> GetChildrenForMetadataUpdates(MusicArtist item) protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(MusicArtist item)
{ {
return item.IsAccessedByName return item.IsAccessedByName
? item.GetTaggedItems(new InternalItemsQuery ? item.GetTaggedItems(new InternalItemsQuery
@ -36,7 +37,7 @@ namespace MediaBrowser.Providers.Music
Recursive = true, Recursive = true,
IsFolder = false IsFolder = false
}) })
: item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder); : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToImmutableArray();
} }
} }
} }

2
MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
View File

@ -36,7 +36,7 @@ namespace MediaBrowser.Providers.Playlists
protected override bool EnableUpdatingStudiosFromChildren => true; protected override bool EnableUpdatingStudiosFromChildren => true;
/// <inheritdoc /> /// <inheritdoc />
protected override IList<BaseItem> GetChildrenForMetadataUpdates(Playlist item) protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(Playlist item)
=> item.GetLinkedChildren(); => item.GetLinkedChildren();
/// <inheritdoc /> /// <inheritdoc />

6
MediaBrowser.Providers/TV/SeasonMetadataService.cs
View File

@ -80,11 +80,11 @@ namespace MediaBrowser.Providers.TV
} }
/// <inheritdoc /> /// <inheritdoc />
protected override IList<BaseItem> GetChildrenForMetadataUpdates(Season item) protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(Season item)
=> item.GetEpisodes(); => item.GetEpisodes();
/// <inheritdoc /> /// <inheritdoc />
protected override ItemUpdateType UpdateMetadataFromChildren(Season item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType) protected override ItemUpdateType UpdateMetadataFromChildren(Season item, IReadOnlyList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
{ {
var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType); var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType);
@ -96,7 +96,7 @@ namespace MediaBrowser.Providers.TV
return updateType; return updateType;
} }
private ItemUpdateType SaveIsVirtualItem(Season item, IList<BaseItem> episodes) private ItemUpdateType SaveIsVirtualItem(Season item, IReadOnlyList<BaseItem> episodes)
{ {
var isVirtualItem = item.LocationType == LocationType.Virtual && (episodes.Count == 0 || episodes.All(i => i.LocationType == LocationType.Virtual)); var isVirtualItem = item.LocationType == LocationType.Virtual && (episodes.Count == 0 || episodes.All(i => i.LocationType == LocationType.Virtual));

2
MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
View File

@ -67,7 +67,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
AddAlbums(albums, writer); AddAlbums(albums, writer);
} }
private void AddAlbums(IList<BaseItem> albums, XmlWriter writer) private void AddAlbums(IReadOnlyList<BaseItem> albums, XmlWriter writer)
{ {
foreach (var album in albums) foreach (var album in albums)
{ {

2
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@ -914,7 +914,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteEndElement(); writer.WriteEndElement();
} }
private void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath) private void AddActors(IReadOnlyList<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath)
{ {
foreach (var person in people) foreach (var person in people)
{ {