Fix incorrect check in Selective Sync that prevented folder changes to propagate...
[pithos-ms-client] / trunk / Pithos.Core / Agents / FileAgent.cs
index 761199c..b64773a 100644 (file)
@@ -1,27 +1,70 @@
-using System;
+#region
+/* -----------------------------------------------------------------------
+ * <copyright file="FileAgent.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;
-using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
-using System.Text;
+using System.Reflection;
 using System.Threading.Tasks;
 using Pithos.Interfaces;
 using Pithos.Network;
 using log4net;
-using log4net.Core;
 
 namespace Pithos.Core.Agents
 {
 //    [Export]
     public class FileAgent
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         Agent<WorkflowState> _agent;
         private FileSystemWatcher _watcher;
+        private FileSystemWatcherAdapter _adapter;
 
         //[Import]
         public IStatusKeeper StatusKeeper { get; set; }
+
+        public IStatusNotification StatusNotification { get; set; }
         //[Import]
         public IPithosWorkflow Workflow { get; set; }
         //[Import]
@@ -29,9 +72,50 @@ namespace Pithos.Core.Agents
 
         private AccountInfo AccountInfo { get; set; }
 
-        private string RootPath { get;  set; }
+        internal string RootPath { get;  set; }
+        
+        private FileEventIdleBatch _eventIdleBatch;
+
+        public TimeSpan IdleTimeout { get; set; }
+
 
-        private static readonly ILog Log = LogManager.GetLogger("FileAgent");
+        private void ProcessBatchedEvents(Dictionary<string, FileSystemEventArgs[]> fileEvents)
+        {
+            StatusNotification.SetPithosStatus(PithosStatus.LocalSyncing,String.Format("Uploading {0} files",fileEvents.Count));
+            foreach (var fileEvent in fileEvents)
+            {
+                var filePath = fileEvent.Key;
+                var changes = fileEvent.Value;
+                
+                if (Ignore(filePath)) continue;
+                                
+                foreach (var change in changes)
+                {
+                    if (change.ChangeType == WatcherChangeTypes.Renamed)
+                    {
+                        var rename = (MovedEventArgs) change;
+                        _agent.Post(new WorkflowState(change)
+                                        {
+                                            AccountInfo = AccountInfo,
+                                            OldPath = rename.OldFullPath,
+                                            OldFileName = Path.GetFileName(rename.OldName),
+                                            Path = rename.FullPath,
+                                            FileName = Path.GetFileName(rename.Name),
+                                            TriggeringChange = rename.ChangeType
+                                        });
+                    }
+                    else
+                        _agent.Post(new WorkflowState(change)
+                        {
+                            AccountInfo = AccountInfo,
+                            Path = change.FullPath,
+                            FileName = Path.GetFileName(change.Name),
+                            TriggeringChange = change.ChangeType
+                        });                        
+                }
+            }
+            StatusNotification.SetPithosStatus(PithosStatus.LocalComplete);
+        }
 
         public void Start(AccountInfo accountInfo,string rootPath)
         {
@@ -41,16 +125,23 @@ namespace Pithos.Core.Agents
                 throw new ArgumentNullException("rootPath");
             if (!Path.IsPathRooted(rootPath))
                 throw new ArgumentException("rootPath must be an absolute path","rootPath");
+            if (IdleTimeout == null)
+                throw new InvalidOperationException("IdleTimeout must have a valid value");
             Contract.EndContractBlock();
 
             AccountInfo = accountInfo;
             RootPath = rootPath;
-            _watcher = new FileSystemWatcher(rootPath);
-            _watcher.IncludeSubdirectories = true;            
-            _watcher.Changed += OnFileEvent;
-            _watcher.Created += OnFileEvent;
-            _watcher.Deleted += OnFileEvent;
-            _watcher.Renamed += OnRenameEvent;
+
+            _eventIdleBatch = new FileEventIdleBatch((int)IdleTimeout.TotalMilliseconds, ProcessBatchedEvents);
+
+            _watcher = new FileSystemWatcher(rootPath) {IncludeSubdirectories = true,InternalBufferSize=8*4096};
+            _adapter = new FileSystemWatcherAdapter(_watcher);
+
+            _adapter.Changed += OnFileEvent;
+            _adapter.Created += OnFileEvent;
+            _adapter.Deleted += OnFileEvent;
+            //_adapter.Renamed += OnRenameEvent;
+            _adapter.Moved += OnMoveEvent;
             _watcher.EnableRaisingEvents = true;
 
 
@@ -60,8 +151,7 @@ namespace Pithos.Core.Agents
                 loop = () =>
                 {
                     var message = inbox.Receive();
-                    var process=message.Then(Process,inbox.CancellationToken);
-
+                    var process=message.Then(Process,inbox.CancellationToken);                    
                     inbox.LoopAsync(process,loop,ex=>
                         Log.ErrorFormat("[ERROR] File Event Processing:\r{0}", ex));
                 };
@@ -75,7 +165,8 @@ namespace Pithos.Core.Agents
                 throw new ArgumentNullException("state");
             Contract.EndContractBlock();
 
-            Debug.Assert(!Ignore(state.Path));
+            if (Ignore(state.Path))
+                return CompletedTask<object>.Default;
 
             var networkState = NetworkGate.GetNetworkState(state.Path);
             //Skip if the file is already being downloaded or uploaded and 
@@ -89,6 +180,8 @@ namespace Pithos.Core.Agents
 
             try
             {
+                //StatusKeeper.EnsureFileState(state.Path);
+                
                 UpdateFileStatus(state);
                 UpdateOverlayStatus(state);
                 UpdateFileChecksum(state);
@@ -126,12 +219,14 @@ namespace Pithos.Core.Agents
 
         public string CachePath { get; set; }
 
-        private List<string> _selectivePaths = new List<string>();
+        /*private List<string> _selectivePaths = new List<string>();
         public List<string> SelectivePaths
         {
             get { return _selectivePaths; }
             set { _selectivePaths = value; }
         }
+*/
+        public Selectives Selectives { get; set; }
 
 
         public void Post(WorkflowState workflowState)
