Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 05:34:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix nullref for imageProcessor in LibraryManager

Browse Source
This commit is contained in:
Vasily 2020-05-21 00:03:22 +03:00
parent 3fb4c1356c
commit 8b517e9bef
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,8 @@ namespace Emby.Server.Implementations.Library
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly IItemRepository _itemRepository; private readonly IItemRepository _itemRepository;
private readonly ConcurrentDictionary<Guid, BaseItem> _libraryItemsCache; private readonly ConcurrentDictionary<Guid, BaseItem> _libraryItemsCache;
private readonly IImageProcessor _imageProcessor;
private NamingOptions _namingOptions; private NamingOptions _namingOptions;
private string[] _videoFileExtensions; private string[] _videoFileExtensions;
@ -111,12 +113,6 @@ namespace Emby.Server.Implementations.Library
/// <value>The comparers.</value> /// <value>The comparers.</value>
private IBaseItemComparer[] Comparers { get; set; } private IBaseItemComparer[] Comparers { get; set; }
/// <summary>
/// Gets or sets the active image processor
/// </summary>
/// <value>The image processor.</value>
public IImageProcessor ImageProcessor { get; set; }
/// <summary> /// <summary>
/// Occurs when [item added]. /// Occurs when [item added].
/// </summary> /// </summary>
@ -155,7 +151,8 @@ namespace Emby.Server.Implementations.Library
Lazy<IProviderManager> providerManagerFactory, Lazy<IProviderManager> providerManagerFactory,
Lazy<IUserViewManager> userviewManagerFactory, Lazy<IUserViewManager> userviewManagerFactory,
IMediaEncoder mediaEncoder, IMediaEncoder mediaEncoder,
IItemRepository itemRepository) IItemRepository itemRepository,
IImageProcessor imageProcessor)
{ {
_appHost = appHost; _appHost = appHost;
_logger = logger; _logger = logger;
@ -169,6 +166,7 @@ namespace Emby.Server.Implementations.Library
_userviewManagerFactory = userviewManagerFactory; _userviewManagerFactory = userviewManagerFactory;
_mediaEncoder = mediaEncoder; _mediaEncoder = mediaEncoder;
_itemRepository = itemRepository; _itemRepository = itemRepository;
_imageProcessor = imageProcessor;
_libraryItemsCache = new ConcurrentDictionary<Guid, BaseItem>(); _libraryItemsCache = new ConcurrentDictionary<Guid, BaseItem>();
@ -1841,10 +1839,10 @@ namespace Emby.Server.Implementations.Library
outdated.ForEach(img => outdated.ForEach(img =>
{ {
ImageDimensions size = ImageProcessor.GetImageDimensions(item, img); ImageDimensions size = _imageProcessor.GetImageDimensions(item, img);
img.Width = size.Width; img.Width = size.Width;
img.Height = size.Height; img.Height = size.Height;
img.Hash = ImageProcessor.GetImageHash(img.Path); img.Hash = _imageProcessor.GetImageHash(img.Path);
}); });
_itemRepository.SaveImages(item); _itemRepository.SaveImages(item);