diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-05-06 20:31:58 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-05-06 20:31:58 -0700 |
| commit | 024d4f3a99fce8cf8005f9851bbf0437c241fbbc (patch) | |
| tree | 6d3b9654315669ebd70ff17d57fb953c9d00e4f0 /MediaBrowser.Controller | |
| parent | 3f433b3b618d2a955441596cac1a9e30a5d6c070 (diff) | |
| parent | 3517d1d5f0d02925eea22af1101480bee8726dd4 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Dto/DtoBuilder.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs | 33 |
2 files changed, 29 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs index 3a2412aeb..e9c472e42 100644 --- a/MediaBrowser.Controller/Dto/DtoBuilder.cs +++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs @@ -279,6 +279,11 @@ namespace MediaBrowser.Controller.Dto dto.HomePageUrl = item.HomePageUrl; } + if (fields.Contains(ItemFields.Tags)) + { + dto.Tags = item.Tags; + } + if (fields.Contains(ItemFields.ProductionLocations)) { dto.ProductionLocations = item.ProductionLocations; diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs index dbeba42d9..4d60aa517 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs @@ -916,6 +916,12 @@ namespace MediaBrowser.Controller.Providers.Movies } movie.SetProviderId(MetadataProviders.Imdb, movieData.imdb_id); + + if (movieData.belongs_to_collection != null) + { + movie.SetProviderId(MetadataProviders.TmdbCollection, movieData.belongs_to_collection.id.ToString(CultureInfo.InvariantCulture)); + } + float rating; string voteAvg = movieData.vote_average.ToString(CultureInfo.InvariantCulture); //tmdb appears to have unified their numbers to always report "7.3" regardless of country @@ -933,20 +939,29 @@ namespace MediaBrowser.Controller.Providers.Movies if (ourRelease.release_date > new DateTime(1900, 1, 1)) { - movie.PremiereDate = ourRelease.release_date.ToUniversalTime(); - movie.ProductionYear = ourRelease.release_date.Year; + if (ourRelease.release_date.Year != 1) + { + movie.PremiereDate = ourRelease.release_date.ToUniversalTime(); + movie.ProductionYear = ourRelease.release_date.Year; + } } else { - movie.PremiereDate = usRelease.release_date.ToUniversalTime(); - movie.ProductionYear = usRelease.release_date.Year; + if (usRelease.release_date.Year != 1) + { + movie.PremiereDate = usRelease.release_date.ToUniversalTime(); + movie.ProductionYear = usRelease.release_date.Year; + } } } else { - //no specific country release info at all - movie.PremiereDate = movieData.release_date.ToUniversalTime(); - movie.ProductionYear = movieData.release_date.Year; + if (movieData.release_date.Year != 1) + { + //no specific country release info at all + movie.PremiereDate = movieData.release_date.ToUniversalTime(); + movie.ProductionYear = movieData.release_date.Year; + } } //if that didn't find a rating and we are a boxset, use the one from our first child @@ -960,8 +975,8 @@ namespace MediaBrowser.Controller.Providers.Movies boxset.OfficialRating = firstChild != null ? firstChild.OfficialRating : null; } - //if (movie.RunTimeTicks == null && movieData.runtime > 0) - // movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks; + if (movie.RunTimeTicks == null && movieData.runtime > 0) + movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks; //studios if (movieData.production_companies != null) |