using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.IO;
+using System.Linq;
using System.Net;
using System.Reflection;
using System.Threading;
private Agent<CloudAction> _agent;
[System.ComponentModel.Composition.Import]
- private DeleteAgent DeleteAgent { get; set; }
+ public DeleteAgent DeleteAgent { get; set; }
[System.ComponentModel.Composition.Import]
public IStatusKeeper StatusKeeper { get; set; }
[System.ComponentModel.Composition.Import]
public IPithosSettings Settings { get; set; }
+ private Uploader _uploader;
+
[System.ComponentModel.Composition.Import]
- public Uploader Uploader { get; set; }
+ public Uploader Uploader
+ {
+ get { return _uploader; }
+ set
+ {
+ _uploader = value;
+ _uploader.UnpauseEvent = _unPauseEvent;
+ }
+ }
+
+ private Downloader _downloader;
[System.ComponentModel.Composition.Import]
- public Downloader Downloader { get; set; }
+ public Downloader Downloader
+ {
+ get { return _downloader; }
+ set
+ {
+ _downloader = value;
+ _downloader.UnpauseEvent = _unPauseEvent;
+ }
+ }
+ [System.ComponentModel.Composition.Import]
+ public Selectives Selectives { get; set; }
+
//The Proceed signals the poll agent that it can proceed with polling.
//Essentially it stops the poll agent to give priority to the network agent
//Initially the event is signalled because we don't need to pause
private readonly AsyncManualResetEvent _proceedEvent = new AsyncManualResetEvent(true);
+ private Agents.Selectives _selectives;
+ private bool _pause;
public AsyncManualResetEvent ProceedEvent
{
get { return _proceedEvent; }
}
+ private readonly AsyncManualResetEvent _unPauseEvent = new AsyncManualResetEvent(true);
+
+ private CancellationTokenSource _currentOperationCancellation=new CancellationTokenSource();
+
+ public void CancelCurrentOperation()
+ {
+ //What does it mean to cancel the current upload/download?
+ //Obviously, the current operation will be cancelled by throwing
+ //a cancellation exception.
+ //
+ //The default behavior is to retry any operations that throw.
+ //Obviously this is not what we want in this situation.
+ //The cancelled operation should NOT bea retried.
+ //
+ //This can be done by catching the cancellation exception
+ //and avoiding the retry.
+ //
+
+ //Have to reset the cancellation source - it is not possible to reset the source
+ //Have to prevent a case where an operation requests a token from the old source
+ var oldSource = Interlocked.Exchange(ref _currentOperationCancellation, new CancellationTokenSource());
+ oldSource.Cancel();
+
+ }
public void Start()
{
loop = () =>
{
DeleteAgent.ProceedEvent.Wait();
+ _unPauseEvent.Wait();
var message = inbox.Receive();
var process=message.Then(Process,inbox.CancellationToken);
inbox.LoopAsync(process, loop);
{
case CloudActionType.UploadUnconditional:
//Abort if the file was deleted before we reached this point
- await Uploader.UploadCloudFile(action);
+ var uploadAction = (CloudUploadAction) action;
+ ProcessChildUploads(uploadAction);
+ await Uploader.UploadCloudFile(uploadAction ,CurrentOperationCancelToken);
break;
case CloudActionType.DownloadUnconditional:
- await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath);
+ await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath, CurrentOperationCancelToken);
break;
case CloudActionType.RenameCloud:
var moveAction = (CloudMoveAction)action;
case CloudActionType.MustSynch:
if (!File.Exists(downloadPath) && !Directory.Exists(downloadPath))
{
- await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath);
+ await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath, CurrentOperationCancelToken);
}
else
{
}
}
*/
- catch (OperationCanceledException)
- {
- throw;
+ catch (OperationCanceledException ex)
+ {
+ Log.WarnFormat("Cancelling [{0}]",ex);
}
catch (DirectoryNotFoundException)
{
}
}
+ private void ProcessChildUploads(CloudUploadAction uploadAction)
+ {
+ if (!uploadAction.IsCreation || !(uploadAction.LocalFile is DirectoryInfo))
+ return;
+
+ var dirInfo = uploadAction.LocalFile as DirectoryInfo;
+
+ var account = uploadAction.AccountInfo;
+ var folderActions = from info in dirInfo.EnumerateDirectories("*", SearchOption.AllDirectories)
+ select
+ new CloudUploadAction(account, info, null, account.BlockSize, account.BlockHash,
+ uploadAction, true);
+ var fileActions = from info in dirInfo.EnumerateFiles("*", SearchOption.AllDirectories)
+ select
+ new CloudUploadAction(account, info, null, account.BlockSize, account.BlockHash,
+ uploadAction, true);
+ //Post folder actions first, to ensure the selective folders are updated
+ folderActions.ApplyAction(PostUploadAction);
+ fileActions.ApplyAction(PostUploadAction);
+ }
+
+ private void PostUploadAction(CloudUploadAction action)
+ {
+ var state = StatusKeeper.GetStateByFilePath(action.LocalFile.FullName);
+ if (state != null)
+ state.Delete();
+ //StatusKeeper.SetFileState(action.LocalFile.FullName,FileStatus.Created,FileOverlayStatus.Normal,String.Empty);
+ state = FileState.CreateFor(action.LocalFile);
+ //StatusKeeper.SetFileStatus();
+ state.FileStatus = FileStatus.Created;
+ state.OverlayStatus = FileOverlayStatus.Normal;
+ state.Create();
+ action.FileState = state;
+ Post(action);
+ }
+
+ private CancellationToken CurrentOperationCancelToken
+ {
+ get { return _currentOperationCancellation.Token; }
+ }
+
private void UpdateStatus(PithosStatus status)
{
var state = StatusKeeper.GetStateByFilePath(previousFullPath);
state.FilePath = newPath;
state.SaveCopy();
- StatusKeeper.SetFileState(previousFullPath,FileStatus.Deleted,FileOverlayStatus.Deleted);
+ StatusKeeper.SetFileState(previousFullPath,FileStatus.Deleted,FileOverlayStatus.Deleted, "Deleted");
}
}
var cloudFile = action.CloudFile;
var downloadPath = action.LocalFile.GetProperCapitalization();
- var cloudHash = cloudFile.Hash.ToLower();
- var previousCloudHash = cloudFile.PreviousHash.ToLower();
+ var cloudHash = cloudFile.X_Object_Hash.ToLower();
+ var previousCloudHash = cloudFile.PreviousHash == null?null: cloudFile.PreviousHash.ToLower();
var localHash = action.TreeHash.Value.TopHash.ToHashString();// LocalHash.Value.ToLower();
//var topHash = action.TopHash.Value.ToLower();
+ if(cloudFile.IsDirectory && action.LocalFile is DirectoryInfo)
+ {
+ Log.InfoFormat("Skipping folder {0} , exists in server", downloadPath);
+ return;
+ }
+
//At this point we know that an object has changed on the server and that a local
//file already exists. We need to decide whether the file has only changed on
//the server or there is a conflicting change on the client.
return;
}
+ //If the local and remote files have 0 length their hashes will not match
+ if (!cloudFile.IsDirectory && cloudFile.Bytes==0 && action.LocalFile is FileInfo && (action.LocalFile as FileInfo).Length==0 )
+ {
+ Log.InfoFormat("Skipping {0}, files are empty", downloadPath);
+ return;
+ }
+
//The hashes DON'T match. We need to sync
// If the previous tophash matches the local tophash, the file was only changed on the server.
if (localHash == previousCloudHash)
{
- await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath);
+ await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath, CurrentOperationCancelToken);
}
else
{
//If the previous and local hash don't match, there was a local conflict
//that was not uploaded to the server. We have a conflict
- ReportConflict(downloadPath);
+ ReportConflictForMismatch(downloadPath);
}
}
}
- private void ReportConflict(string downloadPath)
+ private void ReportConflictForMismatch(string downloadPath)
{
if (String.IsNullOrWhiteSpace(downloadPath))
throw new ArgumentNullException("downloadPath");
Contract.EndContractBlock();
- StatusKeeper.SetFileOverlayStatus(downloadPath, FileOverlayStatus.Conflict);
+ StatusKeeper.SetFileState(downloadPath,FileStatus.Conflict, FileOverlayStatus.Conflict,"File changed at the server");
UpdateStatus(PithosStatus.HasConflicts);
var message = String.Format("Conflict detected for file {0}", downloadPath);
Log.Warn(message);
Contract.EndContractBlock();
DeleteAgent.ProceedEvent.Wait();
-/*
-
- //If the action targets a local file, add a treehash calculation
- if (!(cloudAction is CloudDeleteAction) && cloudAction.LocalFile as FileInfo != null)
- {
- var accountInfo = cloudAction.AccountInfo;
- var localFile = (FileInfo) cloudAction.LocalFile;
-
- if (localFile.Length > accountInfo.BlockSize)
- cloudAction.TopHash =
- new Lazy<string>(() => Signature.CalculateTreeHashAsync(localFile,
- accountInfo.BlockSize,
- accountInfo.BlockHash, Settings.HashingParallelism).Result
- .TopHash.ToHashString());
- else
- {
- cloudAction.TopHash = new Lazy<string>(() => cloudAction.LocalHash.Value);
- }
-
- }
- else
- {
- //The hash for a directory is the empty string
- cloudAction.TopHash = new Lazy<string>(() => String.Empty);
- }
-*/
if (cloudAction is CloudDeleteAction)
DeleteAgent.Post((CloudDeleteAction)cloudAction);
get { return _agent.CancellationToken; }
}
+ public bool Pause
+ {
+ get {
+ return _pause;
+ }
+ set {
+ _pause = value;
+ if (_pause)
+ _unPauseEvent.Reset();
+ else
+ {
+ _unPauseEvent.Set();
+ }
+ }
+ }
private void RenameCloudFile(AccountInfo accountInfo,CloudMoveAction action)
//The local file is already renamed
- StatusKeeper.SetFileOverlayStatus(newFilePath, FileOverlayStatus.Modified);
+ StatusKeeper.SetFileOverlayStatus(newFilePath, FileOverlayStatus.Modified).Wait();
var account = action.CloudFile.Account ?? accountInfo.UserName;
client.MoveObject(account, container, action.OldCloudFile.Name, container, action.CloudFile.Name);
StatusKeeper.SetFileStatus(newFilePath, FileStatus.Unchanged);
- StatusKeeper.SetFileOverlayStatus(newFilePath, FileOverlayStatus.Normal);
+ StatusKeeper.SetFileOverlayStatus(newFilePath, FileOverlayStatus.Normal).Wait();
NativeMethods.RaiseChangeNotification(newFilePath);
}
}
+
}
projects / pithos-ms-client / blobdiff