Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

2 files changed, 5 insertions, 44 deletions

diff --git a/MediaBrowser.LocalMetadata/Providers/ChannelXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/ChannelXmlProvider.cs
deleted file mode 100644
index 78845487a2..0000000000
--- a/MediaBrowser.LocalMetadata/Providers/ChannelXmlProvider.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Logging;
-
-namespace MediaBrowser.LocalMetadata.Providers
-{
-    public class ChannelXmlProvider : BaseXmlProvider<LiveTvChannel>
-    {
-        private readonly ILogger _logger;
-
-        public ChannelXmlProvider(IFileSystem fileSystem, ILogger logger)
-            : base(fileSystem)
-        {
-            _logger = logger;
-        }
-
-        protected override void Fetch(LocalMetadataResult<LiveTvChannel> result, string path, CancellationToken cancellationToken)
-        {
-            new BaseItemXmlParser<LiveTvChannel>(_logger).Fetch(result.Item, path, cancellationToken);
-        }
-
-        protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
-        {
-            return directoryService.GetFile(Path.Combine(info.Path, "channel.xml"));
-        }
-    }
-}
diff --git a/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
index dff3c1c07c..d800093300 100644
--- a/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/EpisodeXmlProvider.cs
@@ -1,16 +1,16 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.LocalMetadata.Parsers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Providers
 {
-    public class EpisodeXmlProvider : BaseXmlProvider<Episode>, IHasOrder
+    public class EpisodeXmlProvider : BaseXmlProvider<Episode>
     {
         private readonly ILogger _logger;
 
@@ -40,14 +40,5 @@ namespace MediaBrowser.LocalMetadata.Providers
 
             return directoryService.GetFile(metadataFile);
         }
-
-        public int Order
-        {
-            get
-            {
-                // After Xbmc
-                return 1;
-            }
-        }
     }
 }