refactor: split noise detection for files and directories

Author: paul-fresquet

src/ByteSync.Client/Interfaces/Controls/Inventories/IFileSystemInspector.cs

@@ -12,15 +12,15 @@ public interface IFileSystemInspector
 
     bool IsSystemAttribute(FileInfo fileInfo);
 
-    bool IsNoiseEntryName(string? entryName, OSPlatforms os);
-    
     bool IsNoiseFileName(FileInfo fileInfo, OSPlatforms os);
 
+    bool IsNoiseDirectoryName(DirectoryInfo directoryInfo, OSPlatforms os);
+    
     bool IsReparsePoint(FileSystemInfo fsi);
 
     bool Exists(FileInfo fileInfo);
 
     bool IsOffline(FileInfo fileInfo);
 
     bool IsRecallOnDataAccess(FileInfo fileInfo);
-}
+}

src/ByteSync.Client/Services/Inventories/FileSystemInspector.cs

@@ -61,14 +61,14 @@ public bool IsSystemAttribute(FileInfo fileInfo)
         return isSystem;
     }
 
-    public bool IsNoiseEntryName(string? entryName, OSPlatforms os)
+    public bool IsNoiseFileName(FileInfo fileInfo, OSPlatforms os)
     {
-        return NoiseFileDetector.IsNoiseFileName(entryName, os);
+        return NoiseFileDetector.IsNoiseFileName(fileInfo.Name, os);
     }
 
-    public bool IsNoiseFileName(FileInfo fileInfo, OSPlatforms os)
+    public bool IsNoiseDirectoryName(DirectoryInfo directoryInfo, OSPlatforms os)
     {
-        return IsNoiseEntryName(fileInfo.Name, os);
+        return NoiseFileDetector.IsNoiseFileName(directoryInfo.Name, os);
     }
 
     public bool IsReparsePoint(FileSystemInfo fsi)

src/ByteSync.Client/Services/Inventories/InventoryBuilder.cs

@@ -549,7 +549,7 @@ private bool ShouldIgnoreNoiseDirectory(DirectoryInfo directoryInfo)
             return false;
         }
 
-        if (FileSystemInspector.IsNoiseEntryName(directoryInfo.Name, OSPlatform))
+        if (FileSystemInspector.IsNoiseDirectoryName(directoryInfo, OSPlatform))
         {
             _logger.LogInformation("Directory {Directory} is ignored because considered as noise", directoryInfo.FullName);
 
@@ -566,7 +566,7 @@ private bool ShouldIgnoreNoiseDirectory(DirectoryInfo directoryInfo)
             return null;
         }
 
-        if (FileSystemInspector.IsNoiseEntryName(fileInfo.Name, OSPlatform))
+        if (FileSystemInspector.IsNoiseFileName(fileInfo, OSPlatform))
         {
             _logger.LogInformation("File {File} is ignored because considered as noise", fileInfo.FullName);
 

tests/ByteSync.Client.UnitTests/Services/Inventories/FileSystemInspectorTests.cs

@@ -134,23 +134,41 @@ public void ClassifyEntry_FallsBackToRegularFile_WhenPosixClassifierThrows()
     }
 
     [Test]
-    public void IsNoiseEntryName_ShouldReturnTrue_ForKnownNoiseEntry()
+    public void IsNoiseDirectoryName_ShouldReturnTrue_ForKnownNoiseDirectory()
     {
         var inspector = new FileSystemInspector();
+        var tempDirectory = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N")));
+        var noiseDirectory = Directory.CreateDirectory(Path.Combine(tempDirectory.FullName, "$RECYCLE.BIN"));
 
-        var result = inspector.IsNoiseEntryName("thumbs.db", OSPlatforms.Windows);
+        try
+        {
+            var result = inspector.IsNoiseDirectoryName(noiseDirectory, OSPlatforms.Windows);
 
-        result.Should().BeTrue();
+            result.Should().BeTrue();
+        }
+        finally
+        {
+            Directory.Delete(tempDirectory.FullName, true);
+        }
     }
 
     [Test]
-    public void IsNoiseEntryName_ShouldReturnFalse_ForUnknownEntry()
+    public void IsNoiseDirectoryName_ShouldReturnFalse_ForUnknownDirectory()
     {
         var inspector = new FileSystemInspector();
+        var tempDirectory = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N")));
+        var regularDirectory = Directory.CreateDirectory(Path.Combine(tempDirectory.FullName, "regular"));
 
-        var result = inspector.IsNoiseEntryName("regular.txt", OSPlatforms.Windows);
+        try
+        {
+            var result = inspector.IsNoiseDirectoryName(regularDirectory, OSPlatforms.Windows);
 
-        result.Should().BeFalse();
+            result.Should().BeFalse();
+        }
+        finally
+        {
+            Directory.Delete(tempDirectory.FullName, true);
+        }
     }
 
     [Test]

tests/ByteSync.Client.UnitTests/Services/Inventories/InventoryBuilderInspectorTests.cs

@@ -95,7 +95,7 @@ private static void SetupDefaultClassification(Mock<IFileSystemInspector> inspec
                 _ => FileSystemEntryKind.Unknown
             });
         inspector
-            .Setup(i => i.IsNoiseEntryName(It.IsAny<string>(), It.IsAny<OSPlatforms>()))
+            .Setup(i => i.IsNoiseDirectoryName(It.IsAny<DirectoryInfo>(), It.IsAny<OSPlatforms>()))
             .Returns(false);
     }
 
@@ -246,8 +246,6 @@ public async Task Noise_Child_File_Is_Recorded()
         SetupDefaultClassification(insp);
         insp.Setup(i => i.IsHidden(It.IsAny<DirectoryInfo>(), It.IsAny<OSPlatforms>())).Returns(false);
         insp.Setup(i => i.IsHidden(It.IsAny<FileInfo>(), It.IsAny<OSPlatforms>())).Returns(false);
-        insp.Setup(i => i.IsNoiseEntryName(It.Is<string>(name => name == "thumbs.db"), It.IsAny<OSPlatforms>()))
-            .Returns(true);
         insp.Setup(i => i.IsNoiseFileName(It.Is<FileInfo>(fi => fi.Name == "thumbs.db"), It.IsAny<OSPlatforms>()))
             .Returns(true);
         insp.Setup(i => i.IsNoiseFileName(It.Is<FileInfo>(fi => fi.Name != "thumbs.db"), It.IsAny<OSPlatforms>()))
@@ -280,7 +278,7 @@ public async Task Noise_Child_Directory_Is_Recorded_And_Not_Traversed()
         SetupDefaultClassification(insp);
         insp.Setup(i => i.IsHidden(It.IsAny<DirectoryInfo>(), It.IsAny<OSPlatforms>())).Returns(false);
         insp.Setup(i => i.IsHidden(It.IsAny<FileInfo>(), It.IsAny<OSPlatforms>())).Returns(false);
-        insp.Setup(i => i.IsNoiseEntryName(It.Is<string>(name => name == "$RECYCLE.BIN"), It.IsAny<OSPlatforms>()))
+        insp.Setup(i => i.IsNoiseDirectoryName(It.Is<DirectoryInfo>(di => di.Name == "$RECYCLE.BIN"), It.IsAny<OSPlatforms>()))
             .Returns(true);
         insp.Setup(i => i.IsNoiseFileName(It.IsAny<FileInfo>(), It.IsAny<OSPlatforms>())).Returns(false);
         insp.Setup(i => i.IsSystemAttribute(It.IsAny<FileInfo>())).Returns(false);