Modified the uploader to add new directories to Selected Folders if Selective Sync...

[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 d05f8d3..f56afef 100644 (file)
--- a/trunk/Pithos.Core/Agents/WorkflowAgent.cs
+++ b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
@@ -46,6 +46,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Castle.ActiveRecord;
@@ -58,6 +59,8 @@ namespace Pithos.Core.Agents
     [Export]
     public class WorkflowAgent
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         readonly Agent<WorkflowState> _agent;
                 
         public IStatusNotification StatusNotification { get; set; }
@@ -67,7 +70,11 @@ namespace Pithos.Core.Agents
         [System.ComponentModel.Composition.Import]
         public NetworkAgent NetworkAgent { get; set; }
 
-        private static readonly ILog Log = LogManager.GetLogger("WorkflowAgent");
+        [System.ComponentModel.Composition.Import]
+        public IPithosSettings Settings { get; set; }
+
+        [System.ComponentModel.Composition.Import]
+        public Selectives Selectives { get; set; }
 
         public WorkflowAgent()
         {
@@ -101,9 +108,9 @@ namespace Pithos.Core.Agents
                         if (Log.IsDebugEnabled) Log.DebugFormat("Skipping {0}", state.FileName);
 
                         return CompletedTask<object>.Default;
-                    }                    
+                    }
 
-                    var info = Directory.Exists(state.Path) ? (FileSystemInfo)new DirectoryInfo(state.Path) : new FileInfo(state.Path);
+                    var info = FileInfoExtensions.FromPath(state.Path);// 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)
@@ -127,13 +134,20 @@ namespace Pithos.Core.Agents
                             case FileStatus.Modified:
                                 NetworkAgent.Post(new CloudUploadAction(accountInfo, info, fileState,
                                                                         accountInfo.BlockSize,
-                                                                        accountInfo.BlockHash));
+                                                                        accountInfo.BlockHash,state,state.IsCreation));
                                 break;
                             case FileStatus.Deleted:
                                 DeleteChildObjects(state, fileState);
-                                NetworkAgent.Post(new CloudDeleteAction(accountInfo, info, fileState));
+                                NetworkAgent.Post(new CloudDeleteAction(accountInfo, info, fileState,state));
                                 break;
                             case FileStatus.Renamed:
+                                if (state.OldPath == null)
+                                {
+                                    //We reach this point only if the app closed before propagating a rename to the server
+                                    Log.WarnFormat("Unfinished rename [{0}]",state.Path);
+                                    StatusKeeper.SetFileState(state.Path,FileStatus.Conflict,FileOverlayStatus.Conflict, "Rename without old path");
+                                    break;
+                                }
                                 FileSystemInfo oldInfo = Directory.Exists(state.OldPath)
                                                              ? (FileSystemInfo) new DirectoryInfo(state.OldPath)
                                                              : new FileInfo(state.OldPath);
@@ -142,7 +156,7 @@ namespace Pithos.Core.Agents
                                                              : new FileInfo(state.Path);
                                 NetworkAgent.Post(new CloudMoveAction(accountInfo, CloudActionType.RenameCloud,
                                                                       oldInfo,
-                                                                      newInfo));                                
+                                                                      newInfo,state));                                
                                 //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);
@@ -171,7 +185,7 @@ namespace Pithos.Core.Agents
                     var childInfo = child.IsFolder
                                         ? (FileSystemInfo) new DirectoryInfo(child.FilePath)
                                         : new FileInfo(child.FilePath);
-                    NetworkAgent.Post(new CloudDeleteAction(state.AccountInfo, childInfo, child));
+                    NetworkAgent.Post(new CloudDeleteAction(state.AccountInfo, childInfo, child,state));
                 }
             }
         }
@@ -206,8 +220,8 @@ namespace Pithos.Core.Agents
         public void RestartInterruptedFiles(AccountInfo accountInfo)
         {
             
-
-            using (log4net.ThreadContext.Stacks["Workflow"].Push("Restart"))
+            StatusKeeper.CleanupOrphanStates();
+            using (log4net.ThreadContext.Stacks["Operation"].Push("RestartInterrupted"))
             {
                 if (Log.IsDebugEnabled)
                     Log.Debug("Starting interrupted files");
@@ -216,13 +230,16 @@ namespace Pithos.Core.Agents
                     .ToLower();
 
 
-
+                
+                
                 var account = accountInfo;
                 var pendingEntries = (from state in FileState.Queryable
                                      where state.FileStatus != FileStatus.Unchanged &&
+                                            state.FileStatus != FileStatus.Forbidden &&
+                                            state.FileStatus != FileStatus.Conflict &&
                                            !state.FilePath.StartsWith(cachePath) &&
                                            !state.FilePath.EndsWith(".ignore") &&
-                                           state.FilePath.StartsWith(account.AccountPath)
+                                           state.FilePath.StartsWith(account.AccountPath)                                            
                                      select state).ToList();
                 if (pendingEntries.Count>0)
                     StatusNotification.NotifyChange("Restart processing interrupted files", TraceLevel.Verbose);
@@ -230,7 +247,8 @@ namespace Pithos.Core.Agents
                 var pendingStates = pendingEntries
                     .Select(state => new WorkflowState(account, state))
                     .ToList();
-
+                
+                                
                 if (Log.IsDebugEnabled)
                     Log.DebugFormat("Found {0} interrupted files", pendingStates.Count);
 
@@ -251,6 +269,16 @@ namespace Pithos.Core.Agents
                 return;*/
             //TODO: Need to handle folder renames            
 
+
+            if (!Selectives.IsSelected(workflowState.AccountInfo, workflowState.Path))
+            {
+                if (!workflowState.IsCreation || File.Exists(workflowState.Path))
+                {
+                    Log.InfoFormat("File skipped, not under a selected folder [{0}] ", workflowState.Path);
+                    return;
+                }
+            }
+
             Debug.Assert(workflowState.Path.StartsWith(workflowState.AccountInfo.AccountPath, StringComparison.InvariantCultureIgnoreCase), "File from wrong account posted");
 
             _agent.Post(workflowState);