From e7e18af2d76e1d44a9ca80644b9cd562059626c4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 4 Sep 2013 13:07:35 -0400 Subject: fixes #433 - Add root collection type to ItemResolveArgs --- MediaBrowser.Controller/Entities/BaseItem.cs | 4 ++-- MediaBrowser.Controller/Library/ItemResolveArgs.cs | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index a15c30e425..fb22607692 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -327,7 +327,7 @@ namespace MediaBrowser.Controller.Entities if (LocationType == LocationType.Remote || LocationType == LocationType.Virtual) { - return new ItemResolveArgs(ConfigurationManager.ApplicationPaths); + return new ItemResolveArgs(ConfigurationManager.ApplicationPaths, LibraryManager); } var isDirectory = false; @@ -345,7 +345,7 @@ namespace MediaBrowser.Controller.Entities throw new IOException("Unable to retrieve file system info for " + path); } - var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths) + var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, LibraryManager) { FileInfo = pathInfo, Path = path, diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs index 109ffe7e7e..2bae106f3b 100644 --- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs @@ -1,5 +1,4 @@ using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.IO; using System; using System.Collections.Generic; using System.IO; @@ -17,14 +16,17 @@ namespace MediaBrowser.Controller.Library /// The _app paths /// private readonly IServerApplicationPaths _appPaths; + private readonly ILibraryManager _libraryManager; /// /// Initializes a new instance of the class. /// /// The app paths. - public ItemResolveArgs(IServerApplicationPaths appPaths) + /// The library manager. + public ItemResolveArgs(IServerApplicationPaths appPaths, ILibraryManager libraryManager) { _appPaths = appPaths; + _libraryManager = libraryManager; } /// @@ -368,6 +370,11 @@ namespace MediaBrowser.Controller.Library return GetFileSystemEntryByName(name) != null; } + public string GetCollectionType() + { + return Parent == null ? null : _libraryManager.FindCollectionType(Parent); + } + #region Equality Overrides /// -- cgit v1.2.3