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

6 files changed, 45 insertions, 13 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..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
@@ -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)
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/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.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,
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