Io abstraction (#7293)

Co-authored-by: p-storm <paul.de.man@gmail.com>

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/IQueryFileSystemInfo.cs

@@ -3,12 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.IO;
-using Wox.Infrastructure.FileSystemHelper;
 
 namespace Microsoft.Plugin.Folder.Sources
 {
-    public interface IQueryFileSystemInfo : IDirectoryWrapper
+    public interface IQueryFileSystemInfo
     {
         IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive);
     }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/DriveInformation.cs

@@ -4,22 +4,22 @@
 
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 
 namespace Microsoft.Plugin.Folder.Sources
 {
     internal class DriveInformation : IDriveInformation
     {
+        private static readonly IFileSystem _fileSystem = new FileSystem();
         private static readonly List<string> DriverNames = InitialDriverList().ToList();
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase", Justification = "Do not want to change the behavior of the application, but want to enforce static analysis")]
         private static IEnumerable<string> InitialDriverList()
         {
-            var directorySeparatorChar = System.IO.Path.DirectorySeparatorChar;
-
             // Using InvariantCulture since this is internal
-            return DriveInfo.GetDrives()
+            var directorySeparatorChar = _fileSystem.Path.DirectorySeparatorChar;
+            return _fileSystem.DriveInfo.GetDrives()
                 .Select(driver => driver.Name.ToLower(CultureInfo.InvariantCulture).TrimEnd(directorySeparatorChar));
         }
 

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryFileSystemInfo.cs

@@ -2,20 +2,26 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
-using Wox.Infrastructure.FileSystemHelper;
 
 namespace Microsoft.Plugin.Folder.Sources
 {
-    public class QueryFileSystemInfo : DirectoryWrapper,  IQueryFileSystemInfo
+    public class QueryFileSystemInfo : IQueryFileSystemInfo
     {
+        private readonly IDirectoryInfoFactory _directoryInfoFactory;
+
+        public QueryFileSystemInfo(IDirectoryInfoFactory directoryInfoFactory)
+        {
+            _directoryInfoFactory = directoryInfoFactory;
+        }
+
         public IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive)
         {
             // search folder and add results
-            var directoryInfo = new DirectoryInfo(search);
+            var directoryInfo = _directoryInfoFactory.FromDirectoryName(search);
             var fileSystemInfos = directoryInfo.EnumerateFileSystemInfos(incompleteName, new EnumerationOptions()
             {
                 MatchType = MatchType.Win32,
@@ -30,7 +36,7 @@ namespace Microsoft.Plugin.Folder.Sources
                 .Select(CreateDisplayFileInfo);
         }
 
-        private static DisplayFileInfo CreateDisplayFileInfo(FileSystemInfo fileSystemInfo)
+        private static DisplayFileInfo CreateDisplayFileInfo(IFileSystemInfo fileSystemInfo)
         {
             return new DisplayFileInfo()
             {
@@ -40,9 +46,9 @@ namespace Microsoft.Plugin.Folder.Sources
             };
         }
 
-        private static DisplayType GetDisplayType(FileSystemInfo fileSystemInfo)
+        private static DisplayType GetDisplayType(IFileSystemInfo fileSystemInfo)
         {
-            if (fileSystemInfo is DirectoryInfo)
+            if (fileSystemInfo is IDirectoryInfo)
             {
                 return DisplayType.Directory;
             }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryInternalDirectory.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 using ManagedCommon;
 using Microsoft.Plugin.Folder.Sources.Result;
@@ -18,6 +19,7 @@ namespace Microsoft.Plugin.Folder.Sources
     {
         private readonly FolderSettings _settings;
         private readonly IQueryFileSystemInfo _queryFileSystemInfo;
+        private readonly IDirectory _directory;
 
         private static readonly HashSet<char> SpecialSearchChars = new HashSet<char>
         {
@@ -26,10 +28,11 @@ namespace Microsoft.Plugin.Folder.Sources
 
         private static string _warningIconPath;
 
-        public QueryInternalDirectory(FolderSettings folderSettings, IQueryFileSystemInfo queryFileSystemInfo)
+        public QueryInternalDirectory(FolderSettings folderSettings, IQueryFileSystemInfo queryFileSystemInfo, IDirectory directory)
         {
             _settings = folderSettings;
             _queryFileSystemInfo = queryFileSystemInfo;
+            _directory = directory;
         }
 
         private static bool HasSpecialChars(string search)
@@ -47,7 +50,7 @@ namespace Microsoft.Plugin.Folder.Sources
         private (string search, string incompleteName) Process(string search)
         {
             string incompleteName = string.Empty;
-            if (HasSpecialChars(search) || !_queryFileSystemInfo.Exists($@"{search}\"))
+            if (HasSpecialChars(search) || !_directory.Exists($@"{search}\"))
             {
                 // if folder doesn't exist, we want to take the last part and use it afterwards to help the user
                 // find the right folder.
@@ -64,7 +67,7 @@ namespace Microsoft.Plugin.Folder.Sources
                 incompleteName = search.Substring(index + 1)
                     .ToLower(CultureInfo.InvariantCulture) + "*";
                 search = search.Substring(0, index + 1);
-                if (!_queryFileSystemInfo.Exists(search))
+                if (!_directory.Exists(search))
                 {
                     return default;
                 }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Result/FileItemResult.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 using Wox.Infrastructure;
 using Wox.Plugin;
 
@@ -13,15 +13,27 @@ namespace Microsoft.Plugin.Folder.Sources.Result
     {
         private static readonly IShellAction ShellAction = new ShellAction();
 
+        private readonly IPath _path;
+
+        public FileItemResult()
+            : this(new FileSystem().Path)
+        {
+        }
+
+        private FileItemResult(IPath path)
+        {
+            _path = path;
+        }
+
         public string FilePath { get; set; }
 
-        public string Title => Path.GetFileName(FilePath);
+        public string Title => _path.GetFileName(FilePath);
 
         public string Search { get; set; }
 
         public Wox.Plugin.Result Create(IPublicAPI contextApi)
         {
-            var result = new Wox.Plugin.Result(StringMatcher.FuzzySearch(Search, Path.GetFileName(FilePath)).MatchData)
+            var result = new Wox.Plugin.Result(StringMatcher.FuzzySearch(Search, _path.GetFileName(FilePath)).MatchData)
             {
                 Title = Title,