diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-06 23:46:24 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-06 23:46:24 -0400 |
| commit | ba905fecd8ed06ac86d3d889b305b1841c558ced (patch) | |
| tree | 8b95bd70f1f68b4e52248bce7a8ec784b68f6454 | |
| parent | 11767f548f04a28506da8c66caeb38fc7a5763bd (diff) | |
| parent | c0da1486ebba77b15a1982ca8be14c85d9633e6e (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MetadataProviders.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.sln | 3 |
4 files changed, 14 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs index c5bd0b03b..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 diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs index 15648604f..3c7b2ff01 100644 --- a/MediaBrowser.Model/Entities/MetadataProviders.cs +++ b/MediaBrowser.Model/Entities/MetadataProviders.cs @@ -29,6 +29,10 @@ namespace MediaBrowser.Model.Entities /// <summary> /// The rotten tomatoes /// </summary> - RottenTomatoes + RottenTomatoes, + /// <summary> + /// Tmdb Collection Id + /// </summary> + TmdbCollection } } diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 11e139350..c65022620 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -111,6 +111,9 @@ <Content Include="dashboard-ui\css\images\items\searchhints\tv.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\css\images\media\settings.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\css\images\rotten.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/MediaBrowser.sln b/MediaBrowser.sln index eb3251f74..f9f5e9436 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -173,7 +173,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal |