SyncFiles method modified to detect conflicts as per #2096
[pithos-ms-client] / trunk / Pithos.Core / Agents / WorkflowAgent.cs
index 02155e9..d05f8d3 100644 (file)
@@ -1,40 +1,44 @@
-// -----------------------------------------------------------------------
-// <copyright file="WorkflowAgent.cs" company="GRNET">
-// Copyright 2011 GRNET S.A. All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or
-// without modification, are permitted provided that the following
-// conditions are met:
-// 
-//   1. Redistributions of source code must retain the above
-//      copyright notice, this list of conditions and the following
-//      disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above
-//      copyright notice, this list of conditions and the following
-//      disclaimer in the documentation and/or other materials
-//      provided with the distribution.
-// 
-// THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-// 
-// The views and conclusions contained in the software and
-// documentation are those of the authors and should not be
-// interpreted as representing official policies, either expressed
-// or implied, of GRNET S.A.
-// </copyright>
-// -----------------------------------------------------------------------
-
+#region
+/* -----------------------------------------------------------------------
+ * <copyright file="WorkflowAgent.cs" company="GRNet">
+ * 
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ * </copyright>
+ * -----------------------------------------------------------------------
+ */
+#endregion
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -54,7 +58,7 @@ namespace Pithos.Core.Agents
     [Export]
     public class WorkflowAgent
     {
-        Agent<WorkflowState> _agent;
+        readonly Agent<WorkflowState> _agent;
                 
         public IStatusNotification StatusNotification { get; set; }
         [System.ComponentModel.Composition.Import]
@@ -65,7 +69,7 @@ namespace Pithos.Core.Agents
 
         private static readonly ILog Log = LogManager.GetLogger("WorkflowAgent");
 
-        public void Start()
+        public WorkflowAgent()
         {
             _agent = Agent<WorkflowState>.Start(inbox =>
             {
@@ -126,17 +130,7 @@ namespace Pithos.Core.Agents
                                                                         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));
-                                    }
-                                }
+                                DeleteChildObjects(state, fileState);
                                 NetworkAgent.Post(new CloudDeleteAction(accountInfo, info, fileState));
                                 break;
                             case FileStatus.Renamed:
@@ -148,7 +142,10 @@ namespace Pithos.Core.Agents
                                                              : new FileInfo(state.Path);
                                 NetworkAgent.Post(new CloudMoveAction(accountInfo, CloudActionType.RenameCloud,
                                                                       oldInfo,
-                                                                      newInfo));
+                                                                      newInfo));                                
+                                //TODO: Do I have to move children as well or will Pithos handle this?
+                               //Need to find all children of the OLD filepath
+                                //MoveChildObjects(state);
                                 break;
                         }
                     }
@@ -164,11 +161,51 @@ namespace Pithos.Core.Agents
         }
 
 
+        private void DeleteChildObjects(WorkflowState state, FileState fileState)
+        {
+            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(state.AccountInfo, childInfo, child));
+                }
+            }
+        }
+
+        /*private void MoveChildObjects(WorkflowState state)
+        {
+            var oldFileState = StatusKeeper.GetStateByFilePath(state.OldPath);
+            if (oldFileState != null)
+            {
+                var children = StatusKeeper.GetChildren(oldFileState);
+                foreach (var child in children)
+                {
+                    var newPath = Path.Combine(state.Path, child.FilePath.Substring(state.OldPath.Length+1));
+
+                    var oldMoveInfo = child.IsFolder
+                                          ? (FileSystemInfo) new DirectoryInfo(child.FilePath)
+                                          : new FileInfo(child.FilePath);
+                    var newMoveInfo = child.IsFolder
+                                          ? (FileSystemInfo) new DirectoryInfo(newPath)
+                                          : new FileInfo(newPath);
+                    //The new file path will be created by trimming the old root path
+                    //and substituting the new root path
+
+                    NetworkAgent.Post(new CloudMoveAction(state.AccountInfo, CloudActionType.RenameCloud,
+                                                          oldMoveInfo, newMoveInfo));
+                }
+            }
+        }*/
+
+
         //Starts interrupted files for a specific account
         public void RestartInterruptedFiles(AccountInfo accountInfo)
         {
             
-            StatusNotification.NotifyChange("Restart processing interrupted files", TraceLevel.Verbose);
 
             using (log4net.ThreadContext.Stacks["Workflow"].Push("Restart"))
             {
@@ -181,25 +218,23 @@ namespace Pithos.Core.Agents
 
 
                 var account = accountInfo;
-                var pendingEntries = from state in FileState.Queryable
+                var pendingEntries = (from state in FileState.Queryable
                                      where state.FileStatus != FileStatus.Unchanged &&
                                            !state.FilePath.StartsWith(cachePath) &&
                                            !state.FilePath.EndsWith(".ignore") &&
                                            state.FilePath.StartsWith(account.AccountPath)
-                                     select state;
-                var pendingStates = new List<WorkflowState>();
-                foreach (var state in pendingEntries)
-                {
-                        pendingStates.Add(new WorkflowState(account, state));
-                }
+                                     select state).ToList();
+                if (pendingEntries.Count>0)
+                    StatusNotification.NotifyChange("Restart processing interrupted files", TraceLevel.Verbose);
+
+                var pendingStates = pendingEntries
+                    .Select(state => new WorkflowState(account, state))
+                    .ToList();
+
                 if (Log.IsDebugEnabled)
                     Log.DebugFormat("Found {0} interrupted files", pendingStates.Count);
 
-
-                foreach (var entry in pendingStates)
-                {
-                       Post(entry);
-                }
+                pendingStates.ForEach(Post);
             }
         }