Merge pull request #15 from M1nd3r/Formatting

Fix formatting, fix scanner bug
M1nd3r · Aug 30, 2023 · a4f8867 · a4f8867
2 parents 9bbef1f + f9a068a
commit a4f8867
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/FolderSync/Program.cs b/FolderSync/Program.cs
@@ -32,5 +32,4 @@ private static void StopSyncLoopOnThread(SyncLoop syncLoop, Thread thread) {
         while (thread.IsAlive)
             Thread.Sleep(200);
     }
-
 }
diff --git a/FolderSync/Scanner.cs b/FolderSync/Scanner.cs
@@ -42,9 +42,10 @@ private void ProcessSubfolders(Folder folder, Queue<Folder> foldersToSolve) {
             }
         }
         private void ProcessFilesInFolder(Folder folder) {
-            if (!TryGetFilesPaths(folder.Path, out var filePaths))
+            if (!TryGetFilesPaths(folder.Path, out var filesPaths))
+                return;
+            if (filesPaths == null)
                 return;
-            var filesPaths = Directory.GetFiles(folder.Path);
             foreach (var filePath in filesPaths)
                 ScanAndAddFileToFolder(filePath, folder);
         }

diff --git a/FolderSyncTests/InputHandlerTests.cs b/FolderSyncTests/InputHandlerTests.cs
@@ -3,7 +3,7 @@
 namespace FolderSyncTests {
     [TestClass]
     public class InputHandlerTests {
-        private static string baseDir = AppDomain.CurrentDomain.BaseDirectory;
+        private static readonly string baseDir = AppDomain.CurrentDomain.BaseDirectory;
         [TestMethod]
         public void InputHandlerNullArgumentsTest() {
             Assert.IsFalse(InputHandler.HandleInput(null!));

diff --git a/FolderSyncTests/WithLogTests.cs b/FolderSyncTests/WithLogTests.cs
@@ -3,22 +3,18 @@
 namespace FolderSyncTests {
 
     [TestClass]
-    public class WithLogTests
-    {
-        private static WithLog mockWithLog = new MockWithLog();
+    public class WithLogTests {
+        private readonly static WithLog mockWithLog = new MockWithLog();
 
-        public class MockWithLog : WithLog
-        {
+        public class MockWithLog : WithLog {
         }
         [TestMethod]
-        public void CreateMockWithLogTest()
-        {
+        public void CreateMockWithLogTest() {
             var withLog = new MockWithLog();
             Assert.IsNotNull(withLog);
         }
         [TestMethod]
-        public void WithLogAddNullListenerTest()
-        {
+        public void WithLogAddNullListenerTest() {
             Assert.ThrowsException<ArgumentNullException>(() => { mockWithLog.AddLogListener(null!); });
         }
     }