@@ -147,10 +242,6 @@ namespace Pithos.Core.Agents
         {
             if (_watcher != null)
             {
-                _watcher.Changed -= OnFileEvent;
-                _watcher.Created -= OnFileEvent;
-                _watcher.Deleted -= OnFileEvent;
-                _watcher.Renamed -= OnRenameEvent;
                 _watcher.Dispose();
             }
             _watcher = null;
@@ -187,16 +278,90 @@ namespace Pithos.Core.Agents
             return monitoredFiles;
         }                
 
+        public IEnumerable<string> EnumerateFilesSystemInfosAsRelativeUrls(string searchPattern="*")
+        {
+            var rootDir = new DirectoryInfo(RootPath);
+            var monitoredFiles = from file in rootDir.EnumerateFileSystemInfos(searchPattern, SearchOption.AllDirectories)
+                                 where !Ignore(file.FullName)
+                                 select file.AsRelativeUrlTo(RootPath);
+            return monitoredFiles;
+        }                
+
 
         
 
         private bool Ignore(string filePath)
         {
+            //Ignore all first-level directories and files (ie at the container folders level)
+            if (FoundBelowRoot(filePath, RootPath,1))
+                return true;
+
+            //Ignore first-level items under the "others" folder (ie at the accounts folders level).
+            var othersPath = Path.Combine(RootPath, FolderConstants.OthersFolder);
+            if (FoundBelowRoot(filePath, othersPath,1))
+                return true;
+
+            //Ignore second-level (container) folders under the "others" folder (ie at the container folders level). 
+            if (FoundBelowRoot(filePath, othersPath,2))
+                return true;            
+
+
+            //Ignore anything happening in the cache path
             if (filePath.StartsWith(CachePath))
                 return true;
             if (_ignoreFiles.ContainsKey(filePath.ToLower()))
                 return true;
-            return false;
+            
+            //If selective sync is enabled, propagate folder events
+            if (Selectives.IsSelectiveEnabled(AccountInfo.AccountKey) && Directory.Exists(filePath))
+                return false;
+            //Ignore if selective synchronization is defined, 
+            //And the target file is not below any of the selective paths
+            return !Selectives.IsSelected(AccountInfo, filePath);
+        }
+
+/*        private static bool FoundInRoot(string filePath, string rootPath)
+        {
+            //var rootDirectory = new DirectoryInfo(rootPath);
+
+            //If the paths are equal, return true
+            if (filePath.Equals(rootPath, StringComparison.InvariantCultureIgnoreCase))
+                return true;
+
+            //If the filepath is below the root path
+            if (filePath.StartsWith(rootPath,StringComparison.InvariantCulture))
+            {
+                //Get the relative path
+                var relativePath = filePath.Substring(rootPath.Length + 1);
+                //If the relativePath does NOT contains a path separator, we found a match
+                return (!relativePath.Contains(@"\"));
+            }
+
+            //If the filepath is not under the root path, return false
+            return false;            
+        }*/
+
+
+        private static bool FoundBelowRoot(string filePath, string rootPath,int level)
+        {
+            //var rootDirectory = new DirectoryInfo(rootPath);
+
+            //If the paths are equal, return true
+            if (filePath.Equals(rootPath, StringComparison.InvariantCultureIgnoreCase))
+                return true;
+
+            //If the filepath is below the root path
+            if (filePath.StartsWith(rootPath,StringComparison.InvariantCulture))
+            {
+                //Get the relative path
+                var relativePath = filePath.Substring(rootPath.Length + 1);
+                //If the relativePath does NOT contains a path separator, we found a match
+                var levels=relativePath.ToCharArray().Count(c=>c=='\\')+1;                
+                return levels==level;
+            }
+
+            //If the filepath is not under the root path, return false
+            return false;            
         }
 
         //Post a Change message for all events except rename
