lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Techywarrior 2013-05-06 20:31:58 -07:00
commit 024d4f3a99
6 changed files with 45 additions and 13 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;
}
if (fields.Contains(ItemFields.Tags))
{
dto.Tags = item.Tags;
}
if (fields.Contains(ItemFields.ProductionLocations))
{
dto.ProductionLocations = item.ProductionLocations;

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

@ -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)

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

@ -276,6 +276,12 @@ namespace MediaBrowser.Model.Dto
/// <value>The index options.</value>
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>

6
MediaBrowser.Model/Entities/MetadataProviders.cs
View File

@ -29,6 +29,10 @@ namespace MediaBrowser.Model.Entities
/// <summary>
/// The rotten tomatoes
/// </summary>
RottenTomatoes
RottenTomatoes,
/// <summary>
/// Tmdb Collection Id
/// </summary>
TmdbCollection
}
}

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

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

3
MediaBrowser.sln
View File

@ -173,7 +173,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal