diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-05-06 23:20:58 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-05-06 23:20:58 -0400 |
| commit | 3517d1d5f0d02925eea22af1101480bee8726dd4 (patch) | |
| tree | 6d3b9654315669ebd70ff17d57fb953c9d00e4f0 /MediaBrowser.Controller | |
| parent | bee343c7b3e942b320a72615bbe55609f920e58d (diff) | |
| parent | 1c484b486bb03c9f34a9f6054d766542b5d52f86 (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 | 27 |
2 files changed, 23 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs index 3a2412aebf..e9c472e429 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 b2a556e3d2..4d60aa5175 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs @@ -939,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 @@ -966,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) |