add tvdb and games db to xml savers

4 files changed, 34 insertions, 12 deletions

diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 7086b2c4f..16b708a58 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -275,11 +275,9 @@ namespace MediaBrowser.Controller.Dto
                 dto.DisplayPreferencesId = ((Folder)item).GetDisplayPreferencesId(user.Id).ToString();
             }
 
-            var addUserData = fields.Contains(ItemFields.UserData);
-
             if (item.IsFolder)
             {
-                if (fields.Contains(ItemFields.ItemCounts) || addUserData)
+                if (fields.Contains(ItemFields.ItemCounts))
                 {
                     var folder = (Folder)item;
 
@@ -290,16 +288,13 @@ namespace MediaBrowser.Controller.Dto
                 }
             }
 
-            if (addUserData)
-            {
-                var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
+            var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
 
-                dto.UserData = GetUserItemDataDto(userData);
+            dto.UserData = GetUserItemDataDto(userData);
 
-                if (item.IsFolder)
-                {
-                    dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
-                }
+            if (item.IsFolder)
+            {
+                dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
             }
         }
 
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index c89a7f0b2..c0d681de2 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -992,10 +992,15 @@ namespace MediaBrowser.Controller.Entities
                 return true;
             }
 
-            var rating = CustomRating ?? OfficialRating;
+            var rating = CustomRating;
 
             if (string.IsNullOrEmpty(rating))
             {
+                rating = OfficialRating;
+            }
+            
+            if (string.IsNullOrEmpty(rating))
+            {
                 return !user.Configuration.BlockNotRated;
             }
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index e46ec8d3b..d1f2f87ed 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
@@ -139,6 +140,11 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
+                if (this is Series)
+                {
+                    return base.OfficialRating;
+                }
+
                 return !string.IsNullOrEmpty(base.OfficialRating) ? base.OfficialRating : "None";
             }
             set
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 4fbda1025..953c99fbb 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -464,6 +464,22 @@ namespace MediaBrowser.Controller.Providers
                         break;
                     }
 
+                case "TvDbId":
+                    var tvdbId = reader.ReadElementContentAsString();
+                    if (!string.IsNullOrWhiteSpace(tvdbId))
+                    {
+                        item.SetProviderId(MetadataProviders.Tvdb, tvdbId);
+                    }
+                    break;
+
+                case "GamesDbId":
+                    var gamesdbId = reader.ReadElementContentAsString();
+                    if (!string.IsNullOrWhiteSpace(gamesdbId))
+                    {
+                        item.SetProviderId(MetadataProviders.Gamesdb, gamesdbId);
+                    }
+                    break;
+
                 case "MusicbrainzId":
                     var mbz = reader.ReadElementContentAsString();
                     if (!string.IsNullOrWhiteSpace(mbz))