Merge pull request 'feature/multi-threading' (#2) from feature/multi-threading into main

Reviewed-on: #2

src/Chksum/chksum.cs

@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using System.Reflection;
 using System.Security.Cryptography;
 using Microsoft.Data.Sqlite;
@@ -71,7 +72,7 @@ public class ChksumUtils {
     }
 
     private Dictionary<string, string> CalculateChecksums(string[] filenames) {
-        Dictionary<string, string> checksums = new Dictionary<string, string>();
+        ConcurrentDictionary<string, string> checksums = new ConcurrentDictionary<string, string>();
 
         Parallel.ForEach(filenames, (filename, state) => {
             using (var md5 = MD5.Create()) {
@@ -80,19 +81,23 @@ public class ChksumUtils {
                     var checksum = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
 
                     lock (checksums) {
-                        checksums.Add(filename, checksum);
+                        checksums.TryAdd(filename, checksum);
                     }
                 }
             }
         });
 
-        return checksums;
+        return new Dictionary<string, string>(checksums);
     }
 
     public void doTheThing() {
         using (var connection = new SqliteConnection("Data Source=" + DatabaseRoot + "chksum.db;Mode=ReadWrite")) {
-            if (getTotalFileCount() >= 1) {
+            if (getTotalFileCount() < 1) {
+                return;
+            }
+            connection.Open();
             Dictionary<string, string> fileHashes = CalculateChecksums(indexFiles());
+            
             foreach (var file in fileHashes) {
                 string absolutePathToFile = file.Key;
                 string fileName = Path.GetFileName(absolutePathToFile);
@@ -100,8 +105,6 @@ public class ChksumUtils {
                 string fileHash = file.Value;
                 
                 if (checkIfFileMovedAndUpdatePathToFile(fileHash, fileName, pathToFile) == false && checkIfFileAlreadyExistsInDatabase(fileHash, fileName) == false) {
-                        connection.Open();
-
                     var command = connection.CreateCommand();
                     command.CommandText =
                     @"
@@ -116,7 +119,6 @@ public class ChksumUtils {
             }
         }
     }
-    }
 
     private bool checkIfFileAlreadyExistsInDatabase(string fileHash, string pathToFile) {
         string filehash = string.Empty;
@@ -179,13 +181,13 @@ public class ChksumUtils {
                 command2.Parameters.AddWithValue("$filehash", fileHash);
                 command2.ExecuteNonQuery();
 
-                Console.WriteLine("File moved:");
+                Console.WriteLine("File moved or is a duplicate:");
                 Console.WriteLine($"\tfrom\t{pathToFile}");
                 Console.WriteLine($"\tto  \t{pathtofile}\n");
                 wasMoved = true;
             }
-            return wasMoved;
         }
+        return wasMoved;
     }
 
     public void checkIfFileWasDeleted() {
@@ -204,7 +206,9 @@ public class ChksumUtils {
                 while (reader.Read()) {
                     pathToFile = reader.GetString(0);
                     
-                    if (!File.Exists(pathToFile)) {
+                    if (File.Exists(pathToFile)) {
+                        continue;
+                    }
                     var deleteCommand = connection.CreateCommand();
                     deleteCommand.CommandText =
                     @"
@@ -220,7 +224,6 @@ public class ChksumUtils {
             }
         }
     }
-    }
 
     private List<string> getFilehashesFromDatabase(string connectionString) {
         List<string> filehashesFromDatabase = new List<string>();
@@ -249,7 +252,6 @@ public class ChksumUtils {
 
     public void compareDatabases(string filePathToOtherDatabase) {
         List<string> filesThatDoNotExistsInTheRemote = getFilehashesFromDatabase("Data Source=" + DatabaseRoot + "chksum.db;Mode=ReadOnly").Except(getFilehashesFromDatabase("Data Source=" + filePathToOtherDatabase + ";Mode=ReadOnly")).ToList();
-        //List<string> filesThatDoNotExistsInTheOrigin = filehashesOfRemoteDatabase.Except(filehashesOfOriginDatabase).ToList();
 
         foreach (string file in filesThatDoNotExistsInTheRemote) {
             using (var connection = new SqliteConnection("Data Source=" + DatabaseRoot + "chksum.db;Mode=ReadOnly")) {