From 9ba615e64948de7f377c4ec6bb7967744b4fd029 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 4 Nov 2013 14:04:23 -0500 Subject: fixes #606 - Add manual image selection for Seasons --- .../Drawing/ImageProcessor.cs | 14 +++++--------- .../Library/LibraryManager.cs | 14 +++++++------- 2 files changed, 12 insertions(+), 16 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs index ace633be7..a439251db 100644 --- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs +++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs @@ -48,10 +48,7 @@ namespace MediaBrowser.Server.Implementations.Drawing /// The _logger /// private readonly ILogger _logger; - /// - /// The _app paths - /// - private readonly IServerApplicationPaths _appPaths; + private readonly IFileSystem _fileSystem; private readonly string _imageSizeCachePath; @@ -62,13 +59,12 @@ namespace MediaBrowser.Server.Implementations.Drawing public ImageProcessor(ILogger logger, IServerApplicationPaths appPaths, IFileSystem fileSystem) { _logger = logger; - _appPaths = appPaths; _fileSystem = fileSystem; - _imageSizeCachePath = Path.Combine(_appPaths.ImageCachePath, "image-sizes"); - _croppedWhitespaceImageCachePath = Path.Combine(_appPaths.ImageCachePath, "cropped-images"); - _enhancedImageCachePath = Path.Combine(_appPaths.ImageCachePath, "enhanced-images"); - _resizedImageCachePath = Path.Combine(_appPaths.ImageCachePath, "resized-images"); + _imageSizeCachePath = Path.Combine(appPaths.ImageCachePath, "image-sizes"); + _croppedWhitespaceImageCachePath = Path.Combine(appPaths.ImageCachePath, "cropped-images"); + _enhancedImageCachePath = Path.Combine(appPaths.ImageCachePath, "enhanced-images"); + _resizedImageCachePath = Path.Combine(appPaths.ImageCachePath, "resized-images"); } public void AddParts(IEnumerable enhancers) diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 9197328bd..88832722b 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -60,25 +60,25 @@ namespace MediaBrowser.Server.Implementations.Library /// Gets the list of entity resolution ignore rules /// /// The entity resolution ignore rules. - private IEnumerable EntityResolutionIgnoreRules { get; set; } + private IResolverIgnoreRule[] EntityResolutionIgnoreRules { get; set; } /// /// Gets the list of BasePluginFolders added by plugins /// /// The plugin folders. - private IEnumerable PluginFolderCreators { get; set; } + private IVirtualFolderCreator[] PluginFolderCreators { get; set; } /// /// Gets the list of currently registered entity resolvers /// /// The entity resolvers enumerable. - private IEnumerable EntityResolvers { get; set; } + private IItemResolver[] EntityResolvers { get; set; } /// /// Gets or sets the comparers. /// /// The comparers. - private IEnumerable Comparers { get; set; } + private IBaseItemComparer[] Comparers { get; set; } /// /// Gets the active item repository @@ -218,11 +218,11 @@ namespace MediaBrowser.Server.Implementations.Library IEnumerable peoplePrescanTasks, IEnumerable savers) { - EntityResolutionIgnoreRules = rules; - PluginFolderCreators = pluginFolders; + EntityResolutionIgnoreRules = rules.ToArray(); + PluginFolderCreators = pluginFolders.ToArray(); EntityResolvers = resolvers.OrderBy(i => i.Priority).ToArray(); IntroProviders = introProviders; - Comparers = itemComparers; + Comparers = itemComparers.ToArray(); PrescanTasks = prescanTasks; PostscanTasks = postscanTasks; PeoplePrescanTasks = peoplePrescanTasks; -- cgit v1.2.3