1 files changed, 10 insertions, 24 deletions
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index ae1470190..3e7774abf 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -29,9 +29,14 @@ namespace Emby.Server.Implementations.IO
 
         private string _defaultDirectory;
 
-        public ManagedFileSystem(ILogger logger, IEnvironmentInfo environmentInfo, string defaultDirectory, string tempPath, bool enableSeparateFileAndDirectoryQueries)
-        {
-            Logger = logger;
+        public ManagedFileSystem(
+            ILoggerFactory loggerFactory,
+            IEnvironmentInfo environmentInfo,
+            string defaultDirectory,
+            string tempPath,
+            bool enableSeparateFileAndDirectoryQueries)
+        {
+            Logger = loggerFactory.CreateLogger("FileSystem");
             _supportsAsyncFileStreams = true;
             _tempPath = tempPath;
             _environmentInfo = environmentInfo;
@@ -445,10 +450,7 @@ namespace Emby.Server.Implementations.IO
         }
 
         public Stream GetFileStream(string path, FileOpenMode mode, FileAccessMode access, FileShareMode share, FileOpenOptions fileOpenOptions)
-        {
-            var defaultBufferSize = 4096;
-            return new FileStream(path, GetFileMode(mode), GetFileAccess(access), GetFileShare(share), defaultBufferSize, GetFileOptions(fileOpenOptions));
-        }
+            => new FileStream(path, GetFileMode(mode), GetFileAccess(access), GetFileShare(share), 4096, GetFileOptions(fileOpenOptions));
 
         private static FileOptions GetFileOptions(FileOpenOptions mode)
         {
@@ -759,18 +761,13 @@ namespace Emby.Server.Implementations.IO
             // Only include drives in the ready state or this method could end up being very slow, waiting for drives to timeout
             return DriveInfo.GetDrives().Where(d => d.IsReady).Select(d => new FileSystemMetadata
             {
-                Name = GetName(d),
+                Name = d.Name,
                 FullName = d.RootDirectory.FullName,
                 IsDirectory = true
 
             }).ToList();
         }
 
-        private static string GetName(DriveInfo drive)
-        {
-            return drive.Name;
-        }
-
         public IEnumerable<FileSystemMetadata> GetDirectories(string path, bool recursive = false)
         {
             var searchOption = recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
@@ -846,17 +843,6 @@ namespace Emby.Server.Implementations.IO
             return File.OpenRead(path);
         }
 
-        private void CopyFileUsingStreams(string source, string target, bool overwrite)
-        {
-            using (var sourceStream = OpenRead(source))
-            {
-                using (var targetStream = GetFileStream(target, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
-                {
-                    sourceStream.CopyTo(targetStream);
-                }
-            }
-        }
-
         public void CopyFile(string source, string target, bool overwrite)
         {
             File.Copy(source, target, overwrite);