Merge remote-tracking branch 'upstream/master' into random

1 files changed, 11 insertions, 19 deletions

diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
index bb806ee55..75534b5bd 100644
--- a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
+++ b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
@@ -1,54 +1,46 @@
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 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)
+        public EncodingConfigurationStore()
         {
             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;
+            var newPath = ((EncodingOptions)newConfig).TranscodingTempPath;
 
             if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(oldEncodingConfig.TranscodingTempPath ?? string.Empty, newPath))
+                && !string.Equals(((EncodingOptions)oldConfig).TranscodingTempPath, newPath, StringComparison.Ordinal))
             {
                 // Validate
                 if (!Directory.Exists(newPath))
                 {
-                    throw new FileNotFoundException(string.Format("{0} does not exist.", newPath));
+                    throw new DirectoryNotFoundException(
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            "{0} does not exist.",
+                            newPath));
                 }
             }
         }