aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-12-26 09:20:17 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-12-26 09:20:17 -0500
commit72a956d02272e3e11211ec1e16ae187018e5843a (patch)
treeb502a52170b3f242b7b6556323d203239c52c8f9
parentce51973a8087b0fc48e887f2155eb05b1de2e0ac (diff)
fixed movie genres not getting replaced
-rw-r--r--MediaBrowser.Providers/Movies/MovieDbProvider.cs8
-rw-r--r--MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs2
2 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index a038d9b4c..950dd353c 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -745,13 +745,13 @@ namespace MediaBrowser.Providers.Movies
// tmdb appears to have unified their numbers to always report "7.3" regardless of country
// so I removed the culture-specific processing here because it was not working for other countries -ebr
// Movies get this from imdb
- if (movie is BoxSet && float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out rating))
+ if (!(movie is Movie) && float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out rating))
{
movie.CommunityRating = rating;
}
// Movies get this from imdb
- if (movie is BoxSet)
+ if (!(movie is Movie))
{
movie.VoteCount = movieData.vote_count;
}
@@ -811,7 +811,7 @@ namespace MediaBrowser.Providers.Movies
}
}
- //if that didn't find a rating and we are a boxset, use the one from our first child
+ // If that didn't find a rating and we are a boxset, use the one from our first child
if (movie.OfficialRating == null && movie is BoxSet && !movie.LockedFields.Contains(MetadataFields.OfficialRating))
{
var boxset = movie as BoxSet;
@@ -842,7 +842,7 @@ namespace MediaBrowser.Providers.Movies
{
// Only grab them if a boxset or there are no genres.
// For movies and trailers we'll use imdb via omdb
- if (movie is BoxSet || movie.Genres.Count == 0)
+ if (!(movie is Movie) || movie.Genres.Count == 0)
{
movie.Genres.Clear();
diff --git a/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs b/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs
index 8370eecbb..1c7264ceb 100644
--- a/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs
+++ b/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs
@@ -208,7 +208,7 @@ namespace MediaBrowser.Providers.Movies
return item.Genres.Count == 0;
}
- return item is Series;
+ return item is Series || item is Movie;
}
protected class RootObject