pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

This commit is contained in:
Eric Reed 2013-05-06 23:20:58 -04:00
parent bee343c7b3 1c484b486b
commit 3517d1d5f0
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/Dto/DtoBuilder.cs
View File

@ -279,6 +279,11 @@ namespace MediaBrowser.Controller.Dto
dto.HomePageUrl = item.HomePageUrl; dto.HomePageUrl = item.HomePageUrl;
} }
if (fields.Contains(ItemFields.Tags))
{
dto.Tags = item.Tags;
}
if (fields.Contains(ItemFields.ProductionLocations)) if (fields.Contains(ItemFields.ProductionLocations))
{ {
dto.ProductionLocations = item.ProductionLocations; dto.ProductionLocations = item.ProductionLocations;

27
MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
View File

@ -939,20 +939,29 @@ namespace MediaBrowser.Controller.Providers.Movies
if (ourRelease.release_date > new DateTime(1900, 1, 1)) if (ourRelease.release_date > new DateTime(1900, 1, 1))
{ {
movie.PremiereDate = ourRelease.release_date.ToUniversalTime(); if (ourRelease.release_date.Year != 1)
movie.ProductionYear = ourRelease.release_date.Year; {
movie.PremiereDate = ourRelease.release_date.ToUniversalTime();
movie.ProductionYear = ourRelease.release_date.Year;
}
} }
else else
{ {
movie.PremiereDate = usRelease.release_date.ToUniversalTime(); if (usRelease.release_date.Year != 1)
movie.ProductionYear = usRelease.release_date.Year; {
movie.PremiereDate = usRelease.release_date.ToUniversalTime();
movie.ProductionYear = usRelease.release_date.Year;
}
} }
} }
else else
{ {
//no specific country release info at all if (movieData.release_date.Year != 1)
movie.PremiereDate = movieData.release_date.ToUniversalTime(); {
movie.ProductionYear = movieData.release_date.Year; //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 //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; boxset.OfficialRating = firstChild != null ? firstChild.OfficialRating : null;
} }
//if (movie.RunTimeTicks == null && movieData.runtime > 0) if (movie.RunTimeTicks == null && movieData.runtime > 0)
// movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks; movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks;
//studios //studios
if (movieData.production_companies != null) if (movieData.production_companies != null)

6
MediaBrowser.Model/DTO/BaseItemDto.cs
View File

@ -276,6 +276,12 @@ namespace MediaBrowser.Model.Dto
/// <value>The index options.</value> /// <value>The index options.</value>
public string[] IndexOptions { get; set; } public string[] IndexOptions { get; set; }
/// <summary>
/// Gets or sets the tags.
/// </summary>
/// <value>The tags.</value>
public List<string> Tags { get; set; }
/// <summary> /// <summary>
/// Gets or sets the primary image aspect ratio. /// Gets or sets the primary image aspect ratio.
/// </summary> /// </summary>

5
MediaBrowser.Model/Querying/ItemFields.cs
View File

@ -131,6 +131,11 @@ namespace MediaBrowser.Model.Querying
/// </summary> /// </summary>
Taglines, Taglines,
/// <summary>
/// The tags
/// </summary>
Tags,
/// <summary> /// <summary>
/// The trailer url of the item /// The trailer url of the item
/// </summary> /// </summary>