Modifications to raise move events for moved child objects from the FileAgent

[pithos-ms-client] / trunk / Pithos.Core / Agents / FileSystemWatcherAdapter.cs

diff --git a/trunk/Pithos.Core/Agents/FileSystemWatcherAdapter.cs b/trunk/Pithos.Core/Agents/FileSystemWatcherAdapter.cs
index 55aeea2..54592df 100644 (file)
--- a/trunk/Pithos.Core/Agents/FileSystemWatcherAdapter.cs
+++ b/trunk/Pithos.Core/Agents/FileSystemWatcherAdapter.cs
@@ -42,6 +42,7 @@
 using System.Diagnostics.Contracts;\r
 using System.IO;\r
 using System.Threading.Tasks;\r
+using Pithos.Interfaces;\r
 \r
 namespace Pithos.Core.Agents\r
 {\r
@@ -106,7 +107,7 @@ namespace Pithos.Core.Agents
             //      as this is actually a MOVE operation\r
             //Deleting by Shift+Delete results in a delete event for each file followed by the delete of the folder itself\r
             _cachedDeletedFullPath = e.FullPath;\r
-\r
+            \r
             //TODO: This requires synchronization of the _cachedDeletedFullPath field\r
             //TODO: This creates a new task for each file even though we can cancel any existing tasks if a new event arrives\r
             //Maybe, use a timer instead of a task\r
@@ -199,8 +200,30 @@ namespace Pithos.Core.Agents
                 //If the actual action is a Move, raise a Move event instead of the actual event\r
                 var newDirectory = Path.GetDirectoryName(e.FullPath);\r
                 var oldDirectory = Path.GetDirectoryName(_cachedDeletedFullPath);\r
+\r
                 if (Moved != null)\r
+                {\r
                     Moved(sender, new MovedEventArgs(newDirectory, newName, oldDirectory, oldName));\r
+                    //If the moved item is a dictionary, we need to raise a change event for each child item\r
+                    //When a directory is moved within the same volume, Windows raises events only for the directory object,\r
+                    //not its children. This happens because the move actually changes a single directory entry. It doesn't\r
+                    //affect the entries of the children.\r
+                    var directory = new DirectoryInfo(e.FullPath);\r
+                    if (directory.Exists)\r
+                    {\r
+                        foreach (var child in directory.EnumerateFileSystemInfos("*", SearchOption.AllDirectories))\r
+                        {\r
+                            var newChildDirectory = Path.GetDirectoryName(child.FullName);\r
+\r
+                            var relativePath=child.AsRelativeTo(newDirectory);\r
+                            var relativeFolder = Path.GetDirectoryName(relativePath);\r
+                            var oldChildDirectory = Path.Combine(oldDirectory, relativeFolder);\r
+                            Moved(sender,new MovedEventArgs(newChildDirectory,child.Name,oldChildDirectory,child.Name));\r
+                        }\r
+                    }\r
+\r
+                }\r
+\r
             }\r
             finally\r
             {\r
@@ -223,8 +246,12 @@ namespace Pithos.Core.Agents
             var deletedFileName = Path.GetFileName(_cachedDeletedFullPath);\r
             var deletedFileDirectory = Path.GetDirectoryName(_cachedDeletedFullPath);\r
 \r
-            if (Deleted!=null)\r
-                Deleted(sender, new FileSystemEventArgs(WatcherChangeTypes.Deleted, deletedFileDirectory, deletedFileName));\r
+            //Only a single file Delete event is raised when moving a file to the Recycle Bin, as this is actually a MOVE operation\r
+            //In this case we need to raise the proper events for all child objects of the deleted directory.\r
+            //UNFORTUNATELY, this can't be detected here, eg. by retrieving the child objects, because they are already deleted\r
+            //This should be done at a higher level, eg by checking the stored state\r
+            if (Deleted != null)            \r
+                Deleted(sender,new FileSystemEventArgs(WatcherChangeTypes.Deleted, deletedFileDirectory, deletedFileName));\r
 \r
             _cachedDeletedFullPath = null;\r
         }\r