diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-06 23:00:24 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-06 23:00:24 -0400 |
| commit | 1c484b486bb03c9f34a9f6054d766542b5d52f86 (patch) | |
| tree | aba4c3c2ea6289401a2dac9e3037b946261fede7 | |
| parent | 3f433b3b618d2a955441596cac1a9e30a5d6c070 (diff) | |
display tags on detail page
| -rw-r--r-- | MediaBrowser.Controller/Dto/DtoBuilder.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.Model/DTO/BaseItemDto.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 5 |
4 files changed, 34 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..c5bd0b03b 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs @@ -933,20 +933,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 +969,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) diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs index e8f389940..076fa7bfc 100644 --- a/MediaBrowser.Model/DTO/BaseItemDto.cs +++ b/MediaBrowser.Model/DTO/BaseItemDto.cs @@ -277,6 +277,12 @@ namespace MediaBrowser.Model.Dto public string[] IndexOptions { get; set; } /// <summary> + /// Gets or sets the tags. + /// </summary> + /// <value>The tags.</value> + public List<string> Tags { get; set; } + + /// <summary> /// Gets or sets the primary image aspect ratio. /// </summary> /// <value>The primary image aspect ratio.</value> diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index 2e6e6b7dc..875329c70 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -132,6 +132,11 @@ namespace MediaBrowser.Model.Querying Taglines, /// <summary> + /// The tags + /// </summary> + Tags, + + /// <summary> /// The trailer url of the item /// </summary> TrailerUrls, |