From 1c484b486bb03c9f34a9f6054d766542b5d52f86 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 6 May 2013 23:00:24 -0400
Subject: display tags on detail page

---
 MediaBrowser.Model/DTO/BaseItemDto.cs     | 6 ++++++
 MediaBrowser.Model/Querying/ItemFields.cs | 5 +++++
 2 files changed, 11 insertions(+)

(limited to 'MediaBrowser.Model')

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
@@ -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>
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
@@ -131,6 +131,11 @@ namespace MediaBrowser.Model.Querying
         /// </summary>
         Taglines,
 
+        /// <summary>
+        /// The tags
+        /// </summary>
+        Tags,
+        
         /// <summary>
         /// The trailer url of the item
         /// </summary>
-- 
cgit v1.2.3


From bee343c7b3e942b320a72615bbe55609f920e58d Mon Sep 17 00:00:00 2001
From: Eric Reed <ebr@mediabrowser3.com>
Date: Mon, 6 May 2013 23:20:51 -0400
Subject: Add collection id

---
 MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs | 6 ++++++
 MediaBrowser.Model/Entities/MetadataProviders.cs            | 6 +++++-
 MediaBrowser.sln                                            | 3 ---
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index dbeba42d9..b2a556e3d 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.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
-- 
cgit v1.2.3