@@ -206,12 +371,11 @@ namespace Pithos.Core.Agents
             var filePath = e.FullPath;
             if (Ignore(filePath)) 
                 return;
-            if (Directory.Exists(filePath))
-                return;            
-            _agent.Post(new WorkflowState{AccountInfo=AccountInfo, Path = filePath, FileName = e.Name, TriggeringChange = e.ChangeType });
+            _eventIdleBatch.Post(e);
         }
 
 
+/*
         //Post a Change message for renames containing the old and new names
         void OnRenameEvent(object sender, RenamedEventArgs e)
         {
@@ -230,18 +394,30 @@ namespace Pithos.Core.Agents
                 TriggeringChange = e.ChangeType
             });
         }
+*/
+
+        //Post a Change message for moves containing the old and new names
+        void OnMoveEvent(object sender, MovedEventArgs e)
+        {
+            var oldFullPath = e.OldFullPath;
+            var fullPath = e.FullPath;
+            if (Ignore(oldFullPath) || Ignore(fullPath))
+                return;
+
+            _eventIdleBatch.Post(e);
+        }
 
 
 
         private Dictionary<WatcherChangeTypes, FileStatus> _statusDict = new Dictionary<WatcherChangeTypes, FileStatus>
-        {
+                                                                             {
             {WatcherChangeTypes.Created,FileStatus.Created},
             {WatcherChangeTypes.Changed,FileStatus.Modified},
             {WatcherChangeTypes.Deleted,FileStatus.Deleted},
             {WatcherChangeTypes.Renamed,FileStatus.Renamed}
         };
 
-        private Dictionary<string,string> _ignoreFiles=new Dictionary<string, string>();
+        private Dictionary<string, string> _ignoreFiles=new Dictionary<string, string>();
 
         private WorkflowState UpdateFileStatus(WorkflowState state)
         {
@@ -279,18 +455,20 @@ namespace Pithos.Core.Agents
             switch (state.Status)
             {
                 case FileStatus.Created:
+                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Modified,state.ShortHash);
+                    break;
                 case FileStatus.Modified:
-                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Modified);
+                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Modified,state.ShortHash);
                     break;
                 case FileStatus.Deleted:
                     //this.StatusAgent.RemoveFileOverlayStatus(state.Path);
                     break;
                 case FileStatus.Renamed:
                     this.StatusKeeper.ClearFileStatus(state.OldPath);
