diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-27 21:59:26 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-27 21:59:26 -0400 |
| commit | 657097ee1511824960ca39c3b8c6c23bda5a840f (patch) | |
| tree | b738d23436faf03d975041364b00b62605b5ce7e /MediaBrowser.Controller/Providers | |
| parent | 1f1eab209a289a0ad8ba37f49caf272a6fd9c104 (diff) | |
fixes #296 - Prevent non-movie videos from appearing in Movies view
Diffstat (limited to 'MediaBrowser.Controller/Providers')
7 files changed, 21 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs index 8f55d5b47c..7ea399fe68 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs @@ -235,7 +235,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo /// <param name="video">The video.</param> private void AddExternalSubtitles(Video video) { - var useParent = (video.VideoType == VideoType.VideoFile || video.VideoType == VideoType.Iso) && !(video is Movie); + var useParent = (video.VideoType == VideoType.VideoFile || video.VideoType == VideoType.Iso) && !(video is Movie) && !(video is MusicVideo); if (useParent && video.Parent == null) { diff --git a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs index dc71a860cc..ab7f87d696 100644 --- a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs @@ -103,7 +103,7 @@ namespace MediaBrowser.Controller.Providers.Movies return !trailer.IsLocalTrailer; } - return item is Movie || item is BoxSet; + return item is Movie || item is BoxSet || item is MusicVideo; } /// <summary> diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs index 17d284edb9..e93a936a98 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs @@ -82,7 +82,7 @@ namespace MediaBrowser.Controller.Providers.Movies } // Don't support local trailers - return item is Movie || item is BoxSet; + return item is Movie || item is BoxSet || item is MusicVideo; } /// <summary> diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs index 097b425874..e3e1448443 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs @@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.Providers.Movies } // Don't support local trailers - return item is Movie || item is BoxSet; + return item is Movie || item is BoxSet || item is MusicVideo; } /// <summary> diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs index 1556658d63..3d03903845 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs @@ -23,7 +23,14 @@ namespace MediaBrowser.Controller.Providers.Movies public override bool Supports(BaseItem item) { - return item is Movie || item is BoxSet; + var trailer = item as Trailer; + + if (trailer != null) + { + return !trailer.IsLocalTrailer; + } + + return item is Movie || item is BoxSet || item is MusicVideo; } /// <summary> diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs index 40c6feb617..25fd94138f 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs @@ -25,7 +25,14 @@ namespace MediaBrowser.Controller.Providers.Movies /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns> public override bool Supports(BaseItem item) { - return item is Movie || item is BoxSet; + var trailer = item as Trailer; + + if (trailer != null) + { + return !trailer.IsLocalTrailer; + } + + return item is Movie || item is BoxSet || item is MusicVideo; } /// <summary> diff --git a/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs b/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs index ec33a17140..855e527bfd 100644 --- a/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs @@ -87,7 +87,7 @@ namespace MediaBrowser.Controller.Providers.Movies return !trailer.IsLocalTrailer; } - return item is Movie; + return item is Movie || item is MusicVideo; } /// <summary> |