From fe3323a492a35cae736350e896afd077e13e111d Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 1 Mar 2013 16:22:34 -0500 Subject: fixes around http response caching, updated the mb icon in the dashboard, and isolated web socket events --- MediaBrowser.Controller/Library/DtoBuilder.cs | 12 ++++++------ MediaBrowser.Controller/Library/ILibraryManager.cs | 10 ++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'MediaBrowser.Controller/Library') diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index c3fa38ebf..0a892cbfb 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -24,11 +24,11 @@ namespace MediaBrowser.Controller.Library /// const string IndexFolderDelimeter = "-index-"; - private ILogger Logger; + private readonly ILogger _logger; public DtoBuilder(ILogger logger) { - Logger = logger; + _logger = logger; } /// @@ -62,7 +62,7 @@ namespace MediaBrowser.Controller.Library catch (Exception ex) { // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions - Logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name); + _logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name); } } @@ -124,7 +124,7 @@ namespace MediaBrowser.Controller.Library catch (Exception ex) { // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions - Logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name); + _logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name); } } @@ -219,7 +219,7 @@ namespace MediaBrowser.Controller.Library } catch (FileNotFoundException) { - Logger.Error("Image file does not exist: {0}", path); + _logger.Error("Image file does not exist: {0}", path); return; } @@ -581,7 +581,7 @@ namespace MediaBrowser.Controller.Library } catch (IOException ex) { - Logger.ErrorException("Error getting person {0}", ex, c.Name); + _logger.ErrorException("Error getting person {0}", ex, c.Name); return null; } }) diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index a013b2b47..721b5c216 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.IO; +using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; namespace MediaBrowser.Controller.Library @@ -141,5 +142,14 @@ namespace MediaBrowser.Controller.Library /// The user id. /// BaseItem. BaseItem GetItemById(Guid id, Guid userId); + + /// + /// Adds the parts. + /// + /// The rules. + /// The plugin folders. + /// The resolvers. + void AddParts(IEnumerable rules, IEnumerable pluginFolders, + IEnumerable resolvers); } } \ No newline at end of file -- cgit v1.2.3