-                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Modified);
+                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Modified,state.ShortHash);
                     break;
                 case FileStatus.Unchanged:
-                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Normal);
+                    this.StatusKeeper.SetFileOverlayStatus(state.Path, FileOverlayStatus.Normal,state.ShortHash);
                     break;
             }
 
@@ -316,11 +494,18 @@ namespace Pithos.Core.Agents
                 return state;
 
             var info = new FileInfo(path);
-            string hash = info.CalculateHash(StatusKeeper.BlockSize,StatusKeeper.BlockHash);
-            StatusKeeper.UpdateFileChecksum(path, hash);
 
-            state.Hash = hash;
-            return state;
+            using (StatusNotification.GetNotifier("Hashing {0}", "Finished Hashing {0}", info.Name))
+            {
+
+                var shortHash = info.ComputeShortHash();
+
+                string merkleHash = info.CalculateHash(StatusKeeper.BlockSize, StatusKeeper.BlockHash);
+                StatusKeeper.UpdateFileChecksum(path, shortHash, merkleHash);
+
+                state.Hash = merkleHash;
+                return state;
+            }
         }
 
         //Does the file exist in the container's local folder?
@@ -344,7 +529,18 @@ namespace Pithos.Core.Agents
             return false;
         }
 
-        public FileInfo GetFileInfo(string relativePath)
+        public static FileAgent GetFileAgent(AccountInfo accountInfo)
+        {
+            return GetFileAgent(accountInfo.AccountPath);
+        }
+
+        public static FileAgent GetFileAgent(string rootPath)
+        {
+            return AgentLocator<FileAgent>.Get(rootPath.ToLower());
+        }
+
+
+        public FileSystemInfo GetFileSystemInfo(string relativePath)
         {
             if (String.IsNullOrWhiteSpace(relativePath))
                 throw new ArgumentNullException("relativePath");
@@ -354,20 +550,39 @@ namespace Pithos.Core.Agents
             Contract.EndContractBlock();            
 
             var absolutePath = Path.Combine(RootPath, relativePath);
-//            Debug.Assert(File.Exists(absolutePath),String.Format("Path {0} doesn't exist",absolutePath));
 
-            return new FileInfo(absolutePath);
+            if (Directory.Exists(absolutePath))
+                return new DirectoryInfo(absolutePath).WithProperCapitalization();
+            else
+                return new FileInfo(absolutePath).WithProperCapitalization();
             
         }
 
         public void Delete(string relativePath)
         {
-            var absolutePath = Path.Combine(RootPath, relativePath);
+            var absolutePath = Path.Combine(RootPath, relativePath).ToLower();
+            if (Log.IsDebugEnabled)
+                Log.DebugFormat("Deleting {0}", absolutePath);
             if (File.Exists(absolutePath))
-            {                   
-                File.Delete(absolutePath);
-                _ignoreFiles[absolutePath.ToLower()] = absolutePath.ToLower();                
+            {    
+                try
+                {
+                    File.Delete(absolutePath);
+                }
+                //The file may have been deleted by another thread. Just ignore the relevant exception
+                catch (FileNotFoundException) { }
             }
+            else if (Directory.Exists(absolutePath))
+            {
+                try
+                {
+                    Directory.Delete(absolutePath, true);
+                }
+                //The directory may have been deleted by another thread. Just ignore the relevant exception
+                catch (DirectoryNotFoundException){}                
+            }
+        
+            //_ignoreFiles[absolutePath] = absolutePath;                
             StatusKeeper.ClearFileStatus(absolutePath);
         }
     }