Added check for startup option

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

diff --git a/trunk/Pithos.Core/Agents/WorkflowAgent.cs b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
index 81a52f5..02155e9 100644 (file)
--- a/trunk/Pithos.Core/Agents/WorkflowAgent.cs
+++ b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
@@ -44,6 +44,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Castle.ActiveRecord;
 using Pithos.Interfaces;
 using Pithos.Network;
 using log4net;
@@ -56,10 +57,10 @@ namespace Pithos.Core.Agents
         Agent<WorkflowState> _agent;
                 
         public IStatusNotification StatusNotification { get; set; }
-        [Import]
+        [System.ComponentModel.Composition.Import]
         public IStatusKeeper StatusKeeper { get; set; }
 
-        [Import]
+        [System.ComponentModel.Composition.Import]
         public NetworkAgent NetworkAgent { get; set; }
 
         private static readonly ILog Log = LogManager.GetLogger("WorkflowAgent");
@@ -96,44 +97,60 @@ namespace Pithos.Core.Agents
                         if (Log.IsDebugEnabled) Log.DebugFormat("Skipping {0}", state.FileName);
 
                         return CompletedTask<object>.Default;
-                    }
-                    string path = state.Path.ToLower();
-
-
+                    }                    
 
-                    FileSystemInfo info = Directory.Exists(path) ? (FileSystemInfo) new DirectoryInfo(path) : new FileInfo(path);
+                    var info = Directory.Exists(state.Path) ? (FileSystemInfo)new DirectoryInfo(state.Path) : new FileInfo(state.Path);
 
                     //Bypass deleted files, unless the status is Deleted
                     if (!info.Exists && state.Status != FileStatus.Deleted)
                     {
                         state.Skip = true;
-                        this.StatusKeeper.ClearFileStatus(path);
+                        this.StatusKeeper.ClearFileStatus(state.Path);
 
                         if (Log.IsDebugEnabled) Log.DebugFormat("Skipped missing {0}", state.FileName);
 
                         return CompletedTask<object>.Default;
                     }
 
-                    var fileState = FileState.FindByFilePath(path);
-
-
-                    switch (state.Status)
+                    using (new SessionScope(FlushAction.Never))
                     {
-                        case FileStatus.Created:
-                        case FileStatus.Modified:
-                            NetworkAgent.Post(new CloudUploadAction(accountInfo, info, fileState, accountInfo.BlockSize,
-                                                                    accountInfo.BlockHash));
-                            break;
-                        case FileStatus.Deleted:
-                            NetworkAgent.Post(new CloudDeleteAction(accountInfo, info, fileState));
-                            break;
-                        case FileStatus.Renamed:
-                            FileSystemInfo oldInfo = Directory.Exists(state.OldPath) ? (FileSystemInfo)new DirectoryInfo(state.OldPath) : new FileInfo(state.OldPath);
-                            FileSystemInfo newInfo = Directory.Exists(state.Path) ? (FileSystemInfo)new DirectoryInfo(state.Path) : new FileInfo(state.Path);
-                            NetworkAgent.Post(new CloudMoveAction(accountInfo, CloudActionType.RenameCloud,
-                                                                  oldInfo,
-                                                                  newInfo));
-                            break;
+
+                        var fileState = StatusKeeper.GetStateByFilePath(state.Path);
+
+                        switch (state.Status)
+                        {
+                            case FileStatus.Created:
+                            case FileStatus.Modified:
+                                NetworkAgent.Post(new CloudUploadAction(accountInfo, info, fileState,
+                                                                        accountInfo.BlockSize,
+                                                                        accountInfo.BlockHash));
+                                break;
+                            case FileStatus.Deleted:
+                                if (fileState != null)
+                                {
+                                    var children = StatusKeeper.GetChildren(fileState);
+                                    foreach (var child in children)
+                                    {
+                                        var childInfo = child.IsFolder
+                                                            ? (FileSystemInfo) new DirectoryInfo(child.FilePath)
+                                                            : new FileInfo(child.FilePath);
+                                        NetworkAgent.Post(new CloudDeleteAction(accountInfo, childInfo, child));
+                                    }
+                                }
+                                NetworkAgent.Post(new CloudDeleteAction(accountInfo, info, fileState));
+                                break;
+                            case FileStatus.Renamed:
+                                FileSystemInfo oldInfo = Directory.Exists(state.OldPath)
+                                                             ? (FileSystemInfo) new DirectoryInfo(state.OldPath)
+                                                             : new FileInfo(state.OldPath);
+                                FileSystemInfo newInfo = Directory.Exists(state.Path)
+                                                             ? (FileSystemInfo) new DirectoryInfo(state.Path)
+                                                             : new FileInfo(state.Path);
+                                NetworkAgent.Post(new CloudMoveAction(accountInfo, CloudActionType.RenameCloud,
+                                                                      oldInfo,
+                                                                      newInfo));
+                                break;
+                        }
                     }
 
                     return CompletedTask<object>.Default;