Merge pull request #1 from jellyfin/master

merge with upstream master

2 files changed, 18 insertions, 9 deletions

diff --git a/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs
new file mode 100644
index 0000000000..fe3bc3cd30
--- /dev/null
+++ b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationExtension.cs
@@ -0,0 +1,15 @@
+#pragma warning disable CS1591
+
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.XbmcMetadata.Configuration
+{
+    public static class NfoConfigurationExtension
+    {
+        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
+        {
+            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
+        }
+    }
+}
diff --git a/MediaBrowser.XbmcMetadata/Configuration/NfoOptions.cs b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationFactory.cs
index 60dcde4dba..8325bfdbd5 100644
--- a/MediaBrowser.XbmcMetadata/Configuration/NfoOptions.cs
+++ b/MediaBrowser.XbmcMetadata/Configuration/NfoConfigurationFactory.cs
@@ -1,10 +1,12 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Configuration;
 
 namespace MediaBrowser.XbmcMetadata.Configuration
 {
-    public class ConfigurationFactory : IConfigurationFactory
+    public class NfoConfigurationFactory : IConfigurationFactory
     {
         /// <inheritdoc />
         public IEnumerable<ConfigurationStore> GetConfigurations()
@@ -19,12 +21,4 @@ namespace MediaBrowser.XbmcMetadata.Configuration
             };
         }
     }
-
-    public static class ConfigurationExtension
-    {
-        public static XbmcMetadataOptions GetNfoConfiguration(this IConfigurationManager manager)
-        {
-            return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
-        }
-    }
 }