From d554a3105186974caeaa442229aec015c94870d1 Mon Sep 17 00:00:00 2001
From: Admin <admin@no.com>
Date: Wed, 16 Dec 2020 15:34:42 -0600
Subject: [PATCH] Patched the rename detection function and had some debug
 output placed in the FileManager form.

---
 .vs/DataOrganizer/v16/.suo            | Bin 151040 -> 153600 bytes
 DataOrganizer/FileManager.Designer.cs |   1 +
 DataOrganizer/FileManager.cs          |  56 ++++++++++++++++----------
 DataOrganizer/FileManager.resx        |   6 +++
 DataOrganizer/Snapshot.cs             |   5 ++-
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/.vs/DataOrganizer/v16/.suo b/.vs/DataOrganizer/v16/.suo
index 2709873198d9ab3afc6cab9f388fc3b67bd3f317..0ce1a64655484e7a33dc1e89c259472a9f84f76b 100644
GIT binary patch
delta 3753
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
I1qlZN0G1dFk^lez

delta 3044
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
V$_Y3lWScM30Va&9dh!HK0|1!<(3AiG

diff --git a/DataOrganizer/FileManager.Designer.cs b/DataOrganizer/FileManager.Designer.cs
index 8def445..39c405b 100644
--- a/DataOrganizer/FileManager.Designer.cs
+++ b/DataOrganizer/FileManager.Designer.cs
@@ -379,6 +379,7 @@
             this.ClientSize = new System.Drawing.Size(1306, 964);
             this.Controls.Add(this.MainLayoutPanel);
             this.Name = "FileManager";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "File Manager";
             this.MainLayoutPanel.ResumeLayout(false);
             this.MainLayoutPanel.PerformLayout();
diff --git a/DataOrganizer/FileManager.cs b/DataOrganizer/FileManager.cs
index ef014e1..c10b0ad 100644
--- a/DataOrganizer/FileManager.cs
+++ b/DataOrganizer/FileManager.cs
@@ -81,34 +81,46 @@ namespace DataOrganizer
             ComparisionSnapshot = new Snapshot(db.GetFilesForProfileByFolderGroup(p.Id, f.Id), f);
             var diff = ActiveSnapshot.Diff(ComparisionSnapshot);
 
-            //foreach (var folder in ActiveSnapshot.Directories.Values)
-            //{
-            //    if (ComparisionSnapshot.Directories.ContainsKey(folder.FullPath))
-            //    {
-            //        renames.AddRange(ActiveSnapshot.FindFileRenames(folder, ComparisionSnapshot.Directories[folder.FullPath]));
-            //    }
-            //}
-
-            //foreach (var rename in renames)
-            //{
-            //    DiffViewTreeView.Nodes.Add($"From: {rename.From.Name}");
-            //    DiffViewTreeView.Nodes.Add($"To: {rename.To.Name}");
-            //}
-            var dupCount = 0;
-
-            foreach(var folder in ActiveSnapshot.TopLevelFolders.Keys)
+            foreach (var folder in ActiveSnapshot.Directories.Values)
             {
-                foreach(var dup in ActiveSnapshot.FindDuplicates(ActiveSnapshot.Directories[folder]))
+                if (!folder.IsRootFolder)
                 {
-                    var node = new TreeNode($"{dup.File.Name} ({dup.Duplicates.Count})") { ToolTipText = dup.File.FullPath };
-                    foreach(var d in dup.Duplicates)
+                    var noRoot = folder.FullPath.Remove(0, ActiveSnapshot.Root.FullPath.Length + 1);
+                    var w = Path.Combine(f.Path, noRoot);
+
+                    if (ComparisionSnapshot.Directories.ContainsKey(w))
                     {
-                        node.Nodes.Add(new TreeNode(d.Name) { ToolTipText = d.FullPath });
-                        dupCount++;
+                        renames.AddRange(ActiveSnapshot.FindFileRenames(folder, ComparisionSnapshot.Directories[w]));
                     }
-                    DiffViewTreeView.Nodes.Add(node);
+                }
+                else
+                {
+                    var compareRoot = ComparisionSnapshot.Directories.Single(x => x.Value.IsRootFolder).Value;
+
+                    renames.AddRange(ActiveSnapshot.FindFileRenames(folder, compareRoot));
                 }
             }
+
+            foreach (var rename in renames)
+            {
+                DiffViewTreeView.Nodes.Add($"From: {rename.From.Name}");
+                DiffViewTreeView.Nodes.Add($"To: {rename.To.Name}");
+            }
+            var dupCount = 0;
+
+            //foreach(var folder in ActiveSnapshot.TopLevelFolders.Keys)
+            //{
+            //    foreach(var dup in ActiveSnapshot.FindDuplicates(ActiveSnapshot.Directories[folder]))
+            //    {
+            //        var node = new TreeNode($"{dup.File.Name} ({dup.Duplicates.Count})") { ToolTipText = dup.File.FullPath };
+            //        foreach(var d in dup.Duplicates)
+            //        {
+            //            node.Nodes.Add(new TreeNode(d.Name) { ToolTipText = d.FullPath });
+            //            dupCount++;
+            //        }
+            //        DiffViewTreeView.Nodes.Add(node);
+            //    }
+            //}
             UpdateStatusLabel($"Found {dupCount} duplicate files.");
             //foreach(var file in diff.NewFiles)
             //    AddFileSnapshotToDiffView(file, GetSelectedFolderGroup(), FileSnapshot.FileStatus.PendingInsert);
diff --git a/DataOrganizer/FileManager.resx b/DataOrganizer/FileManager.resx
index 0e5bf2c..57b87f9 100644
--- a/DataOrganizer/FileManager.resx
+++ b/DataOrganizer/FileManager.resx
@@ -123,4 +123,10 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>205, 17</value>
   </metadata>
+  <metadata name="MainMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>205, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/DataOrganizer/Snapshot.cs b/DataOrganizer/Snapshot.cs
index c3d2ae9..236c778 100644
--- a/DataOrganizer/Snapshot.cs
+++ b/DataOrganizer/Snapshot.cs
@@ -265,7 +265,10 @@ namespace DataOrganizer
                 foreach(var f in b.Files.Values)
                 {
                     if (file.Size == f.Size && file.CreatedDate == f.CreatedDate && file.ModifiedDate == f.ModifiedDate)
-                        renames.Add(new SnapshotComparsion.RenamedFile() { From = file, To = f });
+                    {
+                        if(f.Name != file.Name)
+                            renames.Add(new SnapshotComparsion.RenamedFile() { From = file, To = f });
+                    }
                 }
             }