diff options
9 files changed, 17 insertions, 12 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index fbed70af9..264f66945 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities return false; })); - var trailers = LibraryManager.ResolvePaths<Trailer>(files, null).Select(video => + return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video => { // Try to retrieve it from the db. If we don't find it, use the resolved version var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer; @@ -776,9 +776,8 @@ namespace MediaBrowser.Controller.Entities } return video; - }).ToList(); - return trailers; + }).ToList(); } /// <summary> diff --git a/MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs index 05619256c..99d1cdbc1 100644 --- a/MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs @@ -37,9 +37,7 @@ namespace MediaBrowser.Providers.MediaInfo /// <value>The priority.</value> public override MetadataProviderPriority Priority { - // Give this second priority - // Give metadata xml providers a chance to fill in data first, so that we can skip this whenever possible - get { return MetadataProviderPriority.Second; } + get { return MetadataProviderPriority.First; } } protected readonly CultureInfo UsCulture = new CultureInfo("en-US"); diff --git a/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs index 097df336d..b34a692d3 100644 --- a/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs +++ b/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs @@ -85,6 +85,14 @@ namespace MediaBrowser.Providers.Movies } } + public override MetadataProviderPriority Priority + { + get + { + return MetadataProviderPriority.Fourth; + } + } + /// <summary> /// The fan art base URL /// </summary> diff --git a/MediaBrowser.Providers/Movies/MovieDbImagesProvider.cs b/MediaBrowser.Providers/Movies/MovieDbImagesProvider.cs index f9173da67..5847fcd69 100644 --- a/MediaBrowser.Providers/Movies/MovieDbImagesProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbImagesProvider.cs @@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.Movies /// <value>The priority.</value> public override MetadataProviderPriority Priority { - get { return MetadataProviderPriority.Fourth; } + get { return MetadataProviderPriority.Last; } } /// <summary> diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index b25a61c4e..a4154207a 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -83,7 +83,7 @@ namespace MediaBrowser.Providers.Movies /// <value>The priority.</value> public override MetadataProviderPriority Priority { - get { return MetadataProviderPriority.Second; } + get { return MetadataProviderPriority.Third; } } /// <summary> diff --git a/MediaBrowser.Providers/Movies/MovieProviderFromJson.cs b/MediaBrowser.Providers/Movies/MovieProviderFromJson.cs index 2732ba392..529122f40 100644 --- a/MediaBrowser.Providers/Movies/MovieProviderFromJson.cs +++ b/MediaBrowser.Providers/Movies/MovieProviderFromJson.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Movies /// <value>The priority.</value> public override MetadataProviderPriority Priority { - get { return MetadataProviderPriority.First; } + get { return MetadataProviderPriority.Second; } } /// <summary> diff --git a/MediaBrowser.Providers/Movies/MovieProviderFromXml.cs b/MediaBrowser.Providers/Movies/MovieProviderFromXml.cs index a0afaafc4..b7d3e6e57 100644 --- a/MediaBrowser.Providers/Movies/MovieProviderFromXml.cs +++ b/MediaBrowser.Providers/Movies/MovieProviderFromXml.cs @@ -42,7 +42,7 @@ namespace MediaBrowser.Providers.Movies /// <value>The priority.</value> public override MetadataProviderPriority Priority { - get { return MetadataProviderPriority.First; } + get { return MetadataProviderPriority.Second; } } /// <summary> diff --git a/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs b/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs index bbfa0a3bf..498088eac 100644 --- a/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs +++ b/MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs @@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.TV /// <value>The priority.</value> public override MetadataProviderPriority Priority { - get { return MetadataProviderPriority.First; } + get { return MetadataProviderPriority.Second; } } /// <summary> diff --git a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs index 3fe3d6c00..4b46948af 100644 --- a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs +++ b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs @@ -65,7 +65,7 @@ namespace MediaBrowser.Providers.TV /// <value>The priority.</value> public override MetadataProviderPriority Priority { - get { return MetadataProviderPriority.Second; } + get { return MetadataProviderPriority.Third; } } /// <summary> |