Merge pull request #2618 from MediaBrowser/beta

Beta

7 files changed, 6 insertions, 42 deletions

diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index e005ad224..bd33dece8 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
         public List<LocalImageInfo> GetImages(IHasImages item, IDirectoryService directoryService)
         {
-            var parentPath = Path.GetDirectoryName(item.Path);
+            var parentPath = _fileSystem.GetDirectoryName(item.Path);
 
             var parentPathFiles = directoryService.GetFileSystemEntries(parentPath)
                 .ToList();
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index e56bfb49c..2500ee482 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -246,18 +246,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
                         break;
                     }
 
-                case "CriticRatingSummary":
-                    {
-                        var val = reader.ReadElementContentAsString();
-
-                        if (!string.IsNullOrWhiteSpace(val))
-                        {
-                            item.CriticRatingSummary = val;
-                        }
-
-                        break;
-                    }
-
                 case "Language":
                     {
                         var val = reader.ReadElementContentAsString();
@@ -377,17 +365,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
                         break;
                     }
 
-                case "MPAADescription":
-                    {
-                        var rating = reader.ReadElementContentAsString();
-
-                        if (!string.IsNullOrWhiteSpace(rating))
-                        {
-                            item.OfficialRatingDescription = rating;
-                        }
-                        break;
-                    }
-
                 case "CustomRating":
                     {
                         var val = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.LocalMetadata/Parsers/EpisodeXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/EpisodeXmlParser.cs
index 9adc4e5a9..69d799b18 100644
--- a/MediaBrowser.LocalMetadata/Parsers/EpisodeXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/EpisodeXmlParser.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                             // even though it's actually using the metadata folder.
                             filename = Path.GetFileName(filename);
 
-                            var parentFolder = Path.GetDirectoryName(_xmlPath);
+                            var parentFolder = _fileSystem.GetDirectoryName(_xmlPath);
                             filename = Path.Combine(parentFolder, filename);
                             var file = _fileSystem.GetFileInfo(filename);
 
diff --git a/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
index 7e0f1707f..fda8ea6d0 100644
--- a/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.LocalMetadata.Providers
 
         protected override FileSystemMetadata GetXmlFile(ItemInfo info, IDirectoryService directoryService)
         {
-            var metadataPath = Path.GetDirectoryName(info.Path);
+            var metadataPath = FileSystem.GetDirectoryName(info.Path);
             metadataPath = Path.Combine(metadataPath, "metadata");
 
             var metadataFile = Path.Combine(metadataPath, Path.ChangeExtension(Path.GetFileName(info.Path), ".xml"));
diff --git a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
index 888eff416..8ed18df64 100644
--- a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.LocalMetadata.Providers
             var specificFile = Path.ChangeExtension(info.Path, ".xml");
             var file = FileSystem.GetFileInfo(specificFile);
 
-            return info.IsInMixedFolder || file.Exists ? file : FileSystem.GetFileInfo(Path.Combine(Path.GetDirectoryName(info.Path), "game.xml"));
+            return info.IsInMixedFolder || file.Exists ? file : FileSystem.GetFileInfo(Path.Combine(FileSystem.GetDirectoryName(info.Path), "game.xml"));
         }
     }
 }
diff --git a/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs
index 0e59db75f..2d4059a1a 100644
--- a/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.LocalMetadata.Providers
         {
             var fileInfo = fileSystem.GetFileSystemInfo(info.Path);
 
-            var directoryInfo = fileInfo.IsDirectory ? fileInfo : fileSystem.GetDirectoryInfo(Path.GetDirectoryName(info.Path));
+            var directoryInfo = fileInfo.IsDirectory ? fileInfo : fileSystem.GetDirectoryInfo(fileSystem.GetDirectoryName(info.Path));
 
             var directoryPath = directoryInfo.FullName;
 
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 105e685f4..a3a55176c 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -46,7 +46,6 @@ namespace MediaBrowser.LocalMetadata.Savers
                     "Countries",
                     "CustomRating",
                     "CriticRating",
-                    "CriticRatingSummary",
                     "DeathDate",
                     "DisplayOrder",
                     "EndDate",
@@ -72,8 +71,6 @@ namespace MediaBrowser.LocalMetadata.Savers
                     // Deprecated. No longer saving in this field.
                     "MPAARating",
 
-                    "MPAADescription",
-
                     "MusicBrainzArtistId",
                     "MusicBrainzAlbumArtistId",
                     "MusicBrainzAlbumId",
@@ -210,7 +207,7 @@ namespace MediaBrowser.LocalMetadata.Savers
 
         private void SaveToFile(Stream stream, string path)
         {
-            FileSystem.CreateDirectory(Path.GetDirectoryName(path));
+            FileSystem.CreateDirectory(FileSystem.GetDirectoryName(path));
 
             var file = FileSystem.GetFileInfo(path);
 
@@ -309,11 +306,6 @@ namespace MediaBrowser.LocalMetadata.Savers
                 writer.WriteElementString("ContentRating", item.OfficialRating);
             }
 
-            if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
-            {
-                writer.WriteElementString("MPAADescription", item.OfficialRatingDescription);
-            }
-
             writer.WriteElementString("Added", item.DateCreated.ToLocalTime().ToString("G"));
 
             writer.WriteElementString("LockData", item.IsLocked.ToString().ToLower());
@@ -333,11 +325,6 @@ namespace MediaBrowser.LocalMetadata.Savers
                 writer.WriteElementString("CriticRating", item.CriticRating.Value.ToString(UsCulture));
             }
 
-            if (!string.IsNullOrEmpty(item.CriticRatingSummary))
-            {
-                writer.WriteElementString("CriticRatingSummary", item.CriticRatingSummary);
-            }
-
             if (!string.IsNullOrEmpty(item.Overview))
             {
                 writer.WriteElementString("Overview", item.Overview);