From e934783b953ea68b5b5a48445958b0bbad9e4633 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 15 Aug 2013 12:00:39 -0400 Subject: initial support of multiple movies in folder --- MediaBrowser.Controller/Entities/Movies/Movie.cs | 2 +- MediaBrowser.Controller/Entities/Video.cs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index b787885c7e..60e1699363 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -47,7 +47,7 @@ namespace MediaBrowser.Controller.Entities.Movies // Must have a parent to have special features // In other words, it must be part of the Parent/Child tree - if (LocationType == LocationType.FileSystem && Parent != null) + if (LocationType == LocationType.FileSystem && Parent != null && !IsInMixedFolder) { specialFeaturesChanged = await RefreshSpecialFeatures(cancellationToken, forceSave, forceRefresh, allowSlowProviders).ConfigureAwait(false); } diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 67648ecc89..8bc519a437 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -65,6 +65,8 @@ namespace MediaBrowser.Controller.Entities return GetPlayableStreamFiles(Path); } + public bool IsInMixedFolder { get; set; } + /// /// Should be overridden to return the proper folder where metadata lives /// @@ -86,6 +88,11 @@ namespace MediaBrowser.Controller.Entities { get { + if (IsInMixedFolder) + { + return false; + } + return VideoType == VideoType.VideoFile || VideoType == VideoType.Iso || IsMultiPart; } } -- cgit v1.2.3