The Free Software Media System - Server Backend & API
Backport pull request #15872 from jellyfin/release-10.11.z
Shadowghostf9fd34b11ec9
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.csindex 414a0a3c9b..2beb34e43b 100644--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs@@ -303,9 +303,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.MoviesCrewMember = crewMember,PersonType = TmdbUtils.MapCrewToPersonType(crewMember)})- .Where(entry =>- TmdbUtils.WantedCrewKinds.Contains(entry.PersonType) ||- TmdbUtils.WantedCrewTypes.Contains(entry.CrewMember.Job ?? string.Empty, StringComparison.OrdinalIgnoreCase));+ .Where(entry => TmdbUtils.WantedCrewKinds.Contains(entry.PersonType));if (config.HideMissingCrewMembers){diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.csindex e30c555cb4..f0e159f098 100644--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs@@ -275,9 +275,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TVCrewMember = crewMember,PersonType = TmdbUtils.MapCrewToPersonType(crewMember)})- .Where(entry =>- TmdbUtils.WantedCrewKinds.Contains(entry.PersonType) ||- TmdbUtils.WantedCrewTypes.Contains(entry.CrewMember.Job ?? string.Empty, StringComparison.OrdinalIgnoreCase));+ .Where(entry => TmdbUtils.WantedCrewKinds.Contains(entry.PersonType));if (config.HideMissingCrewMembers){diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.csindex 1b429039e7..0905a3bdcb 100644--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs@@ -120,9 +120,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TVCrewMember = crewMember,PersonType = TmdbUtils.MapCrewToPersonType(crewMember)})- .Where(entry =>- TmdbUtils.WantedCrewKinds.Contains(entry.PersonType) ||- TmdbUtils.WantedCrewTypes.Contains(entry.CrewMember.Job ?? string.Empty, StringComparison.OrdinalIgnoreCase));+ .Where(entry => TmdbUtils.WantedCrewKinds.Contains(entry.PersonType));if (config.HideMissingCrewMembers){diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.csindex f0828e8263..82d4e58384 100644--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs@@ -367,9 +367,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TVCrewMember = crewMember,PersonType = TmdbUtils.MapCrewToPersonType(crewMember)})- .Where(entry =>- TmdbUtils.WantedCrewKinds.Contains(entry.PersonType) ||- TmdbUtils.WantedCrewTypes.Contains(entry.CrewMember.Job ?? string.Empty, StringComparison.OrdinalIgnoreCase));+ .Where(entry => TmdbUtils.WantedCrewKinds.Contains(entry.PersonType));if (config.HideMissingCrewMembers){diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.csindex f5e59a2789..d6e66a0e61 100644--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs@@ -70,18 +70,19 @@ namespace MediaBrowser.Providers.Plugins.Tmdbpublic static PersonKind MapCrewToPersonType(Crew crew){if (crew.Department.Equals("production", StringComparison.OrdinalIgnoreCase)- && crew.Job.Contains("director", StringComparison.OrdinalIgnoreCase))+ && crew.Job.Equals("director", StringComparison.OrdinalIgnoreCase)){return PersonKind.Director;}if (crew.Department.Equals("production", StringComparison.OrdinalIgnoreCase)- && crew.Job.Contains("producer", StringComparison.OrdinalIgnoreCase))+ && crew.Job.Equals("producer", StringComparison.OrdinalIgnoreCase)){return PersonKind.Producer;}- if (crew.Department.Equals("writing", StringComparison.OrdinalIgnoreCase))+ if (crew.Department.Equals("writing", StringComparison.OrdinalIgnoreCase)+ && crew.Job.Equals("writer", StringComparison.OrdinalIgnoreCase)){return PersonKind.Writer;}