Merge pull request #2078 from MediaBrowser/dev

Dev

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>();
         }

MediaBrowser.Providers/TV/DummySeasonProvider.cs

@@ -112,7 +112,9 @@ namespace MediaBrowser.Providers.TV
                 IndexNumber = seasonNumber,
                 Id = _libraryManager.GetNewItemId((series.Id + (seasonNumber ?? -1).ToString(_usCulture) + seasonName), typeof(Season)),
                 IsVirtualItem = isVirtualItem,
-                SeriesId = series.Id
+                SeriesId = series.Id,
+                SeriesName = series.Name,
+                SeriesSortName = series.SortName
             };
 
             season.SetParent(series);

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))

MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs

@@ -56,10 +56,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                     if (series != null)
                     {
                         episode.SeriesId = series.Id;
+                        episode.SeriesName = series.Name;
+                        episode.SeriesSortName = series.SortName;
                     }
                     if (season != null)
                     {
                         episode.SeasonId = season.Id;
+                        episode.SeasonName = season.Name;
                     }
                 }
 

MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs

@@ -43,9 +43,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                 var season = new Season
                 {
                     IndexNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(args.Path, true, true).SeasonNumber,
-                    SeriesId = series.Id
+                    SeriesId = series.Id,
+                    SeriesSortName = series.SortName,
+                    SeriesName = series.Name
                 };
-                
+
                 if (season.IndexNumber.HasValue && season.IndexNumber.Value == 0)
                 {
                     season.Name = _config.Configuration.SeasonZeroDisplayName;