diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-19 14:44:58 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-19 14:44:58 -0400 |
| commit | f5ad9186ec3730b92cfdf06947ae6a85912867dc (patch) | |
| tree | 41f84368af79ce8ed2c276d6f651a9ef82dd3e8d | |
| parent | 6e01e277d41c9a8505cfdea7f65e95de5a72bf03 (diff) | |
update boxset resolver
| -rw-r--r-- | MediaBrowser.Controller/Entities/Movies/BoxSet.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs index caf440a83..6d5278f1f 100644 --- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs +++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs @@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Entities.Movies { if (IsLegacyBoxSet) { - return base.LoadChildren(); + return base.GetNonCachedChildren(directoryService); } return new List<BaseItem>(); } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs index 37d1e163f..655840753 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs @@ -48,6 +48,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies string collectionType, IDirectoryService directoryService) { + if (parent != null && parent.Path != null && parent.Path.IndexOf("disney", StringComparison.OrdinalIgnoreCase) != -1) + { + var b = true; + var a = b; + } + var result = ResolveMultipleInternal(parent, files, collectionType, directoryService); if (result != null) @@ -197,6 +203,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies /// <returns>Video.</returns> protected override Video Resolve(ItemResolveArgs args) { + if (args.Path != null && args.Path.IndexOf("disney", StringComparison.OrdinalIgnoreCase) != -1) + { + var b = true; + var a = b; + } + var collectionType = args.GetCollectionType(); if (IsInvalid(args.Parent, collectionType)) |