updated methods to take in whole objects. makes it easier to work with. removed check for mvoed file, it was just doing all sorts of nonsense.

Author: loanstone

FolderSync/FileProps.cs

@@ -1,4 +1,5 @@
 using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
 
 namespace FolderSync
 {
@@ -38,24 +39,19 @@ public FileProps(string absoluteFilePath, string root)
         public string GetRelativePath => this._relativePath;
         public string GetMD5Code => this._md5Code;
 
-        public bool IsFileTheSame(string comparedToPath, string comparedToMD5)
+        public bool IsFileTheSame(FileProps comparedToFile)
         {
-            return this.GetRelativeFilePath == comparedToPath && IsSameMD5(this.GetMD5Code, comparedToMD5);
+            return this.GetRelativeFilePath == comparedToFile.GetRelativeFilePath && IsSameMD5(this.GetMD5Code, comparedToFile.GetMD5Code);
         }
 
-        public bool IsFileCopied(string comparedToName, string comparedToMD5, string comparedToRelativePath)
+        public bool IsFileCopied(FileProps comparedToFile)
         {
-            return (this.GetFileName == comparedToName && IsSameMD5(this.GetMD5Code, comparedToMD5)) && this.GetRelativePath != comparedToRelativePath;
+            return (this.GetFileName == comparedToFile.GetFileName && IsSameMD5(this.GetMD5Code, comparedToFile.GetMD5Code)) && this.GetRelativePath != comparedToFile.GetRelativePath;
         }
 
-        public bool IsFileModified(string comparedToPath, string comparedToMD5)
+        public bool IsFileModified(FileProps comparedToFile)
         {
-            return this.GetRelativeFilePath == comparedToPath && !IsSameMD5(this.GetMD5Code, comparedToMD5);
-        }
-
-        public bool IsFileMoved(string comparedToPath, string comparedToMD5)
-        {
-            return this.GetRelativeFilePath != comparedToPath && IsSameMD5(this.GetMD5Code, comparedToMD5);
+            return this.GetRelativeFilePath == comparedToFile.GetRelativeFilePath && !IsSameMD5(this.GetMD5Code, comparedToFile.GetMD5Code);
         }
 
         private static bool IsSameMD5(string origin, string backup)

FolderSync/Program.cs

@@ -28,8 +28,7 @@ private static void RunSync()
             while (true)
             {
                 CheckForMissingDirs();
-                CheckForMoodifiedFiles();
-                CheckForMovedFiles();
+                CheckForModifiedFiles();
                 CheckForCopiesInSource();
                 CheckForMissingFiles();
                 CheckForDeletedFiles();
@@ -114,14 +113,14 @@ private static void CheckForMissingDirs()
             }
         }
 
-        private static void CheckForMoodifiedFiles()
+        private static void CheckForModifiedFiles()
         {
             List<FileProps> sourceFileList = GetAllFilesInDirectory(sourceRoot);
             List<FileProps> backupFileList = GetAllFilesInDirectory(backupRoot);
 
             foreach (var sourceFile in sourceFileList)
             {
-                var backup = backupFileList.Find(backup => backup.IsFileModified(sourceFile.GetRelativeFilePath, sourceFile.GetMD5Code));
+                var backup = backupFileList.Find(backup => backup.IsFileModified(sourceFile));
                 if (backup != null)
                 {
                     EditFile(sourceFile, backup);
@@ -136,28 +135,6 @@ private static void EditFile(FileProps sourceFile, FileProps backupFile)
             File.Copy(sourceFile.GetAbsoluteFilePath, fullBackupPath);
             Log(sourceFile.GetFileName, backupFile.GetAbsolutePath, Actions.edited);
         }
-        // check for move is still not working properly
-        private static void CheckForMovedFiles()
-        {
-            List<FileProps> sourceFileList = GetAllFilesInDirectory(sourceRoot);
-            List<FileProps> backupFileList = GetAllFilesInDirectory(backupRoot);
-
-            foreach (var sourceFile in sourceFileList)
-            {
-                var backup = backupFileList.Find(backup => backup.IsFileMoved(sourceFile.GetRelativeFilePath, sourceFile.GetMD5Code));
-                if (backup != null && !File.Exists(backup.GetAbsoluteFilePath))
-                {
-                    MoveFile(sourceFile, backup);
-                }
-            }
-        }
-
-        private static void MoveFile(FileProps sourceFile, FileProps backupFile)
-        {
-            string newFile = Path.Combine(backupRoot, sourceFile.GetRelativeFilePath);
-            File.Move(backupFile.GetAbsoluteFilePath, newFile);
-            Log(sourceFile.GetFileName, newFile, Actions.moved);
-        }
 
         private static void CheckForCopiesInSource()
         {
@@ -166,12 +143,12 @@ private static void CheckForCopiesInSource()
 
             foreach (var sourceFile in sourceFileList)
             {
-                var matches = sourceFileList.Where(source => source.IsFileCopied(sourceFile.GetFileName, sourceFile.GetMD5Code, sourceFile.GetRelativePath)).ToList();
+                var matches = sourceFileList.Where(source => source.IsFileCopied(sourceFile)).ToList();
                 if (matches.Count > 0)
                 {
                     foreach (var match in matches)
                     {
-                        var backup = backupFileList.Find(backup => backup.IsFileTheSame(match.GetRelativeFilePath, match.GetMD5Code));
+                        var backup = backupFileList.Find(backup => backup.IsFileTheSame(match));
                         if (backup == null)
                         {
                             CopyFile(match);
@@ -195,7 +172,7 @@ private static void CheckForMissingFiles()
 
             foreach (var sourceFile in sourceFileList)
             {
-                var backup = backupFileList.Find(backup => backup.IsFileTheSame(sourceFile.GetRelativeFilePath, sourceFile.GetMD5Code));
+                var backup = backupFileList.Find(backup => backup.IsFileTheSame(sourceFile));
                 if (backup == null)
                 {
                     CreateFile(sourceFile);
@@ -217,7 +194,7 @@ private static void CheckForDeletedFiles()
 
             foreach (var backupFile in backupFileList)
             {
-                var source = sourceFileList.Find(source => source.IsFileTheSame(backupFile.GetRelativeFilePath, backupFile.GetMD5Code));
+                var source = sourceFileList.Find(source => source.IsFileTheSame(backupFile));
                 if (source == null)
                 {
                     DeleteFile(backupFile);
@@ -284,7 +261,7 @@ private static void Log(string filename, string fullDestinationName, Actions act
                 default:
                     break;
             }
-            string logTemplate = $"{dt} - {filename} was {action} {grammar} {fullDestinationName}";
+            string logTemplate = $"{dt} - {filename} was {action} {grammar} {Path.GetDirectoryName(fullDestinationName)}";
             Console.WriteLine(logTemplate);
 
             if (!Directory.Exists(Path.GetDirectoryName(logFilePath)))