Merge pull request #2224 from MediaBrowser/beta

Beta

4 files changed, 17 insertions, 30 deletions

diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index fe61a7a46..ef9160b70 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -132,7 +132,7 @@ namespace MediaBrowser.LocalMetadata.Images
             }
             
             var imagePrefix = item.FileNameWithoutExtension + "-";
-            var isInMixedFolder = item.IsInMixedFolder;
+            var isInMixedFolder = item.DetectIsInMixedFolder();
 
             PopulatePrimaryImages(item, images, files, imagePrefix, isInMixedFolder);
 
diff --git a/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs
index a90789a3e..5592c068c 100644
--- a/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs
@@ -99,7 +99,7 @@ namespace MediaBrowser.LocalMetadata.Savers
 
         public static string GetGameSavePath(Game item)
         {
-            if (item.IsInMixedFolder)
+            if (item.DetectIsInMixedFolder())
             {
                 return Path.ChangeExtension(item.Path, ".xml");
             }
diff --git a/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs
index bf6ed03ad..295e64881 100644
--- a/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs
@@ -66,9 +66,9 @@ namespace MediaBrowser.LocalMetadata.Savers
 
             XmlSaverHelpers.AddCommonNodes(person, _libraryManager, builder);
 
-            if (!string.IsNullOrEmpty(person.PlaceOfBirth))
+            if (person.ProductionLocations.Count > 0)
             {
-                builder.Append("<PlaceOfBirth>" + SecurityElement.Escape(person.PlaceOfBirth) + "</PlaceOfBirth>");
+                builder.Append("<PlaceOfBirth>" + SecurityElement.Escape(person.ProductionLocations[0]) + "</PlaceOfBirth>");
             }
 
             builder.Append("</Item>");
diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
index ac4ebbefe..c9810b042 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -350,21 +350,17 @@ namespace MediaBrowser.LocalMetadata.Savers
                 }
             }
 
-            var hasProductionLocations = item as IHasProductionLocations;
-            if (hasProductionLocations != null)
-            {
-                if (hasProductionLocations.ProductionLocations.Count > 0)
-                {
-                    builder.Append("<Countries>");
+            //if (hasProductionLocations.ProductionLocations.Count > 0)
+            //{
+            //    builder.Append("<Countries>");
 
-                    foreach (var name in hasProductionLocations.ProductionLocations)
-                    {
-                        builder.Append("<Country>" + SecurityElement.Escape(name) + "</Country>");
-                    }
+            //    foreach (var name in hasProductionLocations.ProductionLocations)
+            //    {
+            //        builder.Append("<Country>" + SecurityElement.Escape(name) + "</Country>");
+            //    }
 
-                    builder.Append("</Countries>");
-                }
-            }
+            //    builder.Append("</Countries>");
+            //}
 
             var hasDisplayOrder = item as IHasDisplayOrder;
             if (hasDisplayOrder != null && !string.IsNullOrEmpty(hasDisplayOrder.DisplayOrder))
@@ -457,20 +453,11 @@ namespace MediaBrowser.LocalMetadata.Savers
                 }
             }
 
-            var hasTagline = item as IHasTaglines;
-            if (hasTagline != null)
+            if (!string.IsNullOrWhiteSpace(item.Tagline))
             {
-                if (hasTagline.Taglines.Count > 0)
-                {
-                    builder.Append("<Taglines>");
-
-                    foreach (var tagline in hasTagline.Taglines)
-                    {
-                        builder.Append("<Tagline>" + SecurityElement.Escape(tagline) + "</Tagline>");
-                    }
-
-                    builder.Append("</Taglines>");
-                }
+                builder.Append("<Taglines>");
+                builder.Append("<Tagline>" + SecurityElement.Escape(item.Tagline) + "</Tagline>");
+                builder.Append("</Taglines>");
             }
 
             if (item.Genres.Count > 0)