2 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 0389980e2..aa5a52512 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -256,7 +256,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             if (!string.IsNullOrWhiteSpace(originalFilenameWithoutExtension) && !string.IsNullOrWhiteSpace(directory))
             {
                 // Get all related files, e.g. metadata, images, etc
-                var files = Directory.EnumerateFiles(directory, "*", SearchOption.TopDirectoryOnly)
+                var files = _fileSystem.GetFilePaths(directory)
                     .Where(i => (Path.GetFileNameWithoutExtension(i) ?? string.Empty).StartsWith(originalFilenameWithoutExtension, StringComparison.OrdinalIgnoreCase))
                     .ToList();
 
@@ -313,7 +313,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             try
             {
-                var filesOfOtherExtensions = Directory.EnumerateFiles(folder, "*", SearchOption.TopDirectoryOnly)
+                var filesOfOtherExtensions = _fileSystem.GetFilePaths(folder)
                     .Where(i => _libraryManager.IsVideoFile(i) && string.Equals(_fileSystem.GetFileNameWithoutExtension(i), targetFileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
 
                 episodePaths.AddRange(filesOfOtherExtensions);
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index 54f2539ff..83fca9939 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -175,12 +175,12 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         {
             try
             {
-                foreach (var d in Directory.EnumerateDirectories(path))
+                foreach (var d in _fileSystem.GetDirectoryPaths(path))
                 {
                     DeleteEmptyFolders(d);
                 }
 
-                var entries = Directory.EnumerateFileSystemEntries(path);
+                var entries = _fileSystem.GetFileSystemEntryPaths(path);
 
                 if (!entries.Any())
                 {