Merge branch 'jellyfin:master' into master

2 files changed, 41 insertions, 41 deletions

diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
index bb806ee55..f81a337db 100644
--- a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
+++ b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
@@ -1,56 +1,18 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
-using System.IO;
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.MediaEncoding.Configuration
 {
     public class EncodingConfigurationFactory : IConfigurationFactory
     {
-        private readonly IFileSystem _fileSystem;
-
-        public EncodingConfigurationFactory(IFileSystem fileSystem)
-        {
-            _fileSystem = fileSystem;
-        }
-
         public IEnumerable<ConfigurationStore> GetConfigurations()
         {
             return new[]
             {
-                new EncodingConfigurationStore(_fileSystem)
+                new EncodingConfigurationStore()
             };
         }
     }
-
-    public class EncodingConfigurationStore : ConfigurationStore, IValidatingConfiguration
-    {
-        private readonly IFileSystem _fileSystem;
-
-        public EncodingConfigurationStore(IFileSystem fileSystem)
-        {
-            ConfigurationType = typeof(EncodingOptions);
-            Key = "encoding";
-            _fileSystem = fileSystem;
-        }
-
-        public void Validate(object oldConfig, object newConfig)
-        {
-            var oldEncodingConfig = (EncodingOptions)oldConfig;
-            var newEncodingConfig = (EncodingOptions)newConfig;
-
-            var newPath = newEncodingConfig.TranscodingTempPath;
-
-            if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(oldEncodingConfig.TranscodingTempPath ?? string.Empty, newPath))
-            {
-                // Validate
-                if (!Directory.Exists(newPath))
-                {
-                    throw new FileNotFoundException(string.Format("{0} does not exist.", newPath));
-                }
-            }
-        }
-    }
 }
diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationStore.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationStore.cs
new file mode 100644
index 000000000..2f158157e
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationStore.cs
@@ -0,0 +1,38 @@
+#pragma warning disable CS1591
+
+using System;
+using System.Globalization;
+using System.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.MediaEncoding.Configuration
+{
+    public class EncodingConfigurationStore : ConfigurationStore, IValidatingConfiguration
+    {
+        public EncodingConfigurationStore()
+        {
+            ConfigurationType = typeof(EncodingOptions);
+            Key = "encoding";
+        }
+
+        public void Validate(object oldConfig, object newConfig)
+        {
+            var newPath = ((EncodingOptions)newConfig).TranscodingTempPath;
+
+            if (!string.IsNullOrWhiteSpace(newPath)
+                && !string.Equals(((EncodingOptions)oldConfig).TranscodingTempPath, newPath, StringComparison.Ordinal))
+            {
+                // Validate
+                if (!Directory.Exists(newPath))
+                {
+                    throw new DirectoryNotFoundException(
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            "{0} does not exist.",
+                            newPath));
+                }
+            }
+        }
+    }